www-commits
[Top][All Lists]
Advanced

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

www/gnu gnu-users-never-heard-of-gnu.ca.html gn...


From: GNUN
Subject: www/gnu gnu-users-never-heard-of-gnu.ca.html gn...
Date: Tue, 2 Nov 2021 10:41:58 -0400 (EDT)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     21/11/02 10:41:55

Modified files:
        gnu            : gnu-users-never-heard-of-gnu.ca.html 
                         gnu-users-never-heard-of-gnu.de.html 
                         gnu-users-never-heard-of-gnu.it.html 
                         gnu-users-never-heard-of-gnu.nl.html 
                         gnu-users-never-heard-of-gnu.pl.html 
                         gnu-users-never-heard-of-gnu.uk.html 
                         incorrect-quotation.pt-br.html 
                         initial-announcement.sv.html 
                         linux-and-gnu.cs.html linux-and-gnu.it.html 
                         linux-and-gnu.nl.html linux-and-gnu.pl.html 
                         manifesto.sv.html why-gnu-linux.ca.html 
                         why-gnu-linux.cs.html why-gnu-linux.de.html 
                         why-gnu-linux.el.html why-gnu-linux.es.html 
                         why-gnu-linux.fr.html why-gnu-linux.hr.html 
                         why-gnu-linux.ja.html why-gnu-linux.ko.html 
                         why-gnu-linux.nl.html why-gnu-linux.pl.html 
                         why-gnu-linux.pt-br.html why-gnu-linux.ru.html 
                         why-gnu-linux.sq.html why-gnu-linux.tr.html 
                         why-gnu-linux.uk.html why-gnu-linux.zh-cn.html 
                         why-gnu-linux.zh-tw.html 
        gnu/po         : gnu-history.ar-diff.html gnu-history.ar.po 
                         gnu-history.bg-diff.html gnu-history.bg.po 
                         gnu-history.ca-diff.html gnu-history.ca.po 
                         gnu-history.cs.po gnu-history.de.po 
                         gnu-history.el-diff.html gnu-history.el.po 
                         gnu-history.es.po gnu-history.fa.po 
                         gnu-history.fr.po gnu-history.hr.po 
                         gnu-history.id.po gnu-history.it.po 
                         gnu-history.ja.po gnu-history.ko.po 
                         gnu-history.ml.po gnu-history.nb.po 
                         gnu-history.nl.po gnu-history.pl.po 
                         gnu-history.pt-br.po gnu-history.ro.po 
                         gnu-history.ru.po gnu-history.sq.po 
                         gnu-history.sr.po gnu-history.sv.po 
                         gnu-history.tr.po gnu-history.uk.po 
                         gnu-history.zh-cn.po gnu-history.zh-tw.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-structure.es.po 
                         gnu-structure.fr.po gnu-structure.pot 
                         gnu-structure.pt-br.po gnu-structure.ru.po 
                         gnu-structure.tr.po gnu-structure.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-diff.html 
                         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-diff.html 
                         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-diff.html 
                         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-diff.html 
                         gnu-users-never-heard-of-gnu.nl.po 
                         gnu-users-never-heard-of-gnu.pl-diff.html 
                         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-diff.html 
                         gnu-users-never-heard-of-gnu.uk.po 
                         gnu-users-never-heard-of-gnu.zh-cn.po 
                         incorrect-quotation.fr.po 
                         incorrect-quotation.pot 
                         incorrect-quotation.pt-br-en.html 
                         incorrect-quotation.pt-br.po 
                         incorrect-quotation.ru.po 
                         incorrect-quotation.zh-cn.po 
                         initial-announcement.ar.po 
                         initial-announcement.bg.po 
                         initial-announcement.ca.po 
                         initial-announcement.cs.po 
                         initial-announcement.de.po 
                         initial-announcement.es.po 
                         initial-announcement.fr.po 
                         initial-announcement.hr.po 
                         initial-announcement.it.po 
                         initial-announcement.ja.po 
                         initial-announcement.nl.po 
                         initial-announcement.pl.po 
                         initial-announcement.pot 
                         initial-announcement.pt-br.po 
                         initial-announcement.ru.po 
                         initial-announcement.sq.po 
                         initial-announcement.sv.po 
                         initial-announcement.tr.po 
                         initial-announcement.uk.po 
                         initial-announcement.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-diff.html 
                         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-diff.html 
                         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-diff.html 
                         linux-and-gnu.nl.po linux-and-gnu.pl-diff.html 
                         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 
                         manifesto.ar.po manifesto.ca.po manifesto.cs.po 
                         manifesto.de.po manifesto.el-diff.html 
                         manifesto.el.po manifesto.es.po manifesto.fr.po 
                         manifesto.hr-diff.html manifesto.hr.po 
                         manifesto.it.po manifesto.ja.po manifesto.ko.po 
                         manifesto.nl.po manifesto.pl.po manifesto.pot 
                         manifesto.pt-br.po manifesto.ro.po 
                         manifesto.ru.po manifesto.sq.po manifesto.sr.po 
                         manifesto.sv.po manifesto.ta.po manifesto.tr.po 
                         manifesto.uk.po manifesto.zh-cn.po 
                         pronunciation.de.po pronunciation.fr.po 
                         pronunciation.hr.po pronunciation.it.po 
                         pronunciation.ja.po pronunciation.ko.po 
                         pronunciation.pot pronunciation.pt-br.po 
                         pronunciation.ru.po pronunciation.tr.po 
                         pronunciation.uk.po pronunciation.zh-cn.po 
                         rms-lisp.es.po rms-lisp.fr.po rms-lisp.ja.po 
                         rms-lisp.pot rms-lisp.pt-br.po rms-lisp.ru.po 
                         rms-lisp.sq.po rms-lisp.uk.po rms-lisp.zh-cn.po 
                         why-gnu-linux.ca-diff.html 
                         why-gnu-linux.cs-diff.html 
                         why-gnu-linux.de-diff.html 
                         why-gnu-linux.el-diff.html 
                         why-gnu-linux.es-en.html 
                         why-gnu-linux.fr-en.html 
                         why-gnu-linux.hr-diff.html 
                         why-gnu-linux.it-diff.html 
                         why-gnu-linux.ja-en.html 
                         why-gnu-linux.ko-diff.html 
                         why-gnu-linux.nl-diff.html 
                         why-gnu-linux.pl-diff.html 
                         why-gnu-linux.pt-br-en.html 
                         why-gnu-linux.ru-en.html 
                         why-gnu-linux.sq-en.html 
                         why-gnu-linux.tr-en.html 
                         why-gnu-linux.uk-diff.html 
                         why-gnu-linux.zh-cn-en.html 
                         why-gnu-linux.zh-tw-en.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/gnu-users-never-heard-of-gnu.ca.html?cvsroot=www&r1=1.34&r2=1.35
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/gnu-users-never-heard-of-gnu.de.html?cvsroot=www&r1=1.51&r2=1.52
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/gnu-users-never-heard-of-gnu.it.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/gnu-users-never-heard-of-gnu.nl.html?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/gnu-users-never-heard-of-gnu.pl.html?cvsroot=www&r1=1.39&r2=1.40
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/gnu-users-never-heard-of-gnu.uk.html?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/incorrect-quotation.pt-br.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/initial-announcement.sv.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/linux-and-gnu.cs.html?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/linux-and-gnu.it.html?cvsroot=www&r1=1.53&r2=1.54
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/linux-and-gnu.nl.html?cvsroot=www&r1=1.31&r2=1.32
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/linux-and-gnu.pl.html?cvsroot=www&r1=1.90&r2=1.91
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/manifesto.sv.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/why-gnu-linux.ca.html?cvsroot=www&r1=1.46&r2=1.47
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/why-gnu-linux.cs.html?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/why-gnu-linux.de.html?cvsroot=www&r1=1.58&r2=1.59
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/why-gnu-linux.el.html?cvsroot=www&r1=1.40&r2=1.41
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/why-gnu-linux.es.html?cvsroot=www&r1=1.61&r2=1.62
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/why-gnu-linux.fr.html?cvsroot=www&r1=1.77&r2=1.78
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/why-gnu-linux.hr.html?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/why-gnu-linux.ja.html?cvsroot=www&r1=1.37&r2=1.38
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/why-gnu-linux.ko.html?cvsroot=www&r1=1.35&r2=1.36
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/why-gnu-linux.nl.html?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/why-gnu-linux.pl.html?cvsroot=www&r1=1.56&r2=1.57
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/why-gnu-linux.pt-br.html?cvsroot=www&r1=1.36&r2=1.37
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/why-gnu-linux.ru.html?cvsroot=www&r1=1.42&r2=1.43
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/why-gnu-linux.sq.html?cvsroot=www&r1=1.45&r2=1.46
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/why-gnu-linux.tr.html?cvsroot=www&r1=1.32&r2=1.33
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/why-gnu-linux.uk.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/why-gnu-linux.zh-cn.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/why-gnu-linux.zh-tw.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-history.ar-diff.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-history.ar.po?cvsroot=www&r1=1.51&r2=1.52
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-history.bg-diff.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-history.bg.po?cvsroot=www&r1=1.29&r2=1.30
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-history.ca-diff.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-history.ca.po?cvsroot=www&r1=1.37&r2=1.38
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-history.cs.po?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-history.de.po?cvsroot=www&r1=1.52&r2=1.53
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-history.el-diff.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-history.el.po?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-history.es.po?cvsroot=www&r1=1.51&r2=1.52
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-history.fa.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-history.fr.po?cvsroot=www&r1=1.64&r2=1.65
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-history.hr.po?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-history.id.po?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-history.it.po?cvsroot=www&r1=1.36&r2=1.37
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-history.ja.po?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-history.ko.po?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-history.ml.po?cvsroot=www&r1=1.39&r2=1.40
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-history.nb.po?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-history.nl.po?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-history.pl.po?cvsroot=www&r1=1.35&r2=1.36
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-history.pt-br.po?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-history.ro.po?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-history.ru.po?cvsroot=www&r1=1.41&r2=1.42
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-history.sq.po?cvsroot=www&r1=1.51&r2=1.52
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-history.sr.po?cvsroot=www&r1=1.29&r2=1.30
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-history.sv.po?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-history.tr.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-history.uk.po?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-history.zh-cn.po?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-history.zh-tw.po?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.ar.po?cvsroot=www&r1=1.74&r2=1.75
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.ca-diff.html?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.ca.po?cvsroot=www&r1=1.98&r2=1.99
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.de-diff.html?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.de.po?cvsroot=www&r1=1.126&r2=1.127
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.es.po?cvsroot=www&r1=1.144&r2=1.145
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.fr.po?cvsroot=www&r1=1.129&r2=1.130
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.hr-diff.html?cvsroot=www&r1=1.39&r2=1.40
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.hr.po?cvsroot=www&r1=1.45&r2=1.46
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.it-diff.html?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.it.po?cvsroot=www&r1=1.56&r2=1.57
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.ja.po?cvsroot=www&r1=1.100&r2=1.101
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.ko-diff.html?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.ko.po?cvsroot=www&r1=1.31&r2=1.32
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.nl-diff.html?cvsroot=www&r1=1.49&r2=1.50
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.nl.po?cvsroot=www&r1=1.67&r2=1.68
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.pl-diff.html?cvsroot=www&r1=1.26&r2=1.27
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.pl.po?cvsroot=www&r1=1.88&r2=1.89
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.pot?cvsroot=www&r1=1.58&r2=1.59
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.pt-br.po?cvsroot=www&r1=1.26&r2=1.27
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.ru.po?cvsroot=www&r1=1.128&r2=1.129
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.sq.po?cvsroot=www&r1=1.121&r2=1.122
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.sr.po?cvsroot=www&r1=1.68&r2=1.69
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.tr.po?cvsroot=www&r1=1.91&r2=1.92
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.uk-diff.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.uk.po?cvsroot=www&r1=1.49&r2=1.50
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.zh-cn.po?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-structure.es.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-structure.fr.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-structure.pot?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-structure.pt-br.po?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-structure.ru.po?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-structure.tr.po?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-structure.zh-cn.po?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.ar-diff.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.ar.po?cvsroot=www&r1=1.39&r2=1.40
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.bg-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.bg.po?cvsroot=www&r1=1.26&r2=1.27
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.ca-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.ca.po?cvsroot=www&r1=1.33&r2=1.34
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.cs-diff.html?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.cs.po?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.de-diff.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.de.po?cvsroot=www&r1=1.42&r2=1.43
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.es.po?cvsroot=www&r1=1.49&r2=1.50
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.fa-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.fa.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.fr.po?cvsroot=www&r1=1.48&r2=1.49
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.hr-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.hr.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.it-diff.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.it.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.ja.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.ml-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.ml.po?cvsroot=www&r1=1.31&r2=1.32
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.nl-diff.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.nl.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.pl-diff.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.pl.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.pot?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.pt-br.po?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.ru.po?cvsroot=www&r1=1.39&r2=1.40
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.sq.po?cvsroot=www&r1=1.53&r2=1.54
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.sr-diff.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.sr.po?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.tr.po?cvsroot=www&r1=1.40&r2=1.41
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.uk-diff.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.uk.po?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.zh-cn.po?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/incorrect-quotation.fr.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/incorrect-quotation.pot?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/incorrect-quotation.pt-br-en.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/incorrect-quotation.pt-br.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/incorrect-quotation.ru.po?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/incorrect-quotation.zh-cn.po?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/initial-announcement.ar.po?cvsroot=www&r1=1.31&r2=1.32
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/initial-announcement.bg.po?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/initial-announcement.ca.po?cvsroot=www&r1=1.33&r2=1.34
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/initial-announcement.cs.po?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/initial-announcement.de.po?cvsroot=www&r1=1.41&r2=1.42
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/initial-announcement.es.po?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/initial-announcement.fr.po?cvsroot=www&r1=1.52&r2=1.53
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/initial-announcement.hr.po?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/initial-announcement.it.po?cvsroot=www&r1=1.51&r2=1.52
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/initial-announcement.ja.po?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/initial-announcement.nl.po?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/initial-announcement.pl.po?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/initial-announcement.pot?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/initial-announcement.pt-br.po?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/initial-announcement.ru.po?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/initial-announcement.sq.po?cvsroot=www&r1=1.37&r2=1.38
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/initial-announcement.sv.po?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/initial-announcement.tr.po?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/initial-announcement.uk.po?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/initial-announcement.zh-cn.po?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.ar-diff.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.ar.po?cvsroot=www&r1=1.65&r2=1.66
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.bg.po?cvsroot=www&r1=1.49&r2=1.50
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.ca-diff.html?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.ca.po?cvsroot=www&r1=1.69&r2=1.70
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.cs-diff.html?cvsroot=www&r1=1.30&r2=1.31
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.cs.po?cvsroot=www&r1=1.34&r2=1.35
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.de-diff.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.de.po?cvsroot=www&r1=1.50&r2=1.51
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.el-diff.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.el.po?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.es.po?cvsroot=www&r1=1.83&r2=1.84
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.fa.po?cvsroot=www&r1=1.46&r2=1.47
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.fr.po?cvsroot=www&r1=1.94&r2=1.95
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.hr-diff.html?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.hr.po?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.id.po?cvsroot=www&r1=1.37&r2=1.38
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.it-diff.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.it.po?cvsroot=www&r1=1.77&r2=1.78
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.ja.po?cvsroot=www&r1=1.65&r2=1.66
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.ko.po?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.lt-diff.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.lt.po?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.ml-diff.html?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.ml.po?cvsroot=www&r1=1.53&r2=1.54
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.nl-diff.html?cvsroot=www&r1=1.26&r2=1.27
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.nl.po?cvsroot=www&r1=1.40&r2=1.41
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.pl-diff.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.pl.po?cvsroot=www&r1=1.56&r2=1.57
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.pot?cvsroot=www&r1=1.40&r2=1.41
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.pt-br.po?cvsroot=www&r1=1.31&r2=1.32
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.ro.po?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.ru.po?cvsroot=www&r1=1.77&r2=1.78
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.sq.po?cvsroot=www&r1=1.86&r2=1.87
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.sr.po?cvsroot=www&r1=1.54&r2=1.55
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.ta.po?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.tr.po?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.uk-diff.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.uk.po?cvsroot=www&r1=1.32&r2=1.33
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.zh-cn.po?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/manifesto.ar.po?cvsroot=www&r1=1.33&r2=1.34
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/manifesto.ca.po?cvsroot=www&r1=1.36&r2=1.37
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/manifesto.cs.po?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/manifesto.de.po?cvsroot=www&r1=1.60&r2=1.61
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/manifesto.el-diff.html?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/manifesto.el.po?cvsroot=www&r1=1.30&r2=1.31
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/manifesto.es.po?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/manifesto.fr.po?cvsroot=www&r1=1.72&r2=1.73
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/manifesto.hr-diff.html?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/manifesto.hr.po?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/manifesto.it.po?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/manifesto.ja.po?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/manifesto.ko.po?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/manifesto.nl.po?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/manifesto.pl.po?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/manifesto.pot?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/manifesto.pt-br.po?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/manifesto.ro.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/manifesto.ru.po?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/manifesto.sq.po?cvsroot=www&r1=1.38&r2=1.39
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/manifesto.sr.po?cvsroot=www&r1=1.30&r2=1.31
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/manifesto.sv.po?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/manifesto.ta.po?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/manifesto.tr.po?cvsroot=www&r1=1.32&r2=1.33
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/manifesto.uk.po?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/manifesto.zh-cn.po?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/pronunciation.de.po?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/pronunciation.fr.po?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/pronunciation.hr.po?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/pronunciation.it.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/pronunciation.ja.po?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/pronunciation.ko.po?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/pronunciation.pot?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/pronunciation.pt-br.po?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/pronunciation.ru.po?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/pronunciation.tr.po?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/pronunciation.uk.po?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/pronunciation.zh-cn.po?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/rms-lisp.es.po?cvsroot=www&r1=1.54&r2=1.55
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/rms-lisp.fr.po?cvsroot=www&r1=1.58&r2=1.59
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/rms-lisp.ja.po?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/rms-lisp.pot?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/rms-lisp.pt-br.po?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/rms-lisp.ru.po?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/rms-lisp.sq.po?cvsroot=www&r1=1.48&r2=1.49
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/rms-lisp.uk.po?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/rms-lisp.zh-cn.po?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.ca-diff.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.cs-diff.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.de-diff.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.el-diff.html?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.es-en.html?cvsroot=www&r1=1.31&r2=1.32
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.fr-en.html?cvsroot=www&r1=1.41&r2=1.42
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.hr-diff.html?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.it-diff.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.ja-en.html?cvsroot=www&r1=1.29&r2=1.30
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.ko-diff.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.nl-diff.html?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.pl-diff.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.pt-br-en.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.ru-en.html?cvsroot=www&r1=1.34&r2=1.35
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.sq-en.html?cvsroot=www&r1=1.26&r2=1.27
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.tr-en.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.uk-diff.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.zh-cn-en.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.zh-tw-en.html?cvsroot=www&r1=1.1&r2=1.2

Patches:
Index: gnu-users-never-heard-of-gnu.ca.html
===================================================================
RCS file: /web/www/www/gnu/gnu-users-never-heard-of-gnu.ca.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- gnu-users-never-heard-of-gnu.ca.html        29 Oct 2021 13:32:42 -0000      
1.34
+++ gnu-users-never-heard-of-gnu.ca.html        2 Nov 2021 14:41:49 -0000       
1.35
@@ -3,7 +3,7 @@
  https://www.gnu.org/gnu/po/gnu-users-never-heard-of-gnu.ca.po</a>'
  --><!--#set var="ORIGINAL_FILE" value="/gnu/gnu-users-never-heard-of-gnu.html"
  --><!--#set var="DIFF_FILE" 
value="/gnu/po/gnu-users-never-heard-of-gnu.ca-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2021-08-30" --><!--#set 
var="ENGLISH_PAGE" value="/gnu/gnu-users-never-heard-of-gnu.en.html" -->
+ --><!--#set var="OUTDATED_SINCE" value="2021-08-30" -->
 
 <!--#include virtual="/server/html5-header.ca.html" -->
 <!-- Parent-Version: 1.96 -->
@@ -143,7 +143,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Updated:
 
-$Date: 2021/10/29 13:32:42 $
+$Date: 2021/11/02 14:41:49 $
 
 <!-- timestamp end -->
 </p>

Index: gnu-users-never-heard-of-gnu.de.html
===================================================================
RCS file: /web/www/www/gnu/gnu-users-never-heard-of-gnu.de.html,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- gnu-users-never-heard-of-gnu.de.html        29 Oct 2021 13:32:42 -0000      
1.51
+++ gnu-users-never-heard-of-gnu.de.html        2 Nov 2021 14:41:49 -0000       
1.52
@@ -3,7 +3,7 @@
  https://www.gnu.org/gnu/po/gnu-users-never-heard-of-gnu.de.po</a>'
  --><!--#set var="ORIGINAL_FILE" value="/gnu/gnu-users-never-heard-of-gnu.html"
  --><!--#set var="DIFF_FILE" 
value="/gnu/po/gnu-users-never-heard-of-gnu.de-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2021-08-30" --><!--#set 
var="ENGLISH_PAGE" value="/gnu/gnu-users-never-heard-of-gnu.en.html" -->
+ --><!--#set var="OUTDATED_SINCE" value="2021-08-30" -->
 
 <!--#include virtual="/server/html5-header.de.html" -->
 <!-- Parent-Version: 1.96 -->
@@ -152,7 +152,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Letzte Änderung:
 
-$Date: 2021/10/29 13:32:42 $
+$Date: 2021/11/02 14:41:49 $
 
 <!-- timestamp end -->
 </p>

Index: gnu-users-never-heard-of-gnu.it.html
===================================================================
RCS file: /web/www/www/gnu/gnu-users-never-heard-of-gnu.it.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- gnu-users-never-heard-of-gnu.it.html        29 Oct 2021 13:32:42 -0000      
1.11
+++ gnu-users-never-heard-of-gnu.it.html        2 Nov 2021 14:41:49 -0000       
1.12
@@ -3,7 +3,7 @@
  https://www.gnu.org/gnu/po/gnu-users-never-heard-of-gnu.it.po</a>'
  --><!--#set var="ORIGINAL_FILE" value="/gnu/gnu-users-never-heard-of-gnu.html"
  --><!--#set var="DIFF_FILE" 
value="/gnu/po/gnu-users-never-heard-of-gnu.it-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2021-08-30" --><!--#set 
var="ENGLISH_PAGE" value="/gnu/gnu-users-never-heard-of-gnu.en.html" -->
+ --><!--#set var="OUTDATED_SINCE" value="2021-08-30" -->
 
 <!--#include virtual="/server/html5-header.it.html" -->
 <!-- Parent-Version: 1.96 -->
@@ -152,7 +152,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Ultimo aggiornamento:
 
-$Date: 2021/10/29 13:32:42 $
+$Date: 2021/11/02 14:41:49 $
 
 <!-- timestamp end -->
 </p>

Index: gnu-users-never-heard-of-gnu.nl.html
===================================================================
RCS file: /web/www/www/gnu/gnu-users-never-heard-of-gnu.nl.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- gnu-users-never-heard-of-gnu.nl.html        29 Oct 2021 13:32:42 -0000      
1.23
+++ gnu-users-never-heard-of-gnu.nl.html        2 Nov 2021 14:41:49 -0000       
1.24
@@ -3,7 +3,7 @@
  https://www.gnu.org/gnu/po/gnu-users-never-heard-of-gnu.nl.po</a>'
  --><!--#set var="ORIGINAL_FILE" value="/gnu/gnu-users-never-heard-of-gnu.html"
  --><!--#set var="DIFF_FILE" 
value="/gnu/po/gnu-users-never-heard-of-gnu.nl-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2021-08-30" --><!--#set 
var="ENGLISH_PAGE" value="/gnu/gnu-users-never-heard-of-gnu.en.html" -->
+ --><!--#set var="OUTDATED_SINCE" value="2021-08-30" -->
 
 <!--#include virtual="/server/html5-header.nl.html" -->
 <!-- Parent-Version: 1.96 -->
@@ -146,7 +146,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Bijgewerkt:
 
-$Date: 2021/10/29 13:32:42 $
+$Date: 2021/11/02 14:41:49 $
 
 <!-- timestamp end -->
 </p>

Index: gnu-users-never-heard-of-gnu.pl.html
===================================================================
RCS file: /web/www/www/gnu/gnu-users-never-heard-of-gnu.pl.html,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- gnu-users-never-heard-of-gnu.pl.html        29 Oct 2021 13:32:42 -0000      
1.39
+++ gnu-users-never-heard-of-gnu.pl.html        2 Nov 2021 14:41:49 -0000       
1.40
@@ -3,7 +3,7 @@
  https://www.gnu.org/gnu/po/gnu-users-never-heard-of-gnu.pl.po</a>'
  --><!--#set var="ORIGINAL_FILE" value="/gnu/gnu-users-never-heard-of-gnu.html"
  --><!--#set var="DIFF_FILE" 
value="/gnu/po/gnu-users-never-heard-of-gnu.pl-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2021-08-30" --><!--#set 
var="ENGLISH_PAGE" value="/gnu/gnu-users-never-heard-of-gnu.en.html" -->
+ --><!--#set var="OUTDATED_SINCE" value="2021-08-30" -->
 
 <!--#include virtual="/server/html5-header.pl.html" -->
 <!-- Parent-Version: 1.96 -->
@@ -153,7 +153,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Aktualizowane:
 
-$Date: 2021/10/29 13:32:42 $
+$Date: 2021/11/02 14:41:49 $
 
 <!-- timestamp end -->
 </p>

Index: gnu-users-never-heard-of-gnu.uk.html
===================================================================
RCS file: /web/www/www/gnu/gnu-users-never-heard-of-gnu.uk.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- gnu-users-never-heard-of-gnu.uk.html        29 Oct 2021 13:32:42 -0000      
1.12
+++ gnu-users-never-heard-of-gnu.uk.html        2 Nov 2021 14:41:49 -0000       
1.13
@@ -3,7 +3,7 @@
  https://www.gnu.org/gnu/po/gnu-users-never-heard-of-gnu.uk.po</a>'
  --><!--#set var="ORIGINAL_FILE" value="/gnu/gnu-users-never-heard-of-gnu.html"
  --><!--#set var="DIFF_FILE" 
value="/gnu/po/gnu-users-never-heard-of-gnu.uk-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2021-08-30" --><!--#set 
var="ENGLISH_PAGE" value="/gnu/gnu-users-never-heard-of-gnu.en.html" -->
+ --><!--#set var="OUTDATED_SINCE" value="2021-08-30" -->
 
 <!--#include virtual="/server/html5-header.uk.html" -->
 <!-- Parent-Version: 1.96 -->
@@ -146,7 +146,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Оновлено:
 
-$Date: 2021/10/29 13:32:42 $
+$Date: 2021/11/02 14:41:49 $
 
 <!-- timestamp end -->
 </p>

Index: incorrect-quotation.pt-br.html
===================================================================
RCS file: /web/www/www/gnu/incorrect-quotation.pt-br.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- incorrect-quotation.pt-br.html      22 May 2020 22:05:08 -0000      1.5
+++ incorrect-quotation.pt-br.html      2 Nov 2021 14:41:49 -0000       1.6
@@ -1,15 +1,24 @@
 <!--#set var="ENGLISH_PAGE" value="/gnu/incorrect-quotation.en.html" -->
 
 <!--#include virtual="/server/header.pt-br.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="gnulinux" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Citação incorreta - Projeto GNU - Free Software Foundation</title>
 
 <!--#include virtual="/gnu/po/incorrect-quotation.translist" -->
 <!--#include virtual="/server/banner.pt-br.html" -->
+<!--#include virtual="/gnu/gnu-breadcrumb.pt-br.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.pt-br.html" -->
+<div class="article reduced-width">
 <h2>Citação incorreta</h2>
 
+<address class="byline">por Richard Stallman</address>
+
 <p>Uma citação circula na Internet, atribuída a mim, mas não foi escrita 
por
 mim.</p>
 
@@ -56,6 +65,7 @@
 <p>Veja <a href="/gnu/linux-and-gnu.html">Linux e GNU</a> e <a
 href="/gnu/gnu-linux-faq.html">GNU/Linux FAQ</a>, e também a história em <a
 href="/gnu/thegnuproject.html">O Projeto GNU</a>.</p>
+</div>
 
 <div class="translators-notes">
 
@@ -65,7 +75,7 @@
 
 <!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.pt-br.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Envie perguntas em geral sobre a FSF e o GNU para <a
@@ -85,7 +95,7 @@
 
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
@@ -95,8 +105,8 @@
 <a
 href="mailto:web-translators@gnu.org";>&lt;web-translators@gnu.org&gt;</a>.
 </p><p>Consulte o <a href="/server/standards/README.translations.html">Guia
-para as traduções</a> para mais informações sobre a coordenação e o 
envio de
-traduções das páginas deste site.</p>
+para as traduções</a> para mais informações sobre a coordenação e a
+contribuição com traduções das páginas deste site.</p>
 </div>
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
@@ -115,7 +125,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2018 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2018, 2021 Free Software Foundation, Inc.</p>
 
 <p>Esta página está licenciada sob uma licença <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/deed.pt_BR";>Creative
@@ -131,7 +141,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Última atualização:
 
-$Date: 2020/05/22 22:05:08 $
+$Date: 2021/11/02 14:41:49 $
 
 <!-- timestamp end -->
 </p>

Index: initial-announcement.sv.html
===================================================================
RCS file: /web/www/www/gnu/initial-announcement.sv.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- initial-announcement.sv.html        29 Apr 2015 10:40:01 -0000      1.11
+++ initial-announcement.sv.html        2 Nov 2021 14:41:49 -0000       1.12
@@ -1,6 +1,6 @@
 <!--#set var="PO_FILE"
  value='<a href="/gnu/po/initial-announcement.sv.po">
- http://www.gnu.org/gnu/po/initial-announcement.sv.po</a>'
+ https://www.gnu.org/gnu/po/initial-announcement.sv.po</a>'
  --><!--#set var="ORIGINAL_FILE" value="/gnu/initial-announcement.html"
  --><!--#set var="DIFF_FILE" value=""
  --><!--#set var="OUTDATED_SINCE" value="2007-05-18" -->
@@ -300,7 +300,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Updaterat:
 
-$Date: 2015/04/29 10:40:01 $
+$Date: 2021/11/02 14:41:49 $
 
 <!-- timestamp end -->
 </p>

Index: linux-and-gnu.cs.html
===================================================================
RCS file: /web/www/www/gnu/linux-and-gnu.cs.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- linux-and-gnu.cs.html       29 Oct 2021 13:32:42 -0000      1.22
+++ linux-and-gnu.cs.html       2 Nov 2021 14:41:49 -0000       1.23
@@ -3,7 +3,7 @@
  https://www.gnu.org/gnu/po/linux-and-gnu.cs.po</a>'
  --><!--#set var="ORIGINAL_FILE" value="/gnu/linux-and-gnu.html"
  --><!--#set var="DIFF_FILE" value="/gnu/po/linux-and-gnu.cs-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2021-08-30" --><!--#set 
var="ENGLISH_PAGE" value="/gnu/linux-and-gnu.en.html" -->
+ --><!--#set var="OUTDATED_SINCE" value="2021-08-30" -->
 
 <!--#include virtual="/server/html5-header.cs.html" -->
 <!-- Parent-Version: 1.96 -->
@@ -315,7 +315,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Aktualizováno:
 
-$Date: 2021/10/29 13:32:42 $
+$Date: 2021/11/02 14:41:49 $
 
 <!-- timestamp end -->
 </p>

Index: linux-and-gnu.it.html
===================================================================
RCS file: /web/www/www/gnu/linux-and-gnu.it.html,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- linux-and-gnu.it.html       29 Oct 2021 13:32:42 -0000      1.53
+++ linux-and-gnu.it.html       2 Nov 2021 14:41:49 -0000       1.54
@@ -3,7 +3,7 @@
  https://www.gnu.org/gnu/po/linux-and-gnu.it.po</a>'
  --><!--#set var="ORIGINAL_FILE" value="/gnu/linux-and-gnu.html"
  --><!--#set var="DIFF_FILE" value="/gnu/po/linux-and-gnu.it-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2021-08-30" --><!--#set 
var="ENGLISH_PAGE" value="/gnu/linux-and-gnu.en.html" -->
+ --><!--#set var="OUTDATED_SINCE" value="2021-08-30" -->
 
 <!--#include virtual="/server/html5-header.it.html" -->
 <!-- Parent-Version: 1.96 -->
@@ -350,7 +350,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Ultimo aggiornamento:
 
-$Date: 2021/10/29 13:32:42 $
+$Date: 2021/11/02 14:41:49 $
 
 <!-- timestamp end -->
 </p>

Index: linux-and-gnu.nl.html
===================================================================
RCS file: /web/www/www/gnu/linux-and-gnu.nl.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- linux-and-gnu.nl.html       29 Oct 2021 13:32:42 -0000      1.31
+++ linux-and-gnu.nl.html       2 Nov 2021 14:41:49 -0000       1.32
@@ -3,7 +3,7 @@
  https://www.gnu.org/gnu/po/linux-and-gnu.nl.po</a>'
  --><!--#set var="ORIGINAL_FILE" value="/gnu/linux-and-gnu.html"
  --><!--#set var="DIFF_FILE" value="/gnu/po/linux-and-gnu.nl-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2021-08-30" --><!--#set 
var="ENGLISH_PAGE" value="/gnu/linux-and-gnu.en.html" -->
+ --><!--#set var="OUTDATED_SINCE" value="2021-08-30" -->
 
 <!--#include virtual="/server/html5-header.nl.html" -->
 <!-- Parent-Version: 1.96 -->
@@ -332,7 +332,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Bijgewerkt:
 
-$Date: 2021/10/29 13:32:42 $
+$Date: 2021/11/02 14:41:49 $
 
 <!-- timestamp end -->
 </p>

Index: linux-and-gnu.pl.html
===================================================================
RCS file: /web/www/www/gnu/linux-and-gnu.pl.html,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -b -r1.90 -r1.91
--- linux-and-gnu.pl.html       29 Oct 2021 13:32:42 -0000      1.90
+++ linux-and-gnu.pl.html       2 Nov 2021 14:41:49 -0000       1.91
@@ -3,7 +3,7 @@
  https://www.gnu.org/gnu/po/linux-and-gnu.pl.po</a>'
  --><!--#set var="ORIGINAL_FILE" value="/gnu/linux-and-gnu.html"
  --><!--#set var="DIFF_FILE" value="/gnu/po/linux-and-gnu.pl-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2021-08-30" --><!--#set 
var="ENGLISH_PAGE" value="/gnu/linux-and-gnu.en.html" -->
+ --><!--#set var="OUTDATED_SINCE" value="2021-08-30" -->
 
 <!--#include virtual="/server/html5-header.pl.html" -->
 <!-- Parent-Version: 1.96 -->
@@ -346,7 +346,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Aktualizowane:
 
-$Date: 2021/10/29 13:32:42 $
+$Date: 2021/11/02 14:41:49 $
 
 <!-- timestamp end -->
 </p>

Index: manifesto.sv.html
===================================================================
RCS file: /web/www/www/gnu/manifesto.sv.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- manifesto.sv.html   29 Apr 2015 10:40:01 -0000      1.6
+++ manifesto.sv.html   2 Nov 2021 14:41:49 -0000       1.7
@@ -1,6 +1,6 @@
 <!--#set var="PO_FILE"
  value='<a href="/gnu/po/manifesto.sv.po">
- http://www.gnu.org/gnu/po/manifesto.sv.po</a>'
+ https://www.gnu.org/gnu/po/manifesto.sv.po</a>'
  --><!--#set var="ORIGINAL_FILE" value="/gnu/manifesto.html"
  --><!--#set var="DIFF_FILE" value=""
  --><!--#set var="OUTDATED_SINCE" value="2004-01-17" -->
@@ -660,7 +660,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Updaterat:
 
-$Date: 2015/04/29 10:40:01 $
+$Date: 2021/11/02 14:41:49 $
 
 <!-- timestamp end -->
 </p>

Index: why-gnu-linux.ca.html
===================================================================
RCS file: /web/www/www/gnu/why-gnu-linux.ca.html,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- why-gnu-linux.ca.html       29 Oct 2021 13:32:42 -0000      1.46
+++ why-gnu-linux.ca.html       2 Nov 2021 14:41:49 -0000       1.47
@@ -3,7 +3,7 @@
  https://www.gnu.org/gnu/po/why-gnu-linux.ca.po</a>'
  --><!--#set var="ORIGINAL_FILE" value="/gnu/why-gnu-linux.html"
  --><!--#set var="DIFF_FILE" value="/gnu/po/why-gnu-linux.ca-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2021-08-30" --><!--#set 
var="ENGLISH_PAGE" value="/gnu/why-gnu-linux.en.html" -->
+ --><!--#set var="OUTDATED_SINCE" value="2021-08-30" -->
 
 <!--#include virtual="/server/html5-header.ca.html" -->
 <!-- Parent-Version: 1.96 -->
@@ -277,7 +277,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Updated:
 
-$Date: 2021/10/29 13:32:42 $
+$Date: 2021/11/02 14:41:49 $
 
 <!-- timestamp end -->
 </p>

Index: why-gnu-linux.cs.html
===================================================================
RCS file: /web/www/www/gnu/why-gnu-linux.cs.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- why-gnu-linux.cs.html       29 Oct 2021 13:32:42 -0000      1.24
+++ why-gnu-linux.cs.html       2 Nov 2021 14:41:49 -0000       1.25
@@ -3,7 +3,7 @@
  https://www.gnu.org/gnu/po/why-gnu-linux.cs.po</a>'
  --><!--#set var="ORIGINAL_FILE" value="/gnu/why-gnu-linux.html"
  --><!--#set var="DIFF_FILE" value="/gnu/po/why-gnu-linux.cs-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2021-08-30" --><!--#set 
var="ENGLISH_PAGE" value="/gnu/why-gnu-linux.en.html" -->
+ --><!--#set var="OUTDATED_SINCE" value="2021-08-30" -->
 
 <!--#include virtual="/server/html5-header.cs.html" -->
 <!-- Parent-Version: 1.96 -->
@@ -263,7 +263,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Aktualizováno:
 
-$Date: 2021/10/29 13:32:42 $
+$Date: 2021/11/02 14:41:49 $
 
 <!-- timestamp end -->
 </p>

Index: why-gnu-linux.de.html
===================================================================
RCS file: /web/www/www/gnu/why-gnu-linux.de.html,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- why-gnu-linux.de.html       29 Oct 2021 13:32:42 -0000      1.58
+++ why-gnu-linux.de.html       2 Nov 2021 14:41:49 -0000       1.59
@@ -3,7 +3,7 @@
  https://www.gnu.org/gnu/po/why-gnu-linux.de.po</a>'
  --><!--#set var="ORIGINAL_FILE" value="/gnu/why-gnu-linux.html"
  --><!--#set var="DIFF_FILE" value="/gnu/po/why-gnu-linux.de-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2021-08-30" --><!--#set 
var="ENGLISH_PAGE" value="/gnu/why-gnu-linux.en.html" -->
+ --><!--#set var="OUTDATED_SINCE" value="2021-08-30" -->
 
 <!--#include virtual="/server/html5-header.de.html" -->
 <!-- Parent-Version: 1.96 -->
@@ -304,7 +304,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Letzte Änderung:
 
-$Date: 2021/10/29 13:32:42 $
+$Date: 2021/11/02 14:41:49 $
 
 <!-- timestamp end -->
 </p>

Index: why-gnu-linux.el.html
===================================================================
RCS file: /web/www/www/gnu/why-gnu-linux.el.html,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- why-gnu-linux.el.html       29 Oct 2021 13:32:42 -0000      1.40
+++ why-gnu-linux.el.html       2 Nov 2021 14:41:49 -0000       1.41
@@ -3,7 +3,7 @@
  https://www.gnu.org/gnu/po/why-gnu-linux.el.po</a>'
  --><!--#set var="ORIGINAL_FILE" value="/gnu/why-gnu-linux.html"
  --><!--#set var="DIFF_FILE" value="/gnu/po/why-gnu-linux.el-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2021-08-30" --><!--#set 
var="ENGLISH_PAGE" value="/gnu/why-gnu-linux.en.html" -->
+ --><!--#set var="OUTDATED_SINCE" value="2021-08-30" -->
 
 <!--#include virtual="/server/html5-header.el.html" -->
 <!-- Parent-Version: 1.96 -->
@@ -306,7 +306,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Ενημερώθηκε:
 
-$Date: 2021/10/29 13:32:42 $
+$Date: 2021/11/02 14:41:49 $
 
 <!-- timestamp end -->
 </p>

Index: why-gnu-linux.es.html
===================================================================
RCS file: /web/www/www/gnu/why-gnu-linux.es.html,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- why-gnu-linux.es.html       31 Aug 2021 11:35:27 -0000      1.61
+++ why-gnu-linux.es.html       2 Nov 2021 14:41:49 -0000       1.62
@@ -3,12 +3,17 @@
 <!--#include virtual="/server/header.es.html" -->
 <!-- Parent-Version: 1.96 -->
 <!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="gnulinux" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>¿Por qué GNU/Linux? - Proyecto GNU - Free Software Foundation </title>
 
 <!--#include virtual="/gnu/po/why-gnu-linux.translist" -->
 <!--#include virtual="/server/banner.es.html" -->
+<!--#include virtual="/gnu/gnu-breadcrumb.es.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.es.html" -->
 <div class="article reduced-width">
 <h2>¿Qué hay detrás de un nombre?</h2>
 
@@ -281,7 +286,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Última actualización:
 
-$Date: 2021/08/31 11:35:27 $
+$Date: 2021/11/02 14:41:49 $
 
 <!-- timestamp end -->
 </p>

Index: why-gnu-linux.fr.html
===================================================================
RCS file: /web/www/www/gnu/why-gnu-linux.fr.html,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- why-gnu-linux.fr.html       30 Aug 2021 14:04:42 -0000      1.77
+++ why-gnu-linux.fr.html       2 Nov 2021 14:41:49 -0000       1.78
@@ -3,12 +3,17 @@
 <!--#include virtual="/server/header.fr.html" -->
 <!-- Parent-Version: 1.96 -->
 <!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="gnulinux" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Pourquoi GNU/Linux ? - Projet GNU - Free Software Foundation</title>
 
 <!--#include virtual="/gnu/po/why-gnu-linux.translist" -->
 <!--#include virtual="/server/banner.fr.html" -->
+<!--#include virtual="/gnu/gnu-breadcrumb.fr.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.fr.html" -->
 <div class="article reduced-width">
 <h2>Qu'y a-t-il dans un nom ?</h2>
 
@@ -284,7 +289,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Dernière mise à jour :
 
-$Date: 2021/08/30 14:04:42 $
+$Date: 2021/11/02 14:41:49 $
 
 <!-- timestamp end -->
 </p>

Index: why-gnu-linux.hr.html
===================================================================
RCS file: /web/www/www/gnu/why-gnu-linux.hr.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- why-gnu-linux.hr.html       29 Oct 2021 13:32:42 -0000      1.15
+++ why-gnu-linux.hr.html       2 Nov 2021 14:41:49 -0000       1.16
@@ -3,7 +3,7 @@
  https://www.gnu.org/gnu/po/why-gnu-linux.hr.po</a>'
  --><!--#set var="ORIGINAL_FILE" value="/gnu/why-gnu-linux.html"
  --><!--#set var="DIFF_FILE" value="/gnu/po/why-gnu-linux.hr-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2021-08-30" --><!--#set 
var="ENGLISH_PAGE" value="/gnu/why-gnu-linux.en.html" -->
+ --><!--#set var="OUTDATED_SINCE" value="2021-08-30" -->
 
 <!--#include virtual="/server/html5-header.hr.html" -->
 <!-- Parent-Version: 1.96 -->
@@ -273,7 +273,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Zadnji put promijenjeno:
 
-$Date: 2021/10/29 13:32:42 $
+$Date: 2021/11/02 14:41:49 $
 
 <!-- timestamp end -->
 </p>

Index: why-gnu-linux.ja.html
===================================================================
RCS file: /web/www/www/gnu/why-gnu-linux.ja.html,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- why-gnu-linux.ja.html       31 Aug 2021 03:05:59 -0000      1.37
+++ why-gnu-linux.ja.html       2 Nov 2021 14:41:49 -0000       1.38
@@ -3,12 +3,17 @@
 <!--#include virtual="/server/header.ja.html" -->
 <!-- Parent-Version: 1.96 -->
 <!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="gnulinux" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>なぜGNU/Linuxなのか? - GNUプロジェクト - 
フリーソフトウェアファウンデーション</title>
 
 <!--#include virtual="/gnu/po/why-gnu-linux.translist" -->
 <!--#include virtual="/server/banner.ja.html" -->
+<!--#include virtual="/gnu/gnu-breadcrumb.ja.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.ja.html" -->
 <div class="article reduced-width">
 <h2>名前が何であろうか?</h2>
 
@@ -166,7 +171,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最終更新:
 
-$Date: 2021/08/31 03:05:59 $
+$Date: 2021/11/02 14:41:49 $
 
 <!-- timestamp end -->
 </p>

Index: why-gnu-linux.ko.html
===================================================================
RCS file: /web/www/www/gnu/why-gnu-linux.ko.html,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- why-gnu-linux.ko.html       29 Oct 2021 13:32:42 -0000      1.35
+++ why-gnu-linux.ko.html       2 Nov 2021 14:41:49 -0000       1.36
@@ -3,7 +3,7 @@
  https://www.gnu.org/gnu/po/why-gnu-linux.ko.po</a>'
  --><!--#set var="ORIGINAL_FILE" value="/gnu/why-gnu-linux.html"
  --><!--#set var="DIFF_FILE" value="/gnu/po/why-gnu-linux.ko-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2021-08-30" --><!--#set 
var="ENGLISH_PAGE" value="/gnu/why-gnu-linux.en.html" -->
+ --><!--#set var="OUTDATED_SINCE" value="2021-08-30" -->
 
 <!--#include virtual="/server/html5-header.ko.html" -->
 <!-- Parent-Version: 1.96 -->
@@ -212,7 +212,7 @@
 <p class="unprintable"><!-- timestamp start -->
 최종 수정일:
 
-$Date: 2021/10/29 13:32:42 $
+$Date: 2021/11/02 14:41:49 $
 
 <!-- timestamp end -->
 </p>

Index: why-gnu-linux.nl.html
===================================================================
RCS file: /web/www/www/gnu/why-gnu-linux.nl.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- why-gnu-linux.nl.html       29 Oct 2021 13:32:42 -0000      1.25
+++ why-gnu-linux.nl.html       2 Nov 2021 14:41:49 -0000       1.26
@@ -3,7 +3,7 @@
  https://www.gnu.org/gnu/po/why-gnu-linux.nl.po</a>'
  --><!--#set var="ORIGINAL_FILE" value="/gnu/why-gnu-linux.html"
  --><!--#set var="DIFF_FILE" value="/gnu/po/why-gnu-linux.nl-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2021-08-30" --><!--#set 
var="ENGLISH_PAGE" value="/gnu/why-gnu-linux.en.html" -->
+ --><!--#set var="OUTDATED_SINCE" value="2021-08-30" -->
 
 <!--#include virtual="/server/html5-header.nl.html" -->
 <!-- Parent-Version: 1.96 -->
@@ -283,7 +283,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Bijgewerkt:
 
-$Date: 2021/10/29 13:32:42 $
+$Date: 2021/11/02 14:41:49 $
 
 <!-- timestamp end -->
 </p>

Index: why-gnu-linux.pl.html
===================================================================
RCS file: /web/www/www/gnu/why-gnu-linux.pl.html,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- why-gnu-linux.pl.html       29 Oct 2021 13:32:42 -0000      1.56
+++ why-gnu-linux.pl.html       2 Nov 2021 14:41:49 -0000       1.57
@@ -3,7 +3,7 @@
  https://www.gnu.org/gnu/po/why-gnu-linux.pl.po</a>'
  --><!--#set var="ORIGINAL_FILE" value="/gnu/why-gnu-linux.html"
  --><!--#set var="DIFF_FILE" value="/gnu/po/why-gnu-linux.pl-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2021-08-30" --><!--#set 
var="ENGLISH_PAGE" value="/gnu/why-gnu-linux.en.html" -->
+ --><!--#set var="OUTDATED_SINCE" value="2021-08-30" -->
 
 <!--#include virtual="/server/html5-header.pl.html" -->
 <!-- Parent-Version: 1.96 -->
@@ -301,7 +301,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Aktualizowane:
 
-$Date: 2021/10/29 13:32:42 $
+$Date: 2021/11/02 14:41:49 $
 
 <!-- timestamp end -->
 </p>

Index: why-gnu-linux.pt-br.html
===================================================================
RCS file: /web/www/www/gnu/why-gnu-linux.pt-br.html,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- why-gnu-linux.pt-br.html    5 Sep 2021 15:33:44 -0000       1.36
+++ why-gnu-linux.pt-br.html    2 Nov 2021 14:41:49 -0000       1.37
@@ -3,12 +3,17 @@
 <!--#include virtual="/server/header.pt-br.html" -->
 <!-- Parent-Version: 1.96 -->
 <!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="gnulinux" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Por que GNU/Linux? - Projeto GNU - Free Software Foundation</title>
 
 <!--#include virtual="/gnu/po/why-gnu-linux.translist" -->
 <!--#include virtual="/server/banner.pt-br.html" -->
+<!--#include virtual="/gnu/gnu-breadcrumb.pt-br.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.pt-br.html" -->
 <div class="article reduced-width">
 <h2>Que há num nome?</h2>
 
@@ -280,7 +285,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Última atualização:
 
-$Date: 2021/09/05 15:33:44 $
+$Date: 2021/11/02 14:41:49 $
 
 <!-- timestamp end -->
 </p>

Index: why-gnu-linux.ru.html
===================================================================
RCS file: /web/www/www/gnu/why-gnu-linux.ru.html,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- why-gnu-linux.ru.html       30 Aug 2021 14:04:42 -0000      1.42
+++ why-gnu-linux.ru.html       2 Nov 2021 14:41:49 -0000       1.43
@@ -3,12 +3,17 @@
 <!--#include virtual="/server/header.ru.html" -->
 <!-- Parent-Version: 1.96 -->
 <!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="gnulinux" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Почему GNU/Linux? - Проект GNU - Фонд 
свободного программного обеспечения</title>
 
 <!--#include virtual="/gnu/po/why-gnu-linux.translist" -->
 <!--#include virtual="/server/banner.ru.html" -->
+<!--#include virtual="/gnu/gnu-breadcrumb.ru.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.ru.html" -->
 <div class="article reduced-width">
 <h2>Что в имени?</h2>
 
@@ -273,7 +278,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2021/08/30 14:04:42 $
+$Date: 2021/11/02 14:41:49 $
 
 <!-- timestamp end -->
 </p>

Index: why-gnu-linux.sq.html
===================================================================
RCS file: /web/www/www/gnu/why-gnu-linux.sq.html,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- why-gnu-linux.sq.html       7 Sep 2021 12:03:48 -0000       1.45
+++ why-gnu-linux.sq.html       2 Nov 2021 14:41:49 -0000       1.46
@@ -3,12 +3,17 @@
 <!--#include virtual="/server/header.sq.html" -->
 <!-- Parent-Version: 1.96 -->
 <!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="gnulinux" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Pse GNU/Linux? - Projekti GNU - Free Software Foundation</title>
 
 <!--#include virtual="/gnu/po/why-gnu-linux.translist" -->
 <!--#include virtual="/server/banner.sq.html" -->
+<!--#include virtual="/gnu/gnu-breadcrumb.sq.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.sq.html" -->
 <div class="article reduced-width">
 <h2>Ç’përmban Emri?</h2>
 
@@ -275,7 +280,7 @@
 <p class="unprintable"><!-- timestamp start -->
 U përditësua më:
 
-$Date: 2021/09/07 12:03:48 $
+$Date: 2021/11/02 14:41:49 $
 
 <!-- timestamp end -->
 </p>

Index: why-gnu-linux.tr.html
===================================================================
RCS file: /web/www/www/gnu/why-gnu-linux.tr.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- why-gnu-linux.tr.html       12 Sep 2021 07:34:21 -0000      1.32
+++ why-gnu-linux.tr.html       2 Nov 2021 14:41:49 -0000       1.33
@@ -3,12 +3,17 @@
 <!--#include virtual="/server/header.tr.html" -->
 <!-- Parent-Version: 1.96 -->
 <!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="gnulinux" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Neden GNU/Linux? - GNU Projesi - Özgür Yazılım Vakfı</title>
 
 <!--#include virtual="/gnu/po/why-gnu-linux.translist" -->
 <!--#include virtual="/server/banner.tr.html" -->
+<!--#include virtual="/gnu/gnu-breadcrumb.tr.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.tr.html" -->
 <div class="article reduced-width">
 <h2>İsim Dediğin Nedir Ki?</h2>
 
@@ -287,7 +292,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Son Güncelleme:
 
-$Date: 2021/09/12 07:34:21 $
+$Date: 2021/11/02 14:41:49 $
 
 <!-- timestamp end -->
 </p>

Index: why-gnu-linux.uk.html
===================================================================
RCS file: /web/www/www/gnu/why-gnu-linux.uk.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- why-gnu-linux.uk.html       29 Oct 2021 13:32:42 -0000      1.10
+++ why-gnu-linux.uk.html       2 Nov 2021 14:41:49 -0000       1.11
@@ -3,7 +3,7 @@
  https://www.gnu.org/gnu/po/why-gnu-linux.uk.po</a>'
  --><!--#set var="ORIGINAL_FILE" value="/gnu/why-gnu-linux.html"
  --><!--#set var="DIFF_FILE" value="/gnu/po/why-gnu-linux.uk-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2021-08-30" --><!--#set 
var="ENGLISH_PAGE" value="/gnu/why-gnu-linux.en.html" -->
+ --><!--#set var="OUTDATED_SINCE" value="2021-08-30" -->
 
 <!--#include virtual="/server/html5-header.uk.html" -->
 <!-- Parent-Version: 1.96 -->
@@ -278,7 +278,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Оновлено:
 
-$Date: 2021/10/29 13:32:42 $
+$Date: 2021/11/02 14:41:49 $
 
 <!-- timestamp end -->
 </p>

Index: why-gnu-linux.zh-cn.html
===================================================================
RCS file: /web/www/www/gnu/why-gnu-linux.zh-cn.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- why-gnu-linux.zh-cn.html    9 Sep 2021 02:32:37 -0000       1.5
+++ why-gnu-linux.zh-cn.html    2 Nov 2021 14:41:49 -0000       1.6
@@ -3,12 +3,17 @@
 <!--#include virtual="/server/header.zh-cn.html" -->
 <!-- Parent-Version: 1.96 -->
 <!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="gnulinux" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>为什么应该是 GNU/Linux? - GNU 工程 - 
自由软件基金会</title>
 
 <!--#include virtual="/gnu/po/why-gnu-linux.translist" -->
 <!--#include virtual="/server/banner.zh-cn.html" -->
+<!--#include virtual="/gnu/gnu-breadcrumb.zh-cn.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.zh-cn.html" -->
 <div class="article reduced-width">
 <h2>名字里应该有什么?</h2>
 
@@ -177,7 +182,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2021/09/09 02:32:37 $
+$Date: 2021/11/02 14:41:49 $
 
 <!-- timestamp end -->
 </p>

Index: why-gnu-linux.zh-tw.html
===================================================================
RCS file: /web/www/www/gnu/why-gnu-linux.zh-tw.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- why-gnu-linux.zh-tw.html    12 Oct 2021 17:32:22 -0000      1.1
+++ why-gnu-linux.zh-tw.html    2 Nov 2021 14:41:49 -0000       1.2
@@ -3,12 +3,17 @@
 <!--#include virtual="/server/header.zh-tw.html" -->
 <!-- Parent-Version: 1.96 -->
 <!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="gnulinux" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>為什麼要稱為 GNU/Linux? - GNU 專案 - 
自由軟體基金會</title>
 
 <!--#include virtual="/gnu/po/why-gnu-linux.translist" -->
 <!--#include virtual="/server/banner.zh-tw.html" -->
+<!--#include virtual="/gnu/gnu-breadcrumb.zh-tw.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.zh-tw.html" -->
 <div class="article reduced-width">
 <h2>名稱的重要性</h2>
 
@@ -186,7 +191,7 @@
 <p class="unprintable"><!-- timestamp start -->
 更新時間︰
 
-$Date: 2021/10/12 17:32:22 $
+$Date: 2021/11/02 14:41:49 $
 
 <!-- timestamp end -->
 </p>

Index: po/gnu-history.ar-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-history.ar-diff.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- po/gnu-history.ar-diff.html 30 May 2021 18:01:56 -0000      1.6
+++ po/gnu-history.ar-diff.html 2 Nov 2021 14:41:50 -0000       1.7
@@ -11,20 +11,28 @@
 </style></head>
 <body><pre>
 &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.84</em></ins></span> --&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 --&gt;
+&lt;!--#set var="TAGS" value="gnu-history" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</em></ins></span> --&gt;
 &lt;title&gt;Overview of the GNU System
 - GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;meta name="Keywords" content="GNU, GNU Project, FSF, Free Software, Free 
Software Foundation, History" /&gt;
 &lt;!--#include virtual="/gnu/po/gnu-history.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&lt;div class="article reduced-width"&gt;</em></ins></span>
 &lt;h2&gt;Overview of the GNU System&lt;/h2&gt;
+<span class="inserted"><ins><em>&lt;div 
class="thin"&gt;&lt;/div&gt;</em></ins></span>
 
 &lt;p&gt;
 The GNU operating system is a complete free software system,
-upward-compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.
-<span class="inserted"><ins><em>It is pronounced as &lt;a 
href="/gnu/pronunciation.html"&gt;one syllable with a
-hard g&lt;/a&gt;.</em></ins></span>
-&lt;a href="http://www.stallman.org/"&gt;Richard Stallman&lt;/a&gt; made the
+upward-compatible with Unix.  GNU stands for &ldquo;GNU's Not <span 
class="removed"><del><strong>Unix&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>Unix.&rdquo;
+It is pronounced as &lt;a href="/gnu/pronunciation.html"&gt;one syllable with a
+hard &lt;i&gt;g&lt;/i&gt;&lt;/a&gt;.</em></ins></span>
+&lt;a <span 
class="removed"><del><strong>href="http://www.stallman.org/"&gt;Richard</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://www.stallman.org/"&gt;Richard</em></ins></span>
 Stallman&lt;/a&gt; made the
 &lt;a href="/gnu/initial-announcement.html"&gt;Initial Announcement&lt;/a&gt; 
of
 the GNU Project in September 1983.  A longer version called
 the &lt;a href="/gnu/manifesto.html"&gt;GNU Manifesto&lt;/a&gt; was published 
in
@@ -34,9 +42,10 @@
 &lt;p&gt;
 The name &ldquo;GNU&rdquo; was chosen because it met a few
 requirements; first, it was a recursive acronym for &ldquo;GNU's Not
-Unix&rdquo;, second, because it was a real word, and third, it was fun
+<span class="removed"><del><strong>Unix&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>Unix,&rdquo;</em></ins></span> second, because 
it was a real word, and third, it was fun
 to say (or
-&lt;a 
href="http://www.poppyfields.net/poppy/songs/gnu.html"&gt;Sing&lt;/a&gt;).&lt;/p&gt;
+&lt;a <span 
class="removed"><del><strong>href="http://www.poppyfields.net/poppy/songs/gnu.html"&gt;Sing&lt;/a&gt;).&lt;/p&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="http://www.poppyfields.net/poppy/songs/gnu.html"&gt;sing&lt;/a&gt;).&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;
 The word &ldquo;free&rdquo; in &ldquo;free software&rdquo; pertains to
@@ -52,7 +61,8 @@
 
 &lt;p&gt;
 The project to develop the GNU system is called the &ldquo;GNU
-Project&rdquo;.  The GNU Project was conceived in 1983 as a way of
+<span class="removed"><del><strong>Project&rdquo;.</strong></del></span>
+<span class="inserted"><ins><em>Project.&rdquo;</em></ins></span>  The GNU 
Project was conceived in 1983 as a way of
 bringing back the cooperative spirit that prevailed in the computing
 community in earlier days&mdash;to make cooperation possible once again by
 removing the obstacles to cooperation imposed by the owners of
@@ -87,7 +97,7 @@
 text formatters, mail software, graphical interfaces, libraries, games
 and many other things.  Thus, writing a whole operating system is a
 very large job.  We started in January 1984.
-The &lt;a href="http://fsf.org/"&gt; Free Software Foundation&lt;/a&gt; was
+The &lt;a <span 
class="removed"><del><strong>href="http://fsf.org/"&gt;</strong></del></span> 
<span 
class="inserted"><ins><em>href="https://www.fsf.org/"&gt;</em></ins></span> 
Free Software Foundation&lt;/a&gt; was
 founded in October 1985, initially to raise funds to help develop
 GNU.&lt;/p&gt;
 
@@ -98,26 +108,27 @@
 complete operating system: the GNU/Linux system.  Estimates are that
 tens of millions of people now use GNU/Linux systems, typically
 via &lt;a <span 
class="removed"><del><strong>href="/distros"&gt;GNU/Linux</strong></del></span> 
<span 
class="inserted"><ins><em>href="/distros/distros.html"&gt;GNU/Linux</em></ins></span>
 distributions&lt;/a&gt;.  The principal
-version of Linux now contains non-free firmware &ldquo;blobs&rdquo;;
+version of Linux now contains <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> firmware 
&ldquo;blobs&rdquo;;
 free software activists now maintain a modified free version of Linux,
-called &lt;a href="http://directory.fsf.org/project/linux"&gt;
+called &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/wiki/Linux-libre"&gt;</em></ins></span>
 Linux-libre&lt;/a&gt;.&lt;/p&gt;
 
 &lt;p&gt;
 However, the GNU Project is not limited to the core operating system.
 We aim to provide a whole spectrum of software, whatever many users
 want to have.  This includes application software.  See
-the &lt;a href="/directory"&gt;Free Software Directory&lt;/a&gt; for a 
catalogue
+the &lt;a <span 
class="removed"><del><strong>href="/directory"&gt;Free</strong></del></span> 
<span 
class="inserted"><ins><em>href="https://directory.fsf.org/wiki/Main_Page"&gt;Free</em></ins></span>
 Software Directory&lt;/a&gt; for a catalogue
 of free software application programs.&lt;/p&gt;
 
 &lt;p&gt;
 We also want to provide software for users who are not computer
 experts.  Therefore we developed a
-&lt;a href="http://www.gnome.org/"&gt;graphical desktop (called 
GNOME)&lt;/a&gt; to help
+&lt;a <span 
class="removed"><del><strong>href="http://www.gnome.org/"&gt;graphical</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://www.gnome.org/"&gt;graphical</em></ins></span>
 desktop (called GNOME)&lt;/a&gt; to help
 beginners use the GNU system.&lt;/p&gt;
 
 &lt;p&gt;We also want to provide games and other recreations.  Plenty of &lt;a
-href="http://directory.fsf.org/wiki/Category/Game"&gt;free games&lt;/a&gt; are
+<span 
class="removed"><del><strong>href="http://directory.fsf.org/wiki/Category/Game"&gt;free</strong></del></span>
+<span 
class="inserted"><ins><em>href="https://directory.fsf.org/wiki/Category/Game"&gt;free</em></ins></span>
 games&lt;/a&gt; are
 already available.&lt;/p&gt;
 
 &lt;p&gt;
@@ -126,11 +137,11 @@
 the patent system prohibit free software&lt;/a&gt;.  The ultimate goal is to
 provide free software to do all of the jobs computer users want to
 do&mdash;and thus make proprietary software a thing of the past.&lt;/p&gt;
-
+<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;
-&lt;div id="footer"&gt;
+&lt;div <span 
class="removed"><del><strong>id="footer"&gt;</strong></del></span> <span 
class="inserted"><ins><em>id="footer" role="contentinfo"&gt;</em></ins></span>
 &lt;div class="unprintable"&gt;
 
 &lt;p&gt;Please send general FSF &amp; GNU inquiries to
@@ -148,13 +159,13 @@
         to &lt;a href="mailto:web-translators@gnu.org"&gt;
         &lt;web-translators@gnu.org&gt;&lt;/a&gt;.&lt;/p&gt;
 
-        &lt;p&gt;For information on coordinating and submitting translations of
+        &lt;p&gt;For information on coordinating and <span 
class="removed"><del><strong>submitting</strong></del></span> <span 
class="inserted"><ins><em>contributing</em></ins></span> translations of
         our web pages, see &lt;a
         href="/server/standards/README.translations.html"&gt;Translations
         README&lt;/a&gt;. --&gt;
 Please see the &lt;a
 href="/server/standards/README.translations.html"&gt;Translations
-README&lt;/a&gt; for information on coordinating and submitting translations
+README&lt;/a&gt; for information on coordinating and <span 
class="removed"><del><strong>submitting</strong></del></span> <span 
class="inserted"><ins><em>contributing</em></ins></span> translations
 of this article.&lt;/p&gt;
 &lt;/div&gt;
 
@@ -175,8 +186,9 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007,
-2009, 2012, <span class="removed"><del><strong>2014</strong></del></span> 
<span class="inserted"><ins><em>2014, 2017</em></ins></span> Free Software 
Foundation, Inc.&lt;/p&gt;
+&lt;p&gt;Copyright &copy; 1996, 1997, <span class="removed"><del><strong>1998, 
1999, 2001, 2002,</strong></del></span> 2003, 2005, <span 
class="removed"><del><strong>2007,
+2009,</strong></del></span> <span 
class="inserted"><ins><em>2008,</em></ins></span> 2012, <span 
class="removed"><del><strong>2014</strong></del></span> <span 
class="inserted"><ins><em>2017, 2021</em></ins></span>
+Free Software Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
 <span 
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/"&gt;Creative</strong></del></span>
@@ -187,11 +199,12 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/05/30 18:01:56 $
+$Date: 2021/11/02 14:41:50 $
 &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: po/gnu-history.ar.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-history.ar.po,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- po/gnu-history.ar.po        30 May 2021 17:01:39 -0000      1.51
+++ po/gnu-history.ar.po        2 Nov 2021 14:41:50 -0000       1.52
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-history.html\n"
-"POT-Creation-Date: 2017-09-04 10:56+0000\n"
+"POT-Creation-Date: 2021-11-02 13:26+0000\n"
 "PO-Revision-Date: 2014-11-16 14:25+0100\n"
 "Last-Translator: faycal <faycal_alami@hotmail.com>\n"
 "Language-Team: Arabic\n"
@@ -30,19 +30,21 @@
 msgid "GNU, GNU Project, FSF, Free Software, Free Software Foundation, History"
 msgstr "تاريخ جنو, إف إس إف, مؤسسة البرمجيات 
الحرة, "
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Overview of the GNU System"
 msgstr "نبذة عن نظام جنو"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | The GNU operating system is a complete free software system,
-# | upward-compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.
-# |  {+It is pronounced as <a href=\"/gnu/pronunciation.html\">one syllable
-# | with a hard g</a>.+}  <a href=\"http://www.stallman.org/\";>Richard
-# | Stallman</a> made the <a href=\"/gnu/initial-announcement.html\">Initial
-# | Announcement</a> of the GNU Project in September 1983.  A longer version
-# | called the <a href=\"/gnu/manifesto.html\">GNU Manifesto</a> was published
-# | in March 1985.  It has been translated into several <a
+# | upward-compatible with Unix.  GNU stands for &ldquo;GNU's Not
+# | [-Unix&rdquo;.-] {+Unix.&rdquo; It is pronounced as+} <a
+# | [-href=\"http://www.stallman.org/\";>Richard-]
+# | {+href=\"/gnu/pronunciation.html\">one syllable with a hard <i>g</i></a>. 
+# | <a href=\"https://www.stallman.org/\";>Richard+} Stallman</a> made the <a
+# | href=\"/gnu/initial-announcement.html\">Initial Announcement</a> of the
+# | GNU Project in September 1983.  A longer version called the <a
+# | href=\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March
+# | 1985.  It has been translated into several <a
 # | href=\"/gnu/manifesto.html#translations\">other languages</a>.
 #, fuzzy
 #| msgid ""
@@ -56,14 +58,14 @@
 #| "\">other languages</a>."
 msgid ""
 "The GNU operating system is a complete free software system, upward-"
-"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.  It is "
+"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix.&rdquo; It is "
 "pronounced as <a href=\"/gnu/pronunciation.html\">one syllable with a hard "
-"g</a>.  <a href=\"http://www.stallman.org/\";>Richard Stallman</a> made the "
-"<a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> of the "
-"GNU Project in September 1983.  A longer version called the <a href=\"/gnu/"
-"manifesto.html\">GNU Manifesto</a> was published in March 1985.  It has been "
-"translated into several <a href=\"/gnu/manifesto.html#translations\">other "
-"languages</a>."
+"<i>g</i></a>.  <a href=\"https://www.stallman.org/\";>Richard Stallman</a> "
+"made the <a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> "
+"of the GNU Project in September 1983.  A longer version called the <a href="
+"\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March 1985.  It "
+"has been translated into several <a href=\"/gnu/manifesto.html#translations"
+"\">other languages</a>."
 msgstr ""
 "نظام التشغيل جنو هو نظام برمجي حر بالكامل، 
متوافق مع يونكس. اسم جنو قادم من "
 "العبارة الإنجليزية &rdquo;جنو ليس يونكس&ldquo;. 
أطلق <a href=\"http://www.";
@@ -72,19 +74,31 @@
 "gnu/manifesto.html\">ظاهرة جنو</a> تم نشرها في سبتمبر 
1985. تم ترجمتها الي "
 "عدة  <a href=\"/gnu/manifesto.html#translations\">لغات أخرى</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The name &ldquo;GNU&rdquo; was chosen because it met a few requirements;
+# | first, it was a recursive acronym for &ldquo;GNU's Not [-Unix&rdquo;,-]
+# | {+Unix,&rdquo;+} second, because it was a real word, and third, it was fun
+# | to say (or <a
+# | href=\"http://www.poppyfields.net/poppy/songs/gnu.html\";>[-S-]{+s+}ing</a>)
+# | .
+#, fuzzy
+#| msgid ""
+#| "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
+#| "first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, "
+#| "second, because it was a real word, and third, it was fun to say (or <a "
+#| "href=\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
 msgid ""
 "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
-"first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, second, "
+"first, it was a recursive acronym for &ldquo;GNU's Not Unix,&rdquo; second, "
 "because it was a real word, and third, it was fun to say (or <a href="
-"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
+"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>sing</a>)."
 msgstr ""
 "اختير اسم &rdquo;جنو&ldquo; لأنه لبّى بعض الم
تطلبات؛ أولا، أنه يتكرر في "
 "العبارة &rdquo;جنو ليس يونكس&ldquo;، ثانيا، لأنه 
كلمة حقيقة، ثالثا، لأن ممتع "
 "عند النطق (أو <a 
href=\"http://www.poppyfields.net/poppy/songs/gnu.html";
 "\">الغناء</a>)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The word &ldquo;free&rdquo; in &ldquo;free software&rdquo; pertains to <a "
 "href=\"/philosophy/free-sw.html\">freedom</a>, not price.  You may or may "
@@ -106,20 +120,34 @@
 "(إذا أعدت توزيع برمجيات جنو، يمكنك الحصول 
على مبالغ مالية مقابل الأجزاء "
 "الفيزيائية للنسخة)."
 
-#. type: Content of: <p>
-msgid ""
-"The project to develop the GNU system is called the &ldquo;GNU "
-"Project&rdquo;.  The GNU Project was conceived in 1983 as a way of bringing "
-"back the cooperative spirit that prevailed in the computing community in "
-"earlier days&mdash;to make cooperation possible once again by removing the "
-"obstacles to cooperation imposed by the owners of proprietary software."
+#. type: Content of: <div><p>
+# | The project to develop the GNU system is called the &ldquo;GNU
+# | [-Project&rdquo;.-] {+Project.&rdquo;+} The GNU Project was conceived in
+# | 1983 as a way of bringing back the cooperative spirit that prevailed in
+# | the computing community in earlier days&mdash;to make cooperation possible
+# | once again by removing the obstacles to cooperation imposed by the owners
+# | of proprietary software.
+#, fuzzy
+#| msgid ""
+#| "The project to develop the GNU system is called the &ldquo;GNU "
+#| "Project&rdquo;.  The GNU Project was conceived in 1983 as a way of "
+#| "bringing back the cooperative spirit that prevailed in the computing "
+#| "community in earlier days&mdash;to make cooperation possible once again "
+#| "by removing the obstacles to cooperation imposed by the owners of "
+#| "proprietary software."
+msgid ""
+"The project to develop the GNU system is called the &ldquo;GNU Project."
+"&rdquo; The GNU Project was conceived in 1983 as a way of bringing back the "
+"cooperative spirit that prevailed in the computing community in earlier "
+"days&mdash;to make cooperation possible once again by removing the obstacles "
+"to cooperation imposed by the owners of proprietary software."
 msgstr ""
 "مشروع تطوير نظام جنو يدعى &rdquo;مشروع 
جنو&ldquo;. ولد مشروع جنة في عام 1983 "
 "كوسيلة لإعادة روح التعاون التي سادت في م
جتمعات الحوسبة في أيام سابقة.&mdash; "
 "لجعل التعاون ممكنا مرة أخرى عن طريق إزالة 
العقبات التي تعترض طريق التعاون "
 "التي يفرضها مُلّاك البرمجيات المملوكة."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In 1971, when Richard Stallman started his career at MIT, he worked in a "
 "group which used <a href=\"/philosophy/free-sw.html\">free software</a> "
@@ -131,7 +159,7 @@
 "حصريا. حتى شركات الحاسوب كثيرا ما توزّع 
البرمجيات الحرة. كان المبرمجون أحرار "
 "في التعاون بينهم، وكثيرا ما كانوا يفعلون 
ذلك."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By the 1980s, almost all software was <a href=\"/philosophy/categories."
 "html#ProprietarySoftware\">proprietary</a>, which means that it had owners "
@@ -142,7 +170,7 @@
 "categories.html#ProprietarySoftware\">مملوكة</a>، مما يعني أن 
مالكيها كانوا "
 "يمنعون التعاون بين المستخدمين. ومن هنا 
اصبح مشروع جنو ضرورة."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Every computer user needs an operating system; if there is no free operating "
 "system, then you can't even get started using a computer without resorting "
@@ -153,7 +181,7 @@
 "تتمكن من تشغيل الحاسوب بدون اللجوء إلى 
البرمجيات المملوكة. لذا، أول مهمة في "
 "جدول أعمال البرمجيات الحرة ضرورة إنشاء 
نظام تشغيل حر."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We decided to make the operating system compatible with Unix because the "
 "overall design was already proven and portable, and because compatibility "
@@ -162,14 +190,28 @@
 "قررنا أن نجعل نظام التشغيل متوافق مع يونكس 
لأن التصميم العام كان بالفعل ذو "
 "شأن، ونظرا لأن التوافق يجعل من السهل على م
ستخدمي يونكس التحوّل إلى جنو."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | A Unix-like operating system includes a kernel, compilers, editors, text
+# | formatters, mail software, graphical interfaces, libraries, games and many
+# | other things.  Thus, writing a whole operating system is a very large job.
+# |  We started in January 1984.  The <a [-href=\"http://fsf.org/\";>-]
+# | {+href=\"https://www.fsf.org/\";>+} Free Software Foundation</a> was
+# | founded in October 1985, initially to raise funds to help develop GNU.
+#, fuzzy
+#| msgid ""
+#| "A Unix-like operating system includes a kernel, compilers, editors, text "
+#| "formatters, mail software, graphical interfaces, libraries, games and "
+#| "many other things.  Thus, writing a whole operating system is a very "
+#| "large job.  We started in January 1984.  The <a href=\"http://fsf.org/\";> "
+#| "Free Software Foundation</a> was founded in October 1985, initially to "
+#| "raise funds to help develop GNU."
 msgid ""
 "A Unix-like operating system includes a kernel, compilers, editors, text "
 "formatters, mail software, graphical interfaces, libraries, games and many "
 "other things.  Thus, writing a whole operating system is a very large job.  "
-"We started in January 1984.  The <a href=\"http://fsf.org/\";> Free Software "
-"Foundation</a> was founded in October 1985, initially to raise funds to help "
-"develop GNU."
+"We started in January 1984.  The <a href=\"https://www.fsf.org/\";> Free "
+"Software Foundation</a> was founded in October 1985, initially to raise "
+"funds to help develop GNU."
 msgstr ""
 "الأنظمة شبيهة يونكس تتضمن نواة، مترجمات، 
ومحررات، ومنسقات نصوص، وبرمجيات "
 "بريد، واجهات رسومية، المكتبات, ألعاب, 
والكثير من الأشياء الأخرى. وهكذا، "
@@ -177,7 +219,7 @@
 "fsf.org/\">مؤسسة البرمجيات الحرة</a> تأسست في 
أكتوبر 1985، في البداية لجمع "
 "الأموال لمساعدة تطوير جنو."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | By 1990 we had either found or written all the major components except
 # | one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by
 # | Linus Torvalds in 1991 and made free software in 1992.  Combining Linux
@@ -186,10 +228,11 @@
 # | people now use GNU/Linux systems, typically via <a
 # | [-href=\"/distros\">GNU/Linux-]
 # | {+href=\"/distros/distros.html\">GNU/Linux+} distributions</a>.  The
-# | principal version of Linux now contains non-free firmware
+# | principal version of Linux now contains non[---]free firmware
 # | &ldquo;blobs&rdquo;; free software activists now maintain a modified free
 # | version of Linux, called <a
-# | href=\"http://directory.fsf.org/project/linux\";> Linux-libre</a>.
+# | [-href=\"http://directory.fsf.org/project/linux\";>-]
+# | {+href=\"https://directory.fsf.org/wiki/Linux-libre\";>+} Linux-libre</a>.
 #, fuzzy
 #| msgid ""
 #| "By 1990 we had either found or written all the major components except "
@@ -209,10 +252,10 @@
 "the almost-complete GNU system resulted in a complete operating system: the "
 "GNU/Linux system.  Estimates are that tens of millions of people now use GNU/"
 "Linux systems, typically via <a href=\"/distros/distros.html\">GNU/Linux "
-"distributions</a>.  The principal version of Linux now contains non-free "
+"distributions</a>.  The principal version of Linux now contains nonfree "
 "firmware &ldquo;blobs&rdquo;; free software activists now maintain a "
-"modified free version of Linux, called <a href=\"http://directory.fsf.org/";
-"project/linux\"> Linux-libre</a>."
+"modified free version of Linux, called <a href=\"https://directory.fsf.org/";
+"wiki/Linux-libre\"> Linux-libre</a>."
 msgstr ""
 "بحلول عام 1990 أصبح لدينا كل الأشياء 
الأساسية باستثناء شيء واحد&mdash;"
 "النواة. ومن ثمَّ لينكس، النواة شبيهة 
يونكس، تم تطويرها بواسطة لينوس تورفالدس "
@@ -223,39 +266,68 @@
 "&rdquo;بلوبز&ldquo;؛ ناشطو البرمجيات الحرة الآن 
يعملون على صيانة إصدار لينكس "
 "حر (<a href=\"http://directory.fsf.org/project/linux\";>لينكس 
ليبرا</a>)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | However, the GNU Project is not limited to the core operating system.  We
+# | aim to provide a whole spectrum of software, whatever many users want to
+# | have.  This includes application software.  See the <a
+# | [-href=\"/directory\">Free-]
+# | {+href=\"https://directory.fsf.org/wiki/Main_Page\";>Free+} Software
+# | Directory</a> for a catalogue of free software application programs.
+#, fuzzy
+#| msgid ""
+#| "However, the GNU Project is not limited to the core operating system.  We "
+#| "aim to provide a whole spectrum of software, whatever many users want to "
+#| "have.  This includes application software.  See the <a href=\"/directory"
+#| "\">Free Software Directory</a> for a catalogue of free software "
+#| "application programs."
 msgid ""
 "However, the GNU Project is not limited to the core operating system.  We "
 "aim to provide a whole spectrum of software, whatever many users want to "
-"have.  This includes application software.  See the <a href=\"/directory"
-"\">Free Software Directory</a> for a catalogue of free software application "
-"programs."
+"have.  This includes application software.  See the <a href=\"https://";
+"directory.fsf.org/wiki/Main_Page\">Free Software Directory</a> for a "
+"catalogue of free software application programs."
 msgstr ""
 "و مع ذلك، لا يقتصر مشروع جنو على نظام 
التشغيل الأساسي. هدفنا هو ان نوفر جميع "
 "أنواع البرمجيات على حسب احتياجات المستخدم
ين. ويشمل هذا البرمجيات التطبيقية. "
 "انظر أيضا <a href=\"/directory\">دليل البرمجيات 
الحرة</a> لكاتلوج البرمجيات "
 "التطبيقية الحرة."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | We also want to provide software for users who are not computer experts. 
+# | Therefore we developed a <a href=\"http{+s+}://www.gnome.org/\">graphical
+# | desktop (called GNOME)</a> to help beginners use the GNU system.
+#, fuzzy
+#| msgid ""
+#| "We also want to provide software for users who are not computer experts.  "
+#| "Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical "
+#| "desktop (called GNOME)</a> to help beginners use the GNU system."
 msgid ""
 "We also want to provide software for users who are not computer experts.  "
-"Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical desktop "
-"(called GNOME)</a> to help beginners use the GNU system."
+"Therefore we developed a <a href=\"https://www.gnome.org/\";>graphical "
+"desktop (called GNOME)</a> to help beginners use the GNU system."
 msgstr ""
 "نرغب أيضا أيضا أن نوفر برمجيات لمستخدمي 
الحاسب الغير محترفين. ولذلك طورنا <a "
 "href=\"http://www.gnome.org/\";>سطح مكتب رسومي (يدعى جنوم
)</a> لمساعدة "
 "المبتدئين في اسخدام نظام جنو."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | We also want to provide games and other recreations.  Plenty of <a
+# | href=\"http{+s+}://directory.fsf.org/wiki/Category/Game\">free games</a>
+# | are already available.
+#, fuzzy
+#| msgid ""
+#| "We also want to provide games and other recreations.  Plenty of <a href="
+#| "\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are "
+#| "already available."
 msgid ""
 "We also want to provide games and other recreations.  Plenty of <a href="
-"\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
+"\"https://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
 "available."
 msgstr ""
 "نرغب أيضا في توفير ألعاب ووسائل ترفيه 
أخرى. كثير من <a href=\"http://";
 "directory.fsf.org/wiki/Category/Game\">الألعاب الحرة</a> م
تاحة فعلا."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "How far can free software go? There are no limits, except when <a href=\"/"
 "philosophy/fighting-software-patents.html\">laws such as the patent system "
@@ -287,6 +359,7 @@
 "يرجى إرسال الوصلات المنقطعة وأي تصحيحات 
أو اقتراحات إلى <a href=\"mailto:";
 "webmasters@gnu.org\">&lt;webmasters@gnu.org&gt;</a>."
 
+# TODO: submitting -> contributing.
 #.  TRANSLATORS: Ignore the original text in this paragraph,
 #.         replace it with the translation of these two:
 #.         We work hard and do our best to provide accurate, good quality
@@ -294,14 +367,20 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "رغم بذلنا قصارى جهدنا لتوفير ترجمات دقيقة 
ذات جودة عالية، فإننا لا ندعي كمال "
@@ -312,15 +391,16 @@
 "href=\"/server/standards/README.translations.html\">دليل الترجم
Ø©</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007,
-# | 2009, 2012, [-2014-] {+2014, 2017+} Free Software Foundation, Inc.
+# | Copyright &copy; 1996, 1997, [-1998, 1999, 2001, 2002,-] 2003, 2005,
+# | [-2007, 2009,-] {+2008,+} 2012, [-2014-] {+2017, 2021+} Free Software
+# | Foundation, Inc.
 #, fuzzy
 #| msgid ""
 #| "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
 #| "2009, 2012, 2014 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017 Free Software Foundation, Inc."
+"Copyright &copy; 1996, 1997, 2003, 2005, 2008, 2012, 2017, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
 "حقوق النشر:</p><p style=\"direction: ltr\">\n"
 "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
@@ -348,3 +428,16 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "حُدّثت:"
+
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "رغم بذلنا قصارى جهدنا لتوفير ترجمات 
دقيقة ذات جودة عالية، فإننا لا ندعي "
+#~ "كمال النصوص وخلوها من الأخطاء. يرجي 
إرسال التعليقات والمقترحات المتعلقة "
+#~ "بهذا الشأن إلى عنوان البريد الإلكتروني <a 
href=\"mailto:web-";
+#~ "translators@gnu.org\"> &lt;web-translators@gnu.org&gt;</a>.</p> 
<p>للحصول "
+#~ "على أي معلومات بشأن تنسيق وتقديم ترجمات م
وقعنا الإلكتروني، يرجى الاطلاع "
+#~ "على الرابط التالي <a 
href=\"/server/standards/README.translations.html"
+#~ "\">دليل الترجمة</a>."

Index: po/gnu-history.bg-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-history.bg-diff.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- po/gnu-history.bg-diff.html 30 May 2021 18:30:20 -0000      1.4
+++ po/gnu-history.bg-diff.html 2 Nov 2021 14:41:50 -0000       1.5
@@ -11,20 +11,28 @@
 </style></head>
 <body><pre>
 &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.84</em></ins></span> --&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 --&gt;
+&lt;!--#set var="TAGS" value="gnu-history" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</em></ins></span> --&gt;
 &lt;title&gt;Overview of the GNU System
 - GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;meta name="Keywords" content="GNU, GNU Project, FSF, Free Software, Free 
Software Foundation, History" /&gt;
 &lt;!--#include virtual="/gnu/po/gnu-history.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&lt;div class="article reduced-width"&gt;</em></ins></span>
 &lt;h2&gt;Overview of the GNU System&lt;/h2&gt;
+<span class="inserted"><ins><em>&lt;div 
class="thin"&gt;&lt;/div&gt;</em></ins></span>
 
 &lt;p&gt;
 The GNU operating system is a complete free software system,
-upward-compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.
-<span class="inserted"><ins><em>It is pronounced as &lt;a 
href="/gnu/pronunciation.html"&gt;one syllable with a
-hard g&lt;/a&gt;.</em></ins></span>
-&lt;a href="http://www.stallman.org/"&gt;Richard Stallman&lt;/a&gt; made the
+upward-compatible with Unix.  GNU stands for &ldquo;GNU's Not <span 
class="removed"><del><strong>Unix&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>Unix.&rdquo;
+It is pronounced as &lt;a href="/gnu/pronunciation.html"&gt;one syllable with a
+hard &lt;i&gt;g&lt;/i&gt;&lt;/a&gt;.</em></ins></span>
+&lt;a <span 
class="removed"><del><strong>href="http://www.stallman.org/"&gt;Richard</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://www.stallman.org/"&gt;Richard</em></ins></span>
 Stallman&lt;/a&gt; made the
 &lt;a href="/gnu/initial-announcement.html"&gt;Initial Announcement&lt;/a&gt; 
of
 the GNU Project in September 1983.  A longer version called
 the &lt;a href="/gnu/manifesto.html"&gt;GNU Manifesto&lt;/a&gt; was published 
in
@@ -34,9 +42,10 @@
 &lt;p&gt;
 The name &ldquo;GNU&rdquo; was chosen because it met a few
 requirements; first, it was a recursive acronym for &ldquo;GNU's Not
-Unix&rdquo;, second, because it was a real word, and third, it was fun
+<span class="removed"><del><strong>Unix&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>Unix,&rdquo;</em></ins></span> second, because 
it was a real word, and third, it was fun
 to say (or
-&lt;a 
href="http://www.poppyfields.net/poppy/songs/gnu.html"&gt;Sing&lt;/a&gt;).&lt;/p&gt;
+&lt;a <span 
class="removed"><del><strong>href="http://www.poppyfields.net/poppy/songs/gnu.html"&gt;Sing&lt;/a&gt;).&lt;/p&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="http://www.poppyfields.net/poppy/songs/gnu.html"&gt;sing&lt;/a&gt;).&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;
 The word &ldquo;free&rdquo; in &ldquo;free software&rdquo; pertains to
@@ -52,7 +61,8 @@
 
 &lt;p&gt;
 The project to develop the GNU system is called the &ldquo;GNU
-Project&rdquo;.  The GNU Project was conceived in 1983 as a way of
+<span class="removed"><del><strong>Project&rdquo;.</strong></del></span>
+<span class="inserted"><ins><em>Project.&rdquo;</em></ins></span>  The GNU 
Project was conceived in 1983 as a way of
 bringing back the cooperative spirit that prevailed in the computing
 community in earlier days&mdash;to make cooperation possible once again by
 removing the obstacles to cooperation imposed by the owners of
@@ -87,7 +97,7 @@
 text formatters, mail software, graphical interfaces, libraries, games
 and many other things.  Thus, writing a whole operating system is a
 very large job.  We started in January 1984.
-The &lt;a href="http://fsf.org/"&gt; Free Software Foundation&lt;/a&gt; was
+The &lt;a <span 
class="removed"><del><strong>href="http://fsf.org/"&gt;</strong></del></span> 
<span 
class="inserted"><ins><em>href="https://www.fsf.org/"&gt;</em></ins></span> 
Free Software Foundation&lt;/a&gt; was
 founded in October 1985, initially to raise funds to help develop
 GNU.&lt;/p&gt;
 
@@ -98,26 +108,27 @@
 complete operating system: the GNU/Linux system.  Estimates are that
 tens of millions of people now use GNU/Linux systems, typically
 via &lt;a <span 
class="removed"><del><strong>href="/distros"&gt;GNU/Linux</strong></del></span> 
<span 
class="inserted"><ins><em>href="/distros/distros.html"&gt;GNU/Linux</em></ins></span>
 distributions&lt;/a&gt;.  The principal
-version of Linux now contains non-free firmware &ldquo;blobs&rdquo;;
+version of Linux now contains <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> firmware 
&ldquo;blobs&rdquo;;
 free software activists now maintain a modified free version of Linux,
-called &lt;a href="http://directory.fsf.org/project/linux"&gt;
+called &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/wiki/Linux-libre"&gt;</em></ins></span>
 Linux-libre&lt;/a&gt;.&lt;/p&gt;
 
 &lt;p&gt;
 However, the GNU Project is not limited to the core operating system.
 We aim to provide a whole spectrum of software, whatever many users
 want to have.  This includes application software.  See
-the &lt;a href="/directory"&gt;Free Software Directory&lt;/a&gt; for a 
catalogue
+the &lt;a <span 
class="removed"><del><strong>href="/directory"&gt;Free</strong></del></span> 
<span 
class="inserted"><ins><em>href="https://directory.fsf.org/wiki/Main_Page"&gt;Free</em></ins></span>
 Software Directory&lt;/a&gt; for a catalogue
 of free software application programs.&lt;/p&gt;
 
 &lt;p&gt;
 We also want to provide software for users who are not computer
 experts.  Therefore we developed a
-&lt;a href="http://www.gnome.org/"&gt;graphical desktop (called 
GNOME)&lt;/a&gt; to help
+&lt;a <span 
class="removed"><del><strong>href="http://www.gnome.org/"&gt;graphical</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://www.gnome.org/"&gt;graphical</em></ins></span>
 desktop (called GNOME)&lt;/a&gt; to help
 beginners use the GNU system.&lt;/p&gt;
 
 &lt;p&gt;We also want to provide games and other recreations.  Plenty of &lt;a
-href="http://directory.fsf.org/wiki/Category/Game"&gt;free games&lt;/a&gt; are
+<span 
class="removed"><del><strong>href="http://directory.fsf.org/wiki/Category/Game"&gt;free</strong></del></span>
+<span 
class="inserted"><ins><em>href="https://directory.fsf.org/wiki/Category/Game"&gt;free</em></ins></span>
 games&lt;/a&gt; are
 already available.&lt;/p&gt;
 
 &lt;p&gt;
@@ -126,11 +137,11 @@
 the patent system prohibit free software&lt;/a&gt;.  The ultimate goal is to
 provide free software to do all of the jobs computer users want to
 do&mdash;and thus make proprietary software a thing of the past.&lt;/p&gt;
-
+<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;
-&lt;div id="footer"&gt;
+&lt;div <span 
class="removed"><del><strong>id="footer"&gt;</strong></del></span> <span 
class="inserted"><ins><em>id="footer" role="contentinfo"&gt;</em></ins></span>
 &lt;div class="unprintable"&gt;
 
 &lt;p&gt;Please send general FSF &amp; GNU inquiries to
@@ -148,13 +159,13 @@
         to &lt;a href="mailto:web-translators@gnu.org"&gt;
         &lt;web-translators@gnu.org&gt;&lt;/a&gt;.&lt;/p&gt;
 
-        &lt;p&gt;For information on coordinating and submitting translations of
+        &lt;p&gt;For information on coordinating and <span 
class="removed"><del><strong>submitting</strong></del></span> <span 
class="inserted"><ins><em>contributing</em></ins></span> translations of
         our web pages, see &lt;a
         href="/server/standards/README.translations.html"&gt;Translations
         README&lt;/a&gt;. --&gt;
 Please see the &lt;a
 href="/server/standards/README.translations.html"&gt;Translations
-README&lt;/a&gt; for information on coordinating and submitting translations
+README&lt;/a&gt; for information on coordinating and <span 
class="removed"><del><strong>submitting</strong></del></span> <span 
class="inserted"><ins><em>contributing</em></ins></span> translations
 of this article.&lt;/p&gt;
 &lt;/div&gt;
 
@@ -175,8 +186,9 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007,
-2009, 2012, <span class="removed"><del><strong>2014</strong></del></span> 
<span class="inserted"><ins><em>2014, 2017</em></ins></span> Free Software 
Foundation, Inc.&lt;/p&gt;
+&lt;p&gt;Copyright &copy; 1996, 1997, <span class="removed"><del><strong>1998, 
1999, 2001, 2002,</strong></del></span> 2003, 2005, <span 
class="removed"><del><strong>2007,
+2009,</strong></del></span> <span 
class="inserted"><ins><em>2008,</em></ins></span> 2012, <span 
class="removed"><del><strong>2014</strong></del></span> <span 
class="inserted"><ins><em>2017, 2021</em></ins></span>
+Free Software Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
 <span 
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/"&gt;Creative</strong></del></span>
@@ -187,11 +199,12 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/05/30 18:30:20 $
+$Date: 2021/11/02 14:41:50 $
 &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: po/gnu-history.bg.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-history.bg.po,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- po/gnu-history.bg.po        30 May 2021 18:30:20 -0000      1.29
+++ po/gnu-history.bg.po        2 Nov 2021 14:41:50 -0000       1.30
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-history.html\n"
-"POT-Creation-Date: 2017-09-04 10:56+0000\n"
+"POT-Creation-Date: 2021-11-02 13:26+0000\n"
 "PO-Revision-Date: 2009-06-29 23:39+0300\n"
 "Last-Translator: Yavor Doganov <yavor@gnu.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -29,19 +29,21 @@
 "ГНУ, Проектът GNU, ФСС, свободен софтуер, 
Фондация за свободен софтуер, "
 "история"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Overview of the GNU System"
 msgstr "Преглед на системата GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | The GNU operating system is a complete free software system,
-# | upward-compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.
-# |  {+It is pronounced as <a href=\"/gnu/pronunciation.html\">one syllable
-# | with a hard g</a>.+}  <a href=\"http://www.stallman.org/\";>Richard
-# | Stallman</a> made the <a href=\"/gnu/initial-announcement.html\">Initial
-# | Announcement</a> of the GNU Project in September 1983.  A longer version
-# | called the <a href=\"/gnu/manifesto.html\">GNU Manifesto</a> was published
-# | in March 1985.  It has been translated into several <a
+# | upward-compatible with Unix.  GNU stands for &ldquo;GNU's Not
+# | [-Unix&rdquo;.-] {+Unix.&rdquo; It is pronounced as+} <a
+# | [-href=\"http://www.stallman.org/\";>Richard-]
+# | {+href=\"/gnu/pronunciation.html\">one syllable with a hard <i>g</i></a>. 
+# | <a href=\"https://www.stallman.org/\";>Richard+} Stallman</a> made the <a
+# | href=\"/gnu/initial-announcement.html\">Initial Announcement</a> of the
+# | GNU Project in September 1983.  A longer version called the <a
+# | href=\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March
+# | 1985.  It has been translated into several <a
 # | href=\"/gnu/manifesto.html#translations\">other languages</a>.
 #, fuzzy
 #| msgid ""
@@ -55,14 +57,14 @@
 #| "\">other languages</a>."
 msgid ""
 "The GNU operating system is a complete free software system, upward-"
-"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.  It is "
+"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix.&rdquo; It is "
 "pronounced as <a href=\"/gnu/pronunciation.html\">one syllable with a hard "
-"g</a>.  <a href=\"http://www.stallman.org/\";>Richard Stallman</a> made the "
-"<a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> of the "
-"GNU Project in September 1983.  A longer version called the <a href=\"/gnu/"
-"manifesto.html\">GNU Manifesto</a> was published in March 1985.  It has been "
-"translated into several <a href=\"/gnu/manifesto.html#translations\">other "
-"languages</a>."
+"<i>g</i></a>.  <a href=\"https://www.stallman.org/\";>Richard Stallman</a> "
+"made the <a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> "
+"of the GNU Project in September 1983.  A longer version called the <a href="
+"\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March 1985.  It "
+"has been translated into several <a href=\"/gnu/manifesto.html#translations"
+"\">other languages</a>."
 msgstr ""
 "Операционната система GNU е цялостна 
система, която е свободен софтуер, "
 "право съвместима с „Юникс“.  GNU значи „GNU's 
Not Unix“ (GNU не е „Юникс“).  "
@@ -72,19 +74,31 @@
 "html\">Манифест на GNU</a>, бе публикувана през 
март 1985 г.  Документът е "
 "преведен на <a 
href=\"/gnu/manifesto.html#translations\">няколко езика</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The name &ldquo;GNU&rdquo; was chosen because it met a few requirements;
+# | first, it was a recursive acronym for &ldquo;GNU's Not [-Unix&rdquo;,-]
+# | {+Unix,&rdquo;+} second, because it was a real word, and third, it was fun
+# | to say (or <a
+# | href=\"http://www.poppyfields.net/poppy/songs/gnu.html\";>[-S-]{+s+}ing</a>)
+# | .
+#, fuzzy
+#| msgid ""
+#| "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
+#| "first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, "
+#| "second, because it was a real word, and third, it was fun to say (or <a "
+#| "href=\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
 msgid ""
 "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
-"first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, second, "
+"first, it was a recursive acronym for &ldquo;GNU's Not Unix,&rdquo; second, "
 "because it was a real word, and third, it was fun to say (or <a href="
-"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
+"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>sing</a>)."
 msgstr ""
 "Името „GNU“ бе избрано, понеже отговаряше 
на някои изисквания: първо, беше "
 "рекурсивен акроним на „GNU не е Юникс“; 
второ, защото беше истинска дума, и "
 "трето, беше приятно да се изговаря (или <a 
href=\"http://www.poppyfields.net/";
 "poppy/songs/gnu.html\">пее</a>)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The word &ldquo;free&rdquo; in &ldquo;free software&rdquo; pertains to <a "
 "href=\"/philosophy/free-sw.html\">freedom</a>, not price.  You may or may "
@@ -110,13 +124,27 @@
 "такса за физическия акт на прехвърлянето 
на копие, или може да предлагате "
 "копия безплатно.)"
 
-#. type: Content of: <p>
-msgid ""
-"The project to develop the GNU system is called the &ldquo;GNU "
-"Project&rdquo;.  The GNU Project was conceived in 1983 as a way of bringing "
-"back the cooperative spirit that prevailed in the computing community in "
-"earlier days&mdash;to make cooperation possible once again by removing the "
-"obstacles to cooperation imposed by the owners of proprietary software."
+#. type: Content of: <div><p>
+# | The project to develop the GNU system is called the &ldquo;GNU
+# | [-Project&rdquo;.-] {+Project.&rdquo;+} The GNU Project was conceived in
+# | 1983 as a way of bringing back the cooperative spirit that prevailed in
+# | the computing community in earlier days&mdash;to make cooperation possible
+# | once again by removing the obstacles to cooperation imposed by the owners
+# | of proprietary software.
+#, fuzzy
+#| msgid ""
+#| "The project to develop the GNU system is called the &ldquo;GNU "
+#| "Project&rdquo;.  The GNU Project was conceived in 1983 as a way of "
+#| "bringing back the cooperative spirit that prevailed in the computing "
+#| "community in earlier days&mdash;to make cooperation possible once again "
+#| "by removing the obstacles to cooperation imposed by the owners of "
+#| "proprietary software."
+msgid ""
+"The project to develop the GNU system is called the &ldquo;GNU Project."
+"&rdquo; The GNU Project was conceived in 1983 as a way of bringing back the "
+"cooperative spirit that prevailed in the computing community in earlier "
+"days&mdash;to make cooperation possible once again by removing the obstacles "
+"to cooperation imposed by the owners of proprietary software."
 msgstr ""
 "Проектът, който разработва системата GNU, 
се нарича „Проект GNU“.  Проектът "
 "GNU е основан през 1983 г. като начин за 
възвръщане на духа на "
@@ -125,7 +153,7 @@
 "премахването на препятствията, наложени 
от собствениците на несвободен "
 "софтуер."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In 1971, when Richard Stallman started his career at MIT, he worked in a "
 "group which used <a href=\"/philosophy/free-sw.html\">free software</a> "
@@ -139,7 +167,7 @@
 "софтуер.  Програмистите са били свободни 
да си сътрудничат един с друг, и "
 "често са го правили."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By the 1980s, almost all software was <a href=\"/philosophy/categories."
 "html#ProprietarySoftware\">proprietary</a>, which means that it had owners "
@@ -151,7 +179,7 @@
 "собственици, които са забранявали 
сътрудничеството между потребителите.  "
 "Това е довело до необходимостта от 
проекта GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Every computer user needs an operating system; if there is no free operating "
 "system, then you can't even get started using a computer without resorting "
@@ -164,7 +192,7 @@
 "очевидно, първата точка в дневния ред на 
свободния софтуер трябваше да бъде "
 "свободна операционна система."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We decided to make the operating system compatible with Unix because the "
 "overall design was already proven and portable, and because compatibility "
@@ -174,14 +202,28 @@
 "цялостният дизайн беше вече доказан и 
преносим, и понеже съвместимостта "
 "прави лесно прехвърлянето на потребители 
на „Юникс“ към GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | A Unix-like operating system includes a kernel, compilers, editors, text
+# | formatters, mail software, graphical interfaces, libraries, games and many
+# | other things.  Thus, writing a whole operating system is a very large job.
+# |  We started in January 1984.  The <a [-href=\"http://fsf.org/\";>-]
+# | {+href=\"https://www.fsf.org/\";>+} Free Software Foundation</a> was
+# | founded in October 1985, initially to raise funds to help develop GNU.
+#, fuzzy
+#| msgid ""
+#| "A Unix-like operating system includes a kernel, compilers, editors, text "
+#| "formatters, mail software, graphical interfaces, libraries, games and "
+#| "many other things.  Thus, writing a whole operating system is a very "
+#| "large job.  We started in January 1984.  The <a href=\"http://fsf.org/\";> "
+#| "Free Software Foundation</a> was founded in October 1985, initially to "
+#| "raise funds to help develop GNU."
 msgid ""
 "A Unix-like operating system includes a kernel, compilers, editors, text "
 "formatters, mail software, graphical interfaces, libraries, games and many "
 "other things.  Thus, writing a whole operating system is a very large job.  "
-"We started in January 1984.  The <a href=\"http://fsf.org/\";> Free Software "
-"Foundation</a> was founded in October 1985, initially to raise funds to help "
-"develop GNU."
+"We started in January 1984.  The <a href=\"https://www.fsf.org/\";> Free "
+"Software Foundation</a> was founded in October 1985, initially to raise "
+"funds to help develop GNU."
 msgstr ""
 "Една операционна система, подобна на 
„Юникс“, съдържа ядро, компилатори, "
 "редактори, софтуер за форматиране на 
текст, обработка на поща, графични "
@@ -191,7 +233,30 @@
 "основана през октомври 1985 г., първоначално 
за да набира средства, които да "
 "подпомогнат разработката на GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | By 1990 we had either found or written all the major components except
+# | one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by
+# | Linus Torvalds in 1991 and made free software in 1992.  Combining Linux
+# | with the almost-complete GNU system resulted in a complete operating
+# | system: the GNU/Linux system.  Estimates are that tens of millions of
+# | people now use GNU/Linux systems, typically via <a
+# | href=\"/distros/distros.html\">GNU/Linux distributions</a>.  The principal
+# | version of Linux now contains non[---]free firmware &ldquo;blobs&rdquo;;
+# | free software activists now maintain a modified free version of Linux,
+# | called <a [-href=\"http://directory.fsf.org/project/linux\";>-]
+# | {+href=\"https://directory.fsf.org/wiki/Linux-libre\";>+} Linux-libre</a>.
+#, fuzzy
+#| msgid ""
+#| "By 1990 we had either found or written all the major components except "
+#| "one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by "
+#| "Linus Torvalds in 1991 and made free software in 1992.  Combining Linux "
+#| "with the almost-complete GNU system resulted in a complete operating "
+#| "system: the GNU/Linux system.  Estimates are that tens of millions of "
+#| "people now use GNU/Linux systems, typically via <a href=\"/distros/"
+#| "distros.html\">GNU/Linux distributions</a>.  The principal version of "
+#| "Linux now contains non-free firmware &ldquo;blobs&rdquo;; free software "
+#| "activists now maintain a modified free version of Linux, called <a href="
+#| "\"http://directory.fsf.org/project/linux\";> Linux-libre</a>."
 msgid ""
 "By 1990 we had either found or written all the major components except "
 "one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by "
@@ -199,10 +264,10 @@
 "the almost-complete GNU system resulted in a complete operating system: the "
 "GNU/Linux system.  Estimates are that tens of millions of people now use GNU/"
 "Linux systems, typically via <a href=\"/distros/distros.html\">GNU/Linux "
-"distributions</a>.  The principal version of Linux now contains non-free "
+"distributions</a>.  The principal version of Linux now contains nonfree "
 "firmware &ldquo;blobs&rdquo;; free software activists now maintain a "
-"modified free version of Linux, called <a href=\"http://directory.fsf.org/";
-"project/linux\"> Linux-libre</a>."
+"modified free version of Linux, called <a href=\"https://directory.fsf.org/";
+"wiki/Linux-libre\"> Linux-libre</a>."
 msgstr ""
 "До 1990 г. ние бяхме или намерили, или 
написали всички главни компоненти, "
 "освен един — ядрото.  Тогава Линукс, ядро, 
подобно на ядрото на „Юникс“, бе "
@@ -216,13 +281,26 @@
 "версия ня Линукс (<a 
href=\"http://directory.fsf.org/project/linux\";>Linux-"
 "libre</a>)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | However, the GNU Project is not limited to the core operating system.  We
+# | aim to provide a whole spectrum of software, whatever many users want to
+# | have.  This includes application software.  See the <a
+# | [-href=\"/directory\">Free-]
+# | {+href=\"https://directory.fsf.org/wiki/Main_Page\";>Free+} Software
+# | Directory</a> for a catalogue of free software application programs.
+#, fuzzy
+#| msgid ""
+#| "However, the GNU Project is not limited to the core operating system.  We "
+#| "aim to provide a whole spectrum of software, whatever many users want to "
+#| "have.  This includes application software.  See the <a href=\"/directory"
+#| "\">Free Software Directory</a> for a catalogue of free software "
+#| "application programs."
 msgid ""
 "However, the GNU Project is not limited to the core operating system.  We "
 "aim to provide a whole spectrum of software, whatever many users want to "
-"have.  This includes application software.  See the <a href=\"/directory"
-"\">Free Software Directory</a> for a catalogue of free software application "
-"programs."
+"have.  This includes application software.  See the <a href=\"https://";
+"directory.fsf.org/wiki/Main_Page\">Free Software Directory</a> for a "
+"catalogue of free software application programs."
 msgstr ""
 "Но проектът GNU не е ограничен в рамките на 
основната операционна система.  "
 "Нашата цел е да осигурим пълен спектър от 
софтуер, каквото е нужно за "
@@ -230,27 +308,43 @@
 "Вижте <a href=\"/directory\">Указателя на свободен 
софтуер</a> за каталог от "
 "свободни приложения."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | We also want to provide software for users who are not computer experts. 
+# | Therefore we developed a <a href=\"http{+s+}://www.gnome.org/\">graphical
+# | desktop (called GNOME)</a> to help beginners use the GNU system.
+#, fuzzy
+#| msgid ""
+#| "We also want to provide software for users who are not computer experts.  "
+#| "Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical "
+#| "desktop (called GNOME)</a> to help beginners use the GNU system."
 msgid ""
 "We also want to provide software for users who are not computer experts.  "
-"Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical desktop "
-"(called GNOME)</a> to help beginners use the GNU system."
+"Therefore we developed a <a href=\"https://www.gnome.org/\";>graphical "
+"desktop (called GNOME)</a> to help beginners use the GNU system."
 msgstr ""
 "Искаме да осигурим и софтуер за 
потребители, които не са компютърни "
 "специалисти.  Затова разработихме <a 
href=\"http://www.gnome.org/\";>графична "
 "работна среда (GNOME)</a>, за да помогнем на 
начинаещите да използват "
 "системата GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | We also want to provide games and other recreations.  Plenty of <a
+# | href=\"http{+s+}://directory.fsf.org/wiki/Category/Game\">free games</a>
+# | are already available.
+#, fuzzy
+#| msgid ""
+#| "We also want to provide games and other recreations.  Plenty of <a href="
+#| "\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are "
+#| "already available."
 msgid ""
 "We also want to provide games and other recreations.  Plenty of <a href="
-"\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
+"\"https://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
 "available."
 msgstr ""
 "Искаме да осигурим игри и други 
развлечения.  Много <a href=\"http://";
 "directory.fsf.org/wiki/Category/Game\">свободни игри</a> вече 
са налице."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "How far can free software go? There are no limits, except when <a href=\"/"
 "philosophy/fighting-software-patents.html\">laws such as the patent system "
@@ -297,14 +391,23 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# | Please see the <a
+# | href=\"/server/standards/README.translations.html\">Translations
+# | README</a> for information on coordinating and [-submitting-]
+# | {+contributing+} translations of this article.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and submitting "
+#| "translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Моля, докладвайте грешки и предложения 
относно българския превод чрез <a "
@@ -314,18 +417,14 @@
 "подаването на преводи на тази статия."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007,
-# | 2009, 2012, [-2014-] {+2014, 2017+} Free Software Foundation, Inc.
+# | Copyright &copy; [-1996-2008-] {+1996, 1997, 2003, 2005, 2008, 2012, 2017,
+# | 2021+} Free Software Foundation, Inc.
 #, fuzzy
-#| msgid ""
-#| "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
-#| "2009, 2012, 2014 Free Software Foundation, Inc."
+#| msgid "Copyright &copy; 1996-2008 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014 Free Software Foundation, Inc. (Фондация за 
свободен софтуер)"
+"Copyright &copy; 1996, 1997, 2003, 2005, 2008, 2012, 2017, 2021 Free "
+"Software Foundation, Inc."
+msgstr "Copyright &copy; 1996-2008 Фондация за свободен 
софтуер"
 
 #. type: Content of: <div><p>
 msgid ""
@@ -350,6 +449,29 @@
 msgstr "Последно обновяване:"
 
 #~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "Моля, докладвайте грешки и предложения 
относно българския превод чрез <a "
+#~ "href=\"mailto:web-translators@gnu.org\";>&lt;web-translators@gnu.org&gt;</"
+#~ "a>.</p> <p>Вижте <a href=\"/server/standards/README.translations.html"
+#~ "\">Документацията за преводачи</a> за 
информация за координирането и "
+#~ "подаването на преводи на тази статия."
+
+#, fuzzy
+#~| msgid ""
+#~| "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~| "2009, 2012, 2014 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014 Free Software Foundation, Inc. (Фондация за 
свободен "
+#~ "софтуер)"
+
+#~ msgid ""
 #~ "(The principal version of Linux now contains non-free firmware &ldquo;"
 #~ "blobs&rdquo;.  Free software activists now maintain a modified <a href="
 #~ "\"http://directory.fsf.org/project/linux\";>free version</a> of Linux.)"

Index: po/gnu-history.ca-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-history.ca-diff.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- po/gnu-history.ca-diff.html 30 May 2021 19:03:06 -0000      1.5
+++ po/gnu-history.ca-diff.html 2 Nov 2021 14:41:50 -0000       1.6
@@ -11,20 +11,28 @@
 </style></head>
 <body><pre>
 &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.84</em></ins></span> --&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 --&gt;
+&lt;!--#set var="TAGS" value="gnu-history" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</em></ins></span> --&gt;
 &lt;title&gt;Overview of the GNU System
 - GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;meta name="Keywords" content="GNU, GNU Project, FSF, Free Software, Free 
Software Foundation, History" /&gt;
 &lt;!--#include virtual="/gnu/po/gnu-history.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&lt;div class="article reduced-width"&gt;</em></ins></span>
 &lt;h2&gt;Overview of the GNU System&lt;/h2&gt;
+<span class="inserted"><ins><em>&lt;div 
class="thin"&gt;&lt;/div&gt;</em></ins></span>
 
 &lt;p&gt;
 The GNU operating system is a complete free software system,
-upward-compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.
-<span class="inserted"><ins><em>It is pronounced as &lt;a 
href="/gnu/pronunciation.html"&gt;one syllable with a
-hard g&lt;/a&gt;.</em></ins></span>
-&lt;a href="http://www.stallman.org/"&gt;Richard Stallman&lt;/a&gt; made the
+upward-compatible with Unix.  GNU stands for &ldquo;GNU's Not <span 
class="removed"><del><strong>Unix&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>Unix.&rdquo;
+It is pronounced as &lt;a href="/gnu/pronunciation.html"&gt;one syllable with a
+hard &lt;i&gt;g&lt;/i&gt;&lt;/a&gt;.</em></ins></span>
+&lt;a <span 
class="removed"><del><strong>href="http://www.stallman.org/"&gt;Richard</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://www.stallman.org/"&gt;Richard</em></ins></span>
 Stallman&lt;/a&gt; made the
 &lt;a href="/gnu/initial-announcement.html"&gt;Initial Announcement&lt;/a&gt; 
of
 the GNU Project in September 1983.  A longer version called
 the &lt;a href="/gnu/manifesto.html"&gt;GNU Manifesto&lt;/a&gt; was published 
in
@@ -34,9 +42,10 @@
 &lt;p&gt;
 The name &ldquo;GNU&rdquo; was chosen because it met a few
 requirements; first, it was a recursive acronym for &ldquo;GNU's Not
-Unix&rdquo;, second, because it was a real word, and third, it was fun
+<span class="removed"><del><strong>Unix&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>Unix,&rdquo;</em></ins></span> second, because 
it was a real word, and third, it was fun
 to say (or
-&lt;a 
href="http://www.poppyfields.net/poppy/songs/gnu.html"&gt;Sing&lt;/a&gt;).&lt;/p&gt;
+&lt;a <span 
class="removed"><del><strong>href="http://www.poppyfields.net/poppy/songs/gnu.html"&gt;Sing&lt;/a&gt;).&lt;/p&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="http://www.poppyfields.net/poppy/songs/gnu.html"&gt;sing&lt;/a&gt;).&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;
 The word &ldquo;free&rdquo; in &ldquo;free software&rdquo; pertains to
@@ -52,7 +61,8 @@
 
 &lt;p&gt;
 The project to develop the GNU system is called the &ldquo;GNU
-Project&rdquo;.  The GNU Project was conceived in 1983 as a way of
+<span class="removed"><del><strong>Project&rdquo;.</strong></del></span>
+<span class="inserted"><ins><em>Project.&rdquo;</em></ins></span>  The GNU 
Project was conceived in 1983 as a way of
 bringing back the cooperative spirit that prevailed in the computing
 community in earlier days&mdash;to make cooperation possible once again by
 removing the obstacles to cooperation imposed by the owners of
@@ -87,7 +97,7 @@
 text formatters, mail software, graphical interfaces, libraries, games
 and many other things.  Thus, writing a whole operating system is a
 very large job.  We started in January 1984.
-The &lt;a href="http://fsf.org/"&gt; Free Software Foundation&lt;/a&gt; was
+The &lt;a <span 
class="removed"><del><strong>href="http://fsf.org/"&gt;</strong></del></span> 
<span 
class="inserted"><ins><em>href="https://www.fsf.org/"&gt;</em></ins></span> 
Free Software Foundation&lt;/a&gt; was
 founded in October 1985, initially to raise funds to help develop
 GNU.&lt;/p&gt;
 
@@ -98,26 +108,27 @@
 complete operating system: the GNU/Linux system.  Estimates are that
 tens of millions of people now use GNU/Linux systems, typically
 via &lt;a <span 
class="removed"><del><strong>href="/distros"&gt;GNU/Linux</strong></del></span> 
<span 
class="inserted"><ins><em>href="/distros/distros.html"&gt;GNU/Linux</em></ins></span>
 distributions&lt;/a&gt;.  The principal
-version of Linux now contains non-free firmware &ldquo;blobs&rdquo;;
+version of Linux now contains <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> firmware 
&ldquo;blobs&rdquo;;
 free software activists now maintain a modified free version of Linux,
-called &lt;a href="http://directory.fsf.org/project/linux"&gt;
+called &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/wiki/Linux-libre"&gt;</em></ins></span>
 Linux-libre&lt;/a&gt;.&lt;/p&gt;
 
 &lt;p&gt;
 However, the GNU Project is not limited to the core operating system.
 We aim to provide a whole spectrum of software, whatever many users
 want to have.  This includes application software.  See
-the &lt;a href="/directory"&gt;Free Software Directory&lt;/a&gt; for a 
catalogue
+the &lt;a <span 
class="removed"><del><strong>href="/directory"&gt;Free</strong></del></span> 
<span 
class="inserted"><ins><em>href="https://directory.fsf.org/wiki/Main_Page"&gt;Free</em></ins></span>
 Software Directory&lt;/a&gt; for a catalogue
 of free software application programs.&lt;/p&gt;
 
 &lt;p&gt;
 We also want to provide software for users who are not computer
 experts.  Therefore we developed a
-&lt;a href="http://www.gnome.org/"&gt;graphical desktop (called 
GNOME)&lt;/a&gt; to help
+&lt;a <span 
class="removed"><del><strong>href="http://www.gnome.org/"&gt;graphical</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://www.gnome.org/"&gt;graphical</em></ins></span>
 desktop (called GNOME)&lt;/a&gt; to help
 beginners use the GNU system.&lt;/p&gt;
 
 &lt;p&gt;We also want to provide games and other recreations.  Plenty of &lt;a
-href="http://directory.fsf.org/wiki/Category/Game"&gt;free games&lt;/a&gt; are
+<span 
class="removed"><del><strong>href="http://directory.fsf.org/wiki/Category/Game"&gt;free</strong></del></span>
+<span 
class="inserted"><ins><em>href="https://directory.fsf.org/wiki/Category/Game"&gt;free</em></ins></span>
 games&lt;/a&gt; are
 already available.&lt;/p&gt;
 
 &lt;p&gt;
@@ -126,11 +137,11 @@
 the patent system prohibit free software&lt;/a&gt;.  The ultimate goal is to
 provide free software to do all of the jobs computer users want to
 do&mdash;and thus make proprietary software a thing of the past.&lt;/p&gt;
-
+<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;
-&lt;div id="footer"&gt;
+&lt;div <span 
class="removed"><del><strong>id="footer"&gt;</strong></del></span> <span 
class="inserted"><ins><em>id="footer" role="contentinfo"&gt;</em></ins></span>
 &lt;div class="unprintable"&gt;
 
 &lt;p&gt;Please send general FSF &amp; GNU inquiries to
@@ -148,13 +159,13 @@
         to &lt;a href="mailto:web-translators@gnu.org"&gt;
         &lt;web-translators@gnu.org&gt;&lt;/a&gt;.&lt;/p&gt;
 
-        &lt;p&gt;For information on coordinating and submitting translations of
+        &lt;p&gt;For information on coordinating and <span 
class="removed"><del><strong>submitting</strong></del></span> <span 
class="inserted"><ins><em>contributing</em></ins></span> translations of
         our web pages, see &lt;a
         href="/server/standards/README.translations.html"&gt;Translations
         README&lt;/a&gt;. --&gt;
 Please see the &lt;a
 href="/server/standards/README.translations.html"&gt;Translations
-README&lt;/a&gt; for information on coordinating and submitting translations
+README&lt;/a&gt; for information on coordinating and <span 
class="removed"><del><strong>submitting</strong></del></span> <span 
class="inserted"><ins><em>contributing</em></ins></span> translations
 of this article.&lt;/p&gt;
 &lt;/div&gt;
 
@@ -175,8 +186,9 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007,
-2009, 2012, <span class="removed"><del><strong>2014</strong></del></span> 
<span class="inserted"><ins><em>2014, 2017</em></ins></span> Free Software 
Foundation, Inc.&lt;/p&gt;
+&lt;p&gt;Copyright &copy; 1996, 1997, <span class="removed"><del><strong>1998, 
1999, 2001, 2002,</strong></del></span> 2003, 2005, <span 
class="removed"><del><strong>2007,
+2009,</strong></del></span> <span 
class="inserted"><ins><em>2008,</em></ins></span> 2012, <span 
class="removed"><del><strong>2014</strong></del></span> <span 
class="inserted"><ins><em>2017, 2021</em></ins></span>
+Free Software Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
 <span 
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/"&gt;Creative</strong></del></span>
@@ -187,11 +199,12 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/05/30 19:03:06 $
+$Date: 2021/11/02 14:41:50 $
 &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: po/gnu-history.ca.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-history.ca.po,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- po/gnu-history.ca.po        30 May 2021 19:03:06 -0000      1.37
+++ po/gnu-history.ca.po        2 Nov 2021 14:41:50 -0000       1.38
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnu-history.ca\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-04 10:56+0000\n"
+"POT-Creation-Date: 2021-11-02 13:26+0000\n"
 "PO-Revision-Date: 2014-06-05 16:13+0200\n"
 "Last-Translator: Miquel Puigpelat <mpuigpe1@xtec.cat>\n"
 "Language-Team: Catalan <www-ca-traductors@gnu.org>\n"
@@ -27,19 +27,21 @@
 msgstr ""
 "GNU, Projecte GNU, FSF, Programari lliure, Free Software Foundation, Historia"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Overview of the GNU System"
 msgstr "Descripció del Sistema GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | The GNU operating system is a complete free software system,
-# | upward-compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.
-# |  {+It is pronounced as <a href=\"/gnu/pronunciation.html\">one syllable
-# | with a hard g</a>.+}  <a href=\"http://www.stallman.org/\";>Richard
-# | Stallman</a> made the <a href=\"/gnu/initial-announcement.html\">Initial
-# | Announcement</a> of the GNU Project in September 1983.  A longer version
-# | called the <a href=\"/gnu/manifesto.html\">GNU Manifesto</a> was published
-# | in March 1985.  It has been translated into several <a
+# | upward-compatible with Unix.  GNU stands for &ldquo;GNU's Not
+# | [-Unix&rdquo;.-] {+Unix.&rdquo; It is pronounced as+} <a
+# | [-href=\"http://www.stallman.org/\";>Richard-]
+# | {+href=\"/gnu/pronunciation.html\">one syllable with a hard <i>g</i></a>. 
+# | <a href=\"https://www.stallman.org/\";>Richard+} Stallman</a> made the <a
+# | href=\"/gnu/initial-announcement.html\">Initial Announcement</a> of the
+# | GNU Project in September 1983.  A longer version called the <a
+# | href=\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March
+# | 1985.  It has been translated into several <a
 # | href=\"/gnu/manifesto.html#translations\">other languages</a>.
 #, fuzzy
 #| msgid ""
@@ -53,14 +55,14 @@
 #| "\">other languages</a>."
 msgid ""
 "The GNU operating system is a complete free software system, upward-"
-"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.  It is "
+"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix.&rdquo; It is "
 "pronounced as <a href=\"/gnu/pronunciation.html\">one syllable with a hard "
-"g</a>.  <a href=\"http://www.stallman.org/\";>Richard Stallman</a> made the "
-"<a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> of the "
-"GNU Project in September 1983.  A longer version called the <a href=\"/gnu/"
-"manifesto.html\">GNU Manifesto</a> was published in March 1985.  It has been "
-"translated into several <a href=\"/gnu/manifesto.html#translations\">other "
-"languages</a>."
+"<i>g</i></a>.  <a href=\"https://www.stallman.org/\";>Richard Stallman</a> "
+"made the <a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> "
+"of the GNU Project in September 1983.  A longer version called the <a href="
+"\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March 1985.  It "
+"has been translated into several <a href=\"/gnu/manifesto.html#translations"
+"\">other languages</a>."
 msgstr ""
 "El sistema operatiu GNU és un sistema de programari completament lliure "
 "compatible amb Unix. GNU significa <cite>GNU's Not Unix</cite> (GNU no és "
@@ -71,19 +73,31 @@
 "traduïda a diferents <a href=\"/gnu/manifesto.html#translations\">idiomes</"
 "a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The name &ldquo;GNU&rdquo; was chosen because it met a few requirements;
+# | first, it was a recursive acronym for &ldquo;GNU's Not [-Unix&rdquo;,-]
+# | {+Unix,&rdquo;+} second, because it was a real word, and third, it was fun
+# | to say (or <a
+# | href=\"http://www.poppyfields.net/poppy/songs/gnu.html\";>[-S-]{+s+}ing</a>)
+# | .
+#, fuzzy
+#| msgid ""
+#| "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
+#| "first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, "
+#| "second, because it was a real word, and third, it was fun to say (or <a "
+#| "href=\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
 msgid ""
 "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
-"first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, second, "
+"first, it was a recursive acronym for &ldquo;GNU's Not Unix,&rdquo; second, "
 "because it was a real word, and third, it was fun to say (or <a href="
-"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
+"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>sing</a>)."
 msgstr ""
 "Es va triar el nom «GNU» perquè complia certs requisits. Primer, era un "
 "acrònim recursiu de <cite>GNU's Not Unix</cite>; segon, era una paraula "
 "existent; i tercer, era divertida de pronunciar (o de <a href=\"http://www.";
 "poppyfields.net/poppy/songs/gnu.html\">cantar</a>)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The word &ldquo;free&rdquo; in &ldquo;free software&rdquo; pertains to <a "
 "href=\"/philosophy/free-sw.html\">freedom</a>, not price.  You may or may "
@@ -107,13 +121,27 @@
 "manera ajudar a la comunitat (si redistribuïu programari GNU, podeu fixar un 
"
 "preu per l'acte físic de transferir la còpia, o bé podeu donar-les de 
franc)."
 
-#. type: Content of: <p>
-msgid ""
-"The project to develop the GNU system is called the &ldquo;GNU "
-"Project&rdquo;.  The GNU Project was conceived in 1983 as a way of bringing "
-"back the cooperative spirit that prevailed in the computing community in "
-"earlier days&mdash;to make cooperation possible once again by removing the "
-"obstacles to cooperation imposed by the owners of proprietary software."
+#. type: Content of: <div><p>
+# | The project to develop the GNU system is called the &ldquo;GNU
+# | [-Project&rdquo;.-] {+Project.&rdquo;+} The GNU Project was conceived in
+# | 1983 as a way of bringing back the cooperative spirit that prevailed in
+# | the computing community in earlier days&mdash;to make cooperation possible
+# | once again by removing the obstacles to cooperation imposed by the owners
+# | of proprietary software.
+#, fuzzy
+#| msgid ""
+#| "The project to develop the GNU system is called the &ldquo;GNU "
+#| "Project&rdquo;.  The GNU Project was conceived in 1983 as a way of "
+#| "bringing back the cooperative spirit that prevailed in the computing "
+#| "community in earlier days&mdash;to make cooperation possible once again "
+#| "by removing the obstacles to cooperation imposed by the owners of "
+#| "proprietary software."
+msgid ""
+"The project to develop the GNU system is called the &ldquo;GNU Project."
+"&rdquo; The GNU Project was conceived in 1983 as a way of bringing back the "
+"cooperative spirit that prevailed in the computing community in earlier "
+"days&mdash;to make cooperation possible once again by removing the obstacles "
+"to cooperation imposed by the owners of proprietary software."
 msgstr ""
 "El projecte consistent en desenvolupar el sistema GNU s'anomena «Projecte "
 "GNU». El Projecte GNU fou concebut l'any 1983 per tal de continuar l'esperit 
"
@@ -122,7 +150,7 @@
 "mitjançant l'eliminació dels obstacles a la cooperació que havien imposat "
 "els titulars de programari propietari."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In 1971, when Richard Stallman started his career at MIT, he worked in a "
 "group which used <a href=\"/philosophy/free-sw.html\">free software</a> "
@@ -135,7 +163,7 @@
 "sovint programari lliure. Els programadors tenien plena llibertat de "
 "cooperar amb els altres, i gairebé sempre ho feien."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By the 1980s, almost all software was <a href=\"/philosophy/categories."
 "html#ProprietarySoftware\">proprietary</a>, which means that it had owners "
@@ -147,7 +175,7 @@
 "propietaris que podien impedir, i fins i tot prohibir, la cooperació entre "
 "usuaris. Això va fer que el projecte GNU esdevingués necessari."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Every computer user needs an operating system; if there is no free operating "
 "system, then you can't even get started using a computer without resorting "
@@ -159,7 +187,7 @@
 "propietari. Per tant la primera tasca a dur a terme fou crear un sistema "
 "operatiu lliure."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We decided to make the operating system compatible with Unix because the "
 "overall design was already proven and portable, and because compatibility "
@@ -169,14 +197,28 @@
 "disseny general havia estat ja implementat, i pel fet que la compatibilitat "
 "feia fàcil que els usuaris de Unix passessin de Unix a GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | A Unix-like operating system includes a kernel, compilers, editors, text
+# | formatters, mail software, graphical interfaces, libraries, games and many
+# | other things.  Thus, writing a whole operating system is a very large job.
+# |  We started in January 1984.  The <a [-href=\"http://fsf.org/\";>-]
+# | {+href=\"https://www.fsf.org/\";>+} Free Software Foundation</a> was
+# | founded in October 1985, initially to raise funds to help develop GNU.
+#, fuzzy
+#| msgid ""
+#| "A Unix-like operating system includes a kernel, compilers, editors, text "
+#| "formatters, mail software, graphical interfaces, libraries, games and "
+#| "many other things.  Thus, writing a whole operating system is a very "
+#| "large job.  We started in January 1984.  The <a href=\"http://fsf.org/\";> "
+#| "Free Software Foundation</a> was founded in October 1985, initially to "
+#| "raise funds to help develop GNU."
 msgid ""
 "A Unix-like operating system includes a kernel, compilers, editors, text "
 "formatters, mail software, graphical interfaces, libraries, games and many "
 "other things.  Thus, writing a whole operating system is a very large job.  "
-"We started in January 1984.  The <a href=\"http://fsf.org/\";> Free Software "
-"Foundation</a> was founded in October 1985, initially to raise funds to help "
-"develop GNU."
+"We started in January 1984.  The <a href=\"https://www.fsf.org/\";> Free "
+"Software Foundation</a> was founded in October 1985, initially to raise "
+"funds to help develop GNU."
 msgstr ""
 "Un sistema operatiu a l'estil d'Unix inclou un nucli, compiladors, editors, "
 "formatadors de text, programari per al correu electrònic, interfícies "
@@ -186,7 +228,30 @@
 "fundar l'octubre de 1985, inicialment per recollir fons que permetessin "
 "desenvolupar GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | By 1990 we had either found or written all the major components except
+# | one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by
+# | Linus Torvalds in 1991 and made free software in 1992.  Combining Linux
+# | with the almost-complete GNU system resulted in a complete operating
+# | system: the GNU/Linux system.  Estimates are that tens of millions of
+# | people now use GNU/Linux systems, typically via <a
+# | href=\"/distros/distros.html\">GNU/Linux distributions</a>.  The principal
+# | version of Linux now contains non[---]free firmware &ldquo;blobs&rdquo;;
+# | free software activists now maintain a modified free version of Linux,
+# | called <a [-href=\"http://directory.fsf.org/project/linux\";>-]
+# | {+href=\"https://directory.fsf.org/wiki/Linux-libre\";>+} Linux-libre</a>.
+#, fuzzy
+#| msgid ""
+#| "By 1990 we had either found or written all the major components except "
+#| "one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by "
+#| "Linus Torvalds in 1991 and made free software in 1992.  Combining Linux "
+#| "with the almost-complete GNU system resulted in a complete operating "
+#| "system: the GNU/Linux system.  Estimates are that tens of millions of "
+#| "people now use GNU/Linux systems, typically via <a href=\"/distros/"
+#| "distros.html\">GNU/Linux distributions</a>.  The principal version of "
+#| "Linux now contains non-free firmware &ldquo;blobs&rdquo;; free software "
+#| "activists now maintain a modified free version of Linux, called <a href="
+#| "\"http://directory.fsf.org/project/linux\";> Linux-libre</a>."
 msgid ""
 "By 1990 we had either found or written all the major components except "
 "one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by "
@@ -194,10 +259,10 @@
 "the almost-complete GNU system resulted in a complete operating system: the "
 "GNU/Linux system.  Estimates are that tens of millions of people now use GNU/"
 "Linux systems, typically via <a href=\"/distros/distros.html\">GNU/Linux "
-"distributions</a>.  The principal version of Linux now contains non-free "
+"distributions</a>.  The principal version of Linux now contains nonfree "
 "firmware &ldquo;blobs&rdquo;; free software activists now maintain a "
-"modified free version of Linux, called <a href=\"http://directory.fsf.org/";
-"project/linux\"> Linux-libre</a>."
+"modified free version of Linux, called <a href=\"https://directory.fsf.org/";
+"wiki/Linux-libre\"> Linux-libre</a>."
 msgstr ""
 "Cap a 1990 havíem escrit o desenvolupat tots els components principals, "
 "llevat d'un: el nucli. Poc després, el 1991, Linus Torvalds va desenvolupar "
@@ -211,13 +276,26 @@
 "actualment una versió modificada lliure de Linux, anomenada <a 
href=\"http://";
 "directory.fsf.org/project/linux\"> Linux-libre</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | However, the GNU Project is not limited to the core operating system.  We
+# | aim to provide a whole spectrum of software, whatever many users want to
+# | have.  This includes application software.  See the <a
+# | [-href=\"/directory\">Free-]
+# | {+href=\"https://directory.fsf.org/wiki/Main_Page\";>Free+} Software
+# | Directory</a> for a catalogue of free software application programs.
+#, fuzzy
+#| msgid ""
+#| "However, the GNU Project is not limited to the core operating system.  We "
+#| "aim to provide a whole spectrum of software, whatever many users want to "
+#| "have.  This includes application software.  See the <a href=\"/directory"
+#| "\">Free Software Directory</a> for a catalogue of free software "
+#| "application programs."
 msgid ""
 "However, the GNU Project is not limited to the core operating system.  We "
 "aim to provide a whole spectrum of software, whatever many users want to "
-"have.  This includes application software.  See the <a href=\"/directory"
-"\">Free Software Directory</a> for a catalogue of free software application "
-"programs."
+"have.  This includes application software.  See the <a href=\"https://";
+"directory.fsf.org/wiki/Main_Page\">Free Software Directory</a> for a "
+"catalogue of free software application programs."
 msgstr ""
 "De tota manera, el Projecte GNU no s'ha volgut limitar a sistemes operatius. "
 "Volem oferir qualsevol mena de programari que els usuaris desitgin tenir. "
@@ -225,27 +303,43 @@
 "\">Directori de programari lliure</a> és un catàleg de totes els programes 
i "
 "aplicacions lliures."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | We also want to provide software for users who are not computer experts. 
+# | Therefore we developed a <a href=\"http{+s+}://www.gnome.org/\">graphical
+# | desktop (called GNOME)</a> to help beginners use the GNU system.
+#, fuzzy
+#| msgid ""
+#| "We also want to provide software for users who are not computer experts.  "
+#| "Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical "
+#| "desktop (called GNOME)</a> to help beginners use the GNU system."
 msgid ""
 "We also want to provide software for users who are not computer experts.  "
-"Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical desktop "
-"(called GNOME)</a> to help beginners use the GNU system."
+"Therefore we developed a <a href=\"https://www.gnome.org/\";>graphical "
+"desktop (called GNOME)</a> to help beginners use the GNU system."
 msgstr ""
 "També volem oferir programari per a usuaris que no siguin experts en "
 "informàtica. Per això vàrem desenvolupar un <a 
href=\"http://www.gnome.org/";
 "\">escriptori gràfic (anomenat GNOME)</a> que ajudés als nouvinguts a "
 "utilitzar elsistema GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | We also want to provide games and other recreations.  Plenty of <a
+# | href=\"http{+s+}://directory.fsf.org/wiki/Category/Game\">free games</a>
+# | are already available.
+#, fuzzy
+#| msgid ""
+#| "We also want to provide games and other recreations.  Plenty of <a href="
+#| "\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are "
+#| "already available."
 msgid ""
 "We also want to provide games and other recreations.  Plenty of <a href="
-"\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
+"\"https://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
 "available."
 msgstr ""
 "També volem oferir jocs i altres entreteniments. Disposem ja de molts <a "
 "href=\"http://directory.fsf.org/wiki/Category/Game\";>jocs lliures</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "How far can free software go? There are no limits, except when <a href=\"/"
 "philosophy/fighting-software-patents.html\">laws such as the patent system "
@@ -285,14 +379,20 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Vegeu la <a href=\"/server/standards/README.translations.html\">Guia de "
@@ -301,19 +401,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; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007,
-# | 2009, 2012, [-2014-] {+2014, 2017+} Free Software Foundation, Inc.
+# | Copyright &copy; [-2014, 2015, 2016-] {+1996, 1997, 2003, 2005, 2008,
+# | 2012, 2017, 2021+} Free Software Foundation, Inc.
 #, fuzzy
-#| msgid ""
-#| "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
-#| "2009, 2012, 2014 Free Software Foundation, Inc."
+#| msgid "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014 Free Software Foundation, Inc."
+"Copyright &copy; 1996, 1997, 2003, 2005, 2008, 2012, 2017, 2021 Free "
+"Software Foundation, Inc."
+msgstr "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -338,6 +435,28 @@
 msgstr "Updated:"
 
 #~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "Vegeu la <a href=\"/server/standards/README.translations.html\">Guia de "
+#~ "traducció</a> per informar-vos sobre la coordinació i publicació de les 
"
+#~ "traduccions d'aquest article. <br />Contacteu amb l'<a href=\"/server/"
+#~ "standards/translations/ca/\">Equip de traducció</a> per col·laborar en 
la "
+#~ "traducció al català del web de GNU."
+
+#, fuzzy
+#~| msgid ""
+#~| "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~| "2009, 2012, 2014 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014 Free Software Foundation, Inc."
+
+#~ msgid ""
 #~ "(The principal version of Linux now contains non-free firmware &ldquo;"
 #~ "blobs&rdquo;.  Free software activists now maintain a modified <a href="
 #~ "\"http://directory.fsf.org/project/linux\";>free version</a> of Linux.)"

Index: po/gnu-history.cs.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-history.cs.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- po/gnu-history.cs.po        2 Nov 2021 13:25:56 -0000       1.15
+++ po/gnu-history.cs.po        2 Nov 2021 14:41:50 -0000       1.16
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-history.html\n"
-"POT-Creation-Date: 2017-09-04 10:56+0000\n"
+"POT-Creation-Date: 2021-11-02 13:26+0000\n"
 "PO-Revision-Date: 2020-07-07 15:10+0100\n"
 "Last-Translator: František Kučera <franta-gnu AT frantovo.cz>\n"
 "Language-Team: Czech <www-cs-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-11-02 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"
 
@@ -29,21 +30,42 @@
 msgstr ""
 "GNU, GNU projekt, FSF, Free Software, Nadace pro svobodný software, historie"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Overview of the GNU System"
 msgstr "Přehled projektu GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The GNU operating system is a complete free software system,
+# | upward-compatible with Unix.  GNU stands for &ldquo;GNU's Not
+# | [-Unix&rdquo;.-] {+Unix.&rdquo;+} It is pronounced as <a
+# | href=\"/gnu/pronunciation.html\">one syllable with a hard [-g</a>.-]
+# | {+<i>g</i></a>.+}  <a href=\"http{+s+}://www.stallman.org/\">Richard
+# | Stallman</a> made the <a href=\"/gnu/initial-announcement.html\">Initial
+# | Announcement</a> of the GNU Project in September 1983.  A longer version
+# | called the <a href=\"/gnu/manifesto.html\">GNU Manifesto</a> was published
+# | in March 1985.  It has been translated into several <a
+# | href=\"/gnu/manifesto.html#translations\">other languages</a>.
+#, fuzzy
+#| msgid ""
+#| "The GNU operating system is a complete free software system, upward-"
+#| "compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.  It "
+#| "is pronounced as <a href=\"/gnu/pronunciation.html\">one syllable with a "
+#| "hard g</a>.  <a href=\"http://www.stallman.org/\";>Richard Stallman</a> "
+#| "made the <a href=\"/gnu/initial-announcement.html\">Initial Announcement</"
+#| "a> of the GNU Project in September 1983.  A longer version called the <a "
+#| "href=\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March "
+#| "1985.  It has been translated into several <a href=\"/gnu/manifesto."
+#| "html#translations\">other languages</a>."
 msgid ""
 "The GNU operating system is a complete free software system, upward-"
-"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.  It is "
+"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix.&rdquo; It is "
 "pronounced as <a href=\"/gnu/pronunciation.html\">one syllable with a hard "
-"g</a>.  <a href=\"http://www.stallman.org/\";>Richard Stallman</a> made the "
-"<a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> of the "
-"GNU Project in September 1983.  A longer version called the <a href=\"/gnu/"
-"manifesto.html\">GNU Manifesto</a> was published in March 1985.  It has been "
-"translated into several <a href=\"/gnu/manifesto.html#translations\">other "
-"languages</a>."
+"<i>g</i></a>.  <a href=\"https://www.stallman.org/\";>Richard Stallman</a> "
+"made the <a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> "
+"of the GNU Project in September 1983.  A longer version called the <a href="
+"\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March 1985.  It "
+"has been translated into several <a href=\"/gnu/manifesto.html#translations"
+"\">other languages</a>."
 msgstr ""
 "Operační systém GNU je kompletní svobodný systém dopředně 
kompatibilní s "
 "Unixem. GNU znamená „GNU's Not Unix“ – „GNU Není Unix“ a 
vyslovuje se jako "
@@ -54,12 +76,24 @@
 "Manifest</a> a vyšla v březnu 1985. GNU Manifest byl přeložen do mnoha <a 
"
 "href=\"/gnu/manifesto.html#translations\">dalších jazyků</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The name &ldquo;GNU&rdquo; was chosen because it met a few requirements;
+# | first, it was a recursive acronym for &ldquo;GNU's Not [-Unix&rdquo;,-]
+# | {+Unix,&rdquo;+} second, because it was a real word, and third, it was fun
+# | to say (or <a
+# | href=\"http://www.poppyfields.net/poppy/songs/gnu.html\";>[-S-]{+s+}ing</a>)
+# | .
+#, fuzzy
+#| msgid ""
+#| "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
+#| "first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, "
+#| "second, because it was a real word, and third, it was fun to say (or <a "
+#| "href=\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
 msgid ""
 "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
-"first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, second, "
+"first, it was a recursive acronym for &ldquo;GNU's Not Unix,&rdquo; second, "
 "because it was a real word, and third, it was fun to say (or <a href="
-"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
+"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>sing</a>)."
 msgstr ""
 "Název „GNU“ byl vybrán, protože splňoval několik požadavků; 
zaprvé, je to "
 "rekurzivní akronym pro „GNU Není Unix“, zadruhé, protože je to 
existující "
@@ -67,7 +101,7 @@
 "vyslovovat (nebo <a href=\"http://www.poppyfields.net/poppy/songs/gnu.html";
 "\">zpívat</a>)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The word &ldquo;free&rdquo; in &ldquo;free software&rdquo; pertains to <a "
 "href=\"/philosophy/free-sw.html\">freedom</a>, not price.  You may or may "
@@ -90,20 +124,34 @@
 "budovat komunitu. (Pokud šíříte GNU software, můžete požadovat odměnu 
za "
 "zkopírování, nebo můžete nabídnout kopie zdarma). "
 
-#. type: Content of: <p>
-msgid ""
-"The project to develop the GNU system is called the &ldquo;GNU "
-"Project&rdquo;.  The GNU Project was conceived in 1983 as a way of bringing "
-"back the cooperative spirit that prevailed in the computing community in "
-"earlier days&mdash;to make cooperation possible once again by removing the "
-"obstacles to cooperation imposed by the owners of proprietary software."
+#. type: Content of: <div><p>
+# | The project to develop the GNU system is called the &ldquo;GNU
+# | [-Project&rdquo;.-] {+Project.&rdquo;+} The GNU Project was conceived in
+# | 1983 as a way of bringing back the cooperative spirit that prevailed in
+# | the computing community in earlier days&mdash;to make cooperation possible
+# | once again by removing the obstacles to cooperation imposed by the owners
+# | of proprietary software.
+#, fuzzy
+#| msgid ""
+#| "The project to develop the GNU system is called the &ldquo;GNU "
+#| "Project&rdquo;.  The GNU Project was conceived in 1983 as a way of "
+#| "bringing back the cooperative spirit that prevailed in the computing "
+#| "community in earlier days&mdash;to make cooperation possible once again "
+#| "by removing the obstacles to cooperation imposed by the owners of "
+#| "proprietary software."
+msgid ""
+"The project to develop the GNU system is called the &ldquo;GNU Project."
+"&rdquo; The GNU Project was conceived in 1983 as a way of bringing back the "
+"cooperative spirit that prevailed in the computing community in earlier "
+"days&mdash;to make cooperation possible once again by removing the obstacles "
+"to cooperation imposed by the owners of proprietary software."
 msgstr ""
 "Projekt vývoje systému GNU se nazývá „Projekt GNU“. Projekt GNU byl 
založen "
 "v roce 1983 jako způsob, jak přinést zpátky ducha spolupráce, který byl 
"
 "komunitě kolem počítačů dříve obvyklý – jak opět umožnit 
spolupráci, "
 "odstraněním překážek uvalených vlastníky proprietárního softwaru."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In 1971, when Richard Stallman started his career at MIT, he worked in a "
 "group which used <a href=\"/philosophy/free-sw.html\">free software</a> "
@@ -116,7 +164,7 @@
 "svobodný software. Programátoři mohli volně spolupracovat jeden s druhým 
a "
 "často tak činili. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By the 1980s, almost all software was <a href=\"/philosophy/categories."
 "html#ProprietarySoftware\">proprietary</a>, which means that it had owners "
@@ -128,7 +176,7 @@
 "kteří zakazovali a znemožňovali spolupráci uživatelů. To učinilo 
Projekt GNU "
 "nezbytným."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Every computer user needs an operating system; if there is no free operating "
 "system, then you can't even get started using a computer without resorting "
@@ -140,7 +188,7 @@
 "proprietárnímu softwaru. První položka na seznamu potřebného 
svobodného "
 "software byl tedy přirozeně svobodný operační systém."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We decided to make the operating system compatible with Unix because the "
 "overall design was already proven and portable, and because compatibility "
@@ -150,14 +198,28 @@
 "jeho celkový návrh byl osvědčený a přenositelný a protože 
kompatibilita "
 "usnadňuje unixovým uživatelům přechod z Unixu na GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | A Unix-like operating system includes a kernel, compilers, editors, text
+# | formatters, mail software, graphical interfaces, libraries, games and many
+# | other things.  Thus, writing a whole operating system is a very large job.
+# |  We started in January 1984.  The <a [-href=\"http://fsf.org/\";>-]
+# | {+href=\"https://www.fsf.org/\";>+} Free Software Foundation</a> was
+# | founded in October 1985, initially to raise funds to help develop GNU.
+#, fuzzy
+#| msgid ""
+#| "A Unix-like operating system includes a kernel, compilers, editors, text "
+#| "formatters, mail software, graphical interfaces, libraries, games and "
+#| "many other things.  Thus, writing a whole operating system is a very "
+#| "large job.  We started in January 1984.  The <a href=\"http://fsf.org/\";> "
+#| "Free Software Foundation</a> was founded in October 1985, initially to "
+#| "raise funds to help develop GNU."
 msgid ""
 "A Unix-like operating system includes a kernel, compilers, editors, text "
 "formatters, mail software, graphical interfaces, libraries, games and many "
 "other things.  Thus, writing a whole operating system is a very large job.  "
-"We started in January 1984.  The <a href=\"http://fsf.org/\";> Free Software "
-"Foundation</a> was founded in October 1985, initially to raise funds to help "
-"develop GNU."
+"We started in January 1984.  The <a href=\"https://www.fsf.org/\";> Free "
+"Software Foundation</a> was founded in October 1985, initially to raise "
+"funds to help develop GNU."
 msgstr ""
 "Operační systém unixového typu obsahuje jádro (kernel), kompilátory, "
 "editory, programy pro úpravu textu, pro práci s poštou, grafické 
rozhraní, "
@@ -166,7 +228,30 @@
 "org/\">Nadace pro svobodný software</a> byla založena v říjnu 1985, 
původně "
 "pro shromáždění finančních prostředků na vývoje GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | By 1990 we had either found or written all the major components except
+# | one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by
+# | Linus Torvalds in 1991 and made free software in 1992.  Combining Linux
+# | with the almost-complete GNU system resulted in a complete operating
+# | system: the GNU/Linux system.  Estimates are that tens of millions of
+# | people now use GNU/Linux systems, typically via <a
+# | href=\"/distros/distros.html\">GNU/Linux distributions</a>.  The principal
+# | version of Linux now contains non[---]free firmware &ldquo;blobs&rdquo;;
+# | free software activists now maintain a modified free version of Linux,
+# | called <a [-href=\"http://directory.fsf.org/project/linux\";>-]
+# | {+href=\"https://directory.fsf.org/wiki/Linux-libre\";>+} Linux-libre</a>.
+#, fuzzy
+#| msgid ""
+#| "By 1990 we had either found or written all the major components except "
+#| "one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by "
+#| "Linus Torvalds in 1991 and made free software in 1992.  Combining Linux "
+#| "with the almost-complete GNU system resulted in a complete operating "
+#| "system: the GNU/Linux system.  Estimates are that tens of millions of "
+#| "people now use GNU/Linux systems, typically via <a href=\"/distros/"
+#| "distros.html\">GNU/Linux distributions</a>.  The principal version of "
+#| "Linux now contains non-free firmware &ldquo;blobs&rdquo;; free software "
+#| "activists now maintain a modified free version of Linux, called <a href="
+#| "\"http://directory.fsf.org/project/linux\";> Linux-libre</a>."
 msgid ""
 "By 1990 we had either found or written all the major components except "
 "one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by "
@@ -174,10 +259,10 @@
 "the almost-complete GNU system resulted in a complete operating system: the "
 "GNU/Linux system.  Estimates are that tens of millions of people now use GNU/"
 "Linux systems, typically via <a href=\"/distros/distros.html\">GNU/Linux "
-"distributions</a>.  The principal version of Linux now contains non-free "
+"distributions</a>.  The principal version of Linux now contains nonfree "
 "firmware &ldquo;blobs&rdquo;; free software activists now maintain a "
-"modified free version of Linux, called <a href=\"http://directory.fsf.org/";
-"project/linux\"> Linux-libre</a>."
+"modified free version of Linux, called <a href=\"https://directory.fsf.org/";
+"wiki/Linux-libre\"> Linux-libre</a>."
 msgstr ""
 "Kolem roku 1990 jsme už měli napsané nebo nalezené všechny hlavní 
komponenty "
 "s jednou výjimkou – jádrem. Potom přišel Linux, jádro unixového typu, 
které "
@@ -190,40 +275,69 @@
 "upravenou svobodnou verzi Linuxu zvanou <a href=\"http://directory.fsf.org/";
 "project/linux\">Linux-libre</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | However, the GNU Project is not limited to the core operating system.  We
+# | aim to provide a whole spectrum of software, whatever many users want to
+# | have.  This includes application software.  See the <a
+# | [-href=\"/directory\">Free-]
+# | {+href=\"https://directory.fsf.org/wiki/Main_Page\";>Free+} Software
+# | Directory</a> for a catalogue of free software application programs.
+#, fuzzy
+#| msgid ""
+#| "However, the GNU Project is not limited to the core operating system.  We "
+#| "aim to provide a whole spectrum of software, whatever many users want to "
+#| "have.  This includes application software.  See the <a href=\"/directory"
+#| "\">Free Software Directory</a> for a catalogue of free software "
+#| "application programs."
 msgid ""
 "However, the GNU Project is not limited to the core operating system.  We "
 "aim to provide a whole spectrum of software, whatever many users want to "
-"have.  This includes application software.  See the <a href=\"/directory"
-"\">Free Software Directory</a> for a catalogue of free software application "
-"programs."
+"have.  This includes application software.  See the <a href=\"https://";
+"directory.fsf.org/wiki/Main_Page\">Free Software Directory</a> for a "
+"catalogue of free software application programs."
 msgstr ""
 "Nicméně projekt GNU se neomezuje jen na operační systém. Klademe si za 
cíl "
 "poskytnout celé spektrum softwaru, který uživatelé chtějí. To zahrnuje 
i "
 "aplikační software. Podívejte se na <a href=\"/directory\">Free Software "
 "Directory</a>, kde najdete katalog svobodných aplikačních programů."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | We also want to provide software for users who are not computer experts. 
+# | Therefore we developed a <a href=\"http{+s+}://www.gnome.org/\">graphical
+# | desktop (called GNOME)</a> to help beginners use the GNU system.
+#, fuzzy
+#| msgid ""
+#| "We also want to provide software for users who are not computer experts.  "
+#| "Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical "
+#| "desktop (called GNOME)</a> to help beginners use the GNU system."
 msgid ""
 "We also want to provide software for users who are not computer experts.  "
-"Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical desktop "
-"(called GNOME)</a> to help beginners use the GNU system."
+"Therefore we developed a <a href=\"https://www.gnome.org/\";>graphical "
+"desktop (called GNOME)</a> to help beginners use the GNU system."
 msgstr ""
 "Chceme také poskytovat software uživatelům, kteří nejsou počítačoví "
 "odborníci. Proto pracujeme na <a href=\"http://www.gnome.org/\";>grafickém "
 "desktopovém prostředí</a> (zvaném GNOME), které pomůže 
začátečníkům používat "
 "systém GNU. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | We also want to provide games and other recreations.  Plenty of <a
+# | href=\"http{+s+}://directory.fsf.org/wiki/Category/Game\">free games</a>
+# | are already available.
+#, fuzzy
+#| msgid ""
+#| "We also want to provide games and other recreations.  Plenty of <a href="
+#| "\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are "
+#| "already available."
 msgid ""
 "We also want to provide games and other recreations.  Plenty of <a href="
-"\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
+"\"https://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
 "available."
 msgstr ""
 "Chceme také poskytovat hry a další zábavu. Mnoho <a 
href=\"http://directory.";
 "fsf.org/wiki/Category/Game\">svobodných her</a> je již k dispozici."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "How far can free software go? There are no limits, except when <a href=\"/"
 "philosophy/fighting-software-patents.html\">laws such as the patent system "
@@ -263,14 +377,20 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Pracujeme tvrdě a děláme to nejlepší, abychom vám přinesli přesné a 
kvalitní "
@@ -281,12 +401,14 @@
 "se dozvíte, jak koordinovat svoji práci a posílat překlady tohoto 
článku."
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017 Free Software Foundation, Inc."
+# | Copyright &copy; [-1999-2002-] {+1996, 1997, 2003, 2005, 2008, 2012, 2017,
+# | 2021+} Free Software Foundation, Inc.
+#, fuzzy
+#| msgid "Copyright &copy; 1999-2002 Free Software Foundation, Inc."
+msgid ""
+"Copyright &copy; 1996, 1997, 2003, 2005, 2008, 2012, 2017, 2021 Free "
+"Software Foundation, Inc."
+msgstr "Copyright &copy; 1999-2002 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -308,10 +430,29 @@
 msgid "Updated:"
 msgstr "Aktualizováno:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017, 2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017, 2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "Pracujeme tvrdě a děláme to nejlepší, abychom vám přinesli přesné 
a "
+#~ "kvalitní překlady. Nicméně i my můžeme udělat chybu. Vaše 
komentáře a "
+#~ "návrhy na vylepšení vítáme na adrese <a 
href=\"mailto:web-translators@gnu.";
+#~ "org\"> &lt;web-translators@gnu.org&gt;</a>.</p> <p>Přečtěte si prosím  
<a "
+#~ "href=\"/server/standards/README.translations.html\">Příručku "
+#~ "překladatele</a>, kde se dozvíte, jak koordinovat svoji práci a 
posílat "
+#~ "překlady tohoto článku."
+
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017 Free Software Foundation, Inc."
+
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017, 2021 Free Software Foundation, Inc."

Index: po/gnu-history.de.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-history.de.po,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- po/gnu-history.de.po        2 Nov 2021 13:25:56 -0000       1.52
+++ po/gnu-history.de.po        2 Nov 2021 14:41:50 -0000       1.53
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnu-history.html\n"
 "Report-Msgid-Bugs-To: Webmasters <webmasters@gnu.org>\n"
-"POT-Creation-Date: 2017-09-04 10:56+0000\n"
+"POT-Creation-Date: 2021-11-02 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"
@@ -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-11-02 13:26+0000\n"
 
 #. type: Content of: <title>
 msgid "Overview of the GNU System - GNU Project - Free Software Foundation"
@@ -25,21 +26,42 @@
 msgid "GNU, GNU Project, FSF, Free Software, Free Software Foundation, History"
 msgstr " "
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Overview of the GNU System"
 msgstr "Geschichte des GNU-Systems"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The GNU operating system is a complete free software system,
+# | upward-compatible with Unix.  GNU stands for &ldquo;GNU's Not
+# | [-Unix&rdquo;.-] {+Unix.&rdquo;+} It is pronounced as <a
+# | href=\"/gnu/pronunciation.html\">one syllable with a hard [-g</a>.-]
+# | {+<i>g</i></a>.+}  <a href=\"http{+s+}://www.stallman.org/\">Richard
+# | Stallman</a> made the <a href=\"/gnu/initial-announcement.html\">Initial
+# | Announcement</a> of the GNU Project in September 1983.  A longer version
+# | called the <a href=\"/gnu/manifesto.html\">GNU Manifesto</a> was published
+# | in March 1985.  It has been translated into several <a
+# | href=\"/gnu/manifesto.html#translations\">other languages</a>.
+#, fuzzy
+#| msgid ""
+#| "The GNU operating system is a complete free software system, upward-"
+#| "compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.  It "
+#| "is pronounced as <a href=\"/gnu/pronunciation.html\">one syllable with a "
+#| "hard g</a>.  <a href=\"http://www.stallman.org/\";>Richard Stallman</a> "
+#| "made the <a href=\"/gnu/initial-announcement.html\">Initial Announcement</"
+#| "a> of the GNU Project in September 1983.  A longer version called the <a "
+#| "href=\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March "
+#| "1985.  It has been translated into several <a href=\"/gnu/manifesto."
+#| "html#translations\">other languages</a>."
 msgid ""
 "The GNU operating system is a complete free software system, upward-"
-"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.  It is "
+"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix.&rdquo; It is "
 "pronounced as <a href=\"/gnu/pronunciation.html\">one syllable with a hard "
-"g</a>.  <a href=\"http://www.stallman.org/\";>Richard Stallman</a> made the "
-"<a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> of the "
-"GNU Project in September 1983.  A longer version called the <a href=\"/gnu/"
-"manifesto.html\">GNU Manifesto</a> was published in March 1985.  It has been "
-"translated into several <a href=\"/gnu/manifesto.html#translations\">other "
-"languages</a>."
+"<i>g</i></a>.  <a href=\"https://www.stallman.org/\";>Richard Stallman</a> "
+"made the <a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> "
+"of the GNU Project in September 1983.  A longer version called the <a href="
+"\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March 1985.  It "
+"has been translated into several <a href=\"/gnu/manifesto.html#translations"
+"\">other languages</a>."
 msgstr ""
 "Das Betriebssystem <b>GNU</b> ist ein vollständig freies Softwaresystem und "
 "aufwärtskompatibel mit Unix. <em>GNU</em> steht für <i>GNU’s Not Unix</i> 
"
@@ -51,12 +73,24 @@
 "manifesto\">GNU-Manifest</a></cite>, veröffentlicht. Es ist <a href=\"/gnu/"
 "manifesto#translations\">mehrsprachig</a> übersetzt worden."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The name &ldquo;GNU&rdquo; was chosen because it met a few requirements;
+# | first, it was a recursive acronym for &ldquo;GNU's Not [-Unix&rdquo;,-]
+# | {+Unix,&rdquo;+} second, because it was a real word, and third, it was fun
+# | to say (or <a
+# | href=\"http://www.poppyfields.net/poppy/songs/gnu.html\";>[-S-]{+s+}ing</a>)
+# | .
+#, fuzzy
+#| msgid ""
+#| "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
+#| "first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, "
+#| "second, because it was a real word, and third, it was fun to say (or <a "
+#| "href=\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
 msgid ""
 "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
-"first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, second, "
+"first, it was a recursive acronym for &ldquo;GNU's Not Unix,&rdquo; second, "
 "because it was a real word, and third, it was fun to say (or <a href="
-"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
+"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>sing</a>)."
 msgstr ""
 "Der Name <em>GNU</em> wurde gewählt, weil er einiger Belange erfüllte: "
 "erstens war es ein rekursives Akronym für <em><span xml:lang=\"en\" 
lang=\"en"
@@ -66,7 +100,7 @@
 "&amp; Swann, The GNU Song, unter: http://www.poppyfields.net/poppy/songs/gnu.";
 "html\">singen</a>)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The word &ldquo;free&rdquo; in &ldquo;free software&rdquo; pertains to <a "
 "href=\"/philosophy/free-sw.html\">freedom</a>, not price.  You may or may "
@@ -91,13 +125,27 @@
 "man GNU-Software weiterverbreitet, kann man ein Entgelt für den physischen "
 "Akt der Weitergabe einer Kopie berechnen oder Kopien verschenken)."
 
-#. type: Content of: <p>
-msgid ""
-"The project to develop the GNU system is called the &ldquo;GNU "
-"Project&rdquo;.  The GNU Project was conceived in 1983 as a way of bringing "
-"back the cooperative spirit that prevailed in the computing community in "
-"earlier days&mdash;to make cooperation possible once again by removing the "
-"obstacles to cooperation imposed by the owners of proprietary software."
+#. type: Content of: <div><p>
+# | The project to develop the GNU system is called the &ldquo;GNU
+# | [-Project&rdquo;.-] {+Project.&rdquo;+} The GNU Project was conceived in
+# | 1983 as a way of bringing back the cooperative spirit that prevailed in
+# | the computing community in earlier days&mdash;to make cooperation possible
+# | once again by removing the obstacles to cooperation imposed by the owners
+# | of proprietary software.
+#, fuzzy
+#| msgid ""
+#| "The project to develop the GNU system is called the &ldquo;GNU "
+#| "Project&rdquo;.  The GNU Project was conceived in 1983 as a way of "
+#| "bringing back the cooperative spirit that prevailed in the computing "
+#| "community in earlier days&mdash;to make cooperation possible once again "
+#| "by removing the obstacles to cooperation imposed by the owners of "
+#| "proprietary software."
+msgid ""
+"The project to develop the GNU system is called the &ldquo;GNU Project."
+"&rdquo; The GNU Project was conceived in 1983 as a way of bringing back the "
+"cooperative spirit that prevailed in the computing community in earlier "
+"days&mdash;to make cooperation possible once again by removing the obstacles "
+"to cooperation imposed by the owners of proprietary software."
 msgstr ""
 "Das Projekt zur Entwicklung des GNU-Systems wird als das <em>GNU-Projekt</"
 "em> bezeichnet. Das GNU-Projekt entstand im Jahr 1983 als eine Möglichkeit, "
@@ -106,7 +154,7 @@
 "Software auferlegte Hindernisse zu beseitigen, die die Zusammenarbeit "
 "verhinderten und dadurch die Zusammenarbeit wieder möglich werden zu lassen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In 1971, when Richard Stallman started his career at MIT, he worked in a "
 "group which used <a href=\"/philosophy/free-sw.html\">free software</a> "
@@ -120,7 +168,7 @@
 "<em>freie</em> Software. Programmierer konnten jederzeit miteinander "
 "zusammenarbeiten&#160;&#8209;&#160;und taten es häufig."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By the 1980s, almost all software was <a href=\"/philosophy/categories."
 "html#ProprietarySoftware\">proprietary</a>, which means that it had owners "
@@ -132,7 +180,7 @@
 "Eigentümer, die die Zusammenarbeit von Nutzern verbieten und verhindern. "
 "Dies machte das GNU-Projekt notwendig."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Every computer user needs an operating system; if there is no free operating "
 "system, then you can't even get started using a computer without resorting "
@@ -144,7 +192,7 @@
 "Software gestartet werden. Also musste der erste auf der Freie-Software-"
 "Agenda stehende Punkt offensichtlich der eines freien Betriebssystems sein."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We decided to make the operating system compatible with Unix because the "
 "overall design was already proven and portable, and because compatibility "
@@ -154,14 +202,28 @@
 "Gesamtkonzept bereits bewährt und portierbar war und weil Kompatibilität es 
"
 "für Unix-Benutzer leichter macht, von Unix auf GNU umzusteigen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | A Unix-like operating system includes a kernel, compilers, editors, text
+# | formatters, mail software, graphical interfaces, libraries, games and many
+# | other things.  Thus, writing a whole operating system is a very large job.
+# |  We started in January 1984.  The <a [-href=\"http://fsf.org/\";>-]
+# | {+href=\"https://www.fsf.org/\";>+} Free Software Foundation</a> was
+# | founded in October 1985, initially to raise funds to help develop GNU.
+#, fuzzy
+#| msgid ""
+#| "A Unix-like operating system includes a kernel, compilers, editors, text "
+#| "formatters, mail software, graphical interfaces, libraries, games and "
+#| "many other things.  Thus, writing a whole operating system is a very "
+#| "large job.  We started in January 1984.  The <a href=\"http://fsf.org/\";> "
+#| "Free Software Foundation</a> was founded in October 1985, initially to "
+#| "raise funds to help develop GNU."
 msgid ""
 "A Unix-like operating system includes a kernel, compilers, editors, text "
 "formatters, mail software, graphical interfaces, libraries, games and many "
 "other things.  Thus, writing a whole operating system is a very large job.  "
-"We started in January 1984.  The <a href=\"http://fsf.org/\";> Free Software "
-"Foundation</a> was founded in October 1985, initially to raise funds to help "
-"develop GNU."
+"We started in January 1984.  The <a href=\"https://www.fsf.org/\";> Free "
+"Software Foundation</a> was founded in October 1985, initially to raise "
+"funds to help develop GNU."
 msgstr ""
 "Ein unixoides Betriebssystem enthält einen Betriebssystemkern, Compiler, "
 "Editoren, Textverarbeitungen, E-Mail-Software, grafische Oberflächen, "
@@ -171,7 +233,30 @@
 "lang=\"en\">Free Software Foundation</a> (FSF) gegründet, um anfangs Gelder "
 "zur Entwicklung von GNU zu beschaffen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | By 1990 we had either found or written all the major components except
+# | one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by
+# | Linus Torvalds in 1991 and made free software in 1992.  Combining Linux
+# | with the almost-complete GNU system resulted in a complete operating
+# | system: the GNU/Linux system.  Estimates are that tens of millions of
+# | people now use GNU/Linux systems, typically via <a
+# | href=\"/distros/distros.html\">GNU/Linux distributions</a>.  The principal
+# | version of Linux now contains non[---]free firmware &ldquo;blobs&rdquo;;
+# | free software activists now maintain a modified free version of Linux,
+# | called <a [-href=\"http://directory.fsf.org/project/linux\";>-]
+# | {+href=\"https://directory.fsf.org/wiki/Linux-libre\";>+} Linux-libre</a>.
+#, fuzzy
+#| msgid ""
+#| "By 1990 we had either found or written all the major components except "
+#| "one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by "
+#| "Linus Torvalds in 1991 and made free software in 1992.  Combining Linux "
+#| "with the almost-complete GNU system resulted in a complete operating "
+#| "system: the GNU/Linux system.  Estimates are that tens of millions of "
+#| "people now use GNU/Linux systems, typically via <a href=\"/distros/"
+#| "distros.html\">GNU/Linux distributions</a>.  The principal version of "
+#| "Linux now contains non-free firmware &ldquo;blobs&rdquo;; free software "
+#| "activists now maintain a modified free version of Linux, called <a href="
+#| "\"http://directory.fsf.org/project/linux\";> Linux-libre</a>."
 msgid ""
 "By 1990 we had either found or written all the major components except "
 "one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by "
@@ -179,10 +264,10 @@
 "the almost-complete GNU system resulted in a complete operating system: the "
 "GNU/Linux system.  Estimates are that tens of millions of people now use GNU/"
 "Linux systems, typically via <a href=\"/distros/distros.html\">GNU/Linux "
-"distributions</a>.  The principal version of Linux now contains non-free "
+"distributions</a>.  The principal version of Linux now contains nonfree "
 "firmware &ldquo;blobs&rdquo;; free software activists now maintain a "
-"modified free version of Linux, called <a href=\"http://directory.fsf.org/";
-"project/linux\"> Linux-libre</a>."
+"modified free version of Linux, called <a href=\"https://directory.fsf.org/";
+"wiki/Linux-libre\"> Linux-libre</a>."
 msgstr ""
 "Bis 1990 hatten wir entweder die wichtigsten Komponenten gefunden oder "
 "geschrieben, mit einer Ausnahme&#160;&#8209;&#160;dem Betriebssystemkern. "
@@ -196,13 +281,26 @@
 "inzwischen eine modifizierte Variante namens <b><a href=\"https://directory.";
 "fsf.org/wiki/Linux-libre\">GNU Linux-libre</a></b>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | However, the GNU Project is not limited to the core operating system.  We
+# | aim to provide a whole spectrum of software, whatever many users want to
+# | have.  This includes application software.  See the <a
+# | [-href=\"/directory\">Free-]
+# | {+href=\"https://directory.fsf.org/wiki/Main_Page\";>Free+} Software
+# | Directory</a> for a catalogue of free software application programs.
+#, fuzzy
+#| msgid ""
+#| "However, the GNU Project is not limited to the core operating system.  We "
+#| "aim to provide a whole spectrum of software, whatever many users want to "
+#| "have.  This includes application software.  See the <a href=\"/directory"
+#| "\">Free Software Directory</a> for a catalogue of free software "
+#| "application programs."
 msgid ""
 "However, the GNU Project is not limited to the core operating system.  We "
 "aim to provide a whole spectrum of software, whatever many users want to "
-"have.  This includes application software.  See the <a href=\"/directory"
-"\">Free Software Directory</a> for a catalogue of free software application "
-"programs."
+"have.  This includes application software.  See the <a href=\"https://";
+"directory.fsf.org/wiki/Main_Page\">Free Software Directory</a> for a "
+"catalogue of free software application programs."
 msgstr ""
 "Allerdings ist das GNU-Projekt nicht nur auf das Kern-Betriebssystem "
 "beschränkt. Ziel ist eine breite Softwareauswahl&#160;&#8209;&#160;was auch "
@@ -211,11 +309,19 @@
 "\">Free Software Directory</a></cite> für ein Verzeichnis von freien "
 "Softwareanwendungsprogrammen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | We also want to provide software for users who are not computer experts. 
+# | Therefore we developed a <a href=\"http{+s+}://www.gnome.org/\">graphical
+# | desktop (called GNOME)</a> to help beginners use the GNU system.
+#, fuzzy
+#| msgid ""
+#| "We also want to provide software for users who are not computer experts.  "
+#| "Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical "
+#| "desktop (called GNOME)</a> to help beginners use the GNU system."
 msgid ""
 "We also want to provide software for users who are not computer experts.  "
-"Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical desktop "
-"(called GNOME)</a> to help beginners use the GNU system."
+"Therefore we developed a <a href=\"https://www.gnome.org/\";>graphical "
+"desktop (called GNOME)</a> to help beginners use the GNU system."
 msgstr ""
 "Wir möchten auch Software für Nutzer bereitstellen, die keine "
 "Rechnerexperten sind. Deshalb wurde eine <a href=\"https://www.gnome.org/";
@@ -223,17 +329,25 @@
 "\"#tn1\" id=\"tn1-ref\" class=\"tnote\">[1]</a>), um Einsteigern die Nutzung "
 "des GNU-Systems zu erleichtern."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | We also want to provide games and other recreations.  Plenty of <a
+# | href=\"http{+s+}://directory.fsf.org/wiki/Category/Game\">free games</a>
+# | are already available.
+#, fuzzy
+#| msgid ""
+#| "We also want to provide games and other recreations.  Plenty of <a href="
+#| "\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are "
+#| "already available."
 msgid ""
 "We also want to provide games and other recreations.  Plenty of <a href="
-"\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
+"\"https://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
 "available."
 msgstr ""
 "Ebenso möchten wir Spiele und anderes Vergnügliches anbieten. Eine Menge <a 
"
 "href=\"https://directory.fsf.org/wiki/category/game\";>freie Spiele</a> sind "
 "bereits verfügbar."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "How far can free software go? There are no limits, except when <a href=\"/"
 "philosophy/fighting-software-patents.html\">laws such as the patent system "
@@ -282,14 +396,20 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Bei der Übersetzung dieses Werkes wurde mit größter Sorgfalt vorgegangen. "
@@ -303,12 +423,19 @@
 "standards/README.translations\">LIESMICH für Übersetzungen</a>."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; 1996, 1997, [-1998, 1999, 2001, 2002,-] 2003, 2005,
+# | [-2007, 2009, 2012-] {+2008, 2012, 2017, 2021+} Free Software Foundation,
+# | Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#| "2009, 2012 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017 Free Software Foundation, Inc."
+"Copyright &copy; 1996, 1997, 2003, 2005, 2008, 2012, 2017, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017 Free Software Foundation, Inc."
+"2012 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -332,13 +459,19 @@
 msgid "Updated:"
 msgstr "Letzte Änderung:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017, 2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017, 2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017 Free Software Foundation, Inc."
+
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017, 2021 Free Software Foundation, Inc."
 
 #~ msgid ""
 #~ "By 1990 we had either found or written all the major components except "
@@ -394,13 +527,6 @@
 #~ "2009, 2012, 2014 Free Software Foundation, Inc."
 
 #~ msgid ""
-#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
-#~ "2009, 2012 Free Software Foundation, Inc."
-#~ msgstr ""
-#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
-#~ "2009, 2012 Free Software Foundation, Inc."
-
-#~ msgid ""
 #~ "Overview of the GNU System - GNU Project - Free Software Foundation (FSF)"
 #~ msgstr ""
 #~ "Überblick über das GNU-System - GNU-Projekt - Free Software Foundation"

Index: po/gnu-history.el-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-history.el-diff.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- po/gnu-history.el-diff.html 8 Jun 2021 08:44:38 -0000       1.8
+++ po/gnu-history.el-diff.html 2 Nov 2021 14:41:50 -0000       1.9
@@ -11,20 +11,28 @@
 </style></head>
 <body><pre>
 &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.84</em></ins></span> --&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 --&gt;
+&lt;!--#set var="TAGS" value="gnu-history" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</em></ins></span> --&gt;
 &lt;title&gt;Overview of the GNU System
 - GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;meta name="Keywords" content="GNU, GNU Project, FSF, Free Software, Free 
Software Foundation, History" /&gt;
 &lt;!--#include virtual="/gnu/po/gnu-history.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&lt;div class="article reduced-width"&gt;</em></ins></span>
 &lt;h2&gt;Overview of the GNU System&lt;/h2&gt;
+<span class="inserted"><ins><em>&lt;div 
class="thin"&gt;&lt;/div&gt;</em></ins></span>
 
 &lt;p&gt;
 The GNU operating system is a complete free software system,
-upward-compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.
-<span class="inserted"><ins><em>It is pronounced as &lt;a 
href="/gnu/pronunciation.html"&gt;one syllable with a
-hard g&lt;/a&gt;.</em></ins></span>
-&lt;a href="http://www.stallman.org/"&gt;Richard Stallman&lt;/a&gt; made the
+upward-compatible with Unix.  GNU stands for &ldquo;GNU's Not <span 
class="removed"><del><strong>Unix&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>Unix.&rdquo;
+It is pronounced as &lt;a href="/gnu/pronunciation.html"&gt;one syllable with a
+hard &lt;i&gt;g&lt;/i&gt;&lt;/a&gt;.</em></ins></span>
+&lt;a <span 
class="removed"><del><strong>href="http://www.stallman.org/"&gt;Richard</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://www.stallman.org/"&gt;Richard</em></ins></span>
 Stallman&lt;/a&gt; made the
 &lt;a href="/gnu/initial-announcement.html"&gt;Initial Announcement&lt;/a&gt; 
of
 the GNU Project in September 1983.  A longer version called
 the &lt;a href="/gnu/manifesto.html"&gt;GNU Manifesto&lt;/a&gt; was published 
in
@@ -34,9 +42,10 @@
 &lt;p&gt;
 The name &ldquo;GNU&rdquo; was chosen because it met a few
 requirements; first, it was a recursive acronym for &ldquo;GNU's Not
-Unix&rdquo;, second, because it was a real word, and third, it was fun
+<span class="removed"><del><strong>Unix&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>Unix,&rdquo;</em></ins></span> second, because 
it was a real word, and third, it was fun
 to say (or
-&lt;a 
href="http://www.poppyfields.net/poppy/songs/gnu.html"&gt;Sing&lt;/a&gt;).&lt;/p&gt;
+&lt;a <span 
class="removed"><del><strong>href="http://www.poppyfields.net/poppy/songs/gnu.html"&gt;Sing&lt;/a&gt;).&lt;/p&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="http://www.poppyfields.net/poppy/songs/gnu.html"&gt;sing&lt;/a&gt;).&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;
 The word &ldquo;free&rdquo; in &ldquo;free software&rdquo; pertains to
@@ -52,7 +61,8 @@
 
 &lt;p&gt;
 The project to develop the GNU system is called the &ldquo;GNU
-Project&rdquo;.  The GNU Project was conceived in 1983 as a way of
+<span class="removed"><del><strong>Project&rdquo;.</strong></del></span>
+<span class="inserted"><ins><em>Project.&rdquo;</em></ins></span>  The GNU 
Project was conceived in 1983 as a way of
 bringing back the cooperative spirit that prevailed in the computing
 community in earlier days&mdash;to make cooperation possible once again by
 removing the obstacles to cooperation imposed by the owners of
@@ -87,7 +97,7 @@
 text formatters, mail software, graphical interfaces, libraries, games
 and many other things.  Thus, writing a whole operating system is a
 very large job.  We started in January 1984.
-The &lt;a href="http://fsf.org/"&gt; Free Software Foundation&lt;/a&gt; was
+The &lt;a <span 
class="removed"><del><strong>href="http://fsf.org/"&gt;</strong></del></span> 
<span 
class="inserted"><ins><em>href="https://www.fsf.org/"&gt;</em></ins></span> 
Free Software Foundation&lt;/a&gt; was
 founded in October 1985, initially to raise funds to help develop
 GNU.&lt;/p&gt;
 
@@ -98,26 +108,27 @@
 complete operating system: the GNU/Linux system.  Estimates are that
 tens of millions of people now use GNU/Linux systems, typically
 via &lt;a <span 
class="removed"><del><strong>href="/distros"&gt;GNU/Linux</strong></del></span> 
<span 
class="inserted"><ins><em>href="/distros/distros.html"&gt;GNU/Linux</em></ins></span>
 distributions&lt;/a&gt;.  The principal
-version of Linux now contains non-free firmware &ldquo;blobs&rdquo;;
+version of Linux now contains <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> firmware 
&ldquo;blobs&rdquo;;
 free software activists now maintain a modified free version of Linux,
-called &lt;a href="http://directory.fsf.org/project/linux"&gt;
+called &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/wiki/Linux-libre"&gt;</em></ins></span>
 Linux-libre&lt;/a&gt;.&lt;/p&gt;
 
 &lt;p&gt;
 However, the GNU Project is not limited to the core operating system.
 We aim to provide a whole spectrum of software, whatever many users
 want to have.  This includes application software.  See
-the &lt;a href="/directory"&gt;Free Software Directory&lt;/a&gt; for a 
catalogue
+the &lt;a <span 
class="removed"><del><strong>href="/directory"&gt;Free</strong></del></span> 
<span 
class="inserted"><ins><em>href="https://directory.fsf.org/wiki/Main_Page"&gt;Free</em></ins></span>
 Software Directory&lt;/a&gt; for a catalogue
 of free software application programs.&lt;/p&gt;
 
 &lt;p&gt;
 We also want to provide software for users who are not computer
 experts.  Therefore we developed a
-&lt;a href="http://www.gnome.org/"&gt;graphical desktop (called 
GNOME)&lt;/a&gt; to help
+&lt;a <span 
class="removed"><del><strong>href="http://www.gnome.org/"&gt;graphical</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://www.gnome.org/"&gt;graphical</em></ins></span>
 desktop (called GNOME)&lt;/a&gt; to help
 beginners use the GNU system.&lt;/p&gt;
 
 &lt;p&gt;We also want to provide games and other recreations.  Plenty of &lt;a
-href="http://directory.fsf.org/wiki/Category/Game"&gt;free games&lt;/a&gt; are
+<span 
class="removed"><del><strong>href="http://directory.fsf.org/wiki/Category/Game"&gt;free</strong></del></span>
+<span 
class="inserted"><ins><em>href="https://directory.fsf.org/wiki/Category/Game"&gt;free</em></ins></span>
 games&lt;/a&gt; are
 already available.&lt;/p&gt;
 
 &lt;p&gt;
@@ -126,11 +137,11 @@
 the patent system prohibit free software&lt;/a&gt;.  The ultimate goal is to
 provide free software to do all of the jobs computer users want to
 do&mdash;and thus make proprietary software a thing of the past.&lt;/p&gt;
-
+<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;
-&lt;div id="footer"&gt;
+&lt;div <span 
class="removed"><del><strong>id="footer"&gt;</strong></del></span> <span 
class="inserted"><ins><em>id="footer" role="contentinfo"&gt;</em></ins></span>
 &lt;div class="unprintable"&gt;
 
 &lt;p&gt;Please send general FSF &amp; GNU inquiries to
@@ -148,13 +159,13 @@
         to &lt;a href="mailto:web-translators@gnu.org"&gt;
         &lt;web-translators@gnu.org&gt;&lt;/a&gt;.&lt;/p&gt;
 
-        &lt;p&gt;For information on coordinating and submitting translations of
+        &lt;p&gt;For information on coordinating and <span 
class="removed"><del><strong>submitting</strong></del></span> <span 
class="inserted"><ins><em>contributing</em></ins></span> translations of
         our web pages, see &lt;a
         href="/server/standards/README.translations.html"&gt;Translations
         README&lt;/a&gt;. --&gt;
 Please see the &lt;a
 href="/server/standards/README.translations.html"&gt;Translations
-README&lt;/a&gt; for information on coordinating and submitting translations
+README&lt;/a&gt; for information on coordinating and <span 
class="removed"><del><strong>submitting</strong></del></span> <span 
class="inserted"><ins><em>contributing</em></ins></span> translations
 of this article.&lt;/p&gt;
 &lt;/div&gt;
 
@@ -175,8 +186,9 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007,
-2009, 2012, <span class="removed"><del><strong>2014</strong></del></span> 
<span class="inserted"><ins><em>2014, 2017</em></ins></span> Free Software 
Foundation, Inc.&lt;/p&gt;
+&lt;p&gt;Copyright &copy; 1996, 1997, <span class="removed"><del><strong>1998, 
1999, 2001, 2002,</strong></del></span> 2003, 2005, <span 
class="removed"><del><strong>2007,
+2009,</strong></del></span> <span 
class="inserted"><ins><em>2008,</em></ins></span> 2012, <span 
class="removed"><del><strong>2014</strong></del></span> <span 
class="inserted"><ins><em>2017, 2021</em></ins></span>
+Free Software Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
 <span 
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/"&gt;Creative</strong></del></span>
@@ -187,11 +199,12 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/06/08 08:44:38 $
+$Date: 2021/11/02 14:41:50 $
 &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: po/gnu-history.el.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-history.el.po,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- po/gnu-history.el.po        27 May 2021 19:00:39 -0000      1.9
+++ po/gnu-history.el.po        2 Nov 2021 14:41:50 -0000       1.10
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-history.html\n"
-"POT-Creation-Date: 2017-09-04 10:56+0000\n"
+"POT-Creation-Date: 2021-11-02 13:26+0000\n"
 "PO-Revision-Date: 2015-05-04 21:55+0200\n"
 "Last-Translator: Georgios Zarkadas <gz@member.fsf.org>\n"
 "Language-Team: Greek <www-el-translators@gnu.org>\n"
@@ -31,19 +31,21 @@
 "GNU, Έργο GNU, ΙΕΛ, FSF, ελεύθερο λογισμικό, Ίδρυ
μα Ελεύθερου Λογισμικού, "
 "Free Software Foundation, Ιστορία, History"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Overview of the GNU System"
 msgstr "Επισκόπηση του συστήματος GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | The GNU operating system is a complete free software system,
-# | upward-compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.
-# |  {+It is pronounced as <a href=\"/gnu/pronunciation.html\">one syllable
-# | with a hard g</a>.+}  <a href=\"http://www.stallman.org/\";>Richard
-# | Stallman</a> made the <a href=\"/gnu/initial-announcement.html\">Initial
-# | Announcement</a> of the GNU Project in September 1983.  A longer version
-# | called the <a href=\"/gnu/manifesto.html\">GNU Manifesto</a> was published
-# | in March 1985.  It has been translated into several <a
+# | upward-compatible with Unix.  GNU stands for &ldquo;GNU's Not
+# | [-Unix&rdquo;.-] {+Unix.&rdquo; It is pronounced as+} <a
+# | [-href=\"http://www.stallman.org/\";>Richard-]
+# | {+href=\"/gnu/pronunciation.html\">one syllable with a hard <i>g</i></a>. 
+# | <a href=\"https://www.stallman.org/\";>Richard+} Stallman</a> made the <a
+# | href=\"/gnu/initial-announcement.html\">Initial Announcement</a> of the
+# | GNU Project in September 1983.  A longer version called the <a
+# | href=\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March
+# | 1985.  It has been translated into several <a
 # | href=\"/gnu/manifesto.html#translations\">other languages</a>.
 #, fuzzy
 #| msgid ""
@@ -57,14 +59,14 @@
 #| "\">other languages</a>."
 msgid ""
 "The GNU operating system is a complete free software system, upward-"
-"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.  It is "
+"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix.&rdquo; It is "
 "pronounced as <a href=\"/gnu/pronunciation.html\">one syllable with a hard "
-"g</a>.  <a href=\"http://www.stallman.org/\";>Richard Stallman</a> made the "
-"<a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> of the "
-"GNU Project in September 1983.  A longer version called the <a href=\"/gnu/"
-"manifesto.html\">GNU Manifesto</a> was published in March 1985.  It has been "
-"translated into several <a href=\"/gnu/manifesto.html#translations\">other "
-"languages</a>."
+"<i>g</i></a>.  <a href=\"https://www.stallman.org/\";>Richard Stallman</a> "
+"made the <a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> "
+"of the GNU Project in September 1983.  A longer version called the <a href="
+"\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March 1985.  It "
+"has been translated into several <a href=\"/gnu/manifesto.html#translations"
+"\">other languages</a>."
 msgstr ""
 "Το λειτουργικό σύστημα GNU είναι ένα πλήρες 
σύστημα ελεύθερου λογισμικού, "
 "συμβατό με το Unix. Η λέξη GNU σημαίνει &ldquo;GNU's 
Not Unix&rdquo;.  Ο <a "
@@ -75,12 +77,24 @@
 "δημοσιεύτηκε το Μάρτιο του 1985.  Αυτό το 
έγγραφο έχει μεταφραστεί σε πολλές "
 "<a href=\"/gnu/manifesto.html#translations\">άλλες γλώσσες</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The name &ldquo;GNU&rdquo; was chosen because it met a few requirements;
+# | first, it was a recursive acronym for &ldquo;GNU's Not [-Unix&rdquo;,-]
+# | {+Unix,&rdquo;+} second, because it was a real word, and third, it was fun
+# | to say (or <a
+# | href=\"http://www.poppyfields.net/poppy/songs/gnu.html\";>[-S-]{+s+}ing</a>)
+# | .
+#, fuzzy
+#| msgid ""
+#| "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
+#| "first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, "
+#| "second, because it was a real word, and third, it was fun to say (or <a "
+#| "href=\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
 msgid ""
 "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
-"first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, second, "
+"first, it was a recursive acronym for &ldquo;GNU's Not Unix,&rdquo; second, "
 "because it was a real word, and third, it was fun to say (or <a href="
-"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
+"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>sing</a>)."
 msgstr ""
 "Το όνομα &ldquo;GNU&rdquo; επιλέχθηκε επειδή 
πληρούσε ορισμένες "
 "προϋποθέσεις· πρωτίστως, ήταν ένα 
αναδρομικό ακρωνύμιο για το &ldquo;GNU's "
@@ -88,7 +102,7 @@
 "επειδή είναι διασκεδαστικό να το λες (ή να 
το <a href=\"http://www.";
 "poppyfields.net/poppy/songs/gnu.html\">Τραγουδάς</a>)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The word &ldquo;free&rdquo; in &ldquo;free software&rdquo; pertains to <a "
 "href=\"/philosophy/free-sw.html\">freedom</a>, not price.  You may or may "
@@ -115,13 +129,27 @@
 "χρεώνετε ένα τέλος για τη φυσική πράξη της 
μεταφοράς ενός αντίγραφου, ή "
 "μπορείτε να δίνετε δωρεάν αντίγραφα)."
 
-#. type: Content of: <p>
-msgid ""
-"The project to develop the GNU system is called the &ldquo;GNU "
-"Project&rdquo;.  The GNU Project was conceived in 1983 as a way of bringing "
-"back the cooperative spirit that prevailed in the computing community in "
-"earlier days&mdash;to make cooperation possible once again by removing the "
-"obstacles to cooperation imposed by the owners of proprietary software."
+#. type: Content of: <div><p>
+# | The project to develop the GNU system is called the &ldquo;GNU
+# | [-Project&rdquo;.-] {+Project.&rdquo;+} The GNU Project was conceived in
+# | 1983 as a way of bringing back the cooperative spirit that prevailed in
+# | the computing community in earlier days&mdash;to make cooperation possible
+# | once again by removing the obstacles to cooperation imposed by the owners
+# | of proprietary software.
+#, fuzzy
+#| msgid ""
+#| "The project to develop the GNU system is called the &ldquo;GNU "
+#| "Project&rdquo;.  The GNU Project was conceived in 1983 as a way of "
+#| "bringing back the cooperative spirit that prevailed in the computing "
+#| "community in earlier days&mdash;to make cooperation possible once again "
+#| "by removing the obstacles to cooperation imposed by the owners of "
+#| "proprietary software."
+msgid ""
+"The project to develop the GNU system is called the &ldquo;GNU Project."
+"&rdquo; The GNU Project was conceived in 1983 as a way of bringing back the "
+"cooperative spirit that prevailed in the computing community in earlier "
+"days&mdash;to make cooperation possible once again by removing the obstacles "
+"to cooperation imposed by the owners of proprietary software."
 msgstr ""
 "Το έργο ανάπτυξης του συστήματος GNU 
ονομάζεται &ldquo;Έργο GNU&rdquo;.  Το "
 "Έργο GNU δημιουργήθηκε το 1983 ως ένας τρόπος 
επαναφοράς του κλίματος "
@@ -130,7 +158,7 @@
 "εμπόδια στη συνεργασία που επιβλήθηκαν 
από τους κατόχους ιδιόκτητου "
 "λογισμικού."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In 1971, when Richard Stallman started his career at MIT, he worked in a "
 "group which used <a href=\"/philosophy/free-sw.html\">free software</a> "
@@ -143,7 +171,7 @@
 "διένειμαν ελεύθερο λογισμικό.  Οι 
προγραμματιστές ήταν ελεύθεροι να "
 "συνεργαστούν μεταξύ τους, και συχνά το 
έκαναν."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By the 1980s, almost all software was <a href=\"/philosophy/categories."
 "html#ProprietarySoftware\">proprietary</a>, which means that it had owners "
@@ -155,7 +183,7 @@
 "ότι είχε ιδιοκτήτες που απαγόρευαν και 
απέτρεπαν τη συνεργασία των χρηστών.  "
 "Αυτό έκανε αναγκαία τη δημιουργία του 
Έργου GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Every computer user needs an operating system; if there is no free operating "
 "system, then you can't even get started using a computer without resorting "
@@ -168,7 +196,7 @@
 "λογισμικό.  Έτσι, το πρώτο αντικείμενο 
στην ατζέντα του ελεύθερου λογισμικού "
 "ήταν προφανές ότι έπρεπε να είναι ένα 
ελεύθερο λειτουργικό σύστημα."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We decided to make the operating system compatible with Unix because the "
 "overall design was already proven and portable, and because compatibility "
@@ -179,14 +207,28 @@
 "\"#TransNote2\">[2]</a></sup>, κι επειδή η συμβατότητα 
το κάνει εύκολο για "
 "τους χρήστες του Unix να μεταπηδήσουν από το 
Unix στο GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | A Unix-like operating system includes a kernel, compilers, editors, text
+# | formatters, mail software, graphical interfaces, libraries, games and many
+# | other things.  Thus, writing a whole operating system is a very large job.
+# |  We started in January 1984.  The <a [-href=\"http://fsf.org/\";>-]
+# | {+href=\"https://www.fsf.org/\";>+} Free Software Foundation</a> was
+# | founded in October 1985, initially to raise funds to help develop GNU.
+#, fuzzy
+#| msgid ""
+#| "A Unix-like operating system includes a kernel, compilers, editors, text "
+#| "formatters, mail software, graphical interfaces, libraries, games and "
+#| "many other things.  Thus, writing a whole operating system is a very "
+#| "large job.  We started in January 1984.  The <a href=\"http://fsf.org/\";> "
+#| "Free Software Foundation</a> was founded in October 1985, initially to "
+#| "raise funds to help develop GNU."
 msgid ""
 "A Unix-like operating system includes a kernel, compilers, editors, text "
 "formatters, mail software, graphical interfaces, libraries, games and many "
 "other things.  Thus, writing a whole operating system is a very large job.  "
-"We started in January 1984.  The <a href=\"http://fsf.org/\";> Free Software "
-"Foundation</a> was founded in October 1985, initially to raise funds to help "
-"develop GNU."
+"We started in January 1984.  The <a href=\"https://www.fsf.org/\";> Free "
+"Software Foundation</a> was founded in October 1985, initially to raise "
+"funds to help develop GNU."
 msgstr ""
 "Ένα λειτουργικό σύστημα το οποίο μοιάζει 
με το Unix περιλαμβάνει ένα πυρήνα, "
 "μεταγλωττιστές, συντάκτες κειμένου, 
διαμορφωτές κειμένου, λογισμικό "
@@ -197,7 +239,30 @@
 "του 1985, με αρχικό σκοπό την απόκτηση 
εσόδων ώστε να βοηθήσει στην ανάπτυξη "
 "του GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | By 1990 we had either found or written all the major components except
+# | one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by
+# | Linus Torvalds in 1991 and made free software in 1992.  Combining Linux
+# | with the almost-complete GNU system resulted in a complete operating
+# | system: the GNU/Linux system.  Estimates are that tens of millions of
+# | people now use GNU/Linux systems, typically via <a
+# | href=\"/distros/distros.html\">GNU/Linux distributions</a>.  The principal
+# | version of Linux now contains non[---]free firmware &ldquo;blobs&rdquo;;
+# | free software activists now maintain a modified free version of Linux,
+# | called <a [-href=\"http://directory.fsf.org/project/linux\";>-]
+# | {+href=\"https://directory.fsf.org/wiki/Linux-libre\";>+} Linux-libre</a>.
+#, fuzzy
+#| msgid ""
+#| "By 1990 we had either found or written all the major components except "
+#| "one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by "
+#| "Linus Torvalds in 1991 and made free software in 1992.  Combining Linux "
+#| "with the almost-complete GNU system resulted in a complete operating "
+#| "system: the GNU/Linux system.  Estimates are that tens of millions of "
+#| "people now use GNU/Linux systems, typically via <a href=\"/distros/"
+#| "distros.html\">GNU/Linux distributions</a>.  The principal version of "
+#| "Linux now contains non-free firmware &ldquo;blobs&rdquo;; free software "
+#| "activists now maintain a modified free version of Linux, called <a href="
+#| "\"http://directory.fsf.org/project/linux\";> Linux-libre</a>."
 msgid ""
 "By 1990 we had either found or written all the major components except "
 "one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by "
@@ -205,10 +270,10 @@
 "the almost-complete GNU system resulted in a complete operating system: the "
 "GNU/Linux system.  Estimates are that tens of millions of people now use GNU/"
 "Linux systems, typically via <a href=\"/distros/distros.html\">GNU/Linux "
-"distributions</a>.  The principal version of Linux now contains non-free "
+"distributions</a>.  The principal version of Linux now contains nonfree "
 "firmware &ldquo;blobs&rdquo;; free software activists now maintain a "
-"modified free version of Linux, called <a href=\"http://directory.fsf.org/";
-"project/linux\"> Linux-libre</a>."
+"modified free version of Linux, called <a href=\"https://directory.fsf.org/";
+"wiki/Linux-libre\"> Linux-libre</a>."
 msgstr ""
 "Μέχρι τη δεκαετία του 1990, είχαμε είτε βρει 
είτε συγγράψει όλα τα κύρια "
 "στοιχεία εκτός από ένα&mdash;τον πυρήνα.  
Τότε το Linux, ένας παρόμοιος με "
@@ -222,13 +287,26 @@
 "λογισμικού διατηρούν τώρα μια 
τροποποιημένη έκδοση του Linux, ονομαζόμενη <a 
"
 "href=\"http://directory.fsf.org/project/linux\";> Linux-libre</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | However, the GNU Project is not limited to the core operating system.  We
+# | aim to provide a whole spectrum of software, whatever many users want to
+# | have.  This includes application software.  See the <a
+# | [-href=\"/directory\">Free-]
+# | {+href=\"https://directory.fsf.org/wiki/Main_Page\";>Free+} Software
+# | Directory</a> for a catalogue of free software application programs.
+#, fuzzy
+#| msgid ""
+#| "However, the GNU Project is not limited to the core operating system.  We "
+#| "aim to provide a whole spectrum of software, whatever many users want to "
+#| "have.  This includes application software.  See the <a href=\"/directory"
+#| "\">Free Software Directory</a> for a catalogue of free software "
+#| "application programs."
 msgid ""
 "However, the GNU Project is not limited to the core operating system.  We "
 "aim to provide a whole spectrum of software, whatever many users want to "
-"have.  This includes application software.  See the <a href=\"/directory"
-"\">Free Software Directory</a> for a catalogue of free software application "
-"programs."
+"have.  This includes application software.  See the <a href=\"https://";
+"directory.fsf.org/wiki/Main_Page\">Free Software Directory</a> for a "
+"catalogue of free software application programs."
 msgstr ""
 "Ωστόσο, το Έργο GNU δεν περιορίζεται μόνο 
στο κεντρικό λειτουργικό σύστημα. "
 "Στοχεύουμε να παρέχουμε ένα ολόκληρο 
φάσμα λογισμικού, ο,τιδήποτε θελήσουν "
@@ -236,28 +314,44 @@
 "Δείτε τον <a href=\"/directory\">Κατάλογο 
Ελεύθερου Λογισμικού</a>, για έναν "
 "κατάλογο με προγράμματα εφαρμογών που 
είναι ελεύθερο λογισμικό."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | We also want to provide software for users who are not computer experts. 
+# | Therefore we developed a <a href=\"http{+s+}://www.gnome.org/\">graphical
+# | desktop (called GNOME)</a> to help beginners use the GNU system.
+#, fuzzy
+#| msgid ""
+#| "We also want to provide software for users who are not computer experts.  "
+#| "Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical "
+#| "desktop (called GNOME)</a> to help beginners use the GNU system."
 msgid ""
 "We also want to provide software for users who are not computer experts.  "
-"Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical desktop "
-"(called GNOME)</a> to help beginners use the GNU system."
+"Therefore we developed a <a href=\"https://www.gnome.org/\";>graphical "
+"desktop (called GNOME)</a> to help beginners use the GNU system."
 msgstr ""
 "Θέλουμε επίσης να παρέχουμε λογισμικό και 
για χρήστες που δεν είναι ειδικοί "
 "στους υπολογιστές.  Αναπτύξαμε επομένως 
κι ένα <a href=\"http://www.gnome.";
 "org/\">γραφικό περιβάλλον (αποκαλούμενο 
GNOME)</a> για να βοηθήσουμε τους "
 "αρχάριους να χρησιμοποιήσουν το σύστημα 
GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | We also want to provide games and other recreations.  Plenty of <a
+# | href=\"http{+s+}://directory.fsf.org/wiki/Category/Game\">free games</a>
+# | are already available.
+#, fuzzy
+#| msgid ""
+#| "We also want to provide games and other recreations.  Plenty of <a href="
+#| "\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are "
+#| "already available."
 msgid ""
 "We also want to provide games and other recreations.  Plenty of <a href="
-"\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
+"\"https://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
 "available."
 msgstr ""
 "Θέλουμε επίσης να παρέχουμε παιχνίδια κι 
άλλα είδη ψυχαγωγίας.  Πολλά <a "
 "href=\"http://directory.fsf.org/wiki/Category/Game\";>ελεύθερα 
παιχνίδια</a> "
 "είναι ήδη διαθέσιμα."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "How far can free software go? There are no limits, except when <a href=\"/"
 "philosophy/fighting-software-patents.html\">laws such as the patent system "
@@ -301,6 +395,7 @@
 "άλλες διορθώσεις ή προτάσεις μπορούν να 
σταλούν στο <a href=\"mailto:";
 "webmasters@gnu.org\">&lt;webmasters@gnu.org&gt;</a>."
 
+# TODO: submitting -> contributing.
 #.  TRANSLATORS: Ignore the original text in this paragraph,
 #.         replace it with the translation of these two:
 #.         We work hard and do our best to provide accurate, good quality
@@ -308,14 +403,20 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Εργαζόμαστε σκληρά και κάνουμε ό,τι 
καλύτερο μπορούμε για να παρέχουμε "
@@ -327,15 +428,16 @@
 "\"/server/standards/README.translations.html\">Μεταφράσεις 
ΔΙΑΒΑΣΕΜΕ</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007,
-# | 2009, 2012, [-2014-] {+2014, 2017+} Free Software Foundation, Inc.
+# | Copyright &copy; 1996, 1997, [-1998, 1999, 2001, 2002,-] 2003, 2005,
+# | [-2007, 2009,-] {+2008,+} 2012, [-2014-] {+2017, 2021+} Free Software
+# | Foundation, Inc.
 #, fuzzy
 #| msgid ""
 #| "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
 #| "2009, 2012, 2014 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017 Free Software Foundation, Inc."
+"Copyright &copy; 1996, 1997, 2003, 2005, 2008, 2012, 2017, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
 "Πνευματικά δικαιώματα:<br />\n"
 "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "

Index: po/gnu-history.es.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-history.es.po,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- po/gnu-history.es.po        2 Nov 2021 13:25:56 -0000       1.51
+++ po/gnu-history.es.po        2 Nov 2021 14:41:50 -0000       1.52
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-history.html\n"
-"POT-Creation-Date: 2017-09-04 10:56+0000\n"
+"POT-Creation-Date: 2021-11-02 13:26+0000\n"
 "PO-Revision-Date: 2017-09-10 10:21+0200\n"
 "Last-Translator: Javier Fdez. Retenaga <jfrtnaga@gnu.org>\n"
 "Language-Team: Spanish <www-es-general@gnu.org>\n"
@@ -20,6 +20,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-11-02 13:26+0000\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: Poedit 1.8.11\n"
 
@@ -37,22 +38,43 @@
 "para el software libre, historia"
 
 # type: Content of: <h2>
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Overview of the GNU System"
 msgstr "Visión general del sistema GNU"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The GNU operating system is a complete free software system,
+# | upward-compatible with Unix.  GNU stands for &ldquo;GNU's Not
+# | [-Unix&rdquo;.-] {+Unix.&rdquo;+} It is pronounced as <a
+# | href=\"/gnu/pronunciation.html\">one syllable with a hard [-g</a>.-]
+# | {+<i>g</i></a>.+}  <a href=\"http{+s+}://www.stallman.org/\">Richard
+# | Stallman</a> made the <a href=\"/gnu/initial-announcement.html\">Initial
+# | Announcement</a> of the GNU Project in September 1983.  A longer version
+# | called the <a href=\"/gnu/manifesto.html\">GNU Manifesto</a> was published
+# | in March 1985.  It has been translated into several <a
+# | href=\"/gnu/manifesto.html#translations\">other languages</a>.
+#, fuzzy
+#| msgid ""
+#| "The GNU operating system is a complete free software system, upward-"
+#| "compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.  It "
+#| "is pronounced as <a href=\"/gnu/pronunciation.html\">one syllable with a "
+#| "hard g</a>.  <a href=\"http://www.stallman.org/\";>Richard Stallman</a> "
+#| "made the <a href=\"/gnu/initial-announcement.html\">Initial Announcement</"
+#| "a> of the GNU Project in September 1983.  A longer version called the <a "
+#| "href=\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March "
+#| "1985.  It has been translated into several <a href=\"/gnu/manifesto."
+#| "html#translations\">other languages</a>."
 msgid ""
 "The GNU operating system is a complete free software system, upward-"
-"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.  It is "
+"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix.&rdquo; It is "
 "pronounced as <a href=\"/gnu/pronunciation.html\">one syllable with a hard "
-"g</a>.  <a href=\"http://www.stallman.org/\";>Richard Stallman</a> made the "
-"<a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> of the "
-"GNU Project in September 1983.  A longer version called the <a href=\"/gnu/"
-"manifesto.html\">GNU Manifesto</a> was published in March 1985.  It has been "
-"translated into several <a href=\"/gnu/manifesto.html#translations\">other "
-"languages</a>."
+"<i>g</i></a>.  <a href=\"https://www.stallman.org/\";>Richard Stallman</a> "
+"made the <a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> "
+"of the GNU Project in September 1983.  A longer version called the <a href="
+"\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March 1985.  It "
+"has been translated into several <a href=\"/gnu/manifesto.html#translations"
+"\">other languages</a>."
 msgstr ""
 "El sistema operativo GNU es un sistema completo de software libre compatible "
 "con Unix. El término GNU proviene de «GNU No es Unix». Se pronuncia <a 
href="
@@ -65,12 +87,24 @@
 "\">idiomas</a>."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The name &ldquo;GNU&rdquo; was chosen because it met a few requirements;
+# | first, it was a recursive acronym for &ldquo;GNU's Not [-Unix&rdquo;,-]
+# | {+Unix,&rdquo;+} second, because it was a real word, and third, it was fun
+# | to say (or <a
+# | href=\"http://www.poppyfields.net/poppy/songs/gnu.html\";>[-S-]{+s+}ing</a>)
+# | .
+#, fuzzy
+#| msgid ""
+#| "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
+#| "first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, "
+#| "second, because it was a real word, and third, it was fun to say (or <a "
+#| "href=\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
 msgid ""
 "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
-"first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, second, "
+"first, it was a recursive acronym for &ldquo;GNU's Not Unix,&rdquo; second, "
 "because it was a real word, and third, it was fun to say (or <a href="
-"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
+"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>sing</a>)."
 msgstr ""
 "El nombre «GNU» se eligió porque satisfacía unos cuantos requisitos. En "
 "primer lugar, era un acrónimo recursivo para «GNU No es Unix». En segundo "
@@ -78,7 +112,7 @@
 "\"http://www.poppyfields.net/poppy/songs/gnu.html\"; >cantar</a>)."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The word &ldquo;free&rdquo; in &ldquo;free software&rdquo; pertains to <a "
 "href=\"/philosophy/free-sw.html\">freedom</a>, not price.  You may or may "
@@ -104,13 +138,27 @@
 "físico de efectuar la copia, o bien regalar copias)."
 
 # type: Content of: <p>
-#. type: Content of: <p>
-msgid ""
-"The project to develop the GNU system is called the &ldquo;GNU "
-"Project&rdquo;.  The GNU Project was conceived in 1983 as a way of bringing "
-"back the cooperative spirit that prevailed in the computing community in "
-"earlier days&mdash;to make cooperation possible once again by removing the "
-"obstacles to cooperation imposed by the owners of proprietary software."
+#. type: Content of: <div><p>
+# | The project to develop the GNU system is called the &ldquo;GNU
+# | [-Project&rdquo;.-] {+Project.&rdquo;+} The GNU Project was conceived in
+# | 1983 as a way of bringing back the cooperative spirit that prevailed in
+# | the computing community in earlier days&mdash;to make cooperation possible
+# | once again by removing the obstacles to cooperation imposed by the owners
+# | of proprietary software.
+#, fuzzy
+#| msgid ""
+#| "The project to develop the GNU system is called the &ldquo;GNU "
+#| "Project&rdquo;.  The GNU Project was conceived in 1983 as a way of "
+#| "bringing back the cooperative spirit that prevailed in the computing "
+#| "community in earlier days&mdash;to make cooperation possible once again "
+#| "by removing the obstacles to cooperation imposed by the owners of "
+#| "proprietary software."
+msgid ""
+"The project to develop the GNU system is called the &ldquo;GNU Project."
+"&rdquo; The GNU Project was conceived in 1983 as a way of bringing back the "
+"cooperative spirit that prevailed in the computing community in earlier "
+"days&mdash;to make cooperation possible once again by removing the obstacles "
+"to cooperation imposed by the owners of proprietary software."
 msgstr ""
 "El proyecto para desarrollar el sistema GNU se denomina «Proyecto GNU». El "
 "Proyecto GNU se concibió en 1983 como un modo de retomar el espíritu "
@@ -119,7 +167,7 @@
 "dueños de software privativo."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In 1971, when Richard Stallman started his career at MIT, he worked in a "
 "group which used <a href=\"/philosophy/free-sw.html\">free software</a> "
@@ -134,7 +182,7 @@
 "con otros y lo hacían a menudo."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By the 1980s, almost all software was <a href=\"/philosophy/categories."
 "html#ProprietarySoftware\">proprietary</a>, which means that it had owners "
@@ -147,7 +195,7 @@
 "usuarios. De ahí que fuera necesario el Proyecto GNU."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Every computer user needs an operating system; if there is no free operating "
 "system, then you can't even get started using a computer without resorting "
@@ -160,7 +208,7 @@
 "software libre tenía que ser un sistema operativo libre."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We decided to make the operating system compatible with Unix because the "
 "overall design was already proven and portable, and because compatibility "
@@ -171,14 +219,28 @@
 "facilitaba a los usuarios de Unix el cambio de Unix a GNU."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | A Unix-like operating system includes a kernel, compilers, editors, text
+# | formatters, mail software, graphical interfaces, libraries, games and many
+# | other things.  Thus, writing a whole operating system is a very large job.
+# |  We started in January 1984.  The <a [-href=\"http://fsf.org/\";>-]
+# | {+href=\"https://www.fsf.org/\";>+} Free Software Foundation</a> was
+# | founded in October 1985, initially to raise funds to help develop GNU.
+#, fuzzy
+#| msgid ""
+#| "A Unix-like operating system includes a kernel, compilers, editors, text "
+#| "formatters, mail software, graphical interfaces, libraries, games and "
+#| "many other things.  Thus, writing a whole operating system is a very "
+#| "large job.  We started in January 1984.  The <a href=\"http://fsf.org/\";> "
+#| "Free Software Foundation</a> was founded in October 1985, initially to "
+#| "raise funds to help develop GNU."
 msgid ""
 "A Unix-like operating system includes a kernel, compilers, editors, text "
 "formatters, mail software, graphical interfaces, libraries, games and many "
 "other things.  Thus, writing a whole operating system is a very large job.  "
-"We started in January 1984.  The <a href=\"http://fsf.org/\";> Free Software "
-"Foundation</a> was founded in October 1985, initially to raise funds to help "
-"develop GNU."
+"We started in January 1984.  The <a href=\"https://www.fsf.org/\";> Free "
+"Software Foundation</a> was founded in October 1985, initially to raise "
+"funds to help develop GNU."
 msgstr ""
 "Un sistema operativo similar a Unix incluye un núcleo, compiladores, "
 "editores, procesadores de texto, software de correo, interfaces gráficas, "
@@ -188,7 +250,30 @@
 "el objetivo inicial de recaudar fondos para ayudar a programar GNU."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | By 1990 we had either found or written all the major components except
+# | one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by
+# | Linus Torvalds in 1991 and made free software in 1992.  Combining Linux
+# | with the almost-complete GNU system resulted in a complete operating
+# | system: the GNU/Linux system.  Estimates are that tens of millions of
+# | people now use GNU/Linux systems, typically via <a
+# | href=\"/distros/distros.html\">GNU/Linux distributions</a>.  The principal
+# | version of Linux now contains non[---]free firmware &ldquo;blobs&rdquo;;
+# | free software activists now maintain a modified free version of Linux,
+# | called <a [-href=\"http://directory.fsf.org/project/linux\";>-]
+# | {+href=\"https://directory.fsf.org/wiki/Linux-libre\";>+} Linux-libre</a>.
+#, fuzzy
+#| msgid ""
+#| "By 1990 we had either found or written all the major components except "
+#| "one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by "
+#| "Linus Torvalds in 1991 and made free software in 1992.  Combining Linux "
+#| "with the almost-complete GNU system resulted in a complete operating "
+#| "system: the GNU/Linux system.  Estimates are that tens of millions of "
+#| "people now use GNU/Linux systems, typically via <a href=\"/distros/"
+#| "distros.html\">GNU/Linux distributions</a>.  The principal version of "
+#| "Linux now contains non-free firmware &ldquo;blobs&rdquo;; free software "
+#| "activists now maintain a modified free version of Linux, called <a href="
+#| "\"http://directory.fsf.org/project/linux\";> Linux-libre</a>."
 msgid ""
 "By 1990 we had either found or written all the major components except "
 "one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by "
@@ -196,10 +281,10 @@
 "the almost-complete GNU system resulted in a complete operating system: the "
 "GNU/Linux system.  Estimates are that tens of millions of people now use GNU/"
 "Linux systems, typically via <a href=\"/distros/distros.html\">GNU/Linux "
-"distributions</a>.  The principal version of Linux now contains non-free "
+"distributions</a>.  The principal version of Linux now contains nonfree "
 "firmware &ldquo;blobs&rdquo;; free software activists now maintain a "
-"modified free version of Linux, called <a href=\"http://directory.fsf.org/";
-"project/linux\"> Linux-libre</a>."
+"modified free version of Linux, called <a href=\"https://directory.fsf.org/";
+"wiki/Linux-libre\"> Linux-libre</a>."
 msgstr ""
 "A principios de 1990 ya habíamos encontrado o programado los componentes "
 "principales excepto uno, el núcleo. En 1991 Linus Torvalds programó Linux, "
@@ -215,13 +300,26 @@
 "project/linux\">Linux-libre</a>."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | However, the GNU Project is not limited to the core operating system.  We
+# | aim to provide a whole spectrum of software, whatever many users want to
+# | have.  This includes application software.  See the <a
+# | [-href=\"/directory\">Free-]
+# | {+href=\"https://directory.fsf.org/wiki/Main_Page\";>Free+} Software
+# | Directory</a> for a catalogue of free software application programs.
+#, fuzzy
+#| msgid ""
+#| "However, the GNU Project is not limited to the core operating system.  We "
+#| "aim to provide a whole spectrum of software, whatever many users want to "
+#| "have.  This includes application software.  See the <a href=\"/directory"
+#| "\">Free Software Directory</a> for a catalogue of free software "
+#| "application programs."
 msgid ""
 "However, the GNU Project is not limited to the core operating system.  We "
 "aim to provide a whole spectrum of software, whatever many users want to "
-"have.  This includes application software.  See the <a href=\"/directory"
-"\">Free Software Directory</a> for a catalogue of free software application "
-"programs."
+"have.  This includes application software.  See the <a href=\"https://";
+"directory.fsf.org/wiki/Main_Page\">Free Software Directory</a> for a "
+"catalogue of free software application programs."
 msgstr ""
 "En todo caso, el proyecto GNU no se limita al sistema operativo propiamente "
 "dicho.  Queremos proporcionar una amplia gama de software, cualquier "
@@ -230,11 +328,19 @@
 "puede consultar un catálogo de aplicaciones libres."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | We also want to provide software for users who are not computer experts. 
+# | Therefore we developed a <a href=\"http{+s+}://www.gnome.org/\">graphical
+# | desktop (called GNOME)</a> to help beginners use the GNU system.
+#, fuzzy
+#| msgid ""
+#| "We also want to provide software for users who are not computer experts.  "
+#| "Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical "
+#| "desktop (called GNOME)</a> to help beginners use the GNU system."
 msgid ""
 "We also want to provide software for users who are not computer experts.  "
-"Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical desktop "
-"(called GNOME)</a> to help beginners use the GNU system."
+"Therefore we developed a <a href=\"https://www.gnome.org/\";>graphical "
+"desktop (called GNOME)</a> to help beginners use the GNU system."
 msgstr ""
 "También queremos proporcionar software para usuarios que no son expertos en "
 "informática. Por ese motivo creamos un <a href=\"http://www.gnome.org/";
@@ -242,10 +348,18 @@
 "usar el sistema GNU."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | We also want to provide games and other recreations.  Plenty of <a
+# | href=\"http{+s+}://directory.fsf.org/wiki/Category/Game\">free games</a>
+# | are already available.
+#, fuzzy
+#| msgid ""
+#| "We also want to provide games and other recreations.  Plenty of <a href="
+#| "\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are "
+#| "already available."
 msgid ""
 "We also want to provide games and other recreations.  Plenty of <a href="
-"\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
+"\"https://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
 "available."
 msgstr ""
 "También queremos ofrecer juegos y otros programas de entretenimiento. "
@@ -253,7 +367,7 @@
 "libres</a> ya están disponibles."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "How far can free software go? There are no limits, except when <a href=\"/"
 "philosophy/fighting-software-patents.html\">laws such as the patent system "
@@ -292,7 +406,6 @@
 "proponer otras correcciones o sugerencias, diríjase a <a href=\"mailto:";
 "webmasters@gnu.org\">&lt;webmasters@gnu.org&gt;</a>."
 
-#
 #.  TRANSLATORS: Ignore the original text in this paragraph,
 #.         replace it with the translation of these two:
 #.         We work hard and do our best to provide accurate, good quality
@@ -300,14 +413,14 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "El equipo de traductores al español se esfuerza por ofrecer traducciones "
@@ -318,14 +431,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,-] {+1996, 1997, 2003, 2005, 2008,
+# | 2012,+} 2017, [-2018-] {+2021+} Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, "
+#| "Inc."
 msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017 Free Software Foundation, Inc."
+"Copyright &copy; 1996, 1997, 2003, 2005, 2008, 2012, 2017, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017 Free Software Foundation, Inc."
+"Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -350,10 +467,17 @@
 msgstr "Última actualización:"
 
 # type: Content of: <div><p>
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017, 2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017, 2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017 Free Software Foundation, Inc."
+
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017, 2021 Free Software Foundation, Inc."

Index: po/gnu-history.fa.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-history.fa.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- po/gnu-history.fa.po        4 Sep 2017 11:03:01 -0000       1.6
+++ po/gnu-history.fa.po        2 Nov 2021 14:41:50 -0000       1.7
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-history.html\n"
-"POT-Creation-Date: 2017-09-04 10:56+0000\n"
+"POT-Creation-Date: 2021-11-02 13:26+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Thérèse Godefroy <godef.th@free.fr>\n"
 "Language-Team: web-translators <web-translators@gnu.org>\n"
@@ -28,11 +28,11 @@
 "گنو, پروژه گنو, FSF, نرم‌افزار آزاد, نرم 
افزار آزاد, بنیاد نرم‌افزار آزاد, "
 "تاریخچه"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Overview of the GNU System"
 msgstr "مروری بر سیستم گنو"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "The GNU operating system is a complete free software system, upward-"
@@ -45,14 +45,14 @@
 #| "\">other languages</a>."
 msgid ""
 "The GNU operating system is a complete free software system, upward-"
-"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.  It is "
+"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix.&rdquo; It is "
 "pronounced as <a href=\"/gnu/pronunciation.html\">one syllable with a hard "
-"g</a>.  <a href=\"http://www.stallman.org/\";>Richard Stallman</a> made the "
-"<a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> of the "
-"GNU Project in September 1983.  A longer version called the <a href=\"/gnu/"
-"manifesto.html\">GNU Manifesto</a> was published in March 1985.  It has been "
-"translated into several <a href=\"/gnu/manifesto.html#translations\">other "
-"languages</a>."
+"<i>g</i></a>.  <a href=\"https://www.stallman.org/\";>Richard Stallman</a> "
+"made the <a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> "
+"of the GNU Project in September 1983.  A longer version called the <a href="
+"\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March 1985.  It "
+"has been translated into several <a href=\"/gnu/manifesto.html#translations"
+"\">other languages</a>."
 msgstr ""
 "سیستم عامل گنو یک سیستم عامل کاملا آزاد 
بوده که به طور فزاینده‌ای با یونیکس "
 "سازگار می‌باشد. گنو مخفف «GNU's Not Unix» است. <a 
href=\"http://www.stallman.";
@@ -61,19 +61,25 @@
 "href=\"/gnu/manifesto.html\">اعلامیه گنو</a> در سپتامبر 
۱۹۸۵ منتشر شد که به "
 "<a href=\"/gnu/manifesto.html#translations\">چندین زبان</a> ترجم
ه شده است."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
+#| "first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, "
+#| "second, because it was a real word, and third, it was fun to say (or <a "
+#| "href=\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
 msgid ""
 "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
-"first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, second, "
+"first, it was a recursive acronym for &ldquo;GNU's Not Unix,&rdquo; second, "
 "because it was a real word, and third, it was fun to say (or <a href="
-"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
+"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>sing</a>)."
 msgstr ""
 "نام «گنو» به این علت انتخاب شده است که 
تعدادی از نیازها را برطرف می‌کند؛ "
 "نخست، یک مخفف بازگشتی برای «GNU's Not Unix» است، 
دوم، یک کلمه واقعی است، "
 "سوم، آهنگ گفتن (یا <a 
href=\"http://www.poppyfields.net/poppy/songs/gnu.html";
 "\">خواندن</a>) آن جالب است."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "The word &ldquo;free&rdquo; in &ldquo;free software&rdquo; pertains to <a "
@@ -109,20 +115,28 @@
 "فیزیکی انتقال یک نسخه مبلغی را دریافت کنید 
و یا آنها را به طور رایگان هدیه "
 "کنید.)"
 
-#. type: Content of: <p>
-msgid ""
-"The project to develop the GNU system is called the &ldquo;GNU "
-"Project&rdquo;.  The GNU Project was conceived in 1983 as a way of bringing "
-"back the cooperative spirit that prevailed in the computing community in "
-"earlier days&mdash;to make cooperation possible once again by removing the "
-"obstacles to cooperation imposed by the owners of proprietary software."
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The project to develop the GNU system is called the &ldquo;GNU "
+#| "Project&rdquo;.  The GNU Project was conceived in 1983 as a way of "
+#| "bringing back the cooperative spirit that prevailed in the computing "
+#| "community in earlier days&mdash;to make cooperation possible once again "
+#| "by removing the obstacles to cooperation imposed by the owners of "
+#| "proprietary software."
+msgid ""
+"The project to develop the GNU system is called the &ldquo;GNU Project."
+"&rdquo; The GNU Project was conceived in 1983 as a way of bringing back the "
+"cooperative spirit that prevailed in the computing community in earlier "
+"days&mdash;to make cooperation possible once again by removing the obstacles "
+"to cooperation imposed by the owners of proprietary software."
 msgstr ""
 "پروژه توسعه سیستم گنو، «پروژه گنو» نامیده 
می‌شود. در سال ۱۹۸۳ پروژه گنو به "
 "عنوان راهی برای بازگرداندن روح همکاری که 
در روزهای نخست در بین جامعه کاربران "
 "کامپیوتر وجود داشت ایجاد شد تا با از بین 
بردن موانع که توسط صاحبان "
 "نرم‌افزارهای انحصاری تحمیل شده بودند، یک 
بار دیگر همکاری را ممکن سازد."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In 1971, when Richard Stallman started his career at MIT, he worked in a "
 "group which used <a href=\"/philosophy/free-sw.html\">free software</a> "
@@ -135,7 +149,7 @@
 "توزیع می‌کردند. برنامه‌نویسان در همکاری 
با یکدیگر آزاد بودند و اغلب نیز همین "
 "کار را انجام می‌دادند."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By the 1980s, almost all software was <a href=\"/philosophy/categories."
 "html#ProprietarySoftware\">proprietary</a>, which means that it had owners "
@@ -147,7 +161,7 @@
 "مالکان آنها همکاری توسط کاربزان را منع م
ی‌کردند که این کار ضرورت پروژه گنو را "
 "ایجاب می‌کرد."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Every computer user needs an operating system; if there is no free operating "
 "system, then you can't even get started using a computer without resorting "
@@ -159,7 +173,7 @@
 "کامپیوتر را شروع کنید. بنابراین اولین 
ضرورت در نرم‌افزار آزاد، وجود یک سیستم "
 "عامل آزاد است."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We decided to make the operating system compatible with Unix because the "
 "overall design was already proven and portable, and because compatibility "
@@ -169,7 +183,7 @@
 "محک خورده و قابل انتقال بود، و همچنین این 
سازگاری حرکت کاربران یونیکس به گنو "
 "را آسان می‌کرد."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "A Unix-like operating system is much more than a kernel; it also includes "
@@ -182,9 +196,9 @@
 "A Unix-like operating system includes a kernel, compilers, editors, text "
 "formatters, mail software, graphical interfaces, libraries, games and many "
 "other things.  Thus, writing a whole operating system is a very large job.  "
-"We started in January 1984.  The <a href=\"http://fsf.org/\";> Free Software "
-"Foundation</a> was founded in October 1985, initially to raise funds to help "
-"develop GNU."
+"We started in January 1984.  The <a href=\"https://www.fsf.org/\";> Free "
+"Software Foundation</a> was founded in October 1985, initially to raise "
+"funds to help develop GNU."
 msgstr ""
 "یک سیستم عامل شبه یونیکس خیلی بیشتر از یک 
هسته است؛ و شامل کامپایلرها، "
 "ویرایشگرها، برنامه‌های قالب‌بندی متن، 
نرم‌افزارهای پستی و خیلی چیزهای دیگر "
@@ -193,7 +207,7 @@
 "\">بنیاد نرم‌افزار آزاد</a> در اکتبر ۱۹۸۵ 
بیشتر برای جذب سرمایه جهت کمک به "
 "توسعه گنو تاسیس شد."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "By 1990 we had either found or written all the major components except "
@@ -210,10 +224,10 @@
 "the almost-complete GNU system resulted in a complete operating system: the "
 "GNU/Linux system.  Estimates are that tens of millions of people now use GNU/"
 "Linux systems, typically via <a href=\"/distros/distros.html\">GNU/Linux "
-"distributions</a>.  The principal version of Linux now contains non-free "
+"distributions</a>.  The principal version of Linux now contains nonfree "
 "firmware &ldquo;blobs&rdquo;; free software activists now maintain a "
-"modified free version of Linux, called <a href=\"http://directory.fsf.org/";
-"project/linux\"> Linux-libre</a>."
+"modified free version of Linux, called <a href=\"https://directory.fsf.org/";
+"wiki/Linux-libre\"> Linux-libre</a>."
 msgstr ""
 "تا سال ۱۹۹۰ به تمامی اجزای اصلی سیستم عام
ل، به جز هسته دست یافتیم و یا آنها "
 "را نوشتیم. سپس لینوکس، یک هسته شبه یونیکس، 
در سال ۱۹۹۱ توسط لینوس تروالدز "
@@ -222,13 +236,20 @@
 "می‌شود که هم‌اکنون ده‌ها میلیون نفر از 
سیستم‌های گنو/لینوکس، شامل اسلکور، دبیان، "
 "ردهت و غیره استفاده می‌کنند."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "However, the GNU Project is not limited to the core operating system.  We "
+#| "aim to provide a whole spectrum of software, whatever many users want to "
+#| "have.  This includes application software.  See the <a href=\"/directory"
+#| "\">Free Software Directory</a> for a catalogue of free software "
+#| "application programs."
 msgid ""
 "However, the GNU Project is not limited to the core operating system.  We "
 "aim to provide a whole spectrum of software, whatever many users want to "
-"have.  This includes application software.  See the <a href=\"/directory"
-"\">Free Software Directory</a> for a catalogue of free software application "
-"programs."
+"have.  This includes application software.  See the <a href=\"https://";
+"directory.fsf.org/wiki/Main_Page\">Free Software Directory</a> for a "
+"catalogue of free software application programs."
 msgstr ""
 "با این حال، پروژه گنو فقط به یک سیستم عامل م
حدود نشده است. ما در نظر داریم "
 "تا یک مجموعه کامل از نرم‌افزارها را ایجاد 
کنیم، هر آنچه که بسیاری از کاربران "
@@ -236,28 +257,38 @@
 "دیدن فهرست برنامه‌های کاربردی نرم‌افزار 
آزاد به <a href=\"/directory\">شاخه "
 "نرم‌افزار آزاد</a> مراجعه نمایید."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "We also want to provide software for users who are not computer experts.  "
+#| "Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical "
+#| "desktop (called GNOME)</a> to help beginners use the GNU system."
 msgid ""
 "We also want to provide software for users who are not computer experts.  "
-"Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical desktop "
-"(called GNOME)</a> to help beginners use the GNU system."
+"Therefore we developed a <a href=\"https://www.gnome.org/\";>graphical "
+"desktop (called GNOME)</a> to help beginners use the GNU system."
 msgstr ""
 "ما همچنین قصد داریم برای کاربرانی که در زم
ینه کامپیوتر مهارت ندارند نیز "
 "نرم‌افزار تهیه کنیم به همین جهت ما یک <a 
href=\"http://www.gnome.org/\";>میز "
 "کار گرافیکی</a> به منظور کمک به کاربران 
تازه‌کار در استفاده از سیستم گنو، "
 "ایجاد کردیم."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "We also want to provide games and other recreations.  Plenty of <a href="
+#| "\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are "
+#| "already available."
 msgid ""
 "We also want to provide games and other recreations.  Plenty of <a href="
-"\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
+"\"https://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
 "available."
 msgstr ""
 "ما همچنین می‌خواهیم بازی‌ها و ابزارهای 
تفریح دیگری نیز ایجاد کنیم. تعدادی <a "
 "href=\"http://directory.fsf.org/category/Game/\";>بازی آزاد</a> هم
‌اکنون در "
 "دسترس است."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "How far can free software go? There are no limits, except when <a href=\"/"
@@ -297,6 +328,7 @@
 "دارد. لطفا لینک‌های خراب و یا مشکلات دیگر 
یا پیشنهادات خود را به <a href="
 "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a> ارسال 
کنید."
 
+# type: Content of: <div><p>
 #.  TRANSLATORS: Ignore the original text in this paragraph,
 #.         replace it with the translation of these two:
 #.         We work hard and do our best to provide accurate, good quality
@@ -304,31 +336,32 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and submitting "
+#| "translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
-"ما سخت کار می‌کنیم و تمام تلاش خود را به 
کار می‌بریم تا ترجمه‌های دقیق و با "
-"کیفیتی ارائه کنیم. اما با این حال، ما عاری 
از نقص نیستیم. لطفا نظرها و "
-"پیشنهادهای خود در این رابطه را به <a 
href=\"mailto:www-fa-general@gnu.org";
-"\">&lt;www-fa-general@gnu.org&gt;</a>ارسال نمایید.</p> <p>لطفا 
برای اطلاعات "
-"بیشتر جهت هماهنگی و ارسال ترجمه‌های این م
قاله صفحهٔ <a href=\"/server/"
-"standards/README.translations.html\">راهنمای ترجمه‌ها</a> 
را ببینید."
+"لطفا برای اطلاعات بیشتر جهت هماهنگی و 
ارسال ترجمه‌های این مقاله صفحه <a href="
+"\"/server/standards/README.translations.html\">راهنمای ترجم
ه‌ها</a> را ببینید."
 
+# type: Content of: <div><p>
 #. type: Content of: <div><p>
 #, fuzzy
+#| msgid "Copyright &copy; 2010 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017 Free Software Foundation, Inc."
-msgstr ""
-"<span dir=\"ltr\">Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, "
-"2005, 2007 Free Software Foundation, Inc.</span>"
+"Copyright &copy; 1996, 1997, 2003, 2005, 2008, 2012, 2017, 2021 Free "
+"Software Foundation, Inc."
+msgstr "Copyright &copy; 2010 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 #, fuzzy
@@ -356,6 +389,26 @@
 msgstr "آخرین به روز رسانی:"
 
 #~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "ما سخت کار می‌کنیم و تمام تلاش خود را به 
کار می‌بریم تا ترجمه‌های دقیق و با "
+#~ "کیفیتی ارائه کنیم. اما با این حال، ما 
عاری از نقص نیستیم. لطفا نظرها و "
+#~ "پیشنهادهای خود در این رابطه را به <a 
href=\"mailto:www-fa-general@gnu.org";
+#~ "\">&lt;www-fa-general@gnu.org&gt;</a>ارسال نمایید.</p> 
<p>لطفا برای "
+#~ "اطلاعات بیشتر جهت هماهنگی و ارسال ترجم
ه‌های این مقاله صفحهٔ <a href=\"/"
+#~ "server/standards/README.translations.html\">راهنمای ترجم
ه‌ها</a> را ببینید."
+
+#, fuzzy
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "<span dir=\"ltr\">Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, "
+#~ "2003, 2005, 2007 Free Software Foundation, Inc.</span>"
+
+#~ msgid ""
 #~ "This page is licensed under a <a rel=\"license\" href=\"http://";
 #~ "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
 #~ "NoDerivs 3.0 United States License</a>."

Index: po/gnu-history.fr.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-history.fr.po,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- po/gnu-history.fr.po        2 Nov 2021 13:25:56 -0000       1.64
+++ po/gnu-history.fr.po        2 Nov 2021 14:41:50 -0000       1.65
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-history.html\n"
-"POT-Creation-Date: 2017-09-04 10:56+0000\n"
+"POT-Creation-Date: 2021-11-02 13:26+0000\n"
 "PO-Revision-Date: 2021-09-12 19:21+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-11-02 13:26+0000\n"
 "Plural-Forms:  \n"
 
 #. type: Content of: <title>
@@ -28,21 +29,42 @@
 msgstr ""
 "GNU, GNU Project, FSF, Free Software, Free Software Foundation, History"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Overview of the GNU System"
 msgstr "Présentation du système GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The GNU operating system is a complete free software system,
+# | upward-compatible with Unix.  GNU stands for &ldquo;GNU's Not
+# | [-Unix&rdquo;.-] {+Unix.&rdquo;+} It is pronounced as <a
+# | href=\"/gnu/pronunciation.html\">one syllable with a hard [-g</a>.-]
+# | {+<i>g</i></a>.+}  <a href=\"http{+s+}://www.stallman.org/\">Richard
+# | Stallman</a> made the <a href=\"/gnu/initial-announcement.html\">Initial
+# | Announcement</a> of the GNU Project in September 1983.  A longer version
+# | called the <a href=\"/gnu/manifesto.html\">GNU Manifesto</a> was published
+# | in March 1985.  It has been translated into several <a
+# | href=\"/gnu/manifesto.html#translations\">other languages</a>.
+#, fuzzy
+#| msgid ""
+#| "The GNU operating system is a complete free software system, upward-"
+#| "compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.  It "
+#| "is pronounced as <a href=\"/gnu/pronunciation.html\">one syllable with a "
+#| "hard g</a>.  <a href=\"http://www.stallman.org/\";>Richard Stallman</a> "
+#| "made the <a href=\"/gnu/initial-announcement.html\">Initial Announcement</"
+#| "a> of the GNU Project in September 1983.  A longer version called the <a "
+#| "href=\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March "
+#| "1985.  It has been translated into several <a href=\"/gnu/manifesto."
+#| "html#translations\">other languages</a>."
 msgid ""
 "The GNU operating system is a complete free software system, upward-"
-"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.  It is "
+"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix.&rdquo; It is "
 "pronounced as <a href=\"/gnu/pronunciation.html\">one syllable with a hard "
-"g</a>.  <a href=\"http://www.stallman.org/\";>Richard Stallman</a> made the "
-"<a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> of the "
-"GNU Project in September 1983.  A longer version called the <a href=\"/gnu/"
-"manifesto.html\">GNU Manifesto</a> was published in March 1985.  It has been "
-"translated into several <a href=\"/gnu/manifesto.html#translations\">other "
-"languages</a>."
+"<i>g</i></a>.  <a href=\"https://www.stallman.org/\";>Richard Stallman</a> "
+"made the <a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> "
+"of the GNU Project in September 1983.  A longer version called the <a href="
+"\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March 1985.  It "
+"has been translated into several <a href=\"/gnu/manifesto.html#translations"
+"\">other languages</a>."
 msgstr ""
 "Le système d'exploitation GNU est un système complet de logiciels libres 
qui "
 "a une compatibilité ascendante avec Unix. « GNU » signifie <i>GNU's Not "
@@ -54,12 +76,24 @@
 "GNU</a> » a été publiée en septembre 1985. Il a été traduit dans 
différentes "
 "<a href=\"/gnu/manifesto.html#translations\">langues</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The name &ldquo;GNU&rdquo; was chosen because it met a few requirements;
+# | first, it was a recursive acronym for &ldquo;GNU's Not [-Unix&rdquo;,-]
+# | {+Unix,&rdquo;+} second, because it was a real word, and third, it was fun
+# | to say (or <a
+# | href=\"http://www.poppyfields.net/poppy/songs/gnu.html\";>[-S-]{+s+}ing</a>)
+# | .
+#, fuzzy
+#| msgid ""
+#| "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
+#| "first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, "
+#| "second, because it was a real word, and third, it was fun to say (or <a "
+#| "href=\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
 msgid ""
 "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
-"first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, second, "
+"first, it was a recursive acronym for &ldquo;GNU's Not Unix,&rdquo; second, "
 "because it was a real word, and third, it was fun to say (or <a href="
-"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
+"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>sing</a>)."
 msgstr ""
 "Le nom « GNU » fut choisi parce qu'il satisfaisait à plusieurs 
conditions : "
 "premièrement c'était un acronyme récursif pour <i>GNU's Not Unix</i>, en "
@@ -67,7 +101,7 @@
 "prononcer (ou à <a href=\"http://www.poppyfields.net/poppy/songs/gnu.html";
 "\">chanter</a>)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The word &ldquo;free&rdquo; in &ldquo;free software&rdquo; pertains to <a "
 "href=\"/philosophy/free-sw.html\">freedom</a>, not price.  You may or may "
@@ -94,13 +128,27 @@
 "l'acte physique de transférer une copie, ou bien vous pouvez donner cette "
 "dernière sans contrepartie)."
 
-#. type: Content of: <p>
-msgid ""
-"The project to develop the GNU system is called the &ldquo;GNU "
-"Project&rdquo;.  The GNU Project was conceived in 1983 as a way of bringing "
-"back the cooperative spirit that prevailed in the computing community in "
-"earlier days&mdash;to make cooperation possible once again by removing the "
-"obstacles to cooperation imposed by the owners of proprietary software."
+#. type: Content of: <div><p>
+# | The project to develop the GNU system is called the &ldquo;GNU
+# | [-Project&rdquo;.-] {+Project.&rdquo;+} The GNU Project was conceived in
+# | 1983 as a way of bringing back the cooperative spirit that prevailed in
+# | the computing community in earlier days&mdash;to make cooperation possible
+# | once again by removing the obstacles to cooperation imposed by the owners
+# | of proprietary software.
+#, fuzzy
+#| msgid ""
+#| "The project to develop the GNU system is called the &ldquo;GNU "
+#| "Project&rdquo;.  The GNU Project was conceived in 1983 as a way of "
+#| "bringing back the cooperative spirit that prevailed in the computing "
+#| "community in earlier days&mdash;to make cooperation possible once again "
+#| "by removing the obstacles to cooperation imposed by the owners of "
+#| "proprietary software."
+msgid ""
+"The project to develop the GNU system is called the &ldquo;GNU Project."
+"&rdquo; The GNU Project was conceived in 1983 as a way of bringing back the "
+"cooperative spirit that prevailed in the computing community in earlier "
+"days&mdash;to make cooperation possible once again by removing the obstacles "
+"to cooperation imposed by the owners of proprietary software."
 msgstr ""
 "Le projet ayant pour but de développer le système d'exploitation GNU est "
 "appelé « projet GNU ». Le projet GNU a été conçu en 1983 comme une 
manière "
@@ -110,7 +158,7 @@
 "logiciels privateurs.<a id=\"TransNote2-rev\" href=\"#TransNote2\"><sup>2</"
 "sup></a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In 1971, when Richard Stallman started his career at MIT, he worked in a "
 "group which used <a href=\"/philosophy/free-sw.html\">free software</a> "
@@ -123,7 +171,7 @@
 "des logiciels libres. Les programmeurs étaient libres de coopérer entre 
eux, "
 "et ils le faisaient souvent."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By the 1980s, almost all software was <a href=\"/philosophy/categories."
 "html#ProprietarySoftware\">proprietary</a>, which means that it had owners "
@@ -135,7 +183,7 @@
 "qui signifie que les propriétaires de logiciels interdisaient et 
empêchaient "
 "la coopération entre utilisateurs. Ceci rendit nécessaire le projet GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Every computer user needs an operating system; if there is no free operating "
 "system, then you can't even get started using a computer without resorting "
@@ -148,7 +196,7 @@
 "priorité, pour avoir du logiciel libre, était évidemment de créer un 
système "
 "d'exploitation libre."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We decided to make the operating system compatible with Unix because the "
 "overall design was already proven and portable, and because compatibility "
@@ -159,14 +207,28 @@
 "portable, et parce que, pour les utilisateurs d'Unix, la compatibilité "
 "rendait plus facile le passage à GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | A Unix-like operating system includes a kernel, compilers, editors, text
+# | formatters, mail software, graphical interfaces, libraries, games and many
+# | other things.  Thus, writing a whole operating system is a very large job.
+# |  We started in January 1984.  The <a [-href=\"http://fsf.org/\";>-]
+# | {+href=\"https://www.fsf.org/\";>+} Free Software Foundation</a> was
+# | founded in October 1985, initially to raise funds to help develop GNU.
+#, fuzzy
+#| msgid ""
+#| "A Unix-like operating system includes a kernel, compilers, editors, text "
+#| "formatters, mail software, graphical interfaces, libraries, games and "
+#| "many other things.  Thus, writing a whole operating system is a very "
+#| "large job.  We started in January 1984.  The <a href=\"http://fsf.org/\";> "
+#| "Free Software Foundation</a> was founded in October 1985, initially to "
+#| "raise funds to help develop GNU."
 msgid ""
 "A Unix-like operating system includes a kernel, compilers, editors, text "
 "formatters, mail software, graphical interfaces, libraries, games and many "
 "other things.  Thus, writing a whole operating system is a very large job.  "
-"We started in January 1984.  The <a href=\"http://fsf.org/\";> Free Software "
-"Foundation</a> was founded in October 1985, initially to raise funds to help "
-"develop GNU."
+"We started in January 1984.  The <a href=\"https://www.fsf.org/\";> Free "
+"Software Foundation</a> was founded in October 1985, initially to raise "
+"funds to help develop GNU."
 msgstr ""
 "Un système d'exploitation de type Unix comprend un noyau, des compilateurs, "
 "des éditeurs, des outils de mise en forme de texte, des logiciels de "
@@ -177,7 +239,30 @@
 "logiciel libre) a été fondée en octobre 1985, initialement dans le but de 
"
 "lever des fonds pour aider au développement de GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | By 1990 we had either found or written all the major components except
+# | one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by
+# | Linus Torvalds in 1991 and made free software in 1992.  Combining Linux
+# | with the almost-complete GNU system resulted in a complete operating
+# | system: the GNU/Linux system.  Estimates are that tens of millions of
+# | people now use GNU/Linux systems, typically via <a
+# | href=\"/distros/distros.html\">GNU/Linux distributions</a>.  The principal
+# | version of Linux now contains non[---]free firmware &ldquo;blobs&rdquo;;
+# | free software activists now maintain a modified free version of Linux,
+# | called <a [-href=\"http://directory.fsf.org/project/linux\";>-]
+# | {+href=\"https://directory.fsf.org/wiki/Linux-libre\";>+} Linux-libre</a>.
+#, fuzzy
+#| msgid ""
+#| "By 1990 we had either found or written all the major components except "
+#| "one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by "
+#| "Linus Torvalds in 1991 and made free software in 1992.  Combining Linux "
+#| "with the almost-complete GNU system resulted in a complete operating "
+#| "system: the GNU/Linux system.  Estimates are that tens of millions of "
+#| "people now use GNU/Linux systems, typically via <a href=\"/distros/"
+#| "distros.html\">GNU/Linux distributions</a>.  The principal version of "
+#| "Linux now contains non-free firmware &ldquo;blobs&rdquo;; free software "
+#| "activists now maintain a modified free version of Linux, called <a href="
+#| "\"http://directory.fsf.org/project/linux\";> Linux-libre</a>."
 msgid ""
 "By 1990 we had either found or written all the major components except "
 "one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by "
@@ -185,10 +270,10 @@
 "the almost-complete GNU system resulted in a complete operating system: the "
 "GNU/Linux system.  Estimates are that tens of millions of people now use GNU/"
 "Linux systems, typically via <a href=\"/distros/distros.html\">GNU/Linux "
-"distributions</a>.  The principal version of Linux now contains non-free "
+"distributions</a>.  The principal version of Linux now contains nonfree "
 "firmware &ldquo;blobs&rdquo;; free software activists now maintain a "
-"modified free version of Linux, called <a href=\"http://directory.fsf.org/";
-"project/linux\"> Linux-libre</a>."
+"modified free version of Linux, called <a href=\"https://directory.fsf.org/";
+"wiki/Linux-libre\"> Linux-libre</a>."
 msgstr ""
 "À l'aube des années 90, nous avions trouvé ou écrit tous les composants "
 "principaux sauf un, le noyau. Puis Linux, un noyau de type Unix, fut "
@@ -203,13 +288,26 @@
 "libre de Linux appelée <a href=\"http://directory.fsf.org/project/linux";
 "\">Linux-libre</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | However, the GNU Project is not limited to the core operating system.  We
+# | aim to provide a whole spectrum of software, whatever many users want to
+# | have.  This includes application software.  See the <a
+# | [-href=\"/directory\">Free-]
+# | {+href=\"https://directory.fsf.org/wiki/Main_Page\";>Free+} Software
+# | Directory</a> for a catalogue of free software application programs.
+#, fuzzy
+#| msgid ""
+#| "However, the GNU Project is not limited to the core operating system.  We "
+#| "aim to provide a whole spectrum of software, whatever many users want to "
+#| "have.  This includes application software.  See the <a href=\"/directory"
+#| "\">Free Software Directory</a> for a catalogue of free software "
+#| "application programs."
 msgid ""
 "However, the GNU Project is not limited to the core operating system.  We "
 "aim to provide a whole spectrum of software, whatever many users want to "
-"have.  This includes application software.  See the <a href=\"/directory"
-"\">Free Software Directory</a> for a catalogue of free software application "
-"programs."
+"have.  This includes application software.  See the <a href=\"https://";
+"directory.fsf.org/wiki/Main_Page\">Free Software Directory</a> for a "
+"catalogue of free software application programs."
 msgstr ""
 "Cependant, le projet GNU ne se limite pas au système d'exploitation. Nous "
 "aspirons à fournir tout l'éventail du logiciel, tout ce qui peut 
intéresser "
@@ -217,28 +315,44 @@
 "catalogue d'applications libres dans le <a href=\"/directory\">répertoire du 
"
 "logiciel libre</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | We also want to provide software for users who are not computer experts. 
+# | Therefore we developed a <a href=\"http{+s+}://www.gnome.org/\">graphical
+# | desktop (called GNOME)</a> to help beginners use the GNU system.
+#, fuzzy
+#| msgid ""
+#| "We also want to provide software for users who are not computer experts.  "
+#| "Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical "
+#| "desktop (called GNOME)</a> to help beginners use the GNU system."
 msgid ""
 "We also want to provide software for users who are not computer experts.  "
-"Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical desktop "
-"(called GNOME)</a> to help beginners use the GNU system."
+"Therefore we developed a <a href=\"https://www.gnome.org/\";>graphical "
+"desktop (called GNOME)</a> to help beginners use the GNU system."
 msgstr ""
 "Nous voulons également fournir des logiciels pour les utilisateurs qui ne "
 "sont pas experts en informatique. Nous avons donc développé <a 
href=\"http://";
 "www.gnome.org/\">une interface graphique (appelée GNOME)</a> [en] pour 
aider "
 "les débutants à utiliser le système GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | We also want to provide games and other recreations.  Plenty of <a
+# | href=\"http{+s+}://directory.fsf.org/wiki/Category/Game\">free games</a>
+# | are already available.
+#, fuzzy
+#| msgid ""
+#| "We also want to provide games and other recreations.  Plenty of <a href="
+#| "\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are "
+#| "already available."
 msgid ""
 "We also want to provide games and other recreations.  Plenty of <a href="
-"\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
+"\"https://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
 "available."
 msgstr ""
 "Enfin, nous voulons fournir des jeux et autres logiciels récréatifs. Un "
 "grand nombre de <a href=\"http://directory.fsf.org/wiki/Category/Game\";>jeux "
 "libres</a> [en] sont déjà disponibles."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "How far can free software go? There are no limits, except when <a href=\"/"
 "philosophy/fighting-software-patents.html\">laws such as the patent system "
@@ -290,14 +404,14 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Merci d'adresser vos commentaires sur les pages en français à &lt;<a href="
@@ -308,12 +422,16 @@
 "traduction</a> les infos nécessaires."
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017 Free Software Foundation, Inc."
+# | Copyright &copy; [-2014, 2015, 2016,-] {+1996, 1997, 2003, 2005, 2008,
+# | 2012,+} 2017, [-2018, 2019-] {+2021+} Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2014, 2015, 2016, 2017, 2018, 2019 Free Software "
+#| "Foundation, Inc."
+msgid ""
+"Copyright &copy; 1996, 1997, 2003, 2005, 2008, 2012, 2017, 2021 Free "
+"Software Foundation, Inc."
+msgstr "Copyright &copy; 2014-2019 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -338,10 +456,16 @@
 msgid "Updated:"
 msgstr "Dernière mise à jour :"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017, 2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017, 2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017 Free Software Foundation, Inc."
+
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017, 2021 Free Software Foundation, Inc."

Index: po/gnu-history.hr.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-history.hr.po,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- po/gnu-history.hr.po        2 Nov 2021 13:25:56 -0000       1.10
+++ po/gnu-history.hr.po        2 Nov 2021 14:41:50 -0000       1.11
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-history.html\n"
-"POT-Creation-Date: 2017-09-04 10:56+0000\n"
+"POT-Creation-Date: 2021-11-02 13:26+0000\n"
 "PO-Revision-Date: 2013-06-12 21:13+0100\n"
 "Last-Translator: Martina Bebek <martinaporec@gmail.com>\n"
 "Language-Team: www-hr <www-hr-lista@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-11-02 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"
@@ -30,21 +31,42 @@
 "GNU, Projekt GNU, FSF, Slobodan softver, Zaklada za slobodan softver, "
 "Povijest"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Overview of the GNU System"
 msgstr "Prikaz sustava GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The GNU operating system is a complete free software system,
+# | upward-compatible with Unix.  GNU stands for &ldquo;GNU's Not
+# | [-Unix&rdquo;.-] {+Unix.&rdquo;+} It is pronounced as <a
+# | href=\"/gnu/pronunciation.html\">one syllable with a hard [-g</a>.-]
+# | {+<i>g</i></a>.+}  <a href=\"http{+s+}://www.stallman.org/\">Richard
+# | Stallman</a> made the <a href=\"/gnu/initial-announcement.html\">Initial
+# | Announcement</a> of the GNU Project in September 1983.  A longer version
+# | called the <a href=\"/gnu/manifesto.html\">GNU Manifesto</a> was published
+# | in March 1985.  It has been translated into several <a
+# | href=\"/gnu/manifesto.html#translations\">other languages</a>.
+#, fuzzy
+#| msgid ""
+#| "The GNU operating system is a complete free software system, upward-"
+#| "compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.  It "
+#| "is pronounced as <a href=\"/gnu/pronunciation.html\">one syllable with a "
+#| "hard g</a>.  <a href=\"http://www.stallman.org/\";>Richard Stallman</a> "
+#| "made the <a href=\"/gnu/initial-announcement.html\">Initial Announcement</"
+#| "a> of the GNU Project in September 1983.  A longer version called the <a "
+#| "href=\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March "
+#| "1985.  It has been translated into several <a href=\"/gnu/manifesto."
+#| "html#translations\">other languages</a>."
 msgid ""
 "The GNU operating system is a complete free software system, upward-"
-"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.  It is "
+"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix.&rdquo; It is "
 "pronounced as <a href=\"/gnu/pronunciation.html\">one syllable with a hard "
-"g</a>.  <a href=\"http://www.stallman.org/\";>Richard Stallman</a> made the "
-"<a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> of the "
-"GNU Project in September 1983.  A longer version called the <a href=\"/gnu/"
-"manifesto.html\">GNU Manifesto</a> was published in March 1985.  It has been "
-"translated into several <a href=\"/gnu/manifesto.html#translations\">other "
-"languages</a>."
+"<i>g</i></a>.  <a href=\"https://www.stallman.org/\";>Richard Stallman</a> "
+"made the <a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> "
+"of the GNU Project in September 1983.  A longer version called the <a href="
+"\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March 1985.  It "
+"has been translated into several <a href=\"/gnu/manifesto.html#translations"
+"\">other languages</a>."
 msgstr ""
 "Operacijski sustav GNU je potpun sustav slobodnog softvera, unaprijed "
 "kompatibilan s Unixom. GNU znači &ldquo;GNU Nije Unix&rdquo;.  <a href=\"/"
@@ -55,12 +77,24 @@
 "objavljena je u ožujku 1985. godine.  Prevedena je na više <a href=\"/gnu/"
 "manifesto.html#translations\">različitih jezika</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The name &ldquo;GNU&rdquo; was chosen because it met a few requirements;
+# | first, it was a recursive acronym for &ldquo;GNU's Not [-Unix&rdquo;,-]
+# | {+Unix,&rdquo;+} second, because it was a real word, and third, it was fun
+# | to say (or <a
+# | href=\"http://www.poppyfields.net/poppy/songs/gnu.html\";>[-S-]{+s+}ing</a>)
+# | .
+#, fuzzy
+#| msgid ""
+#| "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
+#| "first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, "
+#| "second, because it was a real word, and third, it was fun to say (or <a "
+#| "href=\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
 msgid ""
 "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
-"first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, second, "
+"first, it was a recursive acronym for &ldquo;GNU's Not Unix,&rdquo; second, "
 "because it was a real word, and third, it was fun to say (or <a href="
-"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
+"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>sing</a>)."
 msgstr ""
 "Naziv &ldquo;GNU&rdquo; odabran je zbog toga Å¡to ispunjava nekoliko "
 "zahtjeva: prvo, rekurzivna je skraćenica izraza &ldquo;GNU Nije Unix&rdquo;, 
"
@@ -68,7 +102,7 @@
 "ju (ili <a href=\"http://www.poppyfields.net/poppy/songs/gnu.html";
 "\">otpjevati</a>)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The word &ldquo;free&rdquo; in &ldquo;free software&rdquo; pertains to <a "
 "href=\"/philosophy/free-sw.html\">freedom</a>, not price.  You may or may "
@@ -92,13 +126,27 @@
 "ov softver, možete naplatiti naknadu za fizički čin umnožavanja 
primjeraka "
 "ili ih možete dati besplatno.)"
 
-#. type: Content of: <p>
-msgid ""
-"The project to develop the GNU system is called the &ldquo;GNU "
-"Project&rdquo;.  The GNU Project was conceived in 1983 as a way of bringing "
-"back the cooperative spirit that prevailed in the computing community in "
-"earlier days&mdash;to make cooperation possible once again by removing the "
-"obstacles to cooperation imposed by the owners of proprietary software."
+#. type: Content of: <div><p>
+# | The project to develop the GNU system is called the &ldquo;GNU
+# | [-Project&rdquo;.-] {+Project.&rdquo;+} The GNU Project was conceived in
+# | 1983 as a way of bringing back the cooperative spirit that prevailed in
+# | the computing community in earlier days&mdash;to make cooperation possible
+# | once again by removing the obstacles to cooperation imposed by the owners
+# | of proprietary software.
+#, fuzzy
+#| msgid ""
+#| "The project to develop the GNU system is called the &ldquo;GNU "
+#| "Project&rdquo;.  The GNU Project was conceived in 1983 as a way of "
+#| "bringing back the cooperative spirit that prevailed in the computing "
+#| "community in earlier days&mdash;to make cooperation possible once again "
+#| "by removing the obstacles to cooperation imposed by the owners of "
+#| "proprietary software."
+msgid ""
+"The project to develop the GNU system is called the &ldquo;GNU Project."
+"&rdquo; The GNU Project was conceived in 1983 as a way of bringing back the "
+"cooperative spirit that prevailed in the computing community in earlier "
+"days&mdash;to make cooperation possible once again by removing the obstacles "
+"to cooperation imposed by the owners of proprietary software."
 msgstr ""
 "Projekt za razvoj sustava GNU zove se &ldquo;Projekt GNU&rdquo;.  Projekt "
 "GNU začet je 1983. godine kao način vraćanja duha suradnje koji je u 
ranijim "
@@ -106,7 +154,7 @@
 "prepreka suradnji koje su nametnuli vlasnici vlasničkog softvera, ponovo "
 "omogućila suradnja."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In 1971, when Richard Stallman started his career at MIT, he worked in a "
 "group which used <a href=\"/philosophy/free-sw.html\">free software</a> "
@@ -119,7 +167,7 @@
 "slobodan softver. Programeri su bili slobodni surađivati međusobno, što su 
"
 "često i činili."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By the 1980s, almost all software was <a href=\"/philosophy/categories."
 "html#ProprietarySoftware\">proprietary</a>, which means that it had owners "
@@ -131,7 +179,7 @@
 "da je imao vlasnike koji su zabranjivali i sprečavali suradnju korisnika. To 
"
 "je učinilo projekt GNU neophodnim."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Every computer user needs an operating system; if there is no free operating "
 "system, then you can't even get started using a computer without resorting "
@@ -143,7 +191,7 @@
 "bez pribjegavanja vlasničkom softveru. Stoga je prva stavka plana slobodnog "
 "softvera očito morao biti slobodan operacijski sustav."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We decided to make the operating system compatible with Unix because the "
 "overall design was already proven and portable, and because compatibility "
@@ -153,14 +201,28 @@
 "cjelokupan dizajn već bio dokazan i prenosiv, a i stoga jer kompatibilnost "
 "olakšava korisnicima Unixa da prijeđu s Unixa na GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | A Unix-like operating system includes a kernel, compilers, editors, text
+# | formatters, mail software, graphical interfaces, libraries, games and many
+# | other things.  Thus, writing a whole operating system is a very large job.
+# |  We started in January 1984.  The <a [-href=\"http://fsf.org/\";>-]
+# | {+href=\"https://www.fsf.org/\";>+} Free Software Foundation</a> was
+# | founded in October 1985, initially to raise funds to help develop GNU.
+#, fuzzy
+#| msgid ""
+#| "A Unix-like operating system includes a kernel, compilers, editors, text "
+#| "formatters, mail software, graphical interfaces, libraries, games and "
+#| "many other things.  Thus, writing a whole operating system is a very "
+#| "large job.  We started in January 1984.  The <a href=\"http://fsf.org/\";> "
+#| "Free Software Foundation</a> was founded in October 1985, initially to "
+#| "raise funds to help develop GNU."
 msgid ""
 "A Unix-like operating system includes a kernel, compilers, editors, text "
 "formatters, mail software, graphical interfaces, libraries, games and many "
 "other things.  Thus, writing a whole operating system is a very large job.  "
-"We started in January 1984.  The <a href=\"http://fsf.org/\";> Free Software "
-"Foundation</a> was founded in October 1985, initially to raise funds to help "
-"develop GNU."
+"We started in January 1984.  The <a href=\"https://www.fsf.org/\";> Free "
+"Software Foundation</a> was founded in October 1985, initially to raise "
+"funds to help develop GNU."
 msgstr ""
 "Operacijski sustav sličan Unixu uključuje jezgru, prevodioce, uređivače "
 "teksta, oblikovatelje teksta, grafička sučelja, biblioteke, igre i mnoge "
@@ -169,7 +231,30 @@
 "Zaklada za slobodan softver</a> osnovana je u listopadu 1985. godine, u "
 "početku kako bi skupila sredstva koja bi pomogla razvoju GNU-a."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | By 1990 we had either found or written all the major components except
+# | one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by
+# | Linus Torvalds in 1991 and made free software in 1992.  Combining Linux
+# | with the almost-complete GNU system resulted in a complete operating
+# | system: the GNU/Linux system.  Estimates are that tens of millions of
+# | people now use GNU/Linux systems, typically via <a
+# | href=\"/distros/distros.html\">GNU/Linux distributions</a>.  The principal
+# | version of Linux now contains non[---]free firmware &ldquo;blobs&rdquo;;
+# | free software activists now maintain a modified free version of Linux,
+# | called <a [-href=\"http://directory.fsf.org/project/linux\";>-]
+# | {+href=\"https://directory.fsf.org/wiki/Linux-libre\";>+} Linux-libre</a>.
+#, fuzzy
+#| msgid ""
+#| "By 1990 we had either found or written all the major components except "
+#| "one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by "
+#| "Linus Torvalds in 1991 and made free software in 1992.  Combining Linux "
+#| "with the almost-complete GNU system resulted in a complete operating "
+#| "system: the GNU/Linux system.  Estimates are that tens of millions of "
+#| "people now use GNU/Linux systems, typically via <a href=\"/distros/"
+#| "distros.html\">GNU/Linux distributions</a>.  The principal version of "
+#| "Linux now contains non-free firmware &ldquo;blobs&rdquo;; free software "
+#| "activists now maintain a modified free version of Linux, called <a href="
+#| "\"http://directory.fsf.org/project/linux\";> Linux-libre</a>."
 msgid ""
 "By 1990 we had either found or written all the major components except "
 "one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by "
@@ -177,10 +262,10 @@
 "the almost-complete GNU system resulted in a complete operating system: the "
 "GNU/Linux system.  Estimates are that tens of millions of people now use GNU/"
 "Linux systems, typically via <a href=\"/distros/distros.html\">GNU/Linux "
-"distributions</a>.  The principal version of Linux now contains non-free "
+"distributions</a>.  The principal version of Linux now contains nonfree "
 "firmware &ldquo;blobs&rdquo;; free software activists now maintain a "
-"modified free version of Linux, called <a href=\"http://directory.fsf.org/";
-"project/linux\"> Linux-libre</a>."
+"modified free version of Linux, called <a href=\"https://directory.fsf.org/";
+"wiki/Linux-libre\"> Linux-libre</a>."
 msgstr ""
 "Do 1990. godine pronašli smo ili napisali sve glavne komponente osim "
 "jedne&mdash;jezgre. Onda je Linus Torvalds 1991. godine razvio Linux, jezgru "
@@ -194,39 +279,68 @@
 "Linuxa, nazvanu <a href=\"http://directory.fsf.org/project/linux\";> Linux-"
 "libre</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | However, the GNU Project is not limited to the core operating system.  We
+# | aim to provide a whole spectrum of software, whatever many users want to
+# | have.  This includes application software.  See the <a
+# | [-href=\"/directory\">Free-]
+# | {+href=\"https://directory.fsf.org/wiki/Main_Page\";>Free+} Software
+# | Directory</a> for a catalogue of free software application programs.
+#, fuzzy
+#| msgid ""
+#| "However, the GNU Project is not limited to the core operating system.  We "
+#| "aim to provide a whole spectrum of software, whatever many users want to "
+#| "have.  This includes application software.  See the <a href=\"/directory"
+#| "\">Free Software Directory</a> for a catalogue of free software "
+#| "application programs."
 msgid ""
 "However, the GNU Project is not limited to the core operating system.  We "
 "aim to provide a whole spectrum of software, whatever many users want to "
-"have.  This includes application software.  See the <a href=\"/directory"
-"\">Free Software Directory</a> for a catalogue of free software application "
-"programs."
+"have.  This includes application software.  See the <a href=\"https://";
+"directory.fsf.org/wiki/Main_Page\">Free Software Directory</a> for a "
+"catalogue of free software application programs."
 msgstr ""
 "Međutim, projekt GNU nije ograničen na srce operacijskog sustava. Težimo "
 "pružiti čitav spektar softvera, sve što mnogi korisnici žele imati. Ovo "
 "uključuje aplikacijski softver.  Pogledajte <a href=\"/directory\">Katalog "
 "slobodnog softvera</a>, katalog aplikacijskih programa slobodnog softvera."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | We also want to provide software for users who are not computer experts. 
+# | Therefore we developed a <a href=\"http{+s+}://www.gnome.org/\">graphical
+# | desktop (called GNOME)</a> to help beginners use the GNU system.
+#, fuzzy
+#| msgid ""
+#| "We also want to provide software for users who are not computer experts.  "
+#| "Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical "
+#| "desktop (called GNOME)</a> to help beginners use the GNU system."
 msgid ""
 "We also want to provide software for users who are not computer experts.  "
-"Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical desktop "
-"(called GNOME)</a> to help beginners use the GNU system."
+"Therefore we developed a <a href=\"https://www.gnome.org/\";>graphical "
+"desktop (called GNOME)</a> to help beginners use the GNU system."
 msgstr ""
 "Želimo također pružiti softver korisnicima koji nisu računalni 
stručnjaci. "
 "Stoga je razvijena <a href=\"http://www.gnome.org/\";>grafička radna 
površina "
 "(nazvana GNOME)</a> kako bi početnicima olakšala korištenje sustava GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | We also want to provide games and other recreations.  Plenty of <a
+# | href=\"http{+s+}://directory.fsf.org/wiki/Category/Game\">free games</a>
+# | are already available.
+#, fuzzy
+#| msgid ""
+#| "We also want to provide games and other recreations.  Plenty of <a href="
+#| "\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are "
+#| "already available."
 msgid ""
 "We also want to provide games and other recreations.  Plenty of <a href="
-"\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
+"\"https://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
 "available."
 msgstr ""
 "Želimo isto tako pružiti igre i drugu zabavu. Mnogo<a href=\"http://";
 "directory.fsf.org/wiki/Category/Game\">slobodnih igara</a> već je dostupno."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "How far can free software go? There are no limits, except when <a href=\"/"
 "philosophy/fighting-software-patents.html\">laws such as the patent system "
@@ -266,14 +380,20 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Radimo naporno i dajemo sve od sebe da bi pružili točne, visoko kvalitetne "
@@ -285,12 +405,14 @@
 "prijevode</a>."
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017 Free Software Foundation, Inc."
+# | Copyright &copy; [-2010, 2013-] {+1996, 1997, 2003, 2005, 2008, 2012,
+# | 2017, 2021+} Free Software Foundation, Inc.
+#, fuzzy
+#| msgid "Copyright &copy; 2010, 2013 Free Software Foundation, Inc."
+msgid ""
+"Copyright &copy; 1996, 1997, 2003, 2005, 2008, 2012, 2017, 2021 Free "
+"Software Foundation, Inc."
+msgstr "Copyright &copy; 2010, 2013 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -312,10 +434,29 @@
 msgid "Updated:"
 msgstr "Zadnji put promijenjeno:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017, 2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017, 2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "Radimo naporno i dajemo sve od sebe da bi pružili točne, visoko "
+#~ "kvalitetne prijevode. Međutim, nismo oslobođeni od nesavršenosti. Molim 
"
+#~ "vas šaljite vaše komentare i općenite prijedloge u tom smislu na <a 
href="
+#~ "\"mailto:web-translators@gnu.org\";>&lt;web-translators@gnu.org&gt;</a>.</"
+#~ "p> <p>Za informacije o koordiniranju i slanju prijevoda naših mrežnih "
+#~ "stranica, pogledajte <a href=\"/server/standards/README.translations.html"
+#~ "\">README za prijevode</a>."
+
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017 Free Software Foundation, Inc."
+
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017, 2021 Free Software Foundation, Inc."

Index: po/gnu-history.id.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-history.id.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- po/gnu-history.id.po        4 Sep 2017 11:03:01 -0000       1.3
+++ po/gnu-history.id.po        2 Nov 2021 14:41:50 -0000       1.4
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu/gnu-history.html\n"
-"POT-Creation-Date: 2017-09-04 10:56+0000\n"
+"POT-Creation-Date: 2021-11-02 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"
@@ -27,16 +27,19 @@
 "GNU, Proyek GNU, FSF, Perangkat Lunak Bebas, Free Software Foundation, "
 "Yayasan Perangkat Lunak Bebas, Sejarah"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Overview of the GNU System"
 msgstr "Sekilas Sistem GNU"
 
+#. type: Content of: <div><p>
 # | The GNU [-Project has developed-] {+operating system is+} a complete free
-# | software [-system named &ldquo;GNU&rdquo; (GNU's Not Unix) that is
-# | upwardly compatible-] {+system, upward-compatible+} with Unix.  {+GNU
-# | stands for &ldquo;GNU's Not Unix&rdquo;.+}  <a
-# | href=\"http://www.stallman.org/\";>Richard [-Stallman</a>'s initial
-# | document on-] {+Stallman</a> made the <a
+# | software [-system named &ldquo;GNU&rdquo; (GNU's-] {+system,
+# | upward-compatible with Unix.  GNU stands for &ldquo;GNU's+} Not [-Unix)
+# | that-] {+Unix.&rdquo; It+} is [-upwardly compatible-] {+pronounced as <a
+# | href=\"/gnu/pronunciation.html\">one syllable+} with [-Unix.-] {+a hard
+# | <i>g</i></a>.+}  <a [-href=\"http://www.stallman.org/\";>Richard
+# | Stallman</a>'s initial document on-]
+# | {+href=\"https://www.stallman.org/\";>Richard Stallman</a> made the <a
 # | href=\"/gnu/initial-announcement.html\">Initial Announcement</a> of+} the
 # | GNU Project [-is-] {+in September 1983.  A longer version+} called the <a
 # | href=\"/gnu/manifesto.html\">GNU [-Manifesto</a>, which-] {+Manifesto</a>
@@ -44,7 +47,6 @@
 # | href=\"/gnu/manifesto.html#translations\">other languages</a>.  [-We also
 # | have the <a href=\"/gnu/initial-announcement.html\">Initial
 # | Announcement</a> of the GNU Project, written in 1983.-]
-#. type: Content of: <p>
 #, fuzzy
 #| msgid ""
 #| "The GNU Project has developed a complete free software system named "
@@ -57,14 +59,14 @@
 #| "Announcement</a> of the GNU Project, written in 1983."
 msgid ""
 "The GNU operating system is a complete free software system, upward-"
-"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.  It is "
+"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix.&rdquo; It is "
 "pronounced as <a href=\"/gnu/pronunciation.html\">one syllable with a hard "
-"g</a>.  <a href=\"http://www.stallman.org/\";>Richard Stallman</a> made the "
-"<a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> of the "
-"GNU Project in September 1983.  A longer version called the <a href=\"/gnu/"
-"manifesto.html\">GNU Manifesto</a> was published in March 1985.  It has been "
-"translated into several <a href=\"/gnu/manifesto.html#translations\">other "
-"languages</a>."
+"<i>g</i></a>.  <a href=\"https://www.stallman.org/\";>Richard Stallman</a> "
+"made the <a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> "
+"of the GNU Project in September 1983.  A longer version called the <a href="
+"\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March 1985.  It "
+"has been translated into several <a href=\"/gnu/manifesto.html#translations"
+"\">other languages</a>."
 msgstr ""
 "Proyek GNU telah mengembangkan sebuah sistem perangkat lunak bebas lengkap "
 "yaitu &ldquo;GNU&rdquo; (GNU's Not Unix, GNU bukan Unix) yang kompatibel "
@@ -75,14 +77,15 @@
 "announcement.html\">Pengumuman pertama</a> perihal proyek ini ditulis pada "
 "tahun 1983."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
-"first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, second, "
+"first, it was a recursive acronym for &ldquo;GNU's Not Unix,&rdquo; second, "
 "because it was a real word, and third, it was fun to say (or <a href="
-"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
+"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>sing</a>)."
 msgstr ""
 
+#. type: Content of: <div><p>
 # | The word &ldquo;free&rdquo; [-above-] {+in &ldquo;free software&rdquo;+}
 # | pertains to <a href=\"/philosophy/free-sw.html\">freedom</a>, not price. 
 # | You may or may not pay a price to get GNU software.  Either way, once you
@@ -93,7 +96,6 @@
 # | distribute an improved version and thus help build the community.  (If you
 # | redistribute GNU software, you may charge a fee for the physical act of
 # | transferring a copy, or you may give away copies.)
-#. type: Content of: <p>
 #, fuzzy
 #| msgid ""
 #| "The word &ldquo;free&rdquo; above pertains to <a href=\"/philosophy/free-"
@@ -131,13 +133,13 @@
 "mendistribusikan ulang perangkat lunak GNU, anda dapat meminta biaya "
 "duplikasi, atau juga dapat memberikan secara cuma-cuma)."
 
+#. type: Content of: <div><p>
 # | The {+project to develop the GNU system is called the &ldquo;GNU
-# | Project&rdquo;.  The+} GNU Project was conceived in 1983 as a way of
+# | Project.&rdquo; The+} GNU Project was conceived in 1983 as a way of
 # | bringing back the cooperative spirit that prevailed in the computing
 # | community in earlier days&mdash;to make cooperation possible once again by
 # | removing the obstacles to cooperation imposed by the owners of proprietary
 # | software.
-#. type: Content of: <p>
 #, fuzzy
 #| msgid ""
 #| "The GNU Project was conceived in 1983 as a way of bringing back the "
@@ -145,18 +147,18 @@
 #| "days&mdash;to make cooperation possible once again by removing the "
 #| "obstacles to cooperation imposed by the owners of proprietary software."
 msgid ""
-"The project to develop the GNU system is called the &ldquo;GNU "
-"Project&rdquo;.  The GNU Project was conceived in 1983 as a way of bringing "
-"back the cooperative spirit that prevailed in the computing community in "
-"earlier days&mdash;to make cooperation possible once again by removing the "
-"obstacles to cooperation imposed by the owners of proprietary software."
+"The project to develop the GNU system is called the &ldquo;GNU Project."
+"&rdquo; The GNU Project was conceived in 1983 as a way of bringing back the "
+"cooperative spirit that prevailed in the computing community in earlier "
+"days&mdash;to make cooperation possible once again by removing the obstacles "
+"to cooperation imposed by the owners of proprietary software."
 msgstr ""
 "Proyek GNU dicanangkan pada tahun 1983 sebagai cara untuk mengembalikan "
 "semangat gotong-royong masyarakat pengguna komputer pada zaman permulaan "
 "adanya komputer&mdash;agar kerja-sama dimungkinkan kembali setelah timbul "
 "usaha untuk menjadikan perangkat lunak sebagai milik perusahaan."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In 1971, when Richard Stallman started his career at MIT, he worked in a "
 "group which used <a href=\"/philosophy/free-sw.html\">free software</a> "
@@ -169,7 +171,7 @@
 "komputer pun sering mendistribusikan perangkat lunak bebas. Para programer "
 "pun dapat dan sering secara bebas untuk saling bekerja sama."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By the 1980s, almost all software was <a href=\"/philosophy/categories."
 "html#ProprietarySoftware\">proprietary</a>, which means that it had owners "
@@ -181,11 +183,11 @@
 "pemilik perangkat lunak yang melarang dan mencegah kerjasama antara para "
 "pengguna. Hal inilah yang mencetuskan dimulainya proyek GNU."
 
+#. type: Content of: <div><p>
 # | Every computer user needs an operating system; if there is no free
 # | operating system, then you can't even get started using a computer without
 # | resorting to proprietary software.  So the first item on the free software
 # | agenda [-is-] {+obviously had to be+} a free operating system.
-#. type: Content of: <p>
 #, fuzzy
 #| msgid ""
 #| "Every computer user needs an operating system; if there is no free "
@@ -204,7 +206,7 @@
 "Maka dari itu, perangkat lunak bebas pertama yang diagendakan adalah sistem "
 "operasi bebas."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We decided to make the operating system compatible with Unix because the "
 "overall design was already proven and portable, and because compatibility "
@@ -215,14 +217,14 @@
 "kompatibilitas yang membuatnya mudah bagi pengguna Unix untuk berganti ke "
 "GNU."
 
+#. type: Content of: <div><p>
 # | [-An-]{+A Unix-like+} operating system [-is not just a kernel; it also-]
 # | includes {+a kernel,+} compilers, editors, text formatters, mail software,
 # | {+graphical interfaces, libraries, games+} and many other things.  Thus,
 # | writing a whole operating system is a very large job.  [-It took many
-# | years.-]  {+We started in January 1984.  The <a href=\"http://fsf.org/\";>
-# | Free Software Foundation</a> was founded in October 1985, initially to
-# | raise funds to help develop GNU.+}
-#. type: Content of: <p>
+# | years.-]  {+We started in January 1984.  The <a
+# | href=\"https://www.fsf.org/\";> Free Software Foundation</a> was founded in
+# | October 1985, initially to raise funds to help develop GNU.+}
 #, fuzzy
 #| msgid ""
 #| "An operating system is not just a kernel; it also includes compilers, "
@@ -232,15 +234,16 @@
 "A Unix-like operating system includes a kernel, compilers, editors, text "
 "formatters, mail software, graphical interfaces, libraries, games and many "
 "other things.  Thus, writing a whole operating system is a very large job.  "
-"We started in January 1984.  The <a href=\"http://fsf.org/\";> Free Software "
-"Foundation</a> was founded in October 1985, initially to raise funds to help "
-"develop GNU."
+"We started in January 1984.  The <a href=\"https://www.fsf.org/\";> Free "
+"Software Foundation</a> was founded in October 1985, initially to raise "
+"funds to help develop GNU."
 msgstr ""
 "Sistem operasi bukanlah hanya kernel, tapi juga mencakup kompilator, editor, "
 "pemformat teks, perangkat lunak pengirim surat, dan lain sebagainya. Oleh "
 "karena itu memprogram sistem operasi merupakan pekerjaan yang sangat besar, "
 "yang membutuhkan waktu bertahun-tahun."
 
+#. type: Content of: <div><p>
 # | [-The initial goal of a free Unix-like operating system has been
 # | achieved.-]By [-the 1990s,-] {+1990+} we had either found or written all
 # | the major components except one&mdash;the kernel.  Then Linux, a [-free-]
@@ -250,12 +253,11 @@
 # | Linux-based GNU-] {+the GNU/Linux+} system.  Estimates are that
 # | [-hundreds-] {+tens+} of [-thousands-] {+millions+} of people now use
 # | [-Linux-based GNU-] {+GNU/Linux+} systems, [-including Slackware, Debian,
-# | Red Hat, and others.-] {+typically via <a href=\"/distros\">GNU/Linux
-# | distributions</a>.  The principal version of Linux now contains non-free
-# | firmware &ldquo;blobs&rdquo;; free software activists now maintain a
-# | modified free version of Linux, called <a
-# | href=\"http://directory.fsf.org/project/linux\";> Linux-libre</a>.+}
-#. type: Content of: <p>
+# | Red Hat, and others.-] {+typically via <a
+# | href=\"/distros/distros.html\">GNU/Linux distributions</a>.  The principal
+# | version of Linux now contains nonfree firmware &ldquo;blobs&rdquo;; free
+# | software activists now maintain a modified free version of Linux, called
+# | <a href=\"https://directory.fsf.org/wiki/Linux-libre\";> Linux-libre</a>.+}
 #, fuzzy
 #| msgid ""
 #| "The initial goal of a free Unix-like operating system has been achieved.  "
@@ -272,10 +274,10 @@
 "the almost-complete GNU system resulted in a complete operating system: the "
 "GNU/Linux system.  Estimates are that tens of millions of people now use GNU/"
 "Linux systems, typically via <a href=\"/distros/distros.html\">GNU/Linux "
-"distributions</a>.  The principal version of Linux now contains non-free "
+"distributions</a>.  The principal version of Linux now contains nonfree "
 "firmware &ldquo;blobs&rdquo;; free software activists now maintain a "
-"modified free version of Linux, called <a href=\"http://directory.fsf.org/";
-"project/linux\"> Linux-libre</a>."
+"modified free version of Linux, called <a href=\"https://directory.fsf.org/";
+"wiki/Linux-libre\"> Linux-libre</a>."
 msgstr ""
 "Tujuan awal dari sistem operasi seperti Unix yang bebas telah berhasil "
 "diperoleh. Hingga tahun 1990-an, kami telah menyelesaikan komponen-komponen "
@@ -286,14 +288,14 @@
 "menggunakan sistem GNU berbasiskan Linux, termasuk Slackware, Debian, Red "
 "Hat dan lainnya."
 
+#. type: Content of: <div><p>
 # | However, the GNU Project is not limited to {+the core+} operating
 # | system[-s-].  We aim to provide a whole spectrum of software, whatever
 # | many users want to have.  This includes application software.  [-We
 # | already have a spreadsheet.  We hope to extend GNU Emacs into a WYSIWYG
 # | desktop publishing system over-]  {+See+} the [-coming years.-] {+<a
-# | href=\"/directory\">Free Software Directory</a> for a catalogue of free
-# | software application programs.+}
-#. type: Content of: <p>
+# | href=\"https://directory.fsf.org/wiki/Main_Page\";>Free Software
+# | Directory</a> for a catalogue of free software application programs.+}
 #, fuzzy
 #| msgid ""
 #| "However, the GNU Project is not limited to operating systems.  We aim to "
@@ -304,9 +306,9 @@
 msgid ""
 "However, the GNU Project is not limited to the core operating system.  We "
 "aim to provide a whole spectrum of software, whatever many users want to "
-"have.  This includes application software.  See the <a href=\"/directory"
-"\">Free Software Directory</a> for a catalogue of free software application "
-"programs."
+"have.  This includes application software.  See the <a href=\"https://";
+"directory.fsf.org/wiki/Main_Page\">Free Software Directory</a> for a "
+"catalogue of free software application programs."
 msgstr ""
 "Bagaimana pun, kegiatan proyek GNU tidak hanya terbatas pada sistem "
 "operasi.  Kami bertujuan untuk menyediakan segala ragam perangkat lunak, apa "
@@ -316,12 +318,12 @@
 "(<cite>What You See Is What You Get</cite>, Anda mendapatkan yang anda "
 "lihat)  dalam beberapa tahun mendatang."
 
+#. type: Content of: <div><p>
 # | We also want to provide software for users who are not computer experts. 
 # | Therefore we [-are now working on-] {+developed+} a <a
 # | [-href=\"http://www.gnome.org/\";>drag-and-drop icon desktop</a>-]
-# | {+href=\"http://www.gnome.org/\";>graphical desktop (called GNOME)</a>+} to
-# | help beginners use the GNU system.
-#. type: Content of: <p>
+# | {+href=\"https://www.gnome.org/\";>graphical desktop (called GNOME)</a>+}
+# | to help beginners use the GNU system.
 #, fuzzy
 #| msgid ""
 #| "We also want to provide software for users who are not computer experts.  "
@@ -329,18 +331,18 @@
 #| "and-drop icon desktop</a> to help beginners use the GNU system."
 msgid ""
 "We also want to provide software for users who are not computer experts.  "
-"Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical desktop "
-"(called GNOME)</a> to help beginners use the GNU system."
+"Therefore we developed a <a href=\"https://www.gnome.org/\";>graphical "
+"desktop (called GNOME)</a> to help beginners use the GNU system."
 msgstr ""
 "Kami juga ingin menyediakan perangkat lunak untuk pengguna yang bukan ahli "
 "komputer. Oleh karena itu, kami saat ini sedang mengerjakan <a href=\"http://";
 "www.gnome.org/\">sebuah sistem desktop <i>drag-and-drop</i></a> untuk "
 "membantu para pemula menggunakan sistem GNU."
 
+#. type: Content of: <div><p>
 # | We also want to provide games and other recreations.  [-Some-]  {+Plenty
-# | of+} <a href=\"http://directory.fsf.org/wiki/Category/Game\";>free
+# | of+} <a href=\"http{+s+}://directory.fsf.org/wiki/Category/Game\">free
 # | games</a> are already available.
-#. type: Content of: <p>
 #, fuzzy
 #| msgid ""
 #| "We also want to provide games and other recreations.  Some <a href="
@@ -348,19 +350,19 @@
 #| "already available."
 msgid ""
 "We also want to provide games and other recreations.  Plenty of <a href="
-"\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
+"\"https://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
 "available."
 msgstr ""
 "Kami juga ingin menyediakan permainan dan sarana rekreasi lainnya.  Beberapa "
 "<a href=\"http://directory.fsf.org/wiki/Category/Game\";>permainan bebas</a> "
 "telah tersedia."
 
+#. type: Content of: <div><p>
 # | How far can free software go? There are no limits, except when <a
 # | href=\"/philosophy/fighting-software-patents.html\">laws such as the
 # | patent system prohibit free software</a>.  The ultimate goal is to provide
 # | free software to do all of the jobs computer users want to do&mdash;and
 # | thus make proprietary software [-obsolete.-] {+a thing of the past.+}
-#. type: Content of: <p>
 #, fuzzy
 #| msgid ""
 #| "How far can free software go? There are no limits, except when <a href=\"/"
@@ -409,14 +411,23 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# | Please see the <a
+# | href=\"/server/standards/README.translations.html\">Translations
+# | README</a> for information on coordinating and [-submitting-]
+# | {+contributing+} translations of this article.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and submitting "
+#| "translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Jika anda berminat untuk menjadi relawan-penerjemah, atau ingin memberikan "
@@ -426,16 +437,19 @@
 "server/standards/README.translations.html\">panduan menerjemahkan</a> untuk "
 "informasi tambahan."
 
+# type: Content of: <table><tr><td><h3>
 #. type: Content of: <div><p>
+# | [-What is the-]{+Copyright &copy; 1996, 1997, 2003, 2005, 2008, 2012,
+# | 2017, 2021+} Free Software [-Foundation?-] {+Foundation, Inc.+}
 #, fuzzy
+#| msgid "What is the Free Software Foundation?"
 msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002 Free Software "
-"Foundation, Inc."
+"Copyright &copy; 1996, 1997, 2003, 2005, 2008, 2012, 2017, 2021 Free "
+"Software Foundation, Inc."
+msgstr "Apa itu Free Software Foundation?"
 
 #. type: Content of: <div><p>
+# || No change detected.  The change might only be in amounts of spaces.
 #, fuzzy
 #| msgid ""
 #| "This page is licensed under a <a rel=\"license\" href=\"http://";
@@ -464,6 +478,26 @@
 msgstr "Perubahan terakhir:"
 
 #~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "Jika anda berminat untuk menjadi relawan-penerjemah, atau ingin "
+#~ "memberikan masukan dalam bahasa Indonesia, atau hanya sekedar ingin tahu "
+#~ "lebih lanjut, silakan <a href=\"/server/standards/translations/id/"
+#~ "indoteam.id.html\">mengunjungi laman tersebut</a>. Silakan juga merujuk "
+#~ "berkas <a href=\"/server/standards/README.translations.html\">panduan "
+#~ "menerjemahkan</a> untuk informasi tambahan."
+
+#, fuzzy
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002 Free Software "
+#~ "Foundation, Inc."
+
+#~ msgid ""
 #~ "This page is licensed under a <a rel=\"license\" href=\"http://";
 #~ "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
 #~ "NoDerivs 3.0 United States License</a>."

Index: po/gnu-history.it.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-history.it.po,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- po/gnu-history.it.po        2 Nov 2021 13:25:56 -0000       1.36
+++ po/gnu-history.it.po        2 Nov 2021 14:41:50 -0000       1.37
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-history.html\n"
-"POT-Creation-Date: 2017-09-04 10:56+0000\n"
+"POT-Creation-Date: 2021-11-02 13:26+0000\n"
 "PO-Revision-Date: 2017-09-30 22:16+0100\n"
 "Last-Translator: Andrea Pescetti <pescetti@gnu.org>\n"
 "Language-Team: Italian\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-11-02 13:26+0000\n"
 "X-Generator: Poedit 1.5.4\n"
 
 #. type: Content of: <title>
@@ -25,21 +26,42 @@
 msgstr ""
 "GNU, Progetto GNU, FSF, Software Libero, Free Software Foundation, Storia"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Overview of the GNU System"
 msgstr "Panoramica del Progetto GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The GNU operating system is a complete free software system,
+# | upward-compatible with Unix.  GNU stands for &ldquo;GNU's Not
+# | [-Unix&rdquo;.-] {+Unix.&rdquo;+} It is pronounced as <a
+# | href=\"/gnu/pronunciation.html\">one syllable with a hard [-g</a>.-]
+# | {+<i>g</i></a>.+}  <a href=\"http{+s+}://www.stallman.org/\">Richard
+# | Stallman</a> made the <a href=\"/gnu/initial-announcement.html\">Initial
+# | Announcement</a> of the GNU Project in September 1983.  A longer version
+# | called the <a href=\"/gnu/manifesto.html\">GNU Manifesto</a> was published
+# | in March 1985.  It has been translated into several <a
+# | href=\"/gnu/manifesto.html#translations\">other languages</a>.
+#, fuzzy
+#| msgid ""
+#| "The GNU operating system is a complete free software system, upward-"
+#| "compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.  It "
+#| "is pronounced as <a href=\"/gnu/pronunciation.html\">one syllable with a "
+#| "hard g</a>.  <a href=\"http://www.stallman.org/\";>Richard Stallman</a> "
+#| "made the <a href=\"/gnu/initial-announcement.html\">Initial Announcement</"
+#| "a> of the GNU Project in September 1983.  A longer version called the <a "
+#| "href=\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March "
+#| "1985.  It has been translated into several <a href=\"/gnu/manifesto."
+#| "html#translations\">other languages</a>."
 msgid ""
 "The GNU operating system is a complete free software system, upward-"
-"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.  It is "
+"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix.&rdquo; It is "
 "pronounced as <a href=\"/gnu/pronunciation.html\">one syllable with a hard "
-"g</a>.  <a href=\"http://www.stallman.org/\";>Richard Stallman</a> made the "
-"<a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> of the "
-"GNU Project in September 1983.  A longer version called the <a href=\"/gnu/"
-"manifesto.html\">GNU Manifesto</a> was published in March 1985.  It has been "
-"translated into several <a href=\"/gnu/manifesto.html#translations\">other "
-"languages</a>."
+"<i>g</i></a>.  <a href=\"https://www.stallman.org/\";>Richard Stallman</a> "
+"made the <a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> "
+"of the GNU Project in September 1983.  A longer version called the <a href="
+"\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March 1985.  It "
+"has been translated into several <a href=\"/gnu/manifesto.html#translations"
+"\">other languages</a>."
 msgstr ""
 "Il sistema operativo GNU è un sistema completo di software libero "
 "compatibile con Unix. GNU sta per &ldquo;GNU's Not Unix&rdquo; (GNU non è "
@@ -51,12 +73,24 @@
 "Manifesto GNU</a>, che è stato tradotto in <a href=\"/gnu/manifesto."
 "html#translations\">varie lingue</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The name &ldquo;GNU&rdquo; was chosen because it met a few requirements;
+# | first, it was a recursive acronym for &ldquo;GNU's Not [-Unix&rdquo;,-]
+# | {+Unix,&rdquo;+} second, because it was a real word, and third, it was fun
+# | to say (or <a
+# | href=\"http://www.poppyfields.net/poppy/songs/gnu.html\";>[-S-]{+s+}ing</a>)
+# | .
+#, fuzzy
+#| msgid ""
+#| "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
+#| "first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, "
+#| "second, because it was a real word, and third, it was fun to say (or <a "
+#| "href=\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
 msgid ""
 "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
-"first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, second, "
+"first, it was a recursive acronym for &ldquo;GNU's Not Unix,&rdquo; second, "
 "because it was a real word, and third, it was fun to say (or <a href="
-"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
+"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>sing</a>)."
 msgstr ""
 "Il nome &ldquo;GNU&rdquo; fu scelto perché soddisfaceva certi requisiti; in "
 "primo luogo, era un acronimo ricorsivo per &ldquo;GNU's Not Unix&rdquo;; in "
@@ -64,7 +98,7 @@
 "nelle <a href=\"http://www.poppyfields.net/poppy/songs/gnu.html\";>canzoni</"
 "a>)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The word &ldquo;free&rdquo; in &ldquo;free software&rdquo; pertains to <a "
 "href=\"/philosophy/free-sw.html\">freedom</a>, not price.  You may or may "
@@ -91,13 +125,27 @@
 "certo prezzo per l'atto fisico del trasferimento di una copia, o potete "
 "regalarla."
 
-#. type: Content of: <p>
-msgid ""
-"The project to develop the GNU system is called the &ldquo;GNU "
-"Project&rdquo;.  The GNU Project was conceived in 1983 as a way of bringing "
-"back the cooperative spirit that prevailed in the computing community in "
-"earlier days&mdash;to make cooperation possible once again by removing the "
-"obstacles to cooperation imposed by the owners of proprietary software."
+#. type: Content of: <div><p>
+# | The project to develop the GNU system is called the &ldquo;GNU
+# | [-Project&rdquo;.-] {+Project.&rdquo;+} The GNU Project was conceived in
+# | 1983 as a way of bringing back the cooperative spirit that prevailed in
+# | the computing community in earlier days&mdash;to make cooperation possible
+# | once again by removing the obstacles to cooperation imposed by the owners
+# | of proprietary software.
+#, fuzzy
+#| msgid ""
+#| "The project to develop the GNU system is called the &ldquo;GNU "
+#| "Project&rdquo;.  The GNU Project was conceived in 1983 as a way of "
+#| "bringing back the cooperative spirit that prevailed in the computing "
+#| "community in earlier days&mdash;to make cooperation possible once again "
+#| "by removing the obstacles to cooperation imposed by the owners of "
+#| "proprietary software."
+msgid ""
+"The project to develop the GNU system is called the &ldquo;GNU Project."
+"&rdquo; The GNU Project was conceived in 1983 as a way of bringing back the "
+"cooperative spirit that prevailed in the computing community in earlier "
+"days&mdash;to make cooperation possible once again by removing the obstacles "
+"to cooperation imposed by the owners of proprietary software."
 msgstr ""
 "Il progetto per sviluppare un sistema GNU si chiama &ldquo;Progetto "
 "GNU&rdquo;. Il Progetto GNU fu concepito nel 1983 come un modo per tornare "
@@ -105,7 +153,7 @@
 "&mdash; per ritornare allo spirito di cooperazione eliminando gli ostacoli "
 "imposti dai proprietari del software non libero."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In 1971, when Richard Stallman started his career at MIT, he worked in a "
 "group which used <a href=\"/philosophy/free-sw.html\">free software</a> "
@@ -118,7 +166,7 @@
 "distribuivano software libero. I programmatori erano liberi di cooperare gli "
 "uni con gli altri, e spesso lo facevano."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By the 1980s, almost all software was <a href=\"/philosophy/categories."
 "html#ProprietarySoftware\">proprietary</a>, which means that it had owners "
@@ -130,7 +178,7 @@
 "significa che aveva proprietari che proibivano e impedivano la cooperazione "
 "tra gli utenti. Così fu necessario avviare il Progetto GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Every computer user needs an operating system; if there is no free operating "
 "system, then you can't even get started using a computer without resorting "
@@ -143,7 +191,7 @@
 "prima voce nel piano di lavoro del software libero fu lo sviluppo di un "
 "sistema operativo libero. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We decided to make the operating system compatible with Unix because the "
 "overall design was already proven and portable, and because compatibility "
@@ -153,14 +201,28 @@
 "architettura si era già dimostrata collaudata e portabile, perché la "
 "compatibilità rende facile agli utenti di Unix passare da Unix a GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | A Unix-like operating system includes a kernel, compilers, editors, text
+# | formatters, mail software, graphical interfaces, libraries, games and many
+# | other things.  Thus, writing a whole operating system is a very large job.
+# |  We started in January 1984.  The <a [-href=\"http://fsf.org/\";>-]
+# | {+href=\"https://www.fsf.org/\";>+} Free Software Foundation</a> was
+# | founded in October 1985, initially to raise funds to help develop GNU.
+#, fuzzy
+#| msgid ""
+#| "A Unix-like operating system includes a kernel, compilers, editors, text "
+#| "formatters, mail software, graphical interfaces, libraries, games and "
+#| "many other things.  Thus, writing a whole operating system is a very "
+#| "large job.  We started in January 1984.  The <a href=\"http://fsf.org/\";> "
+#| "Free Software Foundation</a> was founded in October 1985, initially to "
+#| "raise funds to help develop GNU."
 msgid ""
 "A Unix-like operating system includes a kernel, compilers, editors, text "
 "formatters, mail software, graphical interfaces, libraries, games and many "
 "other things.  Thus, writing a whole operating system is a very large job.  "
-"We started in January 1984.  The <a href=\"http://fsf.org/\";> Free Software "
-"Foundation</a> was founded in October 1985, initially to raise funds to help "
-"develop GNU."
+"We started in January 1984.  The <a href=\"https://www.fsf.org/\";> Free "
+"Software Foundation</a> was founded in October 1985, initially to raise "
+"funds to help develop GNU."
 msgstr ""
 "Un sistema operativo comprende un kernel, compilatori, editor, formattatori "
 "di testo, software per la posta, interfacce grafiche, librerie, giochi e "
@@ -169,7 +231,30 @@
 "Free Software Foundation</a> fu fondata nel mese di ottobre 1985, in un "
 "primo momento per raccogliere fondi per sostenere lo sviluppo di GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | By 1990 we had either found or written all the major components except
+# | one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by
+# | Linus Torvalds in 1991 and made free software in 1992.  Combining Linux
+# | with the almost-complete GNU system resulted in a complete operating
+# | system: the GNU/Linux system.  Estimates are that tens of millions of
+# | people now use GNU/Linux systems, typically via <a
+# | href=\"/distros/distros.html\">GNU/Linux distributions</a>.  The principal
+# | version of Linux now contains non[---]free firmware &ldquo;blobs&rdquo;;
+# | free software activists now maintain a modified free version of Linux,
+# | called <a [-href=\"http://directory.fsf.org/project/linux\";>-]
+# | {+href=\"https://directory.fsf.org/wiki/Linux-libre\";>+} Linux-libre</a>.
+#, fuzzy
+#| msgid ""
+#| "By 1990 we had either found or written all the major components except "
+#| "one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by "
+#| "Linus Torvalds in 1991 and made free software in 1992.  Combining Linux "
+#| "with the almost-complete GNU system resulted in a complete operating "
+#| "system: the GNU/Linux system.  Estimates are that tens of millions of "
+#| "people now use GNU/Linux systems, typically via <a href=\"/distros/"
+#| "distros.html\">GNU/Linux distributions</a>.  The principal version of "
+#| "Linux now contains non-free firmware &ldquo;blobs&rdquo;; free software "
+#| "activists now maintain a modified free version of Linux, called <a href="
+#| "\"http://directory.fsf.org/project/linux\";> Linux-libre</a>."
 msgid ""
 "By 1990 we had either found or written all the major components except "
 "one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by "
@@ -177,10 +262,10 @@
 "the almost-complete GNU system resulted in a complete operating system: the "
 "GNU/Linux system.  Estimates are that tens of millions of people now use GNU/"
 "Linux systems, typically via <a href=\"/distros/distros.html\">GNU/Linux "
-"distributions</a>.  The principal version of Linux now contains non-free "
+"distributions</a>.  The principal version of Linux now contains nonfree "
 "firmware &ldquo;blobs&rdquo;; free software activists now maintain a "
-"modified free version of Linux, called <a href=\"http://directory.fsf.org/";
-"project/linux\"> Linux-libre</a>."
+"modified free version of Linux, called <a href=\"https://directory.fsf.org/";
+"wiki/Linux-libre\"> Linux-libre</a>."
 msgstr ""
 "Entro il 1990 avevamo trovato o scritto tutti i principali componenti "
 "eccetto uno: il kernel. Poi Linux, un kernel compatibile con Unix, fu "
@@ -194,40 +279,69 @@
 "\"http://directory.fsf.org/project/linux\";>Linux-libre</a>, una versione "
 "modificata libera del kernel."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | However, the GNU Project is not limited to the core operating system.  We
+# | aim to provide a whole spectrum of software, whatever many users want to
+# | have.  This includes application software.  See the <a
+# | [-href=\"/directory\">Free-]
+# | {+href=\"https://directory.fsf.org/wiki/Main_Page\";>Free+} Software
+# | Directory</a> for a catalogue of free software application programs.
+#, fuzzy
+#| msgid ""
+#| "However, the GNU Project is not limited to the core operating system.  We "
+#| "aim to provide a whole spectrum of software, whatever many users want to "
+#| "have.  This includes application software.  See the <a href=\"/directory"
+#| "\">Free Software Directory</a> for a catalogue of free software "
+#| "application programs."
 msgid ""
 "However, the GNU Project is not limited to the core operating system.  We "
 "aim to provide a whole spectrum of software, whatever many users want to "
-"have.  This includes application software.  See the <a href=\"/directory"
-"\">Free Software Directory</a> for a catalogue of free software application "
-"programs."
+"have.  This includes application software.  See the <a href=\"https://";
+"directory.fsf.org/wiki/Main_Page\">Free Software Directory</a> for a "
+"catalogue of free software application programs."
 msgstr ""
 "Tuttavia, il Progetto GNU non si limita al sistema operativo di base. "
 "Vogliamo fornire una gamma completa di software, qualsiasi programma gli "
 "utenti desiderino avere. Questo include gli applicativi. Nel <a href=\"/"
 "directory\">Catalogo di Software Libero</a> si trovano molti applicativi."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | We also want to provide software for users who are not computer experts. 
+# | Therefore we developed a <a href=\"http{+s+}://www.gnome.org/\">graphical
+# | desktop (called GNOME)</a> to help beginners use the GNU system.
+#, fuzzy
+#| msgid ""
+#| "We also want to provide software for users who are not computer experts.  "
+#| "Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical "
+#| "desktop (called GNOME)</a> to help beginners use the GNU system."
 msgid ""
 "We also want to provide software for users who are not computer experts.  "
-"Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical desktop "
-"(called GNOME)</a> to help beginners use the GNU system."
+"Therefore we developed a <a href=\"https://www.gnome.org/\";>graphical "
+"desktop (called GNOME)</a> to help beginners use the GNU system."
 msgstr ""
 "Vogliamo anche fornire software per utenti che non sono esperti di computer, "
 "perciò abbiamo sviluppato un desktop grafico chiamato <a href=\"http://www.";
 "gnome.org/\">GNOME</a> per aiutare i principianti ad usare il sistema GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | We also want to provide games and other recreations.  Plenty of <a
+# | href=\"http{+s+}://directory.fsf.org/wiki/Category/Game\">free games</a>
+# | are already available.
+#, fuzzy
+#| msgid ""
+#| "We also want to provide games and other recreations.  Plenty of <a href="
+#| "\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are "
+#| "already available."
 msgid ""
 "We also want to provide games and other recreations.  Plenty of <a href="
-"\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
+"\"https://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
 "available."
 msgstr ""
 "Vogliamo inoltre fornire giochi e altri svaghi. Molti  <a href=\"http://";
 "directory.fsf.org/wiki/Category/Game\">giochi liberi</a> sono già "
 "disponibili."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "How far can free software go? There are no limits, except when <a href=\"/"
 "philosophy/fighting-software-patents.html\">laws such as the patent system "
@@ -267,14 +381,14 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Le traduzioni italiane sono effettuate ponendo la massima attenzione ai "
@@ -288,12 +402,18 @@
 "traduzioni</a>."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; [-2014, 2015, 2016,-] {+1996, 1997, 2003, 2005, 2008,
+# | 2012,+} 2017, [-2018, 2019-] {+2021+} Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2014, 2015, 2016, 2017, 2018, 2019 Free Software "
+#| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017 Free Software Foundation, Inc."
+"Copyright &copy; 1996, 1997, 2003, 2005, 2008, 2012, 2017, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017 Free Software Foundation, Inc."
+"Copyright &copy; 2014, 2015, 2016, 2017, 2018, 2019 Free Software "
+"Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -318,10 +438,16 @@
 msgid "Updated:"
 msgstr "Ultimo aggiornamento:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017, 2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017, 2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017 Free Software Foundation, Inc."
+
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017, 2021 Free Software Foundation, Inc."

Index: po/gnu-history.ja.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-history.ja.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- po/gnu-history.ja.po        2 Nov 2021 13:25:56 -0000       1.21
+++ po/gnu-history.ja.po        2 Nov 2021 14:41:50 -0000       1.22
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-history.html\n"
-"POT-Creation-Date: 2017-09-04 10:56+0000\n"
+"POT-Creation-Date: 2021-11-02 13:26+0000\n"
 "PO-Revision-Date: 2019-06-25 16:58+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-11-02 13:26+0000\n"
 
 #. type: Content of: <title>
 msgid "Overview of the GNU System - GNU Project - Free Software Foundation"
@@ -28,21 +29,32 @@
 "GNU, GNU Project, FSF, 自由ソフトウェア, 
フリーソフトウェアファウンデーショ"
 "ン, 歴史"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Overview of the GNU System"
 msgstr "GNU プロジェクトの概要"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The GNU operating system is a complete free software system, upward-"
+#| "compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.  It "
+#| "is pronounced as <a href=\"/gnu/pronunciation.html\">one syllable with a "
+#| "hard g</a>.  <a href=\"http://www.stallman.org/\";>Richard Stallman</a> "
+#| "made the <a href=\"/gnu/initial-announcement.html\">Initial Announcement</"
+#| "a> of the GNU Project in September 1983.  A longer version called the <a "
+#| "href=\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March "
+#| "1985.  It has been translated into several <a href=\"/gnu/manifesto."
+#| "html#translations\">other languages</a>."
 msgid ""
 "The GNU operating system is a complete free software system, upward-"
-"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.  It is "
+"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix.&rdquo; It is "
 "pronounced as <a href=\"/gnu/pronunciation.html\">one syllable with a hard "
-"g</a>.  <a href=\"http://www.stallman.org/\";>Richard Stallman</a> made the "
-"<a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> of the "
-"GNU Project in September 1983.  A longer version called the <a href=\"/gnu/"
-"manifesto.html\">GNU Manifesto</a> was published in March 1985.  It has been "
-"translated into several <a href=\"/gnu/manifesto.html#translations\">other "
-"languages</a>."
+"<i>g</i></a>.  <a href=\"https://www.stallman.org/\";>Richard Stallman</a> "
+"made the <a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> "
+"of the GNU Project in September 1983.  A longer version called the <a href="
+"\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March 1985.  It "
+"has been translated into several <a href=\"/gnu/manifesto.html#translations"
+"\">other languages</a>."
 msgstr ""
 "GNUオペレーテイング・システムはUnixと上位互換の完å…
¨ãªè‡ªç”±ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã‚·ã‚¹ãƒ†ãƒ "
 "です。GNUは&ldquo;GNU's Not 
Unix&rdquo;(GNUはUnixではない)を表しています。<a "
@@ -53,19 +65,25 @@
 "1985年3月に発行されました。これはいくつかの<a 
href=\"/gnu/manifesto."
 "html#translations\">ほかの言語</a>に翻訳されました。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
+#| "first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, "
+#| "second, because it was a real word, and third, it was fun to say (or <a "
+#| "href=\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
 msgid ""
 "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
-"first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, second, "
+"first, it was a recursive acronym for &ldquo;GNU's Not Unix,&rdquo; second, "
 "because it was a real word, and third, it was fun to say (or <a href="
-"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
+"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>sing</a>)."
 msgstr ""
 "&ldquo;GNU&rdquo;という名前は、いくつかの必
要に適合するために選ばれました。第"
 "一に、それが&ldquo;GNU's Not Unix&rdquo;の再帰é 
­å­—語であること。第二に、それ"
 "が現実の言葉であること。第三に、それを言う(または<a 
href=\"http://www.";
 
"poppyfields.net/poppy/songs/gnu.html\">うたう</a>)のがおもしろいこと、です。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The word &ldquo;free&rdquo; in &ldquo;free software&rdquo; pertains to <a "
 "href=\"/philosophy/free-sw.html\">freedom</a>, not price.  You may or may "
@@ -89,13 +107,21 @@
 "トウェアを再配布する場合、あなたはコピーのé…
å¸ƒã®ç‰©ç†çš„行為に対して手数料を"
 "取っても構いませんし、ただでコピーをé…
ã£ã¦ã‚‚よいのです。)"
 
-#. type: Content of: <p>
-msgid ""
-"The project to develop the GNU system is called the &ldquo;GNU "
-"Project&rdquo;.  The GNU Project was conceived in 1983 as a way of bringing "
-"back the cooperative spirit that prevailed in the computing community in "
-"earlier days&mdash;to make cooperation possible once again by removing the "
-"obstacles to cooperation imposed by the owners of proprietary software."
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The project to develop the GNU system is called the &ldquo;GNU "
+#| "Project&rdquo;.  The GNU Project was conceived in 1983 as a way of "
+#| "bringing back the cooperative spirit that prevailed in the computing "
+#| "community in earlier days&mdash;to make cooperation possible once again "
+#| "by removing the obstacles to cooperation imposed by the owners of "
+#| "proprietary software."
+msgid ""
+"The project to develop the GNU system is called the &ldquo;GNU Project."
+"&rdquo; The GNU Project was conceived in 1983 as a way of bringing back the "
+"cooperative spirit that prevailed in the computing community in earlier "
+"days&mdash;to make cooperation possible once again by removing the obstacles "
+"to cooperation imposed by the owners of proprietary software."
 msgstr ""
 "GNUシステム
を開発するプロジェクトは「GNUプロジェクト」と呼ばれます。GNUプロ"
 
"ジェクトは1983年に思いつかれました。コンピュータの黎明期にコンピューティング"
@@ -103,7 +129,7 @@
 "タリなソフトウェアの所有者
たちによって押しつけられた協力を妨げる障害を排し、"
 
"協力をもう一度可能とする一つの手段として生まれたものです。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In 1971, when Richard Stallman started his career at MIT, he worked in a "
 "group which used <a href=\"/philosophy/free-sw.html\">free software</a> "
@@ -115,7 +141,7 @@
 "した。コンピュータ会社が自由ソフトウェアをé…
å¸ƒã™ã‚‹ã“とさえありました。プログ"
 
"ラマたちはお互い自由に協力し合うことができ、またしばしばそうしていたのです。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By the 1980s, almost all software was <a href=\"/philosophy/categories."
 "html#ProprietarySoftware\">proprietary</a>, which means that it had owners "
@@ -127,7 +153,7 @@
 
"トウェアに、ユーザによる協力を禁止し妨げようとする所有è€
…がいたのです。GNUプロ"
 "ジェクトを必要としたのはまさにこのためでした。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Every computer user needs an operating system; if there is no free operating "
 "system, then you can't even get started using a computer without resorting "
@@ -140,7 +166,7 @@
 "トウェアの課題の最初の項
目は、明らかに、自由なオペレーティングシステムでなけ"
 "ればならないのでした。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We decided to make the operating system compatible with Unix because the "
 "overall design was already proven and portable, and because compatibility "
@@ -151,14 +177,22 @@
 "かったからです。加
えて、互換性を持たせることでUnixのユーザにとってUnixからGNU"
 "への移行を簡単にすることができると考えられました。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "A Unix-like operating system includes a kernel, compilers, editors, text "
+#| "formatters, mail software, graphical interfaces, libraries, games and "
+#| "many other things.  Thus, writing a whole operating system is a very "
+#| "large job.  We started in January 1984.  The <a href=\"http://fsf.org/\";> "
+#| "Free Software Foundation</a> was founded in October 1985, initially to "
+#| "raise funds to help develop GNU."
 msgid ""
 "A Unix-like operating system includes a kernel, compilers, editors, text "
 "formatters, mail software, graphical interfaces, libraries, games and many "
 "other things.  Thus, writing a whole operating system is a very large job.  "
-"We started in January 1984.  The <a href=\"http://fsf.org/\";> Free Software "
-"Foundation</a> was founded in October 1985, initially to raise funds to help "
-"develop GNU."
+"We started in January 1984.  The <a href=\"https://www.fsf.org/\";> Free "
+"Software Foundation</a> was founded in October 1985, initially to raise "
+"funds to help develop GNU."
 msgstr ""
 "Unixライクなオペレーティングシステム
にはカーネル、コンパイラ、エディタ、テキ"
 
"ストフォーマッタ、メールソフトウェア、グラフィカル・インタフェース、ライブラ"
@@ -168,7 +202,19 @@
 
"1985年10月に設立されましたが、当初はGNUの開発に資金集めをする手伝いをするため"
 "でした。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "By 1990 we had either found or written all the major components except "
+#| "one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by "
+#| "Linus Torvalds in 1991 and made free software in 1992.  Combining Linux "
+#| "with the almost-complete GNU system resulted in a complete operating "
+#| "system: the GNU/Linux system.  Estimates are that tens of millions of "
+#| "people now use GNU/Linux systems, typically via <a href=\"/distros/"
+#| "distros.html\">GNU/Linux distributions</a>.  The principal version of "
+#| "Linux now contains non-free firmware &ldquo;blobs&rdquo;; free software "
+#| "activists now maintain a modified free version of Linux, called <a href="
+#| "\"http://directory.fsf.org/project/linux\";> Linux-libre</a>."
 msgid ""
 "By 1990 we had either found or written all the major components except "
 "one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by "
@@ -176,10 +222,10 @@
 "the almost-complete GNU system resulted in a complete operating system: the "
 "GNU/Linux system.  Estimates are that tens of millions of people now use GNU/"
 "Linux systems, typically via <a href=\"/distros/distros.html\">GNU/Linux "
-"distributions</a>.  The principal version of Linux now contains non-free "
+"distributions</a>.  The principal version of Linux now contains nonfree "
 "firmware &ldquo;blobs&rdquo;; free software activists now maintain a "
-"modified free version of Linux, called <a href=\"http://directory.fsf.org/";
-"project/linux\"> Linux-libre</a>."
+"modified free version of Linux, called <a href=\"https://directory.fsf.org/";
+"wiki/Linux-libre\"> Linux-libre</a>."
 msgstr ""
 "1990年までに、わたしたちはオペレーティングシステム
を構成するすべての主要な部"
 
"分を、ひとつを除いて、見つけるか書き上げていました。カーネルã
 ã‘ができていま"
@@ -193,13 +239,20 @@
 "変更された自由なバージョンのLinuxである<a 
href=\"http://directory.fsf.org/";
 "project/linux\">Linux-libre</a>を保守しています。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "However, the GNU Project is not limited to the core operating system.  We "
+#| "aim to provide a whole spectrum of software, whatever many users want to "
+#| "have.  This includes application software.  See the <a href=\"/directory"
+#| "\">Free Software Directory</a> for a catalogue of free software "
+#| "application programs."
 msgid ""
 "However, the GNU Project is not limited to the core operating system.  We "
 "aim to provide a whole spectrum of software, whatever many users want to "
-"have.  This includes application software.  See the <a href=\"/directory"
-"\">Free Software Directory</a> for a catalogue of free software application "
-"programs."
+"have.  This includes application software.  See the <a href=\"https://";
+"directory.fsf.org/wiki/Main_Page\">Free Software Directory</a> for a "
+"catalogue of free software application programs."
 msgstr ""
 
"しかしながら、GNUプロジェクトの対象はオペレーティングシステãƒ
 ã®ä¸­å¿ƒã«é™å®šã•ã‚Œ"
 
"るものではありません。わたしたちはあらゆる分野の多くのユーザが望むソフトウェ"
@@ -207,28 +260,38 @@
 
"まれます。自由ソフトウェアのアプリケーションプログラãƒ
 ã®ã‚«ã‚¿ãƒ­ã‚°ã¯ã€<a href="
 
"\"/directory\">自由ソフトウェア・ディレクトリ</a>をご覧くだ
さい。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "We also want to provide software for users who are not computer experts.  "
+#| "Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical "
+#| "desktop (called GNOME)</a> to help beginners use the GNU system."
 msgid ""
 "We also want to provide software for users who are not computer experts.  "
-"Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical desktop "
-"(called GNOME)</a> to help beginners use the GNU system."
+"Therefore we developed a <a href=\"https://www.gnome.org/\";>graphical "
+"desktop (called GNOME)</a> to help beginners use the GNU system."
 msgstr ""
 
"また、わたしたちはコンピュータの専門家ではないユーザを対象としたソフトウェア"
 "も提供したいと考えています。そこで、わたしたちは<a 
href=\"http://www.gnome.";
 
"org/\">(GNOMEと呼ばれる)グラフィカル・デスクトップ</a>を開発し、初心è€
…がGNUシ"
 "ステムを使えるよう助けました。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "We also want to provide games and other recreations.  Plenty of <a href="
+#| "\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are "
+#| "already available."
 msgid ""
 "We also want to provide games and other recreations.  Plenty of <a href="
-"\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
+"\"https://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
 "available."
 msgstr ""
 "わたしたちはゲーム
やその他のレクレーションも提供したいと思っています。たくさ"
 "んの<a 
href=\"http://directory.fsf.org/wiki/Category/Game\";>自由なゲーム</a>"
 "がすでに利用可能です。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "How far can free software go? There are no limits, except when <a href=\"/"
 "philosophy/fighting-software-patents.html\">laws such as the patent system "
@@ -267,29 +330,33 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 
"正確で良い品質の翻訳を提供するよう努力していますが、不完å
…¨ãªå ´åˆã‚‚あるかと思"
 "います。翻訳に関するコメントと提案は、<a 
href=\"mailto:web-translators@gnu.";
 
"org\">&lt;web-translators@gnu.org&gt;</a>におねがいします。</p><p>わたしたち"
-"のウェブページの翻訳の調整と提出については、<a 
href=\"/server/standards/"
+"のウェブページの翻訳の調整と貢献については、<a 
href=\"/server/standards/"
 "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; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017 Free Software Foundation, Inc."
+"Copyright &copy; 1996, 1997, 2003, 2005, 2008, 2012, 2017, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017 Free Software Foundation, Inc."
+"Copyright &copy; 2014, 2015, 2016, 2017, 2018, 2019 Free Software "
+"Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -311,10 +378,16 @@
 msgid "Updated:"
 msgstr "最終更新:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017, 2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017, 2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017 Free Software Foundation, Inc."
+
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017, 2021 Free Software Foundation, Inc."

Index: po/gnu-history.ko.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-history.ko.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- po/gnu-history.ko.po        5 Jul 2019 09:58:29 -0000       1.2
+++ po/gnu-history.ko.po        2 Nov 2021 14:41:50 -0000       1.3
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-history.html\n"
-"POT-Creation-Date: 2017-09-04 10:56+0000\n"
+"POT-Creation-Date: 2021-11-02 13:26+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Thérèse Godefroy <godef.th@free.fr>\n"
 "Language-Team: web-translators <web-translators@gnu.org>\n"
@@ -26,18 +26,19 @@
 msgid "GNU, GNU Project, FSF, Free Software, Free Software Foundation, History"
 msgstr ""
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Overview of the GNU System"
 msgstr "GNU 체제의 역사"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | The GNU [-Project has developed-] {+operating system is+} a complete free
 # | software [-system named &ldquo;GNU&rdquo; (GNU's-] {+system,
 # | upward-compatible with Unix.  GNU stands for &ldquo;GNU's+} Not [-Unix)
-# | that-] {+Unix&rdquo;.  It+} is [-upwardly compatible-] {+pronounced as <a
+# | that-] {+Unix.&rdquo; It+} is [-upwardly compatible-] {+pronounced as <a
 # | href=\"/gnu/pronunciation.html\">one syllable+} with [-Unix.-] {+a hard
-# | g</a>.+}  <a href=\"http://www.stallman.org/\";>Richard [-Stallman</a>'s
-# | initial document on-] {+Stallman</a> made the <a
+# | <i>g</i></a>.+}  <a [-href=\"http://www.stallman.org/\";>Richard
+# | Stallman</a>'s initial document on-]
+# | {+href=\"https://www.stallman.org/\";>Richard Stallman</a> made the <a
 # | href=\"/gnu/initial-announcement.html\">Initial Announcement</a> of+} the
 # | GNU Project [-is-] {+in September 1983.  A longer version+} called the <a
 # | href=\"/gnu/manifesto.html\">GNU [-Manifesto</a>, which-] {+Manifesto</a>
@@ -57,14 +58,14 @@
 #| "Announcement</a> of the GNU Project, written in 1983."
 msgid ""
 "The GNU operating system is a complete free software system, upward-"
-"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.  It is "
+"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix.&rdquo; It is "
 "pronounced as <a href=\"/gnu/pronunciation.html\">one syllable with a hard "
-"g</a>.  <a href=\"http://www.stallman.org/\";>Richard Stallman</a> made the "
-"<a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> of the "
-"GNU Project in September 1983.  A longer version called the <a href=\"/gnu/"
-"manifesto.html\">GNU Manifesto</a> was published in March 1985.  It has been "
-"translated into several <a href=\"/gnu/manifesto.html#translations\">other "
-"languages</a>."
+"<i>g</i></a>.  <a href=\"https://www.stallman.org/\";>Richard Stallman</a> "
+"made the <a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> "
+"of the GNU Project in September 1983.  A longer version called the <a href="
+"\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March 1985.  It "
+"has been translated into several <a href=\"/gnu/manifesto.html#translations"
+"\">other languages</a>."
 msgstr ""
 "GNU(그-뉴) 프로젝트는 “GNU”(Gnu is Not Unix - 'GNU는 유닉스가 
아니다'라는 뜻"
 "의 재귀적 약어)라고 불리는 유닉스 호환 자유 
소프트웨어들을 개발해 왔습니다. "
@@ -75,15 +76,15 @@
 "진 <a href=\"/gnu/initial-announcement.html\">발기문</a>도 참고할 수 
있습니"
 "다."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
-"first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, second, "
+"first, it was a recursive acronym for &ldquo;GNU's Not Unix,&rdquo; second, "
 "because it was a real word, and third, it was fun to say (or <a href="
-"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
+"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>sing</a>)."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | The word &ldquo;free&rdquo; [-above-] {+in &ldquo;free software&rdquo;+}
 # | pertains to <a href=\"/philosophy/free-sw.html\">freedom</a>, not price. 
 # | You may or may not pay a price to get GNU software.  Either way, once you
@@ -131,9 +132,9 @@
 "경우, 배포본 제작에 소요된 경비를 충당하기 위해서 이를 
적절한 가격에 판매할 "
 "수 있습니다.)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | The {+project to develop the GNU system is called the &ldquo;GNU
-# | Project&rdquo;.  The+} GNU Project was conceived in 1983 as a way of
+# | Project.&rdquo; The+} GNU Project was conceived in 1983 as a way of
 # | bringing back the cooperative spirit that prevailed in the computing
 # | community in earlier days&mdash;to make cooperation possible once again by
 # | removing the obstacles to cooperation imposed by the owners of proprietary
@@ -145,18 +146,18 @@
 #| "days&mdash;to make cooperation possible once again by removing the "
 #| "obstacles to cooperation imposed by the owners of proprietary software."
 msgid ""
-"The project to develop the GNU system is called the &ldquo;GNU "
-"Project&rdquo;.  The GNU Project was conceived in 1983 as a way of bringing "
-"back the cooperative spirit that prevailed in the computing community in "
-"earlier days&mdash;to make cooperation possible once again by removing the "
-"obstacles to cooperation imposed by the owners of proprietary software."
+"The project to develop the GNU system is called the &ldquo;GNU Project."
+"&rdquo; The GNU Project was conceived in 1983 as a way of bringing back the "
+"cooperative spirit that prevailed in the computing community in earlier "
+"days&mdash;to make cooperation possible once again by removing the obstacles "
+"to cooperation imposed by the owners of proprietary software."
 msgstr ""
 "GNU 프로젝트는 초기의 컴퓨터 공동체 안에 충만해 있던 
호의적인 상호 협력의 정"
 "신을 재건하기 위한 구체적인 실현 방법으로 1983년에 
시작되었으며, 이는 독점 소"
 "프트웨어의 소유자들이 만든 장벽들을 제거함으로써 상호 
협력의 풍토를 다시 한"
 "번 부활시키는 것을 그 목적으로 합니다."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In 1971, when Richard Stallman started his career at MIT, he worked in a "
 "group which used <a href=\"/philosophy/free-sw.html\">free software</a> "
@@ -168,7 +169,7 @@
 "일하게 되었는데, 그 시절은 상업적인 컴퓨터 회사들 
조차도 자유 소프트웨어를 배"
 "포하던 때였으므로 프로그래머들은 아무런 제약없이 서로 
협력할 수 있었습니다"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By the 1980s, almost all software was <a href=\"/philosophy/categories."
 "html#ProprietarySoftware\">proprietary</a>, which means that it had owners "
@@ -181,7 +182,7 @@
 "호 협력을 그들의 권리를 내세워서 금지시켰습니다. 바로 
이것이 GNU 프로젝트가 "
 "시작된 이유였습니다."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Every computer user needs an operating system; if there is no free
 # | operating system, then you can't even get started using a computer without
 # | resorting to proprietary software.  So the first item on the free software
@@ -203,7 +204,7 @@
 "를 이용할 수밖에 없을 것입니다. 따라서, 자유 
소프트웨어에 대한 첫번째 과제는 "
 "자유 운영체제를 만드는 것이었습니다."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We decided to make the operating system compatible with Unix because the "
 "overall design was already proven and portable, and because compatibility "
@@ -214,14 +215,14 @@
 "성을 통해서 많은 유닉스 사용자들이 보다 쉽게 GNU 
환경으로 적응할 수 있도록 하"
 "기 위해서 입니다."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | [-An-]{+A Unix-like+} operating system [-is not just a kernel; it also-]
 # | includes {+a kernel,+} compilers, editors, text formatters, mail software,
 # | {+graphical interfaces, libraries, games+} and many other things.  Thus,
 # | writing a whole operating system is a very large job.  [-It took many
-# | years.-]  {+We started in January 1984.  The <a href=\"http://fsf.org/\";>
-# | Free Software Foundation</a> was founded in October 1985, initially to
-# | raise funds to help develop GNU.+}
+# | years.-]  {+We started in January 1984.  The <a
+# | href=\"https://www.fsf.org/\";> Free Software Foundation</a> was founded in
+# | October 1985, initially to raise funds to help develop GNU.+}
 #, fuzzy
 #| msgid ""
 #| "An operating system is not just a kernel; it also includes compilers, "
@@ -231,16 +232,16 @@
 "A Unix-like operating system includes a kernel, compilers, editors, text "
 "formatters, mail software, graphical interfaces, libraries, games and many "
 "other things.  Thus, writing a whole operating system is a very large job.  "
-"We started in January 1984.  The <a href=\"http://fsf.org/\";> Free Software "
-"Foundation</a> was founded in October 1985, initially to raise funds to help "
-"develop GNU."
+"We started in January 1984.  The <a href=\"https://www.fsf.org/\";> Free "
+"Software Foundation</a> was founded in October 1985, initially to raise "
+"funds to help develop GNU."
 msgstr ""
 "운영체제는 단순히 커널만을 의미하는 것이 아닙니다. 
운영체제에는 컴파일러와 문"
 "서 편집기, 조판 프로그램, 메일 소프트웨어와 같은 
다양한 종류의 소프트웨어들"
 "이 통합되어 있어야 합니다. 따라서, 완성된 운영체제를 
만든다는 것은 무척이나 "
 "방대한 작업이며 많은 세월이 필요한 일입니다."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | [-The initial goal of a free Unix-like operating system has been
 # | achieved.-]By [-the 1990s,-] {+1990+} we had either found or written all
 # | the major components except one&mdash;the kernel.  Then Linux, a [-free-]
@@ -252,9 +253,9 @@
 # | [-Linux-based GNU-] {+GNU/Linux+} systems, [-including Slackware, Debian,
 # | Red Hat, and others.-] {+typically via <a
 # | href=\"/distros/distros.html\">GNU/Linux distributions</a>.  The principal
-# | version of Linux now contains non-free firmware &ldquo;blobs&rdquo;; free
+# | version of Linux now contains nonfree firmware &ldquo;blobs&rdquo;; free
 # | software activists now maintain a modified free version of Linux, called
-# | <a href=\"http://directory.fsf.org/project/linux\";> Linux-libre</a>.+}
+# | <a href=\"https://directory.fsf.org/wiki/Linux-libre\";> Linux-libre</a>.+}
 #, fuzzy
 #| msgid ""
 #| "The initial goal of a free Unix-like operating system has been achieved.  "
@@ -271,10 +272,10 @@
 "the almost-complete GNU system resulted in a complete operating system: the "
 "GNU/Linux system.  Estimates are that tens of millions of people now use GNU/"
 "Linux systems, typically via <a href=\"/distros/distros.html\">GNU/Linux "
-"distributions</a>.  The principal version of Linux now contains non-free "
+"distributions</a>.  The principal version of Linux now contains nonfree "
 "firmware &ldquo;blobs&rdquo;; free software activists now maintain a "
-"modified free version of Linux, called <a href=\"http://directory.fsf.org/";
-"project/linux\"> Linux-libre</a>."
+"modified free version of Linux, called <a href=\"https://directory.fsf.org/";
+"wiki/Linux-libre\"> Linux-libre</a>."
 msgstr ""
 "자유 운영체제에 대한 우리의 첫 번째 계획은 1990년대에 
와서 실현되었습니다. 커"
 "널을 제외한 주요 부분들을 새롭게 작성하고 취합하던 ê³¼ì 
•ì—ì„œ 우리는 리누스 토"
@@ -284,14 +285,15 @@
 "와 데비안, 레드햇과 같은 GNU 시스템에 기반한 많은 
운영체제들이 이제는 수십만"
 "에 달하는 사용자를 갖게 되었습니다."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | However, the GNU Project is not limited to {+the core+} operating [-system
 # | development.-] {+system.+}  We aim to provide a whole spectrum of
 # | software, whatever many users want to have.  This includes application
 # | software.  [-We already have a spreadsheet.  We hope to extend GNU Emacs
 # | into a WYSIWYG desktop publishing system over-]  {+See+} the [-coming
-# | years.-] {+<a href=\"/directory\">Free Software Directory</a> for a
-# | catalogue of free software application programs.+}
+# | years.-] {+<a href=\"https://directory.fsf.org/wiki/Main_Page\";>Free
+# | Software Directory</a> for a catalogue of free software application
+# | programs.+}
 #, fuzzy
 #| msgid ""
 #| "However, the GNU Project is not limited to operating system development.  "
@@ -302,20 +304,20 @@
 msgid ""
 "However, the GNU Project is not limited to the core operating system.  We "
 "aim to provide a whole spectrum of software, whatever many users want to "
-"have.  This includes application software.  See the <a href=\"/directory"
-"\">Free Software Directory</a> for a catalogue of free software application "
-"programs."
+"have.  This includes application software.  See the <a href=\"https://";
+"directory.fsf.org/wiki/Main_Page\">Free Software Directory</a> for a "
+"catalogue of free software application programs."
 msgstr ""
 "그러나, GNU 프로젝트가 단지 운영체제의 개발에만 
국한되는 것은 아닙니다. 우리"
 "의 목표는 수요가 있는 모든 부문의 자유 소프트웨어를 ì 
œê³µí•˜ëŠ” 것입니다. 응용 "
 "소프트웨어인 스프레드시트가 이미 활용되고 있으며 GNU 
Emacs를 몇년 안에 "
 "WYSIWYG 형태의 완벽한 탁상 출판 시스템으로 확장시킬 
계획입니다."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | We also want to provide software for users who are not computer experts. 
 # | Therefore we [-are now working on <a
 # | href=\"http://www.gnome.org/\";>GNOME</a>,-] {+developed+} a [-simple
-# | graphical interface-] {+<a href=\"http://www.gnome.org/\";>graphical
+# | graphical interface-] {+<a href=\"https://www.gnome.org/\";>graphical
 # | desktop (called GNOME)</a>+} to help beginners use the GNU system.
 #, fuzzy
 #| msgid ""
@@ -324,16 +326,16 @@
 #| "a>, a simple graphical interface to help beginners use the GNU system."
 msgid ""
 "We also want to provide software for users who are not computer experts.  "
-"Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical desktop "
-"(called GNOME)</a> to help beginners use the GNU system."
+"Therefore we developed a <a href=\"https://www.gnome.org/\";>graphical "
+"desktop (called GNOME)</a> to help beginners use the GNU system."
 msgstr ""
 "일반인들을 위한 소프트웨어 역시 마다하지 않을 것입
니다. GNU 시스템에 익숙하"
 "지 않은 초보자들을 위해서 <a 
href=\"http://www.gnome.org/\";>GNOME</a>과 같은 "
 "그래픽 환경의 간편한 사용자 인터페이스에 대한 개발이 
이미 진행되고 있습니다."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | We also want to provide games and other recreations.  [-Some free games-] 
-# | {+Plenty of <a href=\"http://directory.fsf.org/wiki/Category/Game\";>free
+# | {+Plenty of <a href=\"https://directory.fsf.org/wiki/Category/Game\";>free
 # | games</a>+} are already available.
 #, fuzzy
 #| msgid ""
@@ -341,14 +343,14 @@
 #| "already available."
 msgid ""
 "We also want to provide games and other recreations.  Plenty of <a href="
-"\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
+"\"https://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
 "available."
 msgstr ""
 "현재 활용될 수 있는 몇 종류의 <a 
href=\"http://directory.fsf.org/wiki/";
 "Category/Game\">게임</a>과 같이 삶의 활력소가 될 수 있는 
다양한 종류의 소프트"
 "웨어 또한 준비되고 있으며, 이는 우리가 갖고 있는 
또하나의 목표이기도 합니다."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | How far can free software go? There are no limits, except when <a
 # | href=\"/philosophy/fighting-software-patents.html\">laws such as the
 # | patent system prohibit free software</a>.  The ultimate goal is to provide
@@ -393,6 +395,7 @@
 "있습니다. 끊어진 링크나 다른 수정 사항 또는 제안은 <a 
href=\"mailto:";
 "webmasters@gnu.org\">&lt;webmasters@gnu.org&gt;</a> 앞으로 보내 
주세요."
 
+# TODO: submitting -> contributing.
 #.  TRANSLATORS: Ignore the original text in this paragraph,
 #.         replace it with the translation of these two:
 #.         We work hard and do our best to provide accurate, good quality
@@ -400,26 +403,34 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "이 글의 다른 언어 번역문 작성이나 제출에 대한 정보는 <a 
href=\"/server/"
 "standards/README.translations.html\">번역 안내</a>를 참고해 
주세요."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; [-2011-] {+1996, 1997, 2003, 2005, 2008, 2012, 2017,
+# | 2021+} Free Software Foundation, Inc.
 #, fuzzy
+#| msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001 Free Software Foundation, Inc."
+"Copyright &copy; 1996, 1997, 2003, 2005, 2008, 2012, 2017, 2021 Free "
+"Software Foundation, Inc."
+msgstr "Copyright &copy; 2011 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -440,3 +451,11 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "최종 수정일:"
+
+#, fuzzy
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001 Free Software Foundation, "
+#~ "Inc."

Index: po/gnu-history.ml.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-history.ml.po,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- po/gnu-history.ml.po        2 Nov 2021 13:25:56 -0000       1.39
+++ po/gnu-history.ml.po        2 Nov 2021 14:41:50 -0000       1.40
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-history.html\n"
-"POT-Creation-Date: 2017-09-04 10:56+0000\n"
+"POT-Creation-Date: 2021-11-02 13:26+0000\n"
 "PO-Revision-Date: 2021-06-01 17:26+0200\n"
 "Last-Translator: Aiswarya Kaitheri Kandoth <aiswaryakk29@gmail.com>\n"
 "Language-Team: Malayalam <www-ml-gnu-malayalam-project-public@gnu.org>\n"
@@ -14,6 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
+"X-Outdated-Since: 2021-11-02 13:26+0000\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 20.12.0\n"
 
@@ -27,21 +28,42 @@
 msgstr "ഗ്നു,ഗ്നു സംരംഭം, 
എഫ്എസ്എഫ്, സ്വതന്ത്ര 
സോഫ്റ്റ്‌വെയര്‍,ഫ്രീ 
സോഫ്റ്റ്‌വെയര്‍ 
ഫൌണ്ടേഷന്‍,ചരിത്രം"
 
 # type: Content of: <h2>
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Overview of the GNU System"
 msgstr "ഗ്നു പ്രവര്‍ത്തക 
സംവിധാനം ഒറ്റനോട്ടത്തില്‍ "
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The GNU operating system is a complete free software system,
+# | upward-compatible with Unix.  GNU stands for &ldquo;GNU's Not
+# | [-Unix&rdquo;.-] {+Unix.&rdquo;+} It is pronounced as <a
+# | href=\"/gnu/pronunciation.html\">one syllable with a hard [-g</a>.-]
+# | {+<i>g</i></a>.+}  <a href=\"http{+s+}://www.stallman.org/\">Richard
+# | Stallman</a> made the <a href=\"/gnu/initial-announcement.html\">Initial
+# | Announcement</a> of the GNU Project in September 1983.  A longer version
+# | called the <a href=\"/gnu/manifesto.html\">GNU Manifesto</a> was published
+# | in March 1985.  It has been translated into several <a
+# | href=\"/gnu/manifesto.html#translations\">other languages</a>.
+#, fuzzy
+#| msgid ""
+#| "The GNU operating system is a complete free software system, upward-"
+#| "compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.  It "
+#| "is pronounced as <a href=\"/gnu/pronunciation.html\">one syllable with a "
+#| "hard g</a>.  <a href=\"http://www.stallman.org/\";>Richard Stallman</a> "
+#| "made the <a href=\"/gnu/initial-announcement.html\">Initial Announcement</"
+#| "a> of the GNU Project in September 1983.  A longer version called the <a "
+#| "href=\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March "
+#| "1985.  It has been translated into several <a href=\"/gnu/manifesto."
+#| "html#translations\">other languages</a>."
 msgid ""
 "The GNU operating system is a complete free software system, upward-"
-"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.  It is "
+"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix.&rdquo; It is "
 "pronounced as <a href=\"/gnu/pronunciation.html\">one syllable with a hard "
-"g</a>.  <a href=\"http://www.stallman.org/\";>Richard Stallman</a> made the "
-"<a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> of the "
-"GNU Project in September 1983.  A longer version called the <a href=\"/gnu/"
-"manifesto.html\">GNU Manifesto</a> was published in March 1985.  It has been "
-"translated into several <a href=\"/gnu/manifesto.html#translations\">other "
-"languages</a>."
+"<i>g</i></a>.  <a href=\"https://www.stallman.org/\";>Richard Stallman</a> "
+"made the <a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> "
+"of the GNU Project in September 1983.  A longer version called the <a href="
+"\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March 1985.  It "
+"has been translated into several <a href=\"/gnu/manifesto.html#translations"
+"\">other languages</a>."
 msgstr ""
 "പൂര്‍ണ്ണമായും 
സ്വതന്ത്രമായതും 
'യുനിക്സ്'-നോട് അനുസൃതമായതും 
ആയ ഒരു പ്രവര്‍ത്തക 
സംവിധാനമാണു് ഗ്നു. GNU "
 "എന്നാല്‍ &ldquo;GNU's Not Unix&rdquo;. 1983 
സെപ്റ്റമ്പറില്‍ <a href=\"http://www.";
@@ -52,19 +74,31 @@
 
"പരിഭാഷപ്പെടുത്തിയിട്ടുണ്ടു്."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The name &ldquo;GNU&rdquo; was chosen because it met a few requirements;
+# | first, it was a recursive acronym for &ldquo;GNU's Not [-Unix&rdquo;,-]
+# | {+Unix,&rdquo;+} second, because it was a real word, and third, it was fun
+# | to say (or <a
+# | href=\"http://www.poppyfields.net/poppy/songs/gnu.html\";>[-S-]{+s+}ing</a>)
+# | .
+#, fuzzy
+#| msgid ""
+#| "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
+#| "first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, "
+#| "second, because it was a real word, and third, it was fun to say (or <a "
+#| "href=\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
 msgid ""
 "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
-"first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, second, "
+"first, it was a recursive acronym for &ldquo;GNU's Not Unix,&rdquo; second, "
 "because it was a real word, and third, it was fun to say (or <a href="
-"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
+"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>sing</a>)."
 msgstr ""
 "ചില സൌകര്യങ്ങള്‍ 
കണക്കിലെടുത്താണ് &ldquo;ഗ്നു&rdquo; 
എന്ന പേരു് തിരഞ്ഞെടുത്തതു്. 
ആദ്യം അതിനു് "
 "&ldquo;GNU's Not Unix&rdquo;(GNU) എന്ന 
വിശദീകരണമുണ്ടു് പിന്നെ അതു് 
ഒരു യഥാര്‍ത്ഥ വാക്കാണു്, "
 "മൂന്നാമതായി അതിന്റെ <a 
href=\"http://www.poppyfields.net/poppy/songs/gnu.html";
 "\">ഉച്ചാരണത്തില്‍ </a>ഒരു 
സൌന്ദര്യമുണ്ടു്"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The word &ldquo;free&rdquo; in &ldquo;free software&rdquo; pertains to <a "
 "href=\"/philosophy/free-sw.html\">freedom</a>, not price.  You may or may "
@@ -86,13 +120,27 @@
 "സോഫ്റ്റ്‌വെയര്‍ 
വേറൊരാള്‍ക്കു് വില്‍ക്കാനോ 
വെറുതെ നല്‍കാനോ 
നിങ്ങള്‍ക്കവകാശമുണ്ടു്.)"
 
 # type: Content of: <p>
-#. type: Content of: <p>
-msgid ""
-"The project to develop the GNU system is called the &ldquo;GNU "
-"Project&rdquo;.  The GNU Project was conceived in 1983 as a way of bringing "
-"back the cooperative spirit that prevailed in the computing community in "
-"earlier days&mdash;to make cooperation possible once again by removing the "
-"obstacles to cooperation imposed by the owners of proprietary software."
+#. type: Content of: <div><p>
+# | The project to develop the GNU system is called the &ldquo;GNU
+# | [-Project&rdquo;.-] {+Project.&rdquo;+} The GNU Project was conceived in
+# | 1983 as a way of bringing back the cooperative spirit that prevailed in
+# | the computing community in earlier days&mdash;to make cooperation possible
+# | once again by removing the obstacles to cooperation imposed by the owners
+# | of proprietary software.
+#, fuzzy
+#| msgid ""
+#| "The project to develop the GNU system is called the &ldquo;GNU "
+#| "Project&rdquo;.  The GNU Project was conceived in 1983 as a way of "
+#| "bringing back the cooperative spirit that prevailed in the computing "
+#| "community in earlier days&mdash;to make cooperation possible once again "
+#| "by removing the obstacles to cooperation imposed by the owners of "
+#| "proprietary software."
+msgid ""
+"The project to develop the GNU system is called the &ldquo;GNU Project."
+"&rdquo; The GNU Project was conceived in 1983 as a way of bringing back the "
+"cooperative spirit that prevailed in the computing community in earlier "
+"days&mdash;to make cooperation possible once again by removing the obstacles "
+"to cooperation imposed by the owners of proprietary software."
 msgstr ""
 "ഗ്നു പ്രവര്‍ത്തക സംവിധാനം 
മെച്ചപ്പെടുത്തുന്നതിനുള്ള 
സംരംഭമാണു് ഗ്നു സംരംഭം. 
കമ്പ്യൂട്ടിങ്ങിന്റെ "
 "ലോകത്തു് നിലനിന്നിരുന്ന 
പരസ്പര സഹകരണം ഊട്ടി 
ഉറപ്പിയ്ക്കുന്നതിനുള്ള ഒരു 
മാര്‍ഗ്ഗം ​എന്ന നിലയിലാണു് "
@@ -100,7 +148,7 @@
 "ഉണ്ടാക്കിത്തീര്‍ത്ത 
തടസ്സങ്ങള്‍ 
തട്ടിനീക്കുന്നതിനും."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In 1971, when Richard Stallman started his career at MIT, he worked in a "
 "group which used <a href=\"/philosophy/free-sw.html\">free software</a> "
@@ -114,7 +162,7 @@
 
"സ്വാതന്ത്ര്യമുണ്ടായിരുന്നു,
 അവരതുപയോഗിച്ചിരുന്നു."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By the 1980s, almost all software was <a href=\"/philosophy/categories."
 "html#ProprietarySoftware\">proprietary</a>, which means that it had owners "
@@ -127,7 +175,7 @@
 "സംരംഭത്തിന്റെ അ
നിവാര്യതയിലേയ്ക്ക് 
നയിച്ചതു്."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Every computer user needs an operating system; if there is no free operating "
 "system, then you can't even get started using a computer without resorting "
@@ -140,7 +188,7 @@
 "കാര്യപരിപാടിയില്‍ 
ആദ്യത്തേത് ഒരു പ്രവര്‍ത്തക 
സംവിധാനമാണു്."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We decided to make the operating system compatible with Unix because the "
 "overall design was already proven and portable, and because compatibility "
@@ -150,14 +198,28 @@
 "എളുപ്പത്തില്‍ മാറ്റി 
ഉപയോഗിയ്ക്കാമെന്നുള്ളതുകൊണ്ടും
 ,യുനിക്സിനു് അനുസൃതമായ ഒരു 
പ്രവര്‍ത്തക സംവിധാനം "
 "ഉണ്ടാക്കാന്‍ തീരുമാനിച്ചു."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | A Unix-like operating system includes a kernel, compilers, editors, text
+# | formatters, mail software, graphical interfaces, libraries, games and many
+# | other things.  Thus, writing a whole operating system is a very large job.
+# |  We started in January 1984.  The <a [-href=\"http://fsf.org/\";>-]
+# | {+href=\"https://www.fsf.org/\";>+} Free Software Foundation</a> was
+# | founded in October 1985, initially to raise funds to help develop GNU.
+#, fuzzy
+#| msgid ""
+#| "A Unix-like operating system includes a kernel, compilers, editors, text "
+#| "formatters, mail software, graphical interfaces, libraries, games and "
+#| "many other things.  Thus, writing a whole operating system is a very "
+#| "large job.  We started in January 1984.  The <a href=\"http://fsf.org/\";> "
+#| "Free Software Foundation</a> was founded in October 1985, initially to "
+#| "raise funds to help develop GNU."
 msgid ""
 "A Unix-like operating system includes a kernel, compilers, editors, text "
 "formatters, mail software, graphical interfaces, libraries, games and many "
 "other things.  Thus, writing a whole operating system is a very large job.  "
-"We started in January 1984.  The <a href=\"http://fsf.org/\";> Free Software "
-"Foundation</a> was founded in October 1985, initially to raise funds to help "
-"develop GNU."
+"We started in January 1984.  The <a href=\"https://www.fsf.org/\";> Free "
+"Software Foundation</a> was founded in October 1985, initially to raise "
+"funds to help develop GNU."
 msgstr ""
 "യുനിക്സിനെ പോലുള്ള ഒരു 
പ്രവര്‍ത്തക സംവിധാനം, 
കേര്‍ണല്‍ എന്നതിലും വളരെ 
വലുതാണു്.അതില്‍ 
കമ്പൈലറുകള്‍, "
 "രചന എഴുത്തിടങ്ങള്‍, രചന 
ചിട്ടപ്പെടുത്തുന്ന 
പ്രയോഗങ്ങള്‍, കത്തു് 
കൈകാര്യം ചെയ്യുന്ന 
പ്രയോഗങ്ങള്‍ തുടങ്ങി "
@@ -166,7 +228,30 @@
 "സഹായത്തിനായി ധനം 
സ്വരൂപിയ്ക്കുക ​എന്ന 
ലക്ഷ്യത്തോടെ 1985 ഒക്ടോബറില്‍ <a 
href=\"http://fsf.";
 "org/\">സ്വതന്ത്ര 
സോഫ്റ്റ്‌വെയര്‍ 
ഫൌണ്ടേഷന്‍</a> സ്ഥാപിതമായി."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | By 1990 we had either found or written all the major components except
+# | one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by
+# | Linus Torvalds in 1991 and made free software in 1992.  Combining Linux
+# | with the almost-complete GNU system resulted in a complete operating
+# | system: the GNU/Linux system.  Estimates are that tens of millions of
+# | people now use GNU/Linux systems, typically via <a
+# | href=\"/distros/distros.html\">GNU/Linux distributions</a>.  The principal
+# | version of Linux now contains non[---]free firmware &ldquo;blobs&rdquo;;
+# | free software activists now maintain a modified free version of Linux,
+# | called <a [-href=\"http://directory.fsf.org/project/linux\";>-]
+# | {+href=\"https://directory.fsf.org/wiki/Linux-libre\";>+} Linux-libre</a>.
+#, fuzzy
+#| msgid ""
+#| "By 1990 we had either found or written all the major components except "
+#| "one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by "
+#| "Linus Torvalds in 1991 and made free software in 1992.  Combining Linux "
+#| "with the almost-complete GNU system resulted in a complete operating "
+#| "system: the GNU/Linux system.  Estimates are that tens of millions of "
+#| "people now use GNU/Linux systems, typically via <a href=\"/distros/"
+#| "distros.html\">GNU/Linux distributions</a>.  The principal version of "
+#| "Linux now contains non-free firmware &ldquo;blobs&rdquo;; free software "
+#| "activists now maintain a modified free version of Linux, called <a href="
+#| "\"http://directory.fsf.org/project/linux\";> Linux-libre</a>."
 msgid ""
 "By 1990 we had either found or written all the major components except "
 "one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by "
@@ -174,10 +259,10 @@
 "the almost-complete GNU system resulted in a complete operating system: the "
 "GNU/Linux system.  Estimates are that tens of millions of people now use GNU/"
 "Linux systems, typically via <a href=\"/distros/distros.html\">GNU/Linux "
-"distributions</a>.  The principal version of Linux now contains non-free "
+"distributions</a>.  The principal version of Linux now contains nonfree "
 "firmware &ldquo;blobs&rdquo;; free software activists now maintain a "
-"modified free version of Linux, called <a href=\"http://directory.fsf.org/";
-"project/linux\"> Linux-libre</a>."
+"modified free version of Linux, called <a href=\"https://directory.fsf.org/";
+"wiki/Linux-libre\"> Linux-libre</a>."
 msgstr ""
 "1990-ഓടെ കേര്‍ണല്‍ ഒഴികെ 
മറ്റെല്ലാ പ്രധാന ഘടകങ്ങളും 
എഴുതുകയോ കണ്ടെത്തുകയോ 
ചെയ്തു. പിന്നീടു് "
 "1991-ല്‍ ലിനസ് ടോര്‍വാള്‍ഡ്സ് 
യുനിക്സ് മാതൃകയിലുള്ള 
ലിനക്സ് എന്ന കേര്‍ണല്‍ 
നിര്‍മ്മിയ്ക്കുകയും 1992-ല്‍ അ
തു് "
@@ -190,13 +275,26 @@
 "ഇപ്പോള്‍ നിലനിര്‍ത്തുന്നത്."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | However, the GNU Project is not limited to the core operating system.  We
+# | aim to provide a whole spectrum of software, whatever many users want to
+# | have.  This includes application software.  See the <a
+# | [-href=\"/directory\">Free-]
+# | {+href=\"https://directory.fsf.org/wiki/Main_Page\";>Free+} Software
+# | Directory</a> for a catalogue of free software application programs.
+#, fuzzy
+#| msgid ""
+#| "However, the GNU Project is not limited to the core operating system.  We "
+#| "aim to provide a whole spectrum of software, whatever many users want to "
+#| "have.  This includes application software.  See the <a href=\"/directory"
+#| "\">Free Software Directory</a> for a catalogue of free software "
+#| "application programs."
 msgid ""
 "However, the GNU Project is not limited to the core operating system.  We "
 "aim to provide a whole spectrum of software, whatever many users want to "
-"have.  This includes application software.  See the <a href=\"/directory"
-"\">Free Software Directory</a> for a catalogue of free software application "
-"programs."
+"have.  This includes application software.  See the <a href=\"https://";
+"directory.fsf.org/wiki/Main_Page\">Free Software Directory</a> for a "
+"catalogue of free software application programs."
 msgstr ""
 "എന്നാല്‍ വെറും പ്രവര്‍ത്തക 
സംവിധാനത്തില്‍ മാത്രം 
ഒതുങ്ങുന്നതല്ല ഗ്നു സംരംഭം. 
പൊതുവെ "
 "ഉപഭോക്താക്കള്‍ക്കു് 
ആവശ്യമുള്ള ​എല്ലാ 
സോഫ്റ്റ്‌വെയറും 
നിര്‍മ്മിയ്ക്കുക എന്നതാണു് 
ഞങ്ങളുടെ ലക്ഷ്യം. അതില്‍ "
@@ -205,27 +303,43 @@
 "തന്നെയുണ്ടു്."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | We also want to provide software for users who are not computer experts. 
+# | Therefore we developed a <a href=\"http{+s+}://www.gnome.org/\">graphical
+# | desktop (called GNOME)</a> to help beginners use the GNU system.
+#, fuzzy
+#| msgid ""
+#| "We also want to provide software for users who are not computer experts.  "
+#| "Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical "
+#| "desktop (called GNOME)</a> to help beginners use the GNU system."
 msgid ""
 "We also want to provide software for users who are not computer experts.  "
-"Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical desktop "
-"(called GNOME)</a> to help beginners use the GNU system."
+"Therefore we developed a <a href=\"https://www.gnome.org/\";>graphical "
+"desktop (called GNOME)</a> to help beginners use the GNU system."
 msgstr ""
 "കമ്പ്യൂട്ടര്‍ 
വിദഗ്ധരല്ലാത്തവര്‍ക്കും 
സോഫ്റ്റ്‌വെയര്‍ നല്‍കാന്‍ 
ഞങ്ങളാഗ്രഹിയ്ക്കുന്നു.അ
തുകൊണ്ടു് 
തുടക്കക്കാര്‍ക്കു് "
 "ഗ്നു ഉപയോഗിയ്ക്കാനായി ഒരു <a 
href=\"http://www.gnome.org/\";>ഗ്രാഫിയ്ക്കല്‍ 
പണിയിടം "
 "(ഗ്നോം എന്ന പേരില്‍)</a> 
ഞങ്ങള്‍ നിര്‍മ്മിച്ചു."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | We also want to provide games and other recreations.  Plenty of <a
+# | href=\"http{+s+}://directory.fsf.org/wiki/Category/Game\">free games</a>
+# | are already available.
+#, fuzzy
+#| msgid ""
+#| "We also want to provide games and other recreations.  Plenty of <a href="
+#| "\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are "
+#| "already available."
 msgid ""
 "We also want to provide games and other recreations.  Plenty of <a href="
-"\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
+"\"https://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
 "available."
 msgstr ""
 "കളികളും മറ്റു വിനോദങ്ങളും 
നിര്‍മ്മിയ്ക്കാനും 
ഞങ്ങള്‍ക്കു് ആഗ്രഹമുണ്ടു്. <a 
href=\"http://directory.";
 "fsf.org/wiki/Category/Game\">സ്വതന്ത്ര 
സോഫ്റ്റ്‌വെയര്‍ ആയ കുറേ 
കളികള്‍</a> ഇപ്പോള്‍ തന്നെ "
 "ലഭ്യമാണു്."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "How far can free software go? There are no limits, except when <a href=\"/"
 "philosophy/fighting-software-patents.html\">laws such as the patent system "
@@ -259,6 +373,7 @@
 "നിര്‍ദ്ദേശങ്ങളും അ
ഭിപ്രായങ്ങളും <a 
href=\"mailto:webmasters@gnu.org\";>&lt;"
 "webmasters@gnu.org&gt;</a> എന്ന 
വിലാസത്തിലേയ്ക്കു് 
എഴുതാവുന്നതാണു്."
 
+# TODO: submitting -> contributing.
 # type: Content of: <div><p>
 #.  TRANSLATORS: Ignore the original text in this paragraph,
 #.         replace it with the translation of these two:
@@ -267,14 +382,20 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "ഗ്നു താളുകളുടെ മലയാളം 
പരിഭാഷകള്‍ കൃത്യവും 
നിലവാരമുള്ളതുമാക്കാൻ 
ഞങ്ങള്‍ പരമാവധി 
ശ്രമിക്കുന്നുണ്ടു്. "
@@ -284,13 +405,20 @@
 "താളുകളുടെ പരിഭാഷകൾ 
സമർപ്പിക്കാനും ബന്ധപ്പെട്ട 
വിവരങ്ങൾക്കും <a href=\"/server/standards/"
 "README.translations.html\">Translations README</a> നോക്കുക."
 
+# type: Content of: <div><p>
 #. type: Content of: <div><p>
+# | Copyright &copy; 1996, 1997, [-1998, 1999, 2001, 2002,-] 2003, 2005,
+# | [-2007-] {+2008, 2012, 2017, 2021+} Free Software Foundation, Inc.[-,-]
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007 "
+#| "Free Software Foundation, Inc.,"
 msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017 Free Software Foundation, Inc."
+"Copyright &copy; 1996, 1997, 2003, 2005, 2008, 2012, 2017, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017 Free Software Foundation, Inc."
+"പകര്‍പ്പവകാശം &copy; 1996, 1997, 1998, 1999, 2001, 
2003, 2005, 2007 ഫ്രീ "
+"സോഫ്റ്റ്‌വെയര്‍ ഫൌണ്ടേഷന്‍ "
 
 #. type: Content of: <div><p>
 msgid ""
@@ -315,13 +443,19 @@
 msgid "Updated:"
 msgstr "പുതുക്കിയതു്:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017, 2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017, 2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017 Free Software Foundation, Inc."
+
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017, 2021 Free Software Foundation, Inc."
 
 # type: Content of: <title>
 #~ msgid ""
@@ -453,14 +587,6 @@
 #~ "കണ്ണികളെകുറിച്ചും മറ്റു് 
നിര്‍ദ്ദ്േശങ്ങളും അ
ഭിപ്രായങ്ങളും <a href=\"mailto:webmasters@gnu.";
 #~ "org\"><em>webmasters@gnu.org</em></a> എന്ന 
വിലാസത്തിലേയ്ക്കു് എഴുതുക"
 
-# type: Content of: <div><p>
-#~ msgid ""
-#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007 "
-#~ "Free Software Foundation, Inc.,"
-#~ msgstr ""
-#~ "പകര്‍പ്പവകാശം &copy; 1996, 1997, 1998, 1999, 
2001, 2003, 2005, 2007 ഫ്രീ "
-#~ "സോഫ്റ്റ്‌വെയര്‍ 
ഫൌണ്ടേഷന്‍ "
-
 # type: Content of: <div><address>
 #~ msgid "51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA"
 #~ msgstr "51 ഫ്രാങ്ക്ലിന്‍ 
സ്റ്റ്രീട്ട്, അഞ്ചാം നില, 
ബോസ്റ്റണ്‍, എം എ 02110-1301, യു എസ് എ"

Index: po/gnu-history.nb.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-history.nb.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- po/gnu-history.nb.po        4 Sep 2017 11:03:01 -0000       1.4
+++ po/gnu-history.nb.po        2 Nov 2021 14:41:50 -0000       1.5
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-history.html\n"
-"POT-Creation-Date: 2017-09-04 10:56+0000\n"
+"POT-Creation-Date: 2021-11-02 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"
@@ -26,11 +26,22 @@
 msgstr ""
 "GNU, GNU prosjektet, FSF, fri programvare, Free Software Foundation, historie"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Overview of the GNU System"
 msgstr "Oversikt over GNU-systemet"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The GNU operating system is a complete free software system,
+# | upward-compatible with Unix.  GNU stands for &ldquo;GNU's Not
+# | [-Unix&rdquo;.-] {+Unix.&rdquo; It is pronounced as+} <a
+# | [-href=\"http://www.stallman.org/\";>Richard-]
+# | {+href=\"/gnu/pronunciation.html\">one syllable with a hard <i>g</i></a>. 
+# | <a href=\"https://www.stallman.org/\";>Richard+} Stallman</a> made the <a
+# | href=\"/gnu/initial-announcement.html\">Initial Announcement</a> of the
+# | GNU Project in September 1983.  A longer version called the <a
+# | href=\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March
+# | 1985.  It has been translated into several <a
+# | href=\"/gnu/manifesto.html#translations\">other languages</a>.
 #, fuzzy
 #| msgid ""
 #| "The GNU operating system is a complete free software system, upward-"
@@ -43,14 +54,14 @@
 #| "\">other languages</a>."
 msgid ""
 "The GNU operating system is a complete free software system, upward-"
-"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.  It is "
+"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix.&rdquo; It is "
 "pronounced as <a href=\"/gnu/pronunciation.html\">one syllable with a hard "
-"g</a>.  <a href=\"http://www.stallman.org/\";>Richard Stallman</a> made the "
-"<a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> of the "
-"GNU Project in September 1983.  A longer version called the <a href=\"/gnu/"
-"manifesto.html\">GNU Manifesto</a> was published in March 1985.  It has been "
-"translated into several <a href=\"/gnu/manifesto.html#translations\">other "
-"languages</a>."
+"<i>g</i></a>.  <a href=\"https://www.stallman.org/\";>Richard Stallman</a> "
+"made the <a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> "
+"of the GNU Project in September 1983.  A longer version called the <a href="
+"\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March 1985.  It "
+"has been translated into several <a href=\"/gnu/manifesto.html#translations"
+"\">other languages</a>."
 msgstr ""
 "Operativsystemet GNU er et komplett fri programvare-system, kompatibelt med "
 "Unix.  GNU står får «GNU's Not Unix» («GNU er ikke Unix»).  <a 
href=\"http://";
@@ -60,12 +71,24 @@
 "\">GNU manifestet</a> ble publisert i mars 1985. Det har blitt oversatt til "
 "en rekke <a href=\"/gnu/manifesto.html#translations\">andre språk</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The name &ldquo;GNU&rdquo; was chosen because it met a few requirements;
+# | first, it was a recursive acronym for &ldquo;GNU's Not [-Unix&rdquo;,-]
+# | {+Unix,&rdquo;+} second, because it was a real word, and third, it was fun
+# | to say (or <a
+# | href=\"http://www.poppyfields.net/poppy/songs/gnu.html\";>[-S-]{+s+}ing</a>)
+# | .
+#, fuzzy
+#| msgid ""
+#| "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
+#| "first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, "
+#| "second, because it was a real word, and third, it was fun to say (or <a "
+#| "href=\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
 msgid ""
 "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
-"first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, second, "
+"first, it was a recursive acronym for &ldquo;GNU's Not Unix,&rdquo; second, "
 "because it was a real word, and third, it was fun to say (or <a href="
-"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
+"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>sing</a>)."
 msgstr ""
 "Navnet «GNU» ble valgt fordi det oppfylte et par krav; først og fremst var 
"
 "det et rekursivt akronym (eller en selvrefererende forkortelse) for «GNU's "
@@ -73,7 +96,7 @@
 "for det tredje, det var morsomt å uttale (eller å <a href=\"http://www.";
 "poppyfields.net/poppy/songs/gnu.html\">synge</a>)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The word &ldquo;free&rdquo; in &ldquo;free software&rdquo; pertains to <a "
 "href=\"/philosophy/free-sw.html\">freedom</a>, not price.  You may or may "
@@ -98,13 +121,13 @@
 "fysiske arbeidet av å overføre en kopi, men du får også gi programvaren 
bort "
 "gratis.)"
 
+#. type: Content of: <div><p>
 # | The {+project to develop the GNU system is called the &ldquo;GNU
-# | Project&rdquo;.  The+} GNU Project [-started-] {+was conceived+} in
+# | Project.&rdquo; The+} GNU Project [-started-] {+was conceived+} in
 # | 198[-4-]{+3+} as [-an attempt to bring-] {+a way of bringing+} back the
 # | cooperative spirit that prevailed in the computing community in earlier
 # | days&mdash;to make cooperation possible once again by removing the
 # | obstacles to cooperation imposed by the owners of proprietary software.
-#. type: Content of: <p>
 #, fuzzy
 #| msgid ""
 #| "The GNU Project started in 1984 as an attempt to bring back the "
@@ -112,18 +135,18 @@
 #| "days&mdash;to make cooperation possible once again by removing the "
 #| "obstacles to cooperation imposed by the owners of proprietary software."
 msgid ""
-"The project to develop the GNU system is called the &ldquo;GNU "
-"Project&rdquo;.  The GNU Project was conceived in 1983 as a way of bringing "
-"back the cooperative spirit that prevailed in the computing community in "
-"earlier days&mdash;to make cooperation possible once again by removing the "
-"obstacles to cooperation imposed by the owners of proprietary software."
+"The project to develop the GNU system is called the &ldquo;GNU Project."
+"&rdquo; The GNU Project was conceived in 1983 as a way of bringing back the "
+"cooperative spirit that prevailed in the computing community in earlier "
+"days&mdash;to make cooperation possible once again by removing the obstacles "
+"to cooperation imposed by the owners of proprietary software."
 msgstr ""
 "GNU-prosjektet startet i 1984 som et forsøk på å bringe tilbake den "
 "hjelpende ånden som gjennomsyret dataverden i de tidligste årene &mdash; å 
"
 "igjen gjøre samarbeid mulig ved å fjerne hindringene som blir satt av 
eierne "
 "til privateid, proprietær programvare."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In 1971, when Richard Stallman started his career at MIT, he worked in a "
 "group which used <a href=\"/philosophy/free-sw.html\">free software</a> "
@@ -136,7 +159,7 @@
 "og programmerere hadde muligheten til å samarbeide med hverandre, noe de "
 "ofte også gjorde."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By the 1980s, almost all software was <a href=\"/philosophy/categories."
 "html#ProprietarySoftware\">proprietary</a>, which means that it had owners "
@@ -148,7 +171,7 @@
 "motarbeidet samarbeid mellom brukerne.  Dette gjorde GNU-prosjektet "
 "nødvendig."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Every computer user needs an operating system; if there is no free operating "
 "system, then you can't even get started using a computer without resorting "
@@ -160,7 +183,7 @@
 "uten proprietær programvare.  Dette innebar at vi først måtte skrive et "
 "fritt operativsystem."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We decided to make the operating system compatible with Unix because the "
 "overall design was already proven and portable, and because compatibility "
@@ -170,14 +193,15 @@
 "gjennomgående design allerede var bevist og tested.  Dette gjorde også at "
 "det ble enkelt for Unix-brukere å skifte fra Unix til GNU."
 
+#. type: Content of: <div><p>
 # | A[-n-] Unix-like operating system [-is much more than a kernel; it also-]
 # | includes {+a kernel,+} compilers, editors, text formatters, mail software,
 # | {+graphical interfaces, libraries, games+} and many other things.  Thus,
 # | writing a whole operating system is a very large job.  We started in
-# | January 1984.  [-It took many years.-]  The <a href=\"http://fsf.org/\";>{+
-# | +}Free Software Foundation</a> was founded in October 1985, initially to
-# | raise funds to help develop GNU.
-#. type: Content of: <p>
+# | January 1984.  [-It took many years.-]  The <a
+# | [-href=\"http://fsf.org/\";>Free-] {+href=\"https://www.fsf.org/\";> Free+}
+# | Software Foundation</a> was founded in October 1985, initially to raise
+# | funds to help develop GNU.
 #, fuzzy
 #| msgid ""
 #| "An Unix-like operating system is much more than a kernel; it also "
@@ -190,9 +214,9 @@
 "A Unix-like operating system includes a kernel, compilers, editors, text "
 "formatters, mail software, graphical interfaces, libraries, games and many "
 "other things.  Thus, writing a whole operating system is a very large job.  "
-"We started in January 1984.  The <a href=\"http://fsf.org/\";> Free Software "
-"Foundation</a> was founded in October 1985, initially to raise funds to help "
-"develop GNU."
+"We started in January 1984.  The <a href=\"https://www.fsf.org/\";> Free "
+"Software Foundation</a> was founded in October 1985, initially to raise "
+"funds to help develop GNU."
 msgstr ""
 "Et Unix-lignende operativsystem er mye mer enn kun en kjerne; det inneholder "
 "også kompilatorer, editorer, tekstformateringsprogrammer, e-postprogramvare, 
"
@@ -201,18 +225,18 @@
 "Ã¥r. I 1985 ble <a href=\"http://fsf.org/\";>Free Software Foundation</a> "
 "stiftet, i utgangspunktet for å fremskaffe midler for å utvikle GNU."
 
+#. type: Content of: <div><p>
 # | By 1990 we had either found or written all the major components except
 # | one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by
 # | Linus Torvalds in 1991 and made free software in 1992.[-.-]  Combining
 # | Linux with the almost-complete GNU system resulted in a complete operating
 # | system: the GNU/Linux system.  Estimates are that tens of millions of
 # | people now use GNU/Linux systems, [-including Slackware, Debian, Red Hat,
-# | and others.-] {+typically via <a href=\"/distros\">GNU/Linux
-# | distributions</a>.  The principal version of Linux now contains non-free
+# | and others.-] {+typically via <a href=\"/distros/distros.html\">GNU/Linux
+# | distributions</a>.  The principal version of Linux now contains nonfree
 # | firmware &ldquo;blobs&rdquo;; free software activists now maintain a
 # | modified free version of Linux, called <a
-# | href=\"http://directory.fsf.org/project/linux\";> Linux-libre</a>.+}
-#. type: Content of: <p>
+# | href=\"https://directory.fsf.org/wiki/Linux-libre\";> Linux-libre</a>.+}
 #, fuzzy
 #| msgid ""
 #| "By 1990 we had either found or written all the major components except "
@@ -229,10 +253,10 @@
 "the almost-complete GNU system resulted in a complete operating system: the "
 "GNU/Linux system.  Estimates are that tens of millions of people now use GNU/"
 "Linux systems, typically via <a href=\"/distros/distros.html\">GNU/Linux "
-"distributions</a>.  The principal version of Linux now contains non-free "
+"distributions</a>.  The principal version of Linux now contains nonfree "
 "firmware &ldquo;blobs&rdquo;; free software activists now maintain a "
-"modified free version of Linux, called <a href=\"http://directory.fsf.org/";
-"project/linux\"> Linux-libre</a>."
+"modified free version of Linux, called <a href=\"https://directory.fsf.org/";
+"wiki/Linux-libre\"> Linux-libre</a>."
 msgstr ""
 "Innen 1990 hadde vi enten funnet eller skrevet alle de største komponentene "
 "med unntak én komponent &mdash; kjernen.  I 1991 ble Linux, en Unix-lignende 
"
@@ -242,13 +266,26 @@
 "titalls millioner mennesker idag bruker GNU/Linux-systemer, inkludert "
 "Slackware, Debian, Red Hat, med andre."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | However, the GNU Project is not limited to the core operating system.  We
+# | aim to provide a whole spectrum of software, whatever many users want to
+# | have.  This includes application software.  See the <a
+# | [-href=\"/directory\">Free-]
+# | {+href=\"https://directory.fsf.org/wiki/Main_Page\";>Free+} Software
+# | Directory</a> for a catalogue of free software application programs.
+#, fuzzy
+#| msgid ""
+#| "However, the GNU Project is not limited to the core operating system.  We "
+#| "aim to provide a whole spectrum of software, whatever many users want to "
+#| "have.  This includes application software.  See the <a href=\"/directory"
+#| "\">Free Software Directory</a> for a catalogue of free software "
+#| "application programs."
 msgid ""
 "However, the GNU Project is not limited to the core operating system.  We "
 "aim to provide a whole spectrum of software, whatever many users want to "
-"have.  This includes application software.  See the <a href=\"/directory"
-"\">Free Software Directory</a> for a catalogue of free software application "
-"programs."
+"have.  This includes application software.  See the <a href=\"https://";
+"directory.fsf.org/wiki/Main_Page\">Free Software Directory</a> for a "
+"catalogue of free software application programs."
 msgstr ""
 "GNU-prosjektet er dog ikke begrenset til å utvikle operativsystem.  Vårt 
mål "
 "er å tilby et stort spekter av programvare som mange brukere vil ha.  <!-- "
@@ -256,11 +293,11 @@
 "directory/\">fri progrmvare katalogen</a> for en oversikt over fri "
 "programvare."
 
+#. type: Content of: <div><p>
 # | We also want to provide software for users who are not computer experts. 
-# | Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical
+# | Therefore we developed a <a href=\"http{+s+}://www.gnome.org/\">graphical
 # | desktop [-(GNOME)</a>-] {+(called GNOME)</a>+} to help beginners use the
 # | GNU system.
-#. type: Content of: <p>
 #, fuzzy
 #| msgid ""
 #| "We also want to provide software for users who are not computer experts.  "
@@ -268,30 +305,38 @@
 #| "desktop (GNOME)</a> to help beginners use the GNU system."
 msgid ""
 "We also want to provide software for users who are not computer experts.  "
-"Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical desktop "
-"(called GNOME)</a> to help beginners use the GNU system."
+"Therefore we developed a <a href=\"https://www.gnome.org/\";>graphical "
+"desktop (called GNOME)</a> to help beginners use the GNU system."
 msgstr ""
 "Vi ønsker også å tilby programvare for brukere som ikke er eksperter på "
 "datamaskiner.  Derfor utviklet vi <a href=\"http://www.gnome.org/\";>et "
 "grafiskk skrivebordsmiljø (GNOME)</a> for å hjelpe nybegynnere å bruke 
GNU-"
 "systemet."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | We also want to provide games and other recreations.  Plenty of <a
+# | href=\"http{+s+}://directory.fsf.org/wiki/Category/Game\">free games</a>
+# | are already available.
+#, fuzzy
+#| msgid ""
+#| "We also want to provide games and other recreations.  Plenty of <a href="
+#| "\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are "
+#| "already available."
 msgid ""
 "We also want to provide games and other recreations.  Plenty of <a href="
-"\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
+"\"https://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
 "available."
 msgstr ""
 "Vi ønsker ogs å tilby spill og andre avslapningsprogrammer.  Mange <a href="
 "\"http://directory.fsf.org/wiki/Category/Game\";>frie spill</a> er allerede "
 "tilgjengelige."
 
+#. type: Content of: <div><p>
 # | How far can free software go? There are no limits, except when <a
 # | href=\"/philosophy/fighting-software-patents.html\">laws such as the
 # | patent system prohibit free software</a>.  The ultimate goal is to provide
 # | free software to do all of the jobs computer users want to do&mdash;and
 # | thus make proprietary software [-obsolete.-] {+a thing of the past.+}
-#. type: Content of: <p>
 #, fuzzy
 #| msgid ""
 #| "How far can free software go? There are no limits, except when <a href=\"/"
@@ -338,31 +383,43 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
 #, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Vennligst se <a href=\"/server/standards/README.translations.html"
 "\">Translations README</a> for informasjon om koordinering og innsendelse  "
 "av oversettelser av denne siden."
 
+# type: Content of: <table><tr><td><h3>
 #. type: Content of: <div><p>
+# | [-What is the-]{+Copyright &copy; 1996, 1997, 2003, 2005, 2008, 2012,
+# | 2017, 2021+} Free Software [-Foundation?-] {+Foundation, Inc.+}
 #, fuzzy
+#| msgid "What is the Free Software Foundation?"
 msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007 Free "
+"Copyright &copy; 1996, 1997, 2003, 2005, 2008, 2012, 2017, 2021 Free "
 "Software Foundation, Inc."
+msgstr "Hva er Free Software Foundation?"
 
 #. type: Content of: <div><p>
+# | This page is licensed under a <a rel=\"license\"
+# | [-href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative-]
+# | {+href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Creative+}
+# | Commons [-Attribution-NoDerivs 3.0 United States-]
+# | {+Attribution-NoDerivatives 4.0 International+} License</a>.
 #, fuzzy
 #| msgid ""
 #| "This page is licensed under a <a rel=\"license\" href=\"http://";
@@ -387,6 +444,24 @@
 msgid "Updated:"
 msgstr "Oppdatert:"
 
+#, fuzzy
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "Vennligst se <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for informasjon om koordinering og "
+#~ "innsendelse  av oversettelser av denne siden."
+
+#, fuzzy
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007 "
+#~ "Free Software Foundation, Inc."
+
 #~ msgid ""
 #~ "This page is licensed under a <a rel=\"license\" href=\"http://";
 #~ "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"

Index: po/gnu-history.nl.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-history.nl.po,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- po/gnu-history.nl.po        2 Nov 2021 13:25:56 -0000       1.25
+++ po/gnu-history.nl.po        2 Nov 2021 14:41:50 -0000       1.26
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-history.html\n"
-"POT-Creation-Date: 2017-09-04 10:56+0000\n"
+"POT-Creation-Date: 2021-11-02 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-11-02 13:26+0000\n"
 "X-Generator: Poedit 1.8.11\n"
 
 #. type: Content of: <title>
@@ -29,21 +30,42 @@
 "GNU, GNU-project, FSF, Free Software, Vrije Software, Free Software "
 "Foundation, Geschiedenis"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Overview of the GNU System"
 msgstr "Overzicht van het GNU-systeem"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The GNU operating system is a complete free software system,
+# | upward-compatible with Unix.  GNU stands for &ldquo;GNU's Not
+# | [-Unix&rdquo;.-] {+Unix.&rdquo;+} It is pronounced as <a
+# | href=\"/gnu/pronunciation.html\">one syllable with a hard [-g</a>.-]
+# | {+<i>g</i></a>.+}  <a href=\"http{+s+}://www.stallman.org/\">Richard
+# | Stallman</a> made the <a href=\"/gnu/initial-announcement.html\">Initial
+# | Announcement</a> of the GNU Project in September 1983.  A longer version
+# | called the <a href=\"/gnu/manifesto.html\">GNU Manifesto</a> was published
+# | in March 1985.  It has been translated into several <a
+# | href=\"/gnu/manifesto.html#translations\">other languages</a>.
+#, fuzzy
+#| msgid ""
+#| "The GNU operating system is a complete free software system, upward-"
+#| "compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.  It "
+#| "is pronounced as <a href=\"/gnu/pronunciation.html\">one syllable with a "
+#| "hard g</a>.  <a href=\"http://www.stallman.org/\";>Richard Stallman</a> "
+#| "made the <a href=\"/gnu/initial-announcement.html\">Initial Announcement</"
+#| "a> of the GNU Project in September 1983.  A longer version called the <a "
+#| "href=\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March "
+#| "1985.  It has been translated into several <a href=\"/gnu/manifesto."
+#| "html#translations\">other languages</a>."
 msgid ""
 "The GNU operating system is a complete free software system, upward-"
-"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.  It is "
+"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix.&rdquo; It is "
 "pronounced as <a href=\"/gnu/pronunciation.html\">one syllable with a hard "
-"g</a>.  <a href=\"http://www.stallman.org/\";>Richard Stallman</a> made the "
-"<a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> of the "
-"GNU Project in September 1983.  A longer version called the <a href=\"/gnu/"
-"manifesto.html\">GNU Manifesto</a> was published in March 1985.  It has been "
-"translated into several <a href=\"/gnu/manifesto.html#translations\">other "
-"languages</a>."
+"<i>g</i></a>.  <a href=\"https://www.stallman.org/\";>Richard Stallman</a> "
+"made the <a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> "
+"of the GNU Project in September 1983.  A longer version called the <a href="
+"\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March 1985.  It "
+"has been translated into several <a href=\"/gnu/manifesto.html#translations"
+"\">other languages</a>."
 msgstr ""
 "Het GNU-besturingssysteem bestaat volledig uit vrije software en is "
 "uitwisselbaar met het Unix-besturingssysteem. GNU is een afkorting van "
@@ -56,12 +78,24 @@
 "1985. Het is sindsdien vertaald in diverse <a href=\"/gnu/manifesto."
 "html#translations\">andere talen</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The name &ldquo;GNU&rdquo; was chosen because it met a few requirements;
+# | first, it was a recursive acronym for &ldquo;GNU's Not [-Unix&rdquo;,-]
+# | {+Unix,&rdquo;+} second, because it was a real word, and third, it was fun
+# | to say (or <a
+# | href=\"http://www.poppyfields.net/poppy/songs/gnu.html\";>[-S-]{+s+}ing</a>)
+# | .
+#, fuzzy
+#| msgid ""
+#| "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
+#| "first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, "
+#| "second, because it was a real word, and third, it was fun to say (or <a "
+#| "href=\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
 msgid ""
 "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
-"first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, second, "
+"first, it was a recursive acronym for &ldquo;GNU's Not Unix,&rdquo; second, "
 "because it was a real word, and third, it was fun to say (or <a href="
-"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
+"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>sing</a>)."
 msgstr ""
 "De keuze viel op de naam &ldquo;GNU&rdquo; omdat het voldeed aan een aantal "
 "criteria; allereerst was het een recursief acroniem voor &ldquo;GNU's Not "
@@ -69,7 +103,7 @@
 "voor gnoe) en ten derde is het een leuk woord om uit te spreken (of te <a "
 "href= \"http://www.poppyfields.net/poppy/songs/gnu.html\";>zingen</a>)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The word &ldquo;free&rdquo; in &ldquo;free software&rdquo; pertains to <a "
 "href=\"/philosophy/free-sw.html\">freedom</a>, not price.  You may or may "
@@ -96,13 +130,27 @@
 "steunt.  (Wanneer je GNU-software opnieuw verspreidt mag je daarvoor kosten "
 "in rekening brengen maar je mag het ook gratis weggeven.)"
 
-#. type: Content of: <p>
-msgid ""
-"The project to develop the GNU system is called the &ldquo;GNU "
-"Project&rdquo;.  The GNU Project was conceived in 1983 as a way of bringing "
-"back the cooperative spirit that prevailed in the computing community in "
-"earlier days&mdash;to make cooperation possible once again by removing the "
-"obstacles to cooperation imposed by the owners of proprietary software."
+#. type: Content of: <div><p>
+# | The project to develop the GNU system is called the &ldquo;GNU
+# | [-Project&rdquo;.-] {+Project.&rdquo;+} The GNU Project was conceived in
+# | 1983 as a way of bringing back the cooperative spirit that prevailed in
+# | the computing community in earlier days&mdash;to make cooperation possible
+# | once again by removing the obstacles to cooperation imposed by the owners
+# | of proprietary software.
+#, fuzzy
+#| msgid ""
+#| "The project to develop the GNU system is called the &ldquo;GNU "
+#| "Project&rdquo;.  The GNU Project was conceived in 1983 as a way of "
+#| "bringing back the cooperative spirit that prevailed in the computing "
+#| "community in earlier days&mdash;to make cooperation possible once again "
+#| "by removing the obstacles to cooperation imposed by the owners of "
+#| "proprietary software."
+msgid ""
+"The project to develop the GNU system is called the &ldquo;GNU Project."
+"&rdquo; The GNU Project was conceived in 1983 as a way of bringing back the "
+"cooperative spirit that prevailed in the computing community in earlier "
+"days&mdash;to make cooperation possible once again by removing the obstacles "
+"to cooperation imposed by the owners of proprietary software."
 msgstr ""
 "Het project om het GNU-systeem te ontwikkelen noemen we het &ldquo;GNU-"
 "project&rdquo;. Het GNU-project werd bedacht in 1983 met als doel de "
@@ -111,7 +159,7 @@
 "het verwijderen van de obstakels, opgeworpen door eigenaren van private "
 "software."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In 1971, when Richard Stallman started his career at MIT, he worked in a "
 "group which used <a href=\"/philosophy/free-sw.html\">free software</a> "
@@ -124,7 +172,7 @@
 "vrije software. Programmeurs hadden de vrijheid om met elkaar samen te "
 "werken en deden dat dan ook."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By the 1980s, almost all software was <a href=\"/philosophy/categories."
 "html#ProprietarySoftware\">proprietary</a>, which means that it had owners "
@@ -136,7 +184,7 @@
 "eigenaar had die samenwerking tussen gebruikers verbood. Dit maakte het GNU-"
 "project noodzakelijk."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Every computer user needs an operating system; if there is no free operating "
 "system, then you can't even get started using a computer without resorting "
@@ -149,7 +197,7 @@
 "de agenda van vrije software werd natuurlijk het realiseren van een vrij "
 "besturingssysteem."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We decided to make the operating system compatible with Unix because the "
 "overall design was already proven and portable, and because compatibility "
@@ -160,14 +208,28 @@
 "computers was over te zetten en de uitwisselbaarheid het gebruikers van Unix "
 "vergemakkelijkte om over te stappen van Unix naar GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | A Unix-like operating system includes a kernel, compilers, editors, text
+# | formatters, mail software, graphical interfaces, libraries, games and many
+# | other things.  Thus, writing a whole operating system is a very large job.
+# |  We started in January 1984.  The <a [-href=\"http://fsf.org/\";>-]
+# | {+href=\"https://www.fsf.org/\";>+} Free Software Foundation</a> was
+# | founded in October 1985, initially to raise funds to help develop GNU.
+#, fuzzy
+#| msgid ""
+#| "A Unix-like operating system includes a kernel, compilers, editors, text "
+#| "formatters, mail software, graphical interfaces, libraries, games and "
+#| "many other things.  Thus, writing a whole operating system is a very "
+#| "large job.  We started in January 1984.  The <a href=\"http://fsf.org/\";> "
+#| "Free Software Foundation</a> was founded in October 1985, initially to "
+#| "raise funds to help develop GNU."
 msgid ""
 "A Unix-like operating system includes a kernel, compilers, editors, text "
 "formatters, mail software, graphical interfaces, libraries, games and many "
 "other things.  Thus, writing a whole operating system is a very large job.  "
-"We started in January 1984.  The <a href=\"http://fsf.org/\";> Free Software "
-"Foundation</a> was founded in October 1985, initially to raise funds to help "
-"develop GNU."
+"We started in January 1984.  The <a href=\"https://www.fsf.org/\";> Free "
+"Software Foundation</a> was founded in October 1985, initially to raise "
+"funds to help develop GNU."
 msgstr ""
 "Een Unix-achtig besturingssysteem bestaat uit meer dan een kernel; het heeft "
 "ook compilers nodig, editors, tekstzetter-software, e-mailprogramma's en "
@@ -177,7 +239,30 @@
 "1985, oorspronkelijk met als doel om fondsen te werven voor de ontwikkeling "
 "van GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | By 1990 we had either found or written all the major components except
+# | one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by
+# | Linus Torvalds in 1991 and made free software in 1992.  Combining Linux
+# | with the almost-complete GNU system resulted in a complete operating
+# | system: the GNU/Linux system.  Estimates are that tens of millions of
+# | people now use GNU/Linux systems, typically via <a
+# | href=\"/distros/distros.html\">GNU/Linux distributions</a>.  The principal
+# | version of Linux now contains non[---]free firmware &ldquo;blobs&rdquo;;
+# | free software activists now maintain a modified free version of Linux,
+# | called <a [-href=\"http://directory.fsf.org/project/linux\";>-]
+# | {+href=\"https://directory.fsf.org/wiki/Linux-libre\";>+} Linux-libre</a>.
+#, fuzzy
+#| msgid ""
+#| "By 1990 we had either found or written all the major components except "
+#| "one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by "
+#| "Linus Torvalds in 1991 and made free software in 1992.  Combining Linux "
+#| "with the almost-complete GNU system resulted in a complete operating "
+#| "system: the GNU/Linux system.  Estimates are that tens of millions of "
+#| "people now use GNU/Linux systems, typically via <a href=\"/distros/"
+#| "distros.html\">GNU/Linux distributions</a>.  The principal version of "
+#| "Linux now contains non-free firmware &ldquo;blobs&rdquo;; free software "
+#| "activists now maintain a modified free version of Linux, called <a href="
+#| "\"http://directory.fsf.org/project/linux\";> Linux-libre</a>."
 msgid ""
 "By 1990 we had either found or written all the major components except "
 "one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by "
@@ -185,10 +270,10 @@
 "the almost-complete GNU system resulted in a complete operating system: the "
 "GNU/Linux system.  Estimates are that tens of millions of people now use GNU/"
 "Linux systems, typically via <a href=\"/distros/distros.html\">GNU/Linux "
-"distributions</a>.  The principal version of Linux now contains non-free "
+"distributions</a>.  The principal version of Linux now contains nonfree "
 "firmware &ldquo;blobs&rdquo;; free software activists now maintain a "
-"modified free version of Linux, called <a href=\"http://directory.fsf.org/";
-"project/linux\"> Linux-libre</a>."
+"modified free version of Linux, called <a href=\"https://directory.fsf.org/";
+"wiki/Linux-libre\"> Linux-libre</a>."
 msgstr ""
 "Tegen 1990 hadden we de belangrijkste onderdelen gevonden of zelf "
 "geschreven, op &eacute;&eacute;n na&mdash;de kernel. Toen kwam Linux, een "
@@ -202,13 +287,26 @@
 "software onderhouden tegenwoordig een gewijzigde, vrije versie van Linux, "
 "genaamd <a href=\"http://directory.fsf.org/project/linux\";> Linux-libre</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | However, the GNU Project is not limited to the core operating system.  We
+# | aim to provide a whole spectrum of software, whatever many users want to
+# | have.  This includes application software.  See the <a
+# | [-href=\"/directory\">Free-]
+# | {+href=\"https://directory.fsf.org/wiki/Main_Page\";>Free+} Software
+# | Directory</a> for a catalogue of free software application programs.
+#, fuzzy
+#| msgid ""
+#| "However, the GNU Project is not limited to the core operating system.  We "
+#| "aim to provide a whole spectrum of software, whatever many users want to "
+#| "have.  This includes application software.  See the <a href=\"/directory"
+#| "\">Free Software Directory</a> for a catalogue of free software "
+#| "application programs."
 msgid ""
 "However, the GNU Project is not limited to the core operating system.  We "
 "aim to provide a whole spectrum of software, whatever many users want to "
-"have.  This includes application software.  See the <a href=\"/directory"
-"\">Free Software Directory</a> for a catalogue of free software application "
-"programs."
+"have.  This includes application software.  See the <a href=\"https://";
+"directory.fsf.org/wiki/Main_Page\">Free Software Directory</a> for a "
+"catalogue of free software application programs."
 msgstr ""
 "Het GNU-project is echter niet beperkt tot het besturingssysteem. Ons doel "
 "is om een heel scala aan software aan te bieden, alles wat grote groepen "
@@ -216,28 +314,44 @@
 "het <a href=\"/directory\">Overzicht Vrije Software</a> voor een overzicht "
 "van vrije toepassingen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | We also want to provide software for users who are not computer experts. 
+# | Therefore we developed a <a href=\"http{+s+}://www.gnome.org/\">graphical
+# | desktop (called GNOME)</a> to help beginners use the GNU system.
+#, fuzzy
+#| msgid ""
+#| "We also want to provide software for users who are not computer experts.  "
+#| "Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical "
+#| "desktop (called GNOME)</a> to help beginners use the GNU system."
 msgid ""
 "We also want to provide software for users who are not computer experts.  "
-"Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical desktop "
-"(called GNOME)</a> to help beginners use the GNU system."
+"Therefore we developed a <a href=\"https://www.gnome.org/\";>graphical "
+"desktop (called GNOME)</a> to help beginners use the GNU system."
 msgstr ""
 "We willen ook software aanbieden aan gebruikers die geen computerexperts "
 "zijn.  Daarvoor hebben we een <a href=\"http://www.gnome.org/\";>grafisch "
 "bureaublad (GNOME genaamd)</a> ontwikkeld om beginnende gebruikers te helpen "
 "bij het gebruik van het GNU-systeem."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | We also want to provide games and other recreations.  Plenty of <a
+# | href=\"http{+s+}://directory.fsf.org/wiki/Category/Game\">free games</a>
+# | are already available.
+#, fuzzy
+#| msgid ""
+#| "We also want to provide games and other recreations.  Plenty of <a href="
+#| "\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are "
+#| "already available."
 msgid ""
 "We also want to provide games and other recreations.  Plenty of <a href="
-"\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
+"\"https://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
 "available."
 msgstr ""
 "We willen ook computerspellen en andere ontspanningssoftware aanbieden. Er "
 "zijn al veel <a href=\"http://directory.fsf.org/wiki/Category/Game\";>vrije "
 "spellen</a> verkrijgbaar."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "How far can free software go? There are no limits, except when <a href=\"/"
 "philosophy/fighting-software-patents.html\">laws such as the patent system "
@@ -278,14 +392,20 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "We doen ons best om goede vertalingen te maken maar staan altijd open voor "
@@ -295,12 +415,15 @@
 "voor informatie over het onderhoud van vertalingen op deze website."
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017 Free Software Foundation, Inc."
+# | Copyright &copy; [-2014, 2015, 2016, 2017-] {+1996, 1997, 2003, 2005,
+# | 2008, 2012, 2017, 2021+} Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+msgid ""
+"Copyright &copy; 1996, 1997, 2003, 2005, 2008, 2012, 2017, 2021 Free "
+"Software Foundation, Inc."
+msgstr "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -324,10 +447,28 @@
 msgid "Updated:"
 msgstr "Bijgewerkt:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017, 2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017, 2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "We doen ons best om goede vertalingen te maken maar staan altijd open "
+#~ "voor verbeteringen. Suggesties, op- en aanmerkingen sturen aan: <a href="
+#~ "\"mailto:web-translators@gnu.org\";>&lt;web-translators@gnu.org&gt;</a>.</"
+#~ "p> <p>Zie <a href=\"/server/standards/README.translations.html\"> "
+#~ "Translations README</a> voor informatie over het onderhoud van "
+#~ "vertalingen op deze website."
+
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017 Free Software Foundation, Inc."
+
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017, 2021 Free Software Foundation, Inc."

Index: po/gnu-history.pl.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-history.pl.po,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- po/gnu-history.pl.po        2 Nov 2021 13:25:56 -0000       1.35
+++ po/gnu-history.pl.po        2 Nov 2021 14:41:50 -0000       1.36
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-history.html\n"
-"POT-Creation-Date: 2017-09-04 10:56+0000\n"
+"POT-Creation-Date: 2021-11-02 13:26+0000\n"
 "PO-Revision-Date: 2014-04-06 19:41-0600\n"
 "Last-Translator: Jan Owoc <jsowoc AT gmail.com>\n"
 "Language-Team: Polish <www-pl-trans@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-11-02 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.0\n"
@@ -31,21 +32,42 @@
 "GNU, Projekt GNU, FSF, Wolne Oprogramowanie, Fundacja Wolnego "
 "Oprogramowania, Historia"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Overview of the GNU System"
 msgstr "Przegląd Systemu GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The GNU operating system is a complete free software system,
+# | upward-compatible with Unix.  GNU stands for &ldquo;GNU's Not
+# | [-Unix&rdquo;.-] {+Unix.&rdquo;+} It is pronounced as <a
+# | href=\"/gnu/pronunciation.html\">one syllable with a hard [-g</a>.-]
+# | {+<i>g</i></a>.+}  <a href=\"http{+s+}://www.stallman.org/\">Richard
+# | Stallman</a> made the <a href=\"/gnu/initial-announcement.html\">Initial
+# | Announcement</a> of the GNU Project in September 1983.  A longer version
+# | called the <a href=\"/gnu/manifesto.html\">GNU Manifesto</a> was published
+# | in March 1985.  It has been translated into several <a
+# | href=\"/gnu/manifesto.html#translations\">other languages</a>.
+#, fuzzy
+#| msgid ""
+#| "The GNU operating system is a complete free software system, upward-"
+#| "compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.  It "
+#| "is pronounced as <a href=\"/gnu/pronunciation.html\">one syllable with a "
+#| "hard g</a>.  <a href=\"http://www.stallman.org/\";>Richard Stallman</a> "
+#| "made the <a href=\"/gnu/initial-announcement.html\">Initial Announcement</"
+#| "a> of the GNU Project in September 1983.  A longer version called the <a "
+#| "href=\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March "
+#| "1985.  It has been translated into several <a href=\"/gnu/manifesto."
+#| "html#translations\">other languages</a>."
 msgid ""
 "The GNU operating system is a complete free software system, upward-"
-"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.  It is "
+"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix.&rdquo; It is "
 "pronounced as <a href=\"/gnu/pronunciation.html\">one syllable with a hard "
-"g</a>.  <a href=\"http://www.stallman.org/\";>Richard Stallman</a> made the "
-"<a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> of the "
-"GNU Project in September 1983.  A longer version called the <a href=\"/gnu/"
-"manifesto.html\">GNU Manifesto</a> was published in March 1985.  It has been "
-"translated into several <a href=\"/gnu/manifesto.html#translations\">other "
-"languages</a>."
+"<i>g</i></a>.  <a href=\"https://www.stallman.org/\";>Richard Stallman</a> "
+"made the <a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> "
+"of the GNU Project in September 1983.  A longer version called the <a href="
+"\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March 1985.  It "
+"has been translated into several <a href=\"/gnu/manifesto.html#translations"
+"\">other languages</a>."
 msgstr ""
 "System operacyjny GNU to kompletny wolny system operacyjny zgodny z&nbsp;"
 "Uniksem. Nazwa GNU oznacza &bdquo;GNU to Nie Unix&rdquo; (GNU's Not Unix). "
@@ -57,12 +79,24 @@
 "opublikowano w&nbsp;marcu 1985. Manifest GNU został przetłumaczony na&nbsp;"
 "kilkanaście <a href=\"/gnu/manifesto.html#translations\">innych 
języków</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The name &ldquo;GNU&rdquo; was chosen because it met a few requirements;
+# | first, it was a recursive acronym for &ldquo;GNU's Not [-Unix&rdquo;,-]
+# | {+Unix,&rdquo;+} second, because it was a real word, and third, it was fun
+# | to say (or <a
+# | href=\"http://www.poppyfields.net/poppy/songs/gnu.html\";>[-S-]{+s+}ing</a>)
+# | .
+#, fuzzy
+#| msgid ""
+#| "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
+#| "first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, "
+#| "second, because it was a real word, and third, it was fun to say (or <a "
+#| "href=\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
 msgid ""
 "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
-"first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, second, "
+"first, it was a recursive acronym for &ldquo;GNU's Not Unix,&rdquo; second, "
 "because it was a real word, and third, it was fun to say (or <a href="
-"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
+"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>sing</a>)."
 msgstr ""
 "Nazwę &bdquo;GNU&rdquo; wybrano, gdyż spełniła parę warunków 
na&nbsp;raz: "
 "po&nbsp;pierwsze, jest rekurencyjnym akronimem określenia &bdquo;GNU's Not "
@@ -70,7 +104,7 @@
 "i&nbsp;po trzecie &ndash; zabawnie brzmi (również w&nbsp;<a href=\"http://";
 "www.poppyfields.net/poppy/songs/gnu.html\">piosence</a>)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The word &ldquo;free&rdquo; in &ldquo;free software&rdquo; pertains to <a "
 "href=\"/philosophy/free-sw.html\">freedom</a>, not price.  You may or may "
@@ -97,13 +131,27 @@
 "oprogramowanie GNU, można pobierać opłaty za&nbsp;akt fizycznego "
 "przekazania; można też je rozdawać za&nbsp;darmo.)"
 
-#. type: Content of: <p>
-msgid ""
-"The project to develop the GNU system is called the &ldquo;GNU "
-"Project&rdquo;.  The GNU Project was conceived in 1983 as a way of bringing "
-"back the cooperative spirit that prevailed in the computing community in "
-"earlier days&mdash;to make cooperation possible once again by removing the "
-"obstacles to cooperation imposed by the owners of proprietary software."
+#. type: Content of: <div><p>
+# | The project to develop the GNU system is called the &ldquo;GNU
+# | [-Project&rdquo;.-] {+Project.&rdquo;+} The GNU Project was conceived in
+# | 1983 as a way of bringing back the cooperative spirit that prevailed in
+# | the computing community in earlier days&mdash;to make cooperation possible
+# | once again by removing the obstacles to cooperation imposed by the owners
+# | of proprietary software.
+#, fuzzy
+#| msgid ""
+#| "The project to develop the GNU system is called the &ldquo;GNU "
+#| "Project&rdquo;.  The GNU Project was conceived in 1983 as a way of "
+#| "bringing back the cooperative spirit that prevailed in the computing "
+#| "community in earlier days&mdash;to make cooperation possible once again "
+#| "by removing the obstacles to cooperation imposed by the owners of "
+#| "proprietary software."
+msgid ""
+"The project to develop the GNU system is called the &ldquo;GNU Project."
+"&rdquo; The GNU Project was conceived in 1983 as a way of bringing back the "
+"cooperative spirit that prevailed in the computing community in earlier "
+"days&mdash;to make cooperation possible once again by removing the obstacles "
+"to cooperation imposed by the owners of proprietary software."
 msgstr ""
 "Przedsięwzięcie utworzenia systemu GNU nosi nazwę &bdquo;Projekt 
GNU&rdquo;. "
 "Projekt GNU został zapoczątkowany w&nbsp;1983 roku jako próba wskrzeszenia 
"
@@ -113,7 +161,7 @@
 "współpracy, które ustanowili właściciele oprogramowania prawnie "
 "zastrzeżonego."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In 1971, when Richard Stallman started his career at MIT, he worked in a "
 "group which used <a href=\"/philosophy/free-sw.html\">free software</a> "
@@ -126,7 +174,7 @@
 "firmy komputerowe. Programiści mieli wolność współpracy &ndash; i&nbsp;"
 "często współpracowali ze sobą."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By the 1980s, almost all software was <a href=\"/philosophy/categories."
 "html#ProprietarySoftware\">proprietary</a>, which means that it had owners "
@@ -139,7 +187,7 @@
 "i&nbsp;nie dopuszczali do&nbsp;współpracy użytkowników. Dlatego&nbsp;"
 "powstanie projektu GNU stało się koniecznością."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Every computer user needs an operating system; if there is no free operating "
 "system, then you can't even get started using a computer without resorting "
@@ -152,7 +200,7 @@
 "elementem w&nbsp;planie przygotowania wolnego oprogramowania musiał stać 
się "
 "wolny system operacyjny."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We decided to make the operating system compatible with Unix because the "
 "overall design was already proven and portable, and because compatibility "
@@ -163,14 +211,28 @@
 "zaś&nbsp;wspomniana kompatybilność ułatwia użytkownikom Uniksa 
przejście "
 "na&nbsp;GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | A Unix-like operating system includes a kernel, compilers, editors, text
+# | formatters, mail software, graphical interfaces, libraries, games and many
+# | other things.  Thus, writing a whole operating system is a very large job.
+# |  We started in January 1984.  The <a [-href=\"http://fsf.org/\";>-]
+# | {+href=\"https://www.fsf.org/\";>+} Free Software Foundation</a> was
+# | founded in October 1985, initially to raise funds to help develop GNU.
+#, fuzzy
+#| msgid ""
+#| "A Unix-like operating system includes a kernel, compilers, editors, text "
+#| "formatters, mail software, graphical interfaces, libraries, games and "
+#| "many other things.  Thus, writing a whole operating system is a very "
+#| "large job.  We started in January 1984.  The <a href=\"http://fsf.org/\";> "
+#| "Free Software Foundation</a> was founded in October 1985, initially to "
+#| "raise funds to help develop GNU."
 msgid ""
 "A Unix-like operating system includes a kernel, compilers, editors, text "
 "formatters, mail software, graphical interfaces, libraries, games and many "
 "other things.  Thus, writing a whole operating system is a very large job.  "
-"We started in January 1984.  The <a href=\"http://fsf.org/\";> Free Software "
-"Foundation</a> was founded in October 1985, initially to raise funds to help "
-"develop GNU."
+"We started in January 1984.  The <a href=\"https://www.fsf.org/\";> Free "
+"Software Foundation</a> was founded in October 1985, initially to raise "
+"funds to help develop GNU."
 msgstr ""
 "System operacyjny typu uniksowego zawiera jądro, kompilatory, edytory, "
 "narzędzia do&nbsp;formatowania tekstu, programy do&nbsp;obsługi poczty, "
@@ -180,7 +242,30 @@
 "\">Fundację Wolnego Oprogramowania (FSF)</a> założono w&nbsp;październiku 
"
 "1985, początkowo w&nbsp;celu zbierania środków na&nbsp;rozwój GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | By 1990 we had either found or written all the major components except
+# | one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by
+# | Linus Torvalds in 1991 and made free software in 1992.  Combining Linux
+# | with the almost-complete GNU system resulted in a complete operating
+# | system: the GNU/Linux system.  Estimates are that tens of millions of
+# | people now use GNU/Linux systems, typically via <a
+# | href=\"/distros/distros.html\">GNU/Linux distributions</a>.  The principal
+# | version of Linux now contains non[---]free firmware &ldquo;blobs&rdquo;;
+# | free software activists now maintain a modified free version of Linux,
+# | called <a [-href=\"http://directory.fsf.org/project/linux\";>-]
+# | {+href=\"https://directory.fsf.org/wiki/Linux-libre\";>+} Linux-libre</a>.
+#, fuzzy
+#| msgid ""
+#| "By 1990 we had either found or written all the major components except "
+#| "one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by "
+#| "Linus Torvalds in 1991 and made free software in 1992.  Combining Linux "
+#| "with the almost-complete GNU system resulted in a complete operating "
+#| "system: the GNU/Linux system.  Estimates are that tens of millions of "
+#| "people now use GNU/Linux systems, typically via <a href=\"/distros/"
+#| "distros.html\">GNU/Linux distributions</a>.  The principal version of "
+#| "Linux now contains non-free firmware &ldquo;blobs&rdquo;; free software "
+#| "activists now maintain a modified free version of Linux, called <a href="
+#| "\"http://directory.fsf.org/project/linux\";> Linux-libre</a>."
 msgid ""
 "By 1990 we had either found or written all the major components except "
 "one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by "
@@ -188,10 +273,10 @@
 "the almost-complete GNU system resulted in a complete operating system: the "
 "GNU/Linux system.  Estimates are that tens of millions of people now use GNU/"
 "Linux systems, typically via <a href=\"/distros/distros.html\">GNU/Linux "
-"distributions</a>.  The principal version of Linux now contains non-free "
+"distributions</a>.  The principal version of Linux now contains nonfree "
 "firmware &ldquo;blobs&rdquo;; free software activists now maintain a "
-"modified free version of Linux, called <a href=\"http://directory.fsf.org/";
-"project/linux\"> Linux-libre</a>."
+"modified free version of Linux, called <a href=\"https://directory.fsf.org/";
+"wiki/Linux-libre\"> Linux-libre</a>."
 msgstr ""
 "Wraz z&nbsp;nadejściem lat dziewięćdziesiątych znaleźliśmy lub&nbsp;"
 "napisaliśmy wszystkie główne składniki systemu oprócz jednego &ndash; ją
dra. "
@@ -205,13 +290,26 @@
 "zmodyfikowaną i&nbsp;wolną wersją Linuksa nazwaną <a 
href=\"http://directory.";
 "fsf.org/project/linux\">Linux-libre</a>.)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | However, the GNU Project is not limited to the core operating system.  We
+# | aim to provide a whole spectrum of software, whatever many users want to
+# | have.  This includes application software.  See the <a
+# | [-href=\"/directory\">Free-]
+# | {+href=\"https://directory.fsf.org/wiki/Main_Page\";>Free+} Software
+# | Directory</a> for a catalogue of free software application programs.
+#, fuzzy
+#| msgid ""
+#| "However, the GNU Project is not limited to the core operating system.  We "
+#| "aim to provide a whole spectrum of software, whatever many users want to "
+#| "have.  This includes application software.  See the <a href=\"/directory"
+#| "\">Free Software Directory</a> for a catalogue of free software "
+#| "application programs."
 msgid ""
 "However, the GNU Project is not limited to the core operating system.  We "
 "aim to provide a whole spectrum of software, whatever many users want to "
-"have.  This includes application software.  See the <a href=\"/directory"
-"\">Free Software Directory</a> for a catalogue of free software application "
-"programs."
+"have.  This includes application software.  See the <a href=\"https://";
+"directory.fsf.org/wiki/Main_Page\">Free Software Directory</a> for a "
+"catalogue of free software application programs."
 msgstr ""
 "Projekt GNU nie ogranicza się jednak&nbsp;do samego systemu operacyjnego. "
 "Chcemy zapewniać całą gamę oprogramowania, jakiego tylko życzą sobie "
@@ -219,28 +317,44 @@
 "directory\">Katalogu Wolnego Oprogramowania</a> można znaleźć wiele 
wolnych "
 "programów użytkowych."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | We also want to provide software for users who are not computer experts. 
+# | Therefore we developed a <a href=\"http{+s+}://www.gnome.org/\">graphical
+# | desktop (called GNOME)</a> to help beginners use the GNU system.
+#, fuzzy
+#| msgid ""
+#| "We also want to provide software for users who are not computer experts.  "
+#| "Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical "
+#| "desktop (called GNOME)</a> to help beginners use the GNU system."
 msgid ""
 "We also want to provide software for users who are not computer experts.  "
-"Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical desktop "
-"(called GNOME)</a> to help beginners use the GNU system."
+"Therefore we developed a <a href=\"https://www.gnome.org/\";>graphical "
+"desktop (called GNOME)</a> to help beginners use the GNU system."
 msgstr ""
 "Chcemy zapewnić oprogramowanie dla użytkowników, którzy nie są 
ekspertami "
 "od&nbsp;komputerów. Dlatego&nbsp;pracujemy nad&nbsp;<a href=\"http://www.";
 "gnome.org/\">pulpitem graficznym(zwanym GNOME)</a>, aby&nbsp;ułatwić "
 "początkującym korzystanie z&nbsp;systemu GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | We also want to provide games and other recreations.  Plenty of <a
+# | href=\"http{+s+}://directory.fsf.org/wiki/Category/Game\">free games</a>
+# | are already available.
+#, fuzzy
+#| msgid ""
+#| "We also want to provide games and other recreations.  Plenty of <a href="
+#| "\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are "
+#| "already available."
 msgid ""
 "We also want to provide games and other recreations.  Plenty of <a href="
-"\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
+"\"https://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
 "available."
 msgstr ""
 "Chcemy również zapewnić gry i&nbsp;inne programy dostarczające rozrywki. "
 "Niektóre <a href=\"http://directory.fsf.org/wiki/Category/Game\";>wolne gry</"
 "a> są już dostępne."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "How far can free software go? There are no limits, except when <a href=\"/"
 "philosophy/fighting-software-patents.html\">laws such as the patent system "
@@ -283,14 +397,20 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Staramy się, aby&nbsp;tłumaczenia były wierne i&nbsp;wysokiej jakości, "
@@ -303,9 +423,16 @@
 "tłumaczeń</a>."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; 1996, 1997, [-1998, 1999, 2001, 2002,-] 2003, 2005,
+# | [-2007, 2009,-] {+2008,+} 2012, [-2014, 2017-] {+2017, 2021+} Free
+# | Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#| "2009, 2012, 2014, 2017 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017 Free Software Foundation, Inc."
+"Copyright &copy; 1996, 1997, 2003, 2005, 2008, 2012, 2017, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
 "2012, 2014, 2017 Free Software Foundation, Inc."
@@ -333,10 +460,9 @@
 msgid "Updated:"
 msgstr "Aktualizowane:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017, 2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017, 2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017, 2021 Free Software Foundation, Inc."

Index: po/gnu-history.pt-br.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-history.pt-br.po,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- po/gnu-history.pt-br.po     2 Nov 2021 13:25:56 -0000       1.22
+++ po/gnu-history.pt-br.po     2 Nov 2021 14:41:50 -0000       1.23
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-history.html\n"
-"POT-Creation-Date: 2017-09-04 10:56+0000\n"
+"POT-Creation-Date: 2021-11-02 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"
@@ -17,6 +17,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bits\n"
+"X-Outdated-Since: 2021-11-02 13:26+0000\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "X-Generator: Gtranslator 40.0\n"
 
@@ -29,21 +30,32 @@
 msgstr ""
 "GNU, Projeto GNU, FSF, Software Livre, Free Software Foundation, História"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Overview of the GNU System"
 msgstr "Visão Geral do Sistema GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The GNU operating system is a complete free software system, upward-"
+#| "compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.  It "
+#| "is pronounced as <a href=\"/gnu/pronunciation.html\">one syllable with a "
+#| "hard g</a>.  <a href=\"http://www.stallman.org/\";>Richard Stallman</a> "
+#| "made the <a href=\"/gnu/initial-announcement.html\">Initial Announcement</"
+#| "a> of the GNU Project in September 1983.  A longer version called the <a "
+#| "href=\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March "
+#| "1985.  It has been translated into several <a href=\"/gnu/manifesto."
+#| "html#translations\">other languages</a>."
 msgid ""
 "The GNU operating system is a complete free software system, upward-"
-"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.  It is "
+"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix.&rdquo; It is "
 "pronounced as <a href=\"/gnu/pronunciation.html\">one syllable with a hard "
-"g</a>.  <a href=\"http://www.stallman.org/\";>Richard Stallman</a> made the "
-"<a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> of the "
-"GNU Project in September 1983.  A longer version called the <a href=\"/gnu/"
-"manifesto.html\">GNU Manifesto</a> was published in March 1985.  It has been "
-"translated into several <a href=\"/gnu/manifesto.html#translations\">other "
-"languages</a>."
+"<i>g</i></a>.  <a href=\"https://www.stallman.org/\";>Richard Stallman</a> "
+"made the <a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> "
+"of the GNU Project in September 1983.  A longer version called the <a href="
+"\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March 1985.  It "
+"has been translated into several <a href=\"/gnu/manifesto.html#translations"
+"\">other languages</a>."
 msgstr ""
 "O sistema operacional GNU é um sistema de software livre completo, "
 "compatível com o Unix. GNU significa “GNU's Not Unix” (GNU Não é 
Unix). Ele "
@@ -55,19 +67,25 @@
 "tem sido traduzido para várias <a href=\"/gnu/manifesto.html#translations"
 "\">outras línguas</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
+#| "first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, "
+#| "second, because it was a real word, and third, it was fun to say (or <a "
+#| "href=\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
 msgid ""
 "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
-"first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, second, "
+"first, it was a recursive acronym for &ldquo;GNU's Not Unix,&rdquo; second, "
 "because it was a real word, and third, it was fun to say (or <a href="
-"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
+"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>sing</a>)."
 msgstr ""
 "O nome “GNU” foi escolhido porque atende a alguns requisitos; em primeiro 
"
 "lugar, é um acrônimo recursivo para “GNU's Not Unix”, depois, porque é 
uma "
 "palavra real e, finalmente, é divertido de falar (ou <a href=\"http://www.";
 "poppyfields.net/poppy/songs/gnu.html\">Cantar</a>)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The word &ldquo;free&rdquo; in &ldquo;free software&rdquo; pertains to <a "
 "href=\"/philosophy/free-sw.html\">freedom</a>, not price.  You may or may "
@@ -92,13 +110,21 @@
 "físico de transferir uma cópia, ou você pode simplesmente dar cópias de "
 "graça.)"
 
-#. type: Content of: <p>
-msgid ""
-"The project to develop the GNU system is called the &ldquo;GNU "
-"Project&rdquo;.  The GNU Project was conceived in 1983 as a way of bringing "
-"back the cooperative spirit that prevailed in the computing community in "
-"earlier days&mdash;to make cooperation possible once again by removing the "
-"obstacles to cooperation imposed by the owners of proprietary software."
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The project to develop the GNU system is called the &ldquo;GNU "
+#| "Project&rdquo;.  The GNU Project was conceived in 1983 as a way of "
+#| "bringing back the cooperative spirit that prevailed in the computing "
+#| "community in earlier days&mdash;to make cooperation possible once again "
+#| "by removing the obstacles to cooperation imposed by the owners of "
+#| "proprietary software."
+msgid ""
+"The project to develop the GNU system is called the &ldquo;GNU Project."
+"&rdquo; The GNU Project was conceived in 1983 as a way of bringing back the "
+"cooperative spirit that prevailed in the computing community in earlier "
+"days&mdash;to make cooperation possible once again by removing the obstacles "
+"to cooperation imposed by the owners of proprietary software."
 msgstr ""
 "O projeto que desenvolve o sistema GNU é chamado de “Projeto GNU”.  O "
 "Projeto GNU foi concebido em 1983 como uma maneira de trazer de volta o "
@@ -106,7 +132,7 @@
 "primórdios — para tornar a cooperação possível novamente ao remover os "
 "obstáculos à cooperação impostos pelos donos de software privativo."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In 1971, when Richard Stallman started his career at MIT, he worked in a "
 "group which used <a href=\"/philosophy/free-sw.html\">free software</a> "
@@ -119,7 +145,7 @@
 "distribuíam software livre.  Programadores eram livres para cooperar uns com 
"
 "os outros, e frequentemente o faziam."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By the 1980s, almost all software was <a href=\"/philosophy/categories."
 "html#ProprietarySoftware\">proprietary</a>, which means that it had owners "
@@ -131,7 +157,7 @@
 "possuía donos que proibiam e evitavam a cooperação dos usuários.  Isso "
 "tornou o Projeto GNU necessário."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Every computer user needs an operating system; if there is no free operating "
 "system, then you can't even get started using a computer without resorting "
@@ -143,7 +169,7 @@
 "computador sem recorrer a software privativo. Dessa forma, o primeiro item "
 "na agenda do software livre tinha de ser um sistema operacional livre."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We decided to make the operating system compatible with Unix because the "
 "overall design was already proven and portable, and because compatibility "
@@ -153,14 +179,22 @@
 "design geral já era testado e portável, e porque a compatibilidade facilita 
"
 "que usuários de Unix migrem para o GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "A Unix-like operating system includes a kernel, compilers, editors, text "
+#| "formatters, mail software, graphical interfaces, libraries, games and "
+#| "many other things.  Thus, writing a whole operating system is a very "
+#| "large job.  We started in January 1984.  The <a href=\"http://fsf.org/\";> "
+#| "Free Software Foundation</a> was founded in October 1985, initially to "
+#| "raise funds to help develop GNU."
 msgid ""
 "A Unix-like operating system includes a kernel, compilers, editors, text "
 "formatters, mail software, graphical interfaces, libraries, games and many "
 "other things.  Thus, writing a whole operating system is a very large job.  "
-"We started in January 1984.  The <a href=\"http://fsf.org/\";> Free Software "
-"Foundation</a> was founded in October 1985, initially to raise funds to help "
-"develop GNU."
+"We started in January 1984.  The <a href=\"https://www.fsf.org/\";> Free "
+"Software Foundation</a> was founded in October 1985, initially to raise "
+"funds to help develop GNU."
 msgstr ""
 "Um sistema operacional do tipo Unix inclui um kernel, compiladores, "
 "editores, formatadores de texto, clientes de e-mail, interfaces gráficas, "
@@ -170,7 +204,19 @@
 "outubro de 1985, inicialmente para levantar fundos para ajudar a desenvolver "
 "o GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "By 1990 we had either found or written all the major components except "
+#| "one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by "
+#| "Linus Torvalds in 1991 and made free software in 1992.  Combining Linux "
+#| "with the almost-complete GNU system resulted in a complete operating "
+#| "system: the GNU/Linux system.  Estimates are that tens of millions of "
+#| "people now use GNU/Linux systems, typically via <a href=\"/distros/"
+#| "distros.html\">GNU/Linux distributions</a>.  The principal version of "
+#| "Linux now contains non-free firmware &ldquo;blobs&rdquo;; free software "
+#| "activists now maintain a modified free version of Linux, called <a href="
+#| "\"http://directory.fsf.org/project/linux\";> Linux-libre</a>."
 msgid ""
 "By 1990 we had either found or written all the major components except "
 "one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by "
@@ -178,10 +224,10 @@
 "the almost-complete GNU system resulted in a complete operating system: the "
 "GNU/Linux system.  Estimates are that tens of millions of people now use GNU/"
 "Linux systems, typically via <a href=\"/distros/distros.html\">GNU/Linux "
-"distributions</a>.  The principal version of Linux now contains non-free "
+"distributions</a>.  The principal version of Linux now contains nonfree "
 "firmware &ldquo;blobs&rdquo;; free software activists now maintain a "
-"modified free version of Linux, called <a href=\"http://directory.fsf.org/";
-"project/linux\"> Linux-libre</a>."
+"modified free version of Linux, called <a href=\"https://directory.fsf.org/";
+"wiki/Linux-libre\"> Linux-libre</a>."
 msgstr ""
 "Por volta de 1990 nós havíamos encontrado ou escrito todos os componentes "
 "principais, exceto um — o kernel.  Então o Linux, um kernel do tipo Unix, "
@@ -194,41 +240,58 @@
 "do software livre mantém uma versão do Linux modificada e livre, chamada <a 
"
 "href=\"http://directory.fsf.org/project/linux\";>Linux-libre</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "However, the GNU Project is not limited to the core operating system.  We "
+#| "aim to provide a whole spectrum of software, whatever many users want to "
+#| "have.  This includes application software.  See the <a href=\"/directory"
+#| "\">Free Software Directory</a> for a catalogue of free software "
+#| "application programs."
 msgid ""
 "However, the GNU Project is not limited to the core operating system.  We "
 "aim to provide a whole spectrum of software, whatever many users want to "
-"have.  This includes application software.  See the <a href=\"/directory"
-"\">Free Software Directory</a> for a catalogue of free software application "
-"programs."
+"have.  This includes application software.  See the <a href=\"https://";
+"directory.fsf.org/wiki/Main_Page\">Free Software Directory</a> for a "
+"catalogue of free software application programs."
 msgstr ""
 "Entretanto, o Projeto GNU não se limita ao cerne do sistema operacional.  "
 "Visamos fornecer todo um espectro de software, o que quer que os usuários "
 "desejem ter.  Isso inclui aplicativos.  Veja o <a href=\"/directory"
 "\">Diretório de Software Livre</a> para um catálogo de aplicativos livres."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "We also want to provide software for users who are not computer experts.  "
+#| "Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical "
+#| "desktop (called GNOME)</a> to help beginners use the GNU system."
 msgid ""
 "We also want to provide software for users who are not computer experts.  "
-"Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical desktop "
-"(called GNOME)</a> to help beginners use the GNU system."
+"Therefore we developed a <a href=\"https://www.gnome.org/\";>graphical "
+"desktop (called GNOME)</a> to help beginners use the GNU system."
 msgstr ""
 "Nós também desejamos fornecer software para usuários que não são "
 "especialistas em computadores. Por esse motivo, nós desenvolvemos um <a 
href="
 "\"http://www.gnome.org/\";>ambiente gráfico (chamado GNOME)</a> para ajudar "
 "iniciantes a utilizar o sistema GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "We also want to provide games and other recreations.  Plenty of <a href="
+#| "\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are "
+#| "already available."
 msgid ""
 "We also want to provide games and other recreations.  Plenty of <a href="
-"\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
+"\"https://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
 "available."
 msgstr ""
 "Também queremos fornecer jogos e outros programas recreativos.  Um grande "
 "número de <a href=\"http://directory.fsf.org/wiki/Category/Game\";>jogos "
 "livres</a> já está disponível."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "How far can free software go? There are no limits, except when <a href=\"/"
 "philosophy/fighting-software-patents.html\">laws such as the patent system "
@@ -268,14 +331,14 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "A equipe de traduções para o português brasileiro se esforça para 
oferecer "
@@ -283,16 +346,20 @@
 "favor, envie seus comentários e sugestões em geral sobre as traduções 
para "
 "<a href=\"mailto:web-translators@gnu.org\";>&lt;web-translators@gnu.org&gt;</"
 "a>. </p><p>Consulte o <a href=\"/server/standards/README.translations.html"
-"\">Guia para as traduções</a> para mais informações sobre a coordenação 
e o "
-"envio de traduções das páginas deste site."
+"\">Guia para as traduções</a> para mais informações sobre a coordenação 
e a "
+"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; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017 Free Software Foundation, Inc."
+"Copyright &copy; 1996, 1997, 2003, 2005, 2008, 2012, 2017, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017 Free Software Foundation, Inc."
+"Copyright &copy; 2014, 2015, 2016, 2017, 2018, 2019 Free Software "
+"Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -317,10 +384,16 @@
 msgid "Updated:"
 msgstr "Última atualização:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017, 2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017, 2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017 Free Software Foundation, Inc."
+
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017, 2021 Free Software Foundation, Inc."

Index: po/gnu-history.ro.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-history.ro.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- po/gnu-history.ro.po        31 May 2021 09:06:17 -0000      1.8
+++ po/gnu-history.ro.po        2 Nov 2021 14:41:50 -0000       1.9
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-history.html\n"
-"POT-Creation-Date: 2017-09-04 10:56+0000\n"
+"POT-Creation-Date: 2021-11-02 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"
@@ -31,19 +31,21 @@
 "GNU, Proiectul GNU, FSF, Software Liber, Fundatia pentru Software Liber, "
 "Istorie"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Overview of the GNU System"
 msgstr "Scurtă istorie a sistemului GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | The GNU operating system is a complete free software system,
-# | upward-compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.
-# |  {+It is pronounced as <a href=\"/gnu/pronunciation.html\">one syllable
-# | with a hard g</a>.+}  <a href=\"http://www.stallman.org/\";>Richard
-# | Stallman</a> made the <a href=\"/gnu/initial-announcement.html\">Initial
-# | Announcement</a> of the GNU Project in September 1983.  A longer version
-# | called the <a href=\"/gnu/manifesto.html\">GNU Manifesto</a> was published
-# | in March 1985.  It has been translated into several <a
+# | upward-compatible with Unix.  GNU stands for &ldquo;GNU's Not
+# | [-Unix&rdquo;.-] {+Unix.&rdquo; It is pronounced as+} <a
+# | [-href=\"http://www.stallman.org/\";>Richard-]
+# | {+href=\"/gnu/pronunciation.html\">one syllable with a hard <i>g</i></a>. 
+# | <a href=\"https://www.stallman.org/\";>Richard+} Stallman</a> made the <a
+# | href=\"/gnu/initial-announcement.html\">Initial Announcement</a> of the
+# | GNU Project in September 1983.  A longer version called the <a
+# | href=\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March
+# | 1985.  It has been translated into several <a
 # | href=\"/gnu/manifesto.html#translations\">other languages</a>.
 #, fuzzy
 #| msgid ""
@@ -57,14 +59,14 @@
 #| "\">other languages</a>."
 msgid ""
 "The GNU operating system is a complete free software system, upward-"
-"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.  It is "
+"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix.&rdquo; It is "
 "pronounced as <a href=\"/gnu/pronunciation.html\">one syllable with a hard "
-"g</a>.  <a href=\"http://www.stallman.org/\";>Richard Stallman</a> made the "
-"<a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> of the "
-"GNU Project in September 1983.  A longer version called the <a href=\"/gnu/"
-"manifesto.html\">GNU Manifesto</a> was published in March 1985.  It has been "
-"translated into several <a href=\"/gnu/manifesto.html#translations\">other "
-"languages</a>."
+"<i>g</i></a>.  <a href=\"https://www.stallman.org/\";>Richard Stallman</a> "
+"made the <a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> "
+"of the GNU Project in September 1983.  A longer version called the <a href="
+"\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March 1985.  It "
+"has been translated into several <a href=\"/gnu/manifesto.html#translations"
+"\">other languages</a>."
 msgstr ""
 "Proiectul GNU a creat un sistem de operare complet liber, ce are o "
 "compatibilitate originară cu Unix. „GNU” semnifică „GNU Nu-i Unix”. 
<a href="
@@ -74,12 +76,24 @@
 "Aceasta a fost tradusă în <a href=\"/gnu/manifesto.html#translations\">mai "
 "multe limbi</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The name &ldquo;GNU&rdquo; was chosen because it met a few requirements;
+# | first, it was a recursive acronym for &ldquo;GNU's Not [-Unix&rdquo;,-]
+# | {+Unix,&rdquo;+} second, because it was a real word, and third, it was fun
+# | to say (or <a
+# | href=\"http://www.poppyfields.net/poppy/songs/gnu.html\";>[-S-]{+s+}ing</a>)
+# | .
+#, fuzzy
+#| msgid ""
+#| "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
+#| "first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, "
+#| "second, because it was a real word, and third, it was fun to say (or <a "
+#| "href=\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
 msgid ""
 "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
-"first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, second, "
+"first, it was a recursive acronym for &ldquo;GNU's Not Unix,&rdquo; second, "
 "because it was a real word, and third, it was fun to say (or <a href="
-"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
+"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>sing</a>)."
 msgstr ""
 "Numele „GNU” a fost ales fiindcă împlinea cîteva năzuințe: în 
primul rînd, "
 "deoarece era un acronim recursiv pentru „GNU Nu-i Unix”, apoi, pentru că 
era "
@@ -87,7 +101,7 @@
 "(sau de <a href=\"http://www.poppyfields.net/poppy/songs/gnu.html\";>cîntat</"
 "a>)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The word &ldquo;free&rdquo; in &ldquo;free software&rdquo; pertains to <a "
 "href=\"/philosophy/free-sw.html\">freedom</a>, not price.  You may or may "
@@ -112,13 +126,27 @@
 "(Dacă redistribuiți software GNU, puteți percepe o taxă pentru transferul 
"
 "copiilor sau le puteti împărți gratuit.)"
 
-#. type: Content of: <p>
-msgid ""
-"The project to develop the GNU system is called the &ldquo;GNU "
-"Project&rdquo;.  The GNU Project was conceived in 1983 as a way of bringing "
-"back the cooperative spirit that prevailed in the computing community in "
-"earlier days&mdash;to make cooperation possible once again by removing the "
-"obstacles to cooperation imposed by the owners of proprietary software."
+#. type: Content of: <div><p>
+# | The project to develop the GNU system is called the &ldquo;GNU
+# | [-Project&rdquo;.-] {+Project.&rdquo;+} The GNU Project was conceived in
+# | 1983 as a way of bringing back the cooperative spirit that prevailed in
+# | the computing community in earlier days&mdash;to make cooperation possible
+# | once again by removing the obstacles to cooperation imposed by the owners
+# | of proprietary software.
+#, fuzzy
+#| msgid ""
+#| "The project to develop the GNU system is called the &ldquo;GNU "
+#| "Project&rdquo;.  The GNU Project was conceived in 1983 as a way of "
+#| "bringing back the cooperative spirit that prevailed in the computing "
+#| "community in earlier days&mdash;to make cooperation possible once again "
+#| "by removing the obstacles to cooperation imposed by the owners of "
+#| "proprietary software."
+msgid ""
+"The project to develop the GNU system is called the &ldquo;GNU Project."
+"&rdquo; The GNU Project was conceived in 1983 as a way of bringing back the "
+"cooperative spirit that prevailed in the computing community in earlier "
+"days&mdash;to make cooperation possible once again by removing the obstacles "
+"to cooperation imposed by the owners of proprietary software."
 msgstr ""
 "Proiectul pentru dezvoltarea sistemului GNU se numește „Proiectul GNU”. "
 "Acesta a fost conceput în 1983 ca o modalite de a renaște spiritul de "
@@ -126,7 +154,7 @@
 "cooperarea din nou posibilă prin înlăturarea piedicilor impuse în calea 
ei "
 "de către deținătorii de software proprietar."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In 1971, when Richard Stallman started his career at MIT, he worked in a "
 "group which used <a href=\"/philosophy/free-sw.html\">free software</a> "
@@ -138,7 +166,7 @@
 "distribuiau deseori software liber. Programatorii erau liberi să colaboreze "
 "unul cu celălalt și o făceau adesea."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By the 1980s, almost all software was <a href=\"/philosophy/categories."
 "html#ProprietarySoftware\">proprietary</a>, which means that it had owners "
@@ -149,7 +177,7 @@
 "înseamnă că avea deținători ce inhibau și interziceau cooperarea între 
"
 "utilizatori. Această stare a făcut necasară înființarea Proiectului GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Every computer user needs an operating system; if there is no free operating "
 "system, then you can't even get started using a computer without resorting "
@@ -161,7 +189,7 @@
 "a recurge la software proprietar. De aceea primul pas pe calea Proiectului "
 "GNU trebuia neapărat să fie crearea unui sistem de operare liber."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We decided to make the operating system compatible with Unix because the "
 "overall design was already proven and portable, and because compatibility "
@@ -172,14 +200,14 @@
 "deoarece compatibilitatea ar fi ușurat trecearea utilizatorilor de Unix "
 "către GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | A Unix-like operating system [-is much more than a kernel; it also-]
 # | includes {+a kernel,+} compilers, editors, text formatters, mail software,
 # | {+graphical interfaces, libraries, games+} and many other things.  Thus,
 # | writing a whole operating system is a very large job.  We started in
-# | January 1984.  The <a href=\"http://fsf.org/\";> Free Software
-# | Foundation</a> was founded in October 1985, initially to raise funds to
-# | help develop GNU.
+# | January 1984.  The <a [-href=\"http://fsf.org/\";>-]
+# | {+href=\"https://www.fsf.org/\";>+} Free Software Foundation</a> was
+# | founded in October 1985, initially to raise funds to help develop GNU.
 #, fuzzy
 #| msgid ""
 #| "A Unix-like operating system is much more than a kernel; it also includes "
@@ -192,9 +220,9 @@
 "A Unix-like operating system includes a kernel, compilers, editors, text "
 "formatters, mail software, graphical interfaces, libraries, games and many "
 "other things.  Thus, writing a whole operating system is a very large job.  "
-"We started in January 1984.  The <a href=\"http://fsf.org/\";> Free Software "
-"Foundation</a> was founded in October 1985, initially to raise funds to help "
-"develop GNU."
+"We started in January 1984.  The <a href=\"https://www.fsf.org/\";> Free "
+"Software Foundation</a> was founded in October 1985, initially to raise "
+"funds to help develop GNU."
 msgstr ""
 "Un sistem de operarea asemenea Unix-ului înseamnă mult mai mult decît un "
 "simplu nucleu; el cuprinde, de asemenea, compilatoare, editoare, modelatoare "
@@ -204,7 +232,7 @@
 "fost întemeiată in 1985, la început cu scopul de a strînge fonduri pentru 
"
 "Proiectul GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | By 1990 we had either found or written all the major components except
 # | one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by
 # | Linus Torvalds in 1991 and made free software in 1992.  Combining Linux
@@ -213,10 +241,10 @@
 # | people now use {+GNU/Linux systems, typically via+} <a
 # | [-href=\"/distros\">GNU/Linux-]
 # | {+href=\"/distros/distros.html\">GNU/Linux+} distributions</a>.  {+The
-# | principal version of Linux now contains non-free firmware
+# | principal version of Linux now contains nonfree firmware
 # | &ldquo;blobs&rdquo;; free software activists now maintain a modified free
 # | version of Linux, called <a
-# | href=\"http://directory.fsf.org/project/linux\";> Linux-libre</a>.+}
+# | href=\"https://directory.fsf.org/wiki/Linux-libre\";> Linux-libre</a>.+}
 #, fuzzy
 #| msgid ""
 #| "By 1990 we had either found or written all the major components except "
@@ -232,10 +260,10 @@
 "the almost-complete GNU system resulted in a complete operating system: the "
 "GNU/Linux system.  Estimates are that tens of millions of people now use GNU/"
 "Linux systems, typically via <a href=\"/distros/distros.html\">GNU/Linux "
-"distributions</a>.  The principal version of Linux now contains non-free "
+"distributions</a>.  The principal version of Linux now contains nonfree "
 "firmware &ldquo;blobs&rdquo;; free software activists now maintain a "
-"modified free version of Linux, called <a href=\"http://directory.fsf.org/";
-"project/linux\"> Linux-libre</a>."
+"modified free version of Linux, called <a href=\"https://directory.fsf.org/";
+"wiki/Linux-libre\"> Linux-libre</a>."
 msgstr ""
 "Proiectul inițial s-a împlinit. Pînă în 1990 reușisem să întemeiem 
sau să "
 "terminăm toate elementele importante cu excepția unuia: nucleul. Apoi 
Linux, "
@@ -245,13 +273,26 @@
 "estimează că zeci de milioane de oameni folosesc acum <a href=\"/distros"
 "\">distribuții GNU/Linux</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | However, the GNU Project is not limited to the core operating system.  We
+# | aim to provide a whole spectrum of software, whatever many users want to
+# | have.  This includes application software.  See the <a
+# | [-href=\"/directory\">Free-]
+# | {+href=\"https://directory.fsf.org/wiki/Main_Page\";>Free+} Software
+# | Directory</a> for a catalogue of free software application programs.
+#, fuzzy
+#| msgid ""
+#| "However, the GNU Project is not limited to the core operating system.  We "
+#| "aim to provide a whole spectrum of software, whatever many users want to "
+#| "have.  This includes application software.  See the <a href=\"/directory"
+#| "\">Free Software Directory</a> for a catalogue of free software "
+#| "application programs."
 msgid ""
 "However, the GNU Project is not limited to the core operating system.  We "
 "aim to provide a whole spectrum of software, whatever many users want to "
-"have.  This includes application software.  See the <a href=\"/directory"
-"\">Free Software Directory</a> for a catalogue of free software application "
-"programs."
+"have.  This includes application software.  See the <a href=\"https://";
+"directory.fsf.org/wiki/Main_Page\">Free Software Directory</a> for a "
+"catalogue of free software application programs."
 msgstr ""
 "însă Proiectul GNU nu se limitează doar la sistemul de operare. Noi 
năzuim "
 "să creăm și să furnizăm o gamă largă de software, orice ar fi dorit de 
un "
@@ -259,30 +300,30 @@
 "<a href=\"/directory\">Directorul de software liber</a> pentru a vedea un "
 "catalog de programe aplicații libere."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 #, fuzzy
 msgid ""
 "We also want to provide software for users who are not computer experts.  "
-"Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical desktop "
-"(called GNOME)</a> to help beginners use the GNU system."
+"Therefore we developed a <a href=\"https://www.gnome.org/\";>graphical "
+"desktop (called GNOME)</a> to help beginners use the GNU system."
 msgstr ""
 "De asemenea, dorim să furnizăm software și pentru cei ce nu sunt experți 
în "
 "informatică. De aceea, am creat o <a href=\"http://www.gnome.org/";
 "\">interfață grafică (numită GNOME)</a> menită a-i sprijini pe 
începători în "
 "folosirea sistemului GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 #, fuzzy
 msgid ""
 "We also want to provide games and other recreations.  Plenty of <a href="
-"\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
+"\"https://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
 "available."
 msgstr ""
 "Mai mult, dorim să creăm jocuri și alte programe recreative. Multe <a 
href="
 "\"http://directory.fsf.org/wiki/Category/Game\";>jocuri libere</a> sunt deja "
 "disponibile."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "How far can free software go? There are no limits, except when <a href=\"/"
 "philosophy/fighting-software-patents.html\">laws such as the patent system "
@@ -323,33 +364,38 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# | Please see the <a
+# | href=\"/server/standards/README.translations.html\">Translations
+# | README</a> for information on coordinating and [-submitting-]
+# | {+contributing+} translations of this article.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and submitting "
+#| "translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
-"Muncim din greu și facem tot ceea ce ne stă în putință să punem la "
-"dispoziție traduceri exacte, de o calitate bună.  Cu toate acestea, nu "
-"suntem perfecți. Vă rugăm să ne trimiteți comentariile și sugestiile 
dvs. "
-"generale în această privință la <a href=\"mailto:web-translators@gnu.org";
-"\">&lt;web-translators@gnu.org&gt;</a>.</p>\n"
-"<p>Pentru informații despre coordonarea și trimiterea de traduceri pentru "
-"paginile noastre, consultați <a 
href=\"/server/standards/README.translations."
-"html\">ghidul de traduceri</a>."
+"Puteți vizita <a href=\"/server/standards/README.translations.html\">README-"
+"ul despre traduceri</a> pentru informații despre coordonarea și trimiterea "
+"traducerilor pentru acest articol."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; [-2014-] {+1996, 1997, 2003, 2005, 2008, 2012, 2017,
+# | 2021+} Free Software Foundation, Inc.
 #, fuzzy
+#| msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005 Free "
+"Copyright &copy; 1996, 1997, 2003, 2005, 2008, 2012, 2017, 2021 Free "
 "Software Foundation, Inc."
+msgstr "Copyright &copy; 2014 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 # | This page is licensed under a <a rel=\"license\"
@@ -380,3 +426,25 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Actualizată:"
+
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "Muncim din greu și facem tot ceea ce ne stă în putință să punem la "
+#~ "dispoziție traduceri exacte, de o calitate bună.  Cu toate acestea, nu "
+#~ "suntem perfecți. Vă rugăm să ne trimiteți comentariile și sugestiile 
dvs. "
+#~ "generale în această privință la <a 
href=\"mailto:web-translators@gnu.org";
+#~ "\">&lt;web-translators@gnu.org&gt;</a>.</p>\n"
+#~ "<p>Pentru informații despre coordonarea și trimiterea de traduceri 
pentru "
+#~ "paginile noastre, consultați <a href=\"/server/standards/README."
+#~ "translations.html\">ghidul de traduceri</a>."
+
+#, fuzzy
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005 Free "
+#~ "Software Foundation, Inc."

Index: po/gnu-history.ru.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-history.ru.po,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- po/gnu-history.ru.po        2 Nov 2021 13:25:56 -0000       1.41
+++ po/gnu-history.ru.po        2 Nov 2021 14:41:50 -0000       1.42
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-history.html\n"
-"POT-Creation-Date: 2017-09-04 10:56+0000\n"
+"POT-Creation-Date: 2021-11-02 13:26+0000\n"
 "PO-Revision-Date: 2020-12-09 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-11-02 13:26+0000\n"
 "X-Poedit-Language: Russian\n"
 
 # type: Content of: <title>
@@ -31,22 +32,43 @@
 "программного обеспечения, история"
 
 # type: Content of: <h2>
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Overview of the GNU System"
 msgstr "Обзор системы GNU"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The GNU operating system is a complete free software system,
+# | upward-compatible with Unix.  GNU stands for &ldquo;GNU's Not
+# | [-Unix&rdquo;.-] {+Unix.&rdquo;+} It is pronounced as <a
+# | href=\"/gnu/pronunciation.html\">one syllable with a hard [-g</a>.-]
+# | {+<i>g</i></a>.+}  <a href=\"http{+s+}://www.stallman.org/\">Richard
+# | Stallman</a> made the <a href=\"/gnu/initial-announcement.html\">Initial
+# | Announcement</a> of the GNU Project in September 1983.  A longer version
+# | called the <a href=\"/gnu/manifesto.html\">GNU Manifesto</a> was published
+# | in March 1985.  It has been translated into several <a
+# | href=\"/gnu/manifesto.html#translations\">other languages</a>.
+#, fuzzy
+#| msgid ""
+#| "The GNU operating system is a complete free software system, upward-"
+#| "compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.  It "
+#| "is pronounced as <a href=\"/gnu/pronunciation.html\">one syllable with a "
+#| "hard g</a>.  <a href=\"http://www.stallman.org/\";>Richard Stallman</a> "
+#| "made the <a href=\"/gnu/initial-announcement.html\">Initial Announcement</"
+#| "a> of the GNU Project in September 1983.  A longer version called the <a "
+#| "href=\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March "
+#| "1985.  It has been translated into several <a href=\"/gnu/manifesto."
+#| "html#translations\">other languages</a>."
 msgid ""
 "The GNU operating system is a complete free software system, upward-"
-"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.  It is "
+"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix.&rdquo; It is "
 "pronounced as <a href=\"/gnu/pronunciation.html\">one syllable with a hard "
-"g</a>.  <a href=\"http://www.stallman.org/\";>Richard Stallman</a> made the "
-"<a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> of the "
-"GNU Project in September 1983.  A longer version called the <a href=\"/gnu/"
-"manifesto.html\">GNU Manifesto</a> was published in March 1985.  It has been "
-"translated into several <a href=\"/gnu/manifesto.html#translations\">other "
-"languages</a>."
+"<i>g</i></a>.  <a href=\"https://www.stallman.org/\";>Richard Stallman</a> "
+"made the <a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> "
+"of the GNU Project in September 1983.  A longer version called the <a href="
+"\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March 1985.  It "
+"has been translated into several <a href=\"/gnu/manifesto.html#translations"
+"\">other languages</a>."
 msgstr ""
 "Операционная система GNU&nbsp;&mdash; это полная 
свободная программная "
 "система, совместимая снизу вверх с Unix. GNU 
означает &ldquo;GNU&nbsp;"
@@ -60,12 +82,24 @@
 "href=\"/gnu/manifesto.html#translations\">других языков</a>."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The name &ldquo;GNU&rdquo; was chosen because it met a few requirements;
+# | first, it was a recursive acronym for &ldquo;GNU's Not [-Unix&rdquo;,-]
+# | {+Unix,&rdquo;+} second, because it was a real word, and third, it was fun
+# | to say (or <a
+# | href=\"http://www.poppyfields.net/poppy/songs/gnu.html\";>[-S-]{+s+}ing</a>)
+# | .
+#, fuzzy
+#| msgid ""
+#| "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
+#| "first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, "
+#| "second, because it was a real word, and third, it was fun to say (or <a "
+#| "href=\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
 msgid ""
 "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
-"first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, second, "
+"first, it was a recursive acronym for &ldquo;GNU's Not Unix,&rdquo; second, "
 "because it was a real word, and third, it was fun to say (or <a href="
-"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
+"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>sing</a>)."
 msgstr ""
 "Название &ldquo;GNU&rdquo; было выбрано потому, 
что оно отвечало нескольким "
 "требованиям; во-первых, это было 
рекурсивное сокращение, означающее &ldquo;"
@@ -74,7 +108,7 @@
 "poppyfields.net/poppy/songs/gnu.html\">петь</a>)."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The word &ldquo;free&rdquo; in &ldquo;free software&rdquo; pertains to <a "
 "href=\"/philosophy/free-sw.html\">freedom</a>, not price.  You may or may "
@@ -99,13 +133,27 @@
 "физической передачи копии или раздавать 
копии даром.)"
 
 # type: Content of: <p>
-#. type: Content of: <p>
-msgid ""
-"The project to develop the GNU system is called the &ldquo;GNU "
-"Project&rdquo;.  The GNU Project was conceived in 1983 as a way of bringing "
-"back the cooperative spirit that prevailed in the computing community in "
-"earlier days&mdash;to make cooperation possible once again by removing the "
-"obstacles to cooperation imposed by the owners of proprietary software."
+#. type: Content of: <div><p>
+# | The project to develop the GNU system is called the &ldquo;GNU
+# | [-Project&rdquo;.-] {+Project.&rdquo;+} The GNU Project was conceived in
+# | 1983 as a way of bringing back the cooperative spirit that prevailed in
+# | the computing community in earlier days&mdash;to make cooperation possible
+# | once again by removing the obstacles to cooperation imposed by the owners
+# | of proprietary software.
+#, fuzzy
+#| msgid ""
+#| "The project to develop the GNU system is called the &ldquo;GNU "
+#| "Project&rdquo;.  The GNU Project was conceived in 1983 as a way of "
+#| "bringing back the cooperative spirit that prevailed in the computing "
+#| "community in earlier days&mdash;to make cooperation possible once again "
+#| "by removing the obstacles to cooperation imposed by the owners of "
+#| "proprietary software."
+msgid ""
+"The project to develop the GNU system is called the &ldquo;GNU Project."
+"&rdquo; The GNU Project was conceived in 1983 as a way of bringing back the "
+"cooperative spirit that prevailed in the computing community in earlier "
+"days&mdash;to make cooperation possible once again by removing the obstacles "
+"to cooperation imposed by the owners of proprietary software."
 msgstr ""
 "Проект по разработке системы GNU 
называется проектом GNU. Проект GNU был "
 "задуман в 1983&nbsp;году как способ возродить 
дух сотрудничества, "
@@ -114,7 +162,7 @@
 "владельцами несвободных программ."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In 1971, when Richard Stallman started his career at MIT, he worked in a "
 "group which used <a href=\"/philosophy/free-sw.html\">free software</a> "
@@ -129,7 +177,7 @@
 "поступали."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By the 1980s, almost all software was <a href=\"/philosophy/categories."
 "html#ProprietarySoftware\">proprietary</a>, which means that it had owners "
@@ -142,7 +190,7 @@
 "сотрудничество между пользователями. Это 
создало потребность в проекте GNU."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Every computer user needs an operating system; if there is no free operating "
 "system, then you can't even get started using a computer without resorting "
@@ -156,7 +204,7 @@
 "очевидно, должна была стать свободная 
операционная система."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We decided to make the operating system compatible with Unix because the "
 "overall design was already proven and portable, and because compatibility "
@@ -167,14 +215,28 @@
 "совместимость облегчает переход с Unix на GNU 
для пользователей Unix."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | A Unix-like operating system includes a kernel, compilers, editors, text
+# | formatters, mail software, graphical interfaces, libraries, games and many
+# | other things.  Thus, writing a whole operating system is a very large job.
+# |  We started in January 1984.  The <a [-href=\"http://fsf.org/\";>-]
+# | {+href=\"https://www.fsf.org/\";>+} Free Software Foundation</a> was
+# | founded in October 1985, initially to raise funds to help develop GNU.
+#, fuzzy
+#| msgid ""
+#| "A Unix-like operating system includes a kernel, compilers, editors, text "
+#| "formatters, mail software, graphical interfaces, libraries, games and "
+#| "many other things.  Thus, writing a whole operating system is a very "
+#| "large job.  We started in January 1984.  The <a href=\"http://fsf.org/\";> "
+#| "Free Software Foundation</a> was founded in October 1985, initially to "
+#| "raise funds to help develop GNU."
 msgid ""
 "A Unix-like operating system includes a kernel, compilers, editors, text "
 "formatters, mail software, graphical interfaces, libraries, games and many "
 "other things.  Thus, writing a whole operating system is a very large job.  "
-"We started in January 1984.  The <a href=\"http://fsf.org/\";> Free Software "
-"Foundation</a> was founded in October 1985, initially to raise funds to help "
-"develop GNU."
+"We started in January 1984.  The <a href=\"https://www.fsf.org/\";> Free "
+"Software Foundation</a> was founded in October 1985, initially to raise "
+"funds to help develop GNU."
 msgstr ""
 "Операционная система типа Unix включает в 
себя ядро, компиляторы, редакторы, "
 "программы для форматирования текстов, 
почтовые программы, графические "
@@ -185,7 +247,30 @@
 "сбора фондов в поддержку разработки GNU."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | By 1990 we had either found or written all the major components except
+# | one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by
+# | Linus Torvalds in 1991 and made free software in 1992.  Combining Linux
+# | with the almost-complete GNU system resulted in a complete operating
+# | system: the GNU/Linux system.  Estimates are that tens of millions of
+# | people now use GNU/Linux systems, typically via <a
+# | href=\"/distros/distros.html\">GNU/Linux distributions</a>.  The principal
+# | version of Linux now contains non[---]free firmware &ldquo;blobs&rdquo;;
+# | free software activists now maintain a modified free version of Linux,
+# | called <a [-href=\"http://directory.fsf.org/project/linux\";>-]
+# | {+href=\"https://directory.fsf.org/wiki/Linux-libre\";>+} Linux-libre</a>.
+#, fuzzy
+#| msgid ""
+#| "By 1990 we had either found or written all the major components except "
+#| "one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by "
+#| "Linus Torvalds in 1991 and made free software in 1992.  Combining Linux "
+#| "with the almost-complete GNU system resulted in a complete operating "
+#| "system: the GNU/Linux system.  Estimates are that tens of millions of "
+#| "people now use GNU/Linux systems, typically via <a href=\"/distros/"
+#| "distros.html\">GNU/Linux distributions</a>.  The principal version of "
+#| "Linux now contains non-free firmware &ldquo;blobs&rdquo;; free software "
+#| "activists now maintain a modified free version of Linux, called <a href="
+#| "\"http://directory.fsf.org/project/linux\";> Linux-libre</a>."
 msgid ""
 "By 1990 we had either found or written all the major components except "
 "one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by "
@@ -193,10 +278,10 @@
 "the almost-complete GNU system resulted in a complete operating system: the "
 "GNU/Linux system.  Estimates are that tens of millions of people now use GNU/"
 "Linux systems, typically via <a href=\"/distros/distros.html\">GNU/Linux "
-"distributions</a>.  The principal version of Linux now contains non-free "
+"distributions</a>.  The principal version of Linux now contains nonfree "
 "firmware &ldquo;blobs&rdquo;; free software activists now maintain a "
-"modified free version of Linux, called <a href=\"http://directory.fsf.org/";
-"project/linux\"> Linux-libre</a>."
+"modified free version of Linux, called <a href=\"https://directory.fsf.org/";
+"wiki/Linux-libre\"> Linux-libre</a>."
 msgstr ""
 "В 1990&nbsp;году мы уже нашли или написали все 
основные компоненты, кроме "
 "одного&nbsp;&mdash; ядра. В 1991&nbsp;году Линус 
Торвальдс разработал Linux, "
@@ -211,13 +296,26 @@
 "\">Linux-libre</a>."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | However, the GNU Project is not limited to the core operating system.  We
+# | aim to provide a whole spectrum of software, whatever many users want to
+# | have.  This includes application software.  See the <a
+# | [-href=\"/directory\">Free-]
+# | {+href=\"https://directory.fsf.org/wiki/Main_Page\";>Free+} Software
+# | Directory</a> for a catalogue of free software application programs.
+#, fuzzy
+#| msgid ""
+#| "However, the GNU Project is not limited to the core operating system.  We "
+#| "aim to provide a whole spectrum of software, whatever many users want to "
+#| "have.  This includes application software.  See the <a href=\"/directory"
+#| "\">Free Software Directory</a> for a catalogue of free software "
+#| "application programs."
 msgid ""
 "However, the GNU Project is not limited to the core operating system.  We "
 "aim to provide a whole spectrum of software, whatever many users want to "
-"have.  This includes application software.  See the <a href=\"/directory"
-"\">Free Software Directory</a> for a catalogue of free software application "
-"programs."
+"have.  This includes application software.  See the <a href=\"https://";
+"directory.fsf.org/wiki/Main_Page\">Free Software Directory</a> for a "
+"catalogue of free software application programs."
 msgstr ""
 "Однако проект GNU не ограничивается лишь 
базовой операционной системой. Наша "
 "цель&nbsp;&mdash; создание всего спектра 
программ, которые могут "
@@ -226,11 +324,19 @@
 "a>, чтобы ознакомиться со списком свободных
 приложений."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | We also want to provide software for users who are not computer experts. 
+# | Therefore we developed a <a href=\"http{+s+}://www.gnome.org/\">graphical
+# | desktop (called GNOME)</a> to help beginners use the GNU system.
+#, fuzzy
+#| msgid ""
+#| "We also want to provide software for users who are not computer experts.  "
+#| "Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical "
+#| "desktop (called GNOME)</a> to help beginners use the GNU system."
 msgid ""
 "We also want to provide software for users who are not computer experts.  "
-"Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical desktop "
-"(called GNOME)</a> to help beginners use the GNU system."
+"Therefore we developed a <a href=\"https://www.gnome.org/\";>graphical "
+"desktop (called GNOME)</a> to help beginners use the GNU system."
 msgstr ""
 "Мы также хотим предоставить программы 
пользователям, не являющимся "
 "специалистами по компьютерам. Поэтому мы 
разработали <a href=\"http://www.";
@@ -238,10 +344,18 @@
 "начинающим пользоваться системой GNU."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | We also want to provide games and other recreations.  Plenty of <a
+# | href=\"http{+s+}://directory.fsf.org/wiki/Category/Game\">free games</a>
+# | are already available.
+#, fuzzy
+#| msgid ""
+#| "We also want to provide games and other recreations.  Plenty of <a href="
+#| "\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are "
+#| "already available."
 msgid ""
 "We also want to provide games and other recreations.  Plenty of <a href="
-"\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
+"\"https://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
 "available."
 msgstr ""
 "Мы также хотим предоставить игры и другие 
программы для отдыха и "
@@ -249,7 +363,7 @@
 "\">свободных игр</a> уже доступно."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "How far can free software go? There are no limits, except when <a href=\"/"
 "philosophy/fighting-software-patents.html\">laws such as the patent system "
@@ -293,14 +407,20 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Мы старались сделать этот перевод точным 
и качественным, но исключить "
@@ -312,12 +432,18 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
+# | Copyright &copy; [-2014, 2015, 2016,-] {+1996, 1997, 2003, 2005, 2008,
+# | 2012,+} 2017, [-2018, 2019-] {+2021+} Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2014, 2015, 2016, 2017, 2018, 2019 Free Software "
+#| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017 Free Software Foundation, Inc."
+"Copyright &copy; 1996, 1997, 2003, 2005, 2008, 2012, 2017, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017, 2020 Free Software Foundation, Inc."
+"Copyright &copy; 2014, 2015, 2016, 2017, 2018, 2019 Free Software "
+"Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -342,10 +468,17 @@
 msgstr "Обновлено:"
 
 # type: Content of: <div><p>
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017, 2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017, 2020, 2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017, 2020 Free Software Foundation, Inc."
+
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017, 2020, 2021 Free Software Foundation, Inc."

Index: po/gnu-history.sq.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-history.sq.po,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- po/gnu-history.sq.po        20 Nov 2017 14:00:03 -0000      1.51
+++ po/gnu-history.sq.po        2 Nov 2021 14:41:50 -0000       1.52
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-history.html\n"
-"POT-Creation-Date: 2017-09-04 10:56+0000\n"
+"POT-Creation-Date: 2021-11-02 13:26+0000\n"
 "PO-Revision-Date: 2017-11-19 18:28+0200\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-11-02 13:26+0000\n"
 "X-Generator: Poedit 1.6.10\n"
 
 # type: Content of: <title>
@@ -28,22 +29,33 @@
 "GNU, Projekti GNU, FSF, Software-i i Lirë, Free Software Foundation, 
Historik"
 
 # type: Content of: <h2>
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Overview of the GNU System"
 msgstr "Përmbledhje e Sistemit GNU"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The GNU operating system is a complete free software system, upward-"
+#| "compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.  It "
+#| "is pronounced as <a href=\"/gnu/pronunciation.html\">one syllable with a "
+#| "hard g</a>.  <a href=\"http://www.stallman.org/\";>Richard Stallman</a> "
+#| "made the <a href=\"/gnu/initial-announcement.html\">Initial Announcement</"
+#| "a> of the GNU Project in September 1983.  A longer version called the <a "
+#| "href=\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March "
+#| "1985.  It has been translated into several <a href=\"/gnu/manifesto."
+#| "html#translations\">other languages</a>."
 msgid ""
 "The GNU operating system is a complete free software system, upward-"
-"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.  It is "
+"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix.&rdquo; It is "
 "pronounced as <a href=\"/gnu/pronunciation.html\">one syllable with a hard "
-"g</a>.  <a href=\"http://www.stallman.org/\";>Richard Stallman</a> made the "
-"<a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> of the "
-"GNU Project in September 1983.  A longer version called the <a href=\"/gnu/"
-"manifesto.html\">GNU Manifesto</a> was published in March 1985.  It has been "
-"translated into several <a href=\"/gnu/manifesto.html#translations\">other "
-"languages</a>."
+"<i>g</i></a>.  <a href=\"https://www.stallman.org/\";>Richard Stallman</a> "
+"made the <a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> "
+"of the GNU Project in September 1983.  A longer version called the <a href="
+"\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March 1985.  It "
+"has been translated into several <a href=\"/gnu/manifesto.html#translations"
+"\">other languages</a>."
 msgstr ""
 "Sistemi operativ GNU është një sistem <em>software</em>-i i plotë dhe i "
 "lirë, i përputhshëm me Unix-in.  GNU do të thotë &ldquo;GNU’s Not "
@@ -56,12 +68,18 @@
 "html#translations\">gjuhë të tjera</a>."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
+#| "first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, "
+#| "second, because it was a real word, and third, it was fun to say (or <a "
+#| "href=\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
 msgid ""
 "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
-"first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, second, "
+"first, it was a recursive acronym for &ldquo;GNU's Not Unix,&rdquo; second, "
 "because it was a real word, and third, it was fun to say (or <a href="
-"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
+"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>sing</a>)."
 msgstr ""
 "Emri i &ldquo;GNU&rdquo;-së u zgjodh sepse plotësonte disa kushte; së 
pari, "
 "qe shkurtim për &ldquo;GNU’s Not Unix&rdquo;, së dyti, ngaqë qe fjalë e 
"
@@ -69,7 +87,7 @@
 "www.poppyfields.net/poppy/songs/gnu.html\">Këndojeni</a>)."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The word &ldquo;free&rdquo; in &ldquo;free software&rdquo; pertains to <a "
 "href=\"/philosophy/free-sw.html\">freedom</a>, not price.  You may or may "
@@ -95,13 +113,21 @@
 "shpërnguljes së një kopjeje të tij, ose mund t’i jepni falas kopjet.)"
 
 # type: Content of: <p>
-#. type: Content of: <p>
-msgid ""
-"The project to develop the GNU system is called the &ldquo;GNU "
-"Project&rdquo;.  The GNU Project was conceived in 1983 as a way of bringing "
-"back the cooperative spirit that prevailed in the computing community in "
-"earlier days&mdash;to make cooperation possible once again by removing the "
-"obstacles to cooperation imposed by the owners of proprietary software."
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The project to develop the GNU system is called the &ldquo;GNU "
+#| "Project&rdquo;.  The GNU Project was conceived in 1983 as a way of "
+#| "bringing back the cooperative spirit that prevailed in the computing "
+#| "community in earlier days&mdash;to make cooperation possible once again "
+#| "by removing the obstacles to cooperation imposed by the owners of "
+#| "proprietary software."
+msgid ""
+"The project to develop the GNU system is called the &ldquo;GNU Project."
+"&rdquo; The GNU Project was conceived in 1983 as a way of bringing back the "
+"cooperative spirit that prevailed in the computing community in earlier "
+"days&mdash;to make cooperation possible once again by removing the obstacles "
+"to cooperation imposed by the owners of proprietary software."
 msgstr ""
 "Projekti për zhvillimin e sistemit GNU quhet &ldquo;Projekti GNU&rdquo;.  "
 "Projekti GNU u konceptua më 1983 si një rrugë për të risjellë frymën e 
"
@@ -111,7 +137,7 @@
 "pronësor."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In 1971, when Richard Stallman started his career at MIT, he worked in a "
 "group which used <a href=\"/philosophy/free-sw.html\">free software</a> "
@@ -125,7 +151,7 @@
 "njëri tjetrin, dhe kështu bënë shpesh."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By the 1980s, almost all software was <a href=\"/philosophy/categories."
 "html#ProprietarySoftware\">proprietary</a>, which means that it had owners "
@@ -138,7 +164,7 @@
 "përdoruesve.  Kjo e bëri Projektin GNU të domosdoshëm."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Every computer user needs an operating system; if there is no free operating "
 "system, then you can't even get started using a computer without resorting "
@@ -152,7 +178,7 @@
 "operativ i lirë."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We decided to make the operating system compatible with Unix because the "
 "overall design was already proven and portable, and because compatibility "
@@ -164,14 +190,22 @@
 "hidheshin nga Unix në GNU."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "A Unix-like operating system includes a kernel, compilers, editors, text "
+#| "formatters, mail software, graphical interfaces, libraries, games and "
+#| "many other things.  Thus, writing a whole operating system is a very "
+#| "large job.  We started in January 1984.  The <a href=\"http://fsf.org/\";> "
+#| "Free Software Foundation</a> was founded in October 1985, initially to "
+#| "raise funds to help develop GNU."
 msgid ""
 "A Unix-like operating system includes a kernel, compilers, editors, text "
 "formatters, mail software, graphical interfaces, libraries, games and many "
 "other things.  Thus, writing a whole operating system is a very large job.  "
-"We started in January 1984.  The <a href=\"http://fsf.org/\";> Free Software "
-"Foundation</a> was founded in October 1985, initially to raise funds to help "
-"develop GNU."
+"We started in January 1984.  The <a href=\"https://www.fsf.org/\";> Free "
+"Software Foundation</a> was founded in October 1985, initially to raise "
+"funds to help develop GNU."
 msgstr ""
 "Një sistem operativ i ngjashëm me Unix-in përfshin kernelin, përpiluesit, 
"
 "përpunuesit, formatuesit e teksteve, <em>software</em> poste, ndërfaqe "
@@ -181,7 +215,19 @@
 "në Tetor 1985, fillimisht për të mbledhur fonde për zhvillimin e GNU-së."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "By 1990 we had either found or written all the major components except "
+#| "one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by "
+#| "Linus Torvalds in 1991 and made free software in 1992.  Combining Linux "
+#| "with the almost-complete GNU system resulted in a complete operating "
+#| "system: the GNU/Linux system.  Estimates are that tens of millions of "
+#| "people now use GNU/Linux systems, typically via <a href=\"/distros/"
+#| "distros.html\">GNU/Linux distributions</a>.  The principal version of "
+#| "Linux now contains non-free firmware &ldquo;blobs&rdquo;; free software "
+#| "activists now maintain a modified free version of Linux, called <a href="
+#| "\"http://directory.fsf.org/project/linux\";> Linux-libre</a>."
 msgid ""
 "By 1990 we had either found or written all the major components except "
 "one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by "
@@ -189,10 +235,10 @@
 "the almost-complete GNU system resulted in a complete operating system: the "
 "GNU/Linux system.  Estimates are that tens of millions of people now use GNU/"
 "Linux systems, typically via <a href=\"/distros/distros.html\">GNU/Linux "
-"distributions</a>.  The principal version of Linux now contains non-free "
+"distributions</a>.  The principal version of Linux now contains nonfree "
 "firmware &ldquo;blobs&rdquo;; free software activists now maintain a "
-"modified free version of Linux, called <a href=\"http://directory.fsf.org/";
-"project/linux\"> Linux-libre</a>."
+"modified free version of Linux, called <a href=\"https://directory.fsf.org/";
+"wiki/Linux-libre\"> Linux-libre</a>."
 msgstr ""
 "Aty nga 1990, ose i kishim siguruar, ose i kishim shkruar krejt përbërësit 
"
 "kryesorë, hiq një&mdash;kernelin.  Ndërkohë, Linux, një kernel i 
ngjashëm me "
@@ -207,13 +253,20 @@
 "quajtur <a href=\"http://directory.fsf.org/project/linux\";> Linux-libre</a>."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "However, the GNU Project is not limited to the core operating system.  We "
+#| "aim to provide a whole spectrum of software, whatever many users want to "
+#| "have.  This includes application software.  See the <a href=\"/directory"
+#| "\">Free Software Directory</a> for a catalogue of free software "
+#| "application programs."
 msgid ""
 "However, the GNU Project is not limited to the core operating system.  We "
 "aim to provide a whole spectrum of software, whatever many users want to "
-"have.  This includes application software.  See the <a href=\"/directory"
-"\">Free Software Directory</a> for a catalogue of free software application "
-"programs."
+"have.  This includes application software.  See the <a href=\"https://";
+"directory.fsf.org/wiki/Main_Page\">Free Software Directory</a> for a "
+"catalogue of free software application programs."
 msgstr ""
 "Megjithatë, Projekti GNU nuk kufizohet me thelbin e sistemit operativ.  "
 "Synimi ynë është të ofrojmë një spektër të plotë 
<em>software</em>-i, për "
@@ -223,11 +276,16 @@
 "em>-i të lirë."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "We also want to provide software for users who are not computer experts.  "
+#| "Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical "
+#| "desktop (called GNOME)</a> to help beginners use the GNU system."
 msgid ""
 "We also want to provide software for users who are not computer experts.  "
-"Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical desktop "
-"(called GNOME)</a> to help beginners use the GNU system."
+"Therefore we developed a <a href=\"https://www.gnome.org/\";>graphical "
+"desktop (called GNOME)</a> to help beginners use the GNU system."
 msgstr ""
 "Duam gjithashtu të ofrojmë <em>software</em> për përdorues që nuk janë "
 "ekspertë kompjuteri.  Ndaj edhe kemi zhvilluar <a href=\"http://www.gnome.";
@@ -235,10 +293,15 @@
 "përdorimin e sistemit GNU."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "We also want to provide games and other recreations.  Plenty of <a href="
+#| "\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are "
+#| "already available."
 msgid ""
 "We also want to provide games and other recreations.  Plenty of <a href="
-"\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
+"\"https://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
 "available."
 msgstr ""
 "Duam gjithashtu të ofrojmë lojëra dhe gjëra të tjera për kalimin e 
kohës së "
@@ -246,7 +309,7 @@
 "\">lojëra të lira</a>."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "How far can free software go? There are no limits, except when <a href=\"/"
 "philosophy/fighting-software-patents.html\">laws such as the patent system "
@@ -282,6 +345,7 @@
 "të dërgohen te <a href=\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu."
 "org&gt;</a>."
 
+# TODO: submitting -> contributing.
 #.  TRANSLATORS: Ignore the original text in this paragraph,
 #.         replace it with the translation of these two:
 #.         We work hard and do our best to provide accurate, good quality
@@ -289,14 +353,19 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Përpiqemi fort dhe bëjmë sa mundemi për të ofruar përkthime me cilësi 
të "
@@ -307,14 +376,16 @@
 "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>
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017 Free Software Foundation, Inc."
+"Copyright &copy; 1996, 1997, 2003, 2005, 2008, 2012, 2017, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
-"Të drejta kopjimi &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, "
-"2007, 2009, 2012, 2014, 2017 Free Software Foundation, Inc."
+"Të drejta kopjimi &copy; 2014, 2015, 2016, 2017 Free Software Foundation, "
+"Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -336,3 +407,11 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "U përditësua më:"
+
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Të drejta kopjimi &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, "
+#~ "2007, 2009, 2012, 2014, 2017 Free Software Foundation, Inc."

Index: po/gnu-history.sr.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-history.sr.po,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- po/gnu-history.sr.po        31 May 2021 09:06:17 -0000      1.29
+++ po/gnu-history.sr.po        2 Nov 2021 14:41:50 -0000       1.30
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-history.html\n"
-"POT-Creation-Date: 2017-09-04 10:56+0000\n"
+"POT-Creation-Date: 2021-11-02 13:26+0000\n"
 "PO-Revision-Date: 2009-07-05 21:56+0200\n"
 "Last-Translator: Strahinya Radich <vilinkamen@mail.ru>\n"
 "Language-Team: Serbian <www-sr-dev@lists.gnu.org>\n"
@@ -29,7 +29,7 @@
 "ГНУ, Пројекат ГНУ, ЗСС, слободни софтвер, 
Задужбина за слободни софтвер, "
 "историја"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Overview of the GNU System"
 msgstr "Преглед система ГНУ"
 
@@ -42,7 +42,7 @@
 # | called the <a href=\"/gnu/manifesto.html\">GNU Manifesto</a> was published
 # | in March 1985.  It has been translated into several <a
 # | href=\"/gnu/manifesto.html#translations\">other languages</a>.
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "The GNU operating system is a complete free software system, upward-"
@@ -55,14 +55,14 @@
 #| "\">other languages</a>."
 msgid ""
 "The GNU operating system is a complete free software system, upward-"
-"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.  It is "
+"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix.&rdquo; It is "
 "pronounced as <a href=\"/gnu/pronunciation.html\">one syllable with a hard "
-"g</a>.  <a href=\"http://www.stallman.org/\";>Richard Stallman</a> made the "
-"<a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> of the "
-"GNU Project in September 1983.  A longer version called the <a href=\"/gnu/"
-"manifesto.html\">GNU Manifesto</a> was published in March 1985.  It has been "
-"translated into several <a href=\"/gnu/manifesto.html#translations\">other "
-"languages</a>."
+"<i>g</i></a>.  <a href=\"https://www.stallman.org/\";>Richard Stallman</a> "
+"made the <a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> "
+"of the GNU Project in September 1983.  A longer version called the <a href="
+"\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March 1985.  It "
+"has been translated into several <a href=\"/gnu/manifesto.html#translations"
+"\">other languages</a>."
 msgstr ""
 "Оперативни систем ГНУ је потпун слободни 
софтверски систем који је уназад "
 "сагласан са Униксом. „ГНУ“ значи „ГНУ 
није Уникс“. <a href=\"http://www.";
@@ -72,19 +72,25 @@
 "а</a> је објављена марта 1985. Он је преведен 
на неколико <a href=\"/gnu/"
 "manifesto.html#translations\">других језика</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
+#| "first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, "
+#| "second, because it was a real word, and third, it was fun to say (or <a "
+#| "href=\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
 msgid ""
 "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
-"first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, second, "
+"first, it was a recursive acronym for &ldquo;GNU's Not Unix,&rdquo; second, "
 "because it was a real word, and third, it was fun to say (or <a href="
-"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
+"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>sing</a>)."
 msgstr ""
 "Назив „ГНУ“ је одабран јер је испунио 
неколико критеријума; прво, то је "
 "рекурзивна скраћеница за „ГНУ није 
Уникс“; друго, то је права реч; треће, "
 "забавно је изговорити (или <a 
href=\"http://www.poppyfields.net/poppy/songs/";
 "gnu.html\">отпевати</a>)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The word &ldquo;free&rdquo; in &ldquo;free software&rdquo; pertains to <a "
 "href=\"/philosophy/free-sw.html\">freedom</a>, not price.  You may or may "
@@ -109,20 +115,28 @@
 "заједници. (Уколико расподељујете ГНУ-ов 
софтвер, можете да наплатите "
 "физички чин преноса примерка, а можете и 
да поклањате примерке.)"
 
-#. type: Content of: <p>
-msgid ""
-"The project to develop the GNU system is called the &ldquo;GNU "
-"Project&rdquo;.  The GNU Project was conceived in 1983 as a way of bringing "
-"back the cooperative spirit that prevailed in the computing community in "
-"earlier days&mdash;to make cooperation possible once again by removing the "
-"obstacles to cooperation imposed by the owners of proprietary software."
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The project to develop the GNU system is called the &ldquo;GNU "
+#| "Project&rdquo;.  The GNU Project was conceived in 1983 as a way of "
+#| "bringing back the cooperative spirit that prevailed in the computing "
+#| "community in earlier days&mdash;to make cooperation possible once again "
+#| "by removing the obstacles to cooperation imposed by the owners of "
+#| "proprietary software."
+msgid ""
+"The project to develop the GNU system is called the &ldquo;GNU Project."
+"&rdquo; The GNU Project was conceived in 1983 as a way of bringing back the "
+"cooperative spirit that prevailed in the computing community in earlier "
+"days&mdash;to make cooperation possible once again by removing the obstacles "
+"to cooperation imposed by the owners of proprietary software."
 msgstr ""
 "Пројекат развоја система ГНУ се назива 
„Пројектом ГНУ“. Пројекат ГНУ је "
 "настао 1983. као вид повратка духу 
заједништва који је био преовлађујући у "
 "ранијим данима рачунарства и да би се 
таква сарадња поново омогућила, "
 "уклањањем препрека које су поставили 
власници власничког софтвера."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In 1971, when Richard Stallman started his career at MIT, he worked in a "
 "group which used <a href=\"/philosophy/free-sw.html\">free software</a> "
@@ -135,7 +149,7 @@
 "рачунарске фирме често расподељивале 
слободни софтвер. Програмери су могли "
 "да међусобно потпуно слободно сарађују, и 
то је често био случај."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By the 1980s, almost all software was <a href=\"/philosophy/categories."
 "html#ProprietarySoftware\">proprietary</a>, which means that it had owners "
@@ -147,7 +161,7 @@
 "власници који забрањују и спречавају 
сарадњу међу корисницима. Ово је "
 "створило потребу за Пројектом ГНУ."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Every computer user needs an operating system; if there is no free operating "
 "system, then you can't even get started using a computer without resorting "
@@ -160,7 +174,7 @@
 "на распореду слободног софтвера очито 
морао да буде слободни оперативни "
 "систем."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We decided to make the operating system compatible with Unix because the "
 "overall design was already proven and portable, and because compatibility "
@@ -177,7 +191,7 @@
 # | January 1984.  The <a href=\"http://fsf.org/\";> Free Software
 # | Foundation</a> was founded in October 1985, initially to raise funds to
 # | help develop GNU.
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "A Unix-like operating system is much more than a kernel; it also includes "
@@ -190,9 +204,9 @@
 "A Unix-like operating system includes a kernel, compilers, editors, text "
 "formatters, mail software, graphical interfaces, libraries, games and many "
 "other things.  Thus, writing a whole operating system is a very large job.  "
-"We started in January 1984.  The <a href=\"http://fsf.org/\";> Free Software "
-"Foundation</a> was founded in October 1985, initially to raise funds to help "
-"develop GNU."
+"We started in January 1984.  The <a href=\"https://www.fsf.org/\";> Free "
+"Software Foundation</a> was founded in October 1985, initially to raise "
+"funds to help develop GNU."
 msgstr ""
 "Униксолики оперативни систем не чини само 
језгро. Он садржи и преводиоце, "
 "уређиваче, програме за слагање текста, 
софтвер за електронску пошту, и многе "
@@ -214,7 +228,7 @@
 # | href=\"http://directory.fsf.org/project/linux\";>free version</a>-] {+free
 # | version+} of [-Linux.-] {+Linux, called <a
 # | href=\"http://directory.fsf.org/project/linux\";> Linux-libre</a>.+}
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "By 1990 we had either found or written all the major components except "
@@ -234,10 +248,10 @@
 "the almost-complete GNU system resulted in a complete operating system: the "
 "GNU/Linux system.  Estimates are that tens of millions of people now use GNU/"
 "Linux systems, typically via <a href=\"/distros/distros.html\">GNU/Linux "
-"distributions</a>.  The principal version of Linux now contains non-free "
+"distributions</a>.  The principal version of Linux now contains nonfree "
 "firmware &ldquo;blobs&rdquo;; free software activists now maintain a "
-"modified free version of Linux, called <a href=\"http://directory.fsf.org/";
-"project/linux\"> Linux-libre</a>."
+"modified free version of Linux, called <a href=\"https://directory.fsf.org/";
+"wiki/Linux-libre\"> Linux-libre</a>."
 msgstr ""
 "До 1990. смо или нашли или написали све 
главне делове, осим једног — језгра. "
 "Онда је Линус Торвалдс изградио 
униксолико језгро — Линукс 1991., а 1992. га "
@@ -249,34 +263,51 @@
 "слободног софтвера одржавају измењену <a 
href=\"http://directory.fsf.org/";
 "project/linux\">слободну верзију</a> Линукса."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "However, the GNU Project is not limited to the core operating system.  We "
+#| "aim to provide a whole spectrum of software, whatever many users want to "
+#| "have.  This includes application software.  See the <a href=\"/directory"
+#| "\">Free Software Directory</a> for a catalogue of free software "
+#| "application programs."
 msgid ""
 "However, the GNU Project is not limited to the core operating system.  We "
 "aim to provide a whole spectrum of software, whatever many users want to "
-"have.  This includes application software.  See the <a href=\"/directory"
-"\">Free Software Directory</a> for a catalogue of free software application "
-"programs."
+"have.  This includes application software.  See the <a href=\"https://";
+"directory.fsf.org/wiki/Main_Page\">Free Software Directory</a> for a "
+"catalogue of free software application programs."
 msgstr ""
 "Међутим, Пројекат ГНУ није ограничен на 
срж оперативног система. Ми тежимо "
 "ка понуди целе лепезе софтвера, било 
каквог кога би желело много корисника. "
 "Ово укључује и апликативни софтвер. 
Погледајте <a href=\"/directory"
 "\">Каталог слободног софтвера</a> за списак 
слободних апликативних програма."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "We also want to provide software for users who are not computer experts.  "
+#| "Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical "
+#| "desktop (called GNOME)</a> to help beginners use the GNU system."
 msgid ""
 "We also want to provide software for users who are not computer experts.  "
-"Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical desktop "
-"(called GNOME)</a> to help beginners use the GNU system."
+"Therefore we developed a <a href=\"https://www.gnome.org/\";>graphical "
+"desktop (called GNOME)</a> to help beginners use the GNU system."
 msgstr ""
 "Ми желимо да понудимо софтвер и 
корисницима који нису стручњаци за "
 "рачунарство. Стога смо развили и <a 
href=\"http://www.gnome.org/\";>графичку "
 "радну површину (која се назива Гном)</a>, 
како бисмо почетницима помогли да "
 "користе систем ГНУ."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "We also want to provide games and other recreations.  Plenty of <a href="
+#| "\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are "
+#| "already available."
 msgid ""
 "We also want to provide games and other recreations.  Plenty of <a href="
-"\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
+"\"https://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
 "available."
 msgstr ""
 "Желимо да понудимо и игре и друге забавне 
програме. Већ је доступно доста <a "
@@ -287,7 +318,7 @@
 # | patent system prohibit free software</a>.  The ultimate goal is to provide
 # | free software to do all of the jobs computer users want to do&mdash;and
 # | thus make proprietary software [-obsolete.-] {+a thing of the past.+}
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "How far can free software go? There are no limits, except when <a href=\"/"
@@ -332,6 +363,7 @@
 "везе и друге исправке (или предлоге) на 
адресу <a href=\"mailto:mailto:";
 "webmasters@gnu.org\">&lt;mailto:webmasters@gnu.org&gt;</a>."
 
+# type: Content of: <div><p>
 #.  TRANSLATORS: Ignore the original text in this paragraph,
 #.         replace it with the translation of these two:
 #.         We work hard and do our best to provide accurate, good quality
@@ -339,36 +371,37 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 #, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and submitting "
+#| "translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Молимо да погледате <a 
href=\"/server/standards/README.translations.html"
 "\">ПРОЧИТАЈМЕ за преводе</a> за више 
информација о координисању и слању "
-"превода овог чланка. (За допринос српском 
преводу, корисно је да погледате и "
-"<a href=\"http://alas.matf.bg.ac.rs/~mr99164/uput/kakoda-prevodim-gnu-ov-veb.";
-"html\"> КАКОДА прeводим ГНУ-ов веб</a>.)"
+"превода овог чланка."
 
-# | Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007,
-# | [-2009-] {+2009, 2012, 2014, 2017+} Free Software Foundation, Inc.
+# type: Content of: <div><p>
 #. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
-#| "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
-#| "2009 Free Software Foundation, Inc."
+#| "Copyright &copy; 2004, 2005, 2006, 2007, 2008, 2009 Free Software "
+#| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017 Free Software Foundation, Inc."
+"Copyright &copy; 1996, 1997, 2003, 2005, 2008, 2012, 2017, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
-"<b>Ауторска права:</b><br />Copyright &copy; 1996, 1997, 1998, 
1999, 2001, "
-"2002, 2003, 2005, 2007, 2009 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 ""
@@ -396,6 +429,31 @@
 msgid "Updated:"
 msgstr "Ажурирано:"
 
+#, fuzzy
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "Молимо да погледате <a 
href=\"/server/standards/README.translations.html"
+#~ "\">ПРОЧИТАЈМЕ за преводе</a> за више 
информација о координисању и слању "
+#~ "превода овог чланка. (За допринос 
српском преводу, корисно је да "
+#~ "погледате и <a 
href=\"http://alas.matf.bg.ac.rs/~mr99164/uput/kakoda-";
+#~ "prevodim-gnu-ov-veb.html\"> КАКОДА прeводим ГНУ-ов 
веб</a>.)"
+
+# | Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007,
+# | [-2009-] {+2009, 2012, 2014, 2017+} Free Software Foundation, Inc.
+#, fuzzy
+#~| msgid ""
+#~| "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~| "2009 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "<b>Ауторска права:</b><br />Copyright &copy; 1996, 1997, 
1998, 1999, "
+#~ "2001, 2002, 2003, 2005, 2007, 2009 Free Software Foundation, Inc."
+
 #~ msgid ""
 #~ "(The principal version of Linux now contains non-free firmware &ldquo;"
 #~ "blobs&rdquo;.  Free software activists now maintain a modified <a href="

Index: po/gnu-history.sv.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-history.sv.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- po/gnu-history.sv.po        4 Sep 2017 11:03:01 -0000       1.4
+++ po/gnu-history.sv.po        2 Nov 2021 14:41:50 -0000       1.5
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-history.html\n"
-"POT-Creation-Date: 2017-09-04 10:56+0000\n"
+"POT-Creation-Date: 2021-11-02 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"
@@ -27,11 +27,26 @@
 "GNU, GNU Projektet, FSF, Free Software, Fri mjukvara, Free Software "
 "Foundation, Historia"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Overview of the GNU System"
 msgstr "Översikt av GNU Projektet"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The GNU [-Project has developed-] {+operating system is+} a complete free
+# | software [-system named ``GNU'' (GNU's-] {+system, upward-compatible with
+# | Unix.  GNU stands for &ldquo;GNU's+} Not [-Unix) that-] {+Unix.&rdquo;
+# | It+} is [-upwardly compatible-] {+pronounced as <a
+# | href=\"/gnu/pronunciation.html\">one syllable+} with [-Unix.-] {+a hard
+# | <i>g</i></a>.+}  <a [-href=\"http://www.stallman.org/\";>Richard
+# | Stallman</a>'s initial document on-]
+# | {+href=\"https://www.stallman.org/\";>Richard Stallman</a> made the <a
+# | href=\"/gnu/initial-announcement.html\">Initial Announcement</a> of+} the
+# | GNU Project [-is-] {+in September 1983.  A longer version+} called the <a
+# | href=\"/gnu/manifesto.html\">GNU [-Manifesto </a>, which-] {+Manifesto</a>
+# | was published in March 1985.  It+} has been translated into several <a
+# | href=\"/gnu/manifesto.html#translations\">other languages</a>. [-We also
+# | have the <a href=\"/gnu/initial-announcement.html\">Initial
+# | Announcement</a> of the GNU Project, written in 1983.-]
 #, fuzzy
 #| msgid ""
 #| "The GNU Project has developed a complete free software system named "
@@ -44,14 +59,14 @@
 #| "GNU Project, written in 1983."
 msgid ""
 "The GNU operating system is a complete free software system, upward-"
-"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.  It is "
+"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix.&rdquo; It is "
 "pronounced as <a href=\"/gnu/pronunciation.html\">one syllable with a hard "
-"g</a>.  <a href=\"http://www.stallman.org/\";>Richard Stallman</a> made the "
-"<a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> of the "
-"GNU Project in September 1983.  A longer version called the <a href=\"/gnu/"
-"manifesto.html\">GNU Manifesto</a> was published in March 1985.  It has been "
-"translated into several <a href=\"/gnu/manifesto.html#translations\">other "
-"languages</a>."
+"<i>g</i></a>.  <a href=\"https://www.stallman.org/\";>Richard Stallman</a> "
+"made the <a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> "
+"of the GNU Project in September 1983.  A longer version called the <a href="
+"\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March 1985.  It "
+"has been translated into several <a href=\"/gnu/manifesto.html#translations"
+"\">other languages</a>."
 msgstr ""
 "GNU-projektet har utvecklat ett komplett, fritt mjukvarusystem kallat "
 "“GNU” (GNU's Not Unix) som är framåtkompatibelt med Unix. <a 
href=\"http://";
@@ -61,15 +76,15 @@
 "språk</a> än engelska. Vi har också det <a 
href=\"/gnu/initial-announcement."
 "html\">första tillkännagivandet</a> av GNU-projektet, skrivet 1983."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
-"first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, second, "
+"first, it was a recursive acronym for &ldquo;GNU's Not Unix,&rdquo; second, "
 "because it was a real word, and third, it was fun to say (or <a href="
-"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
+"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>sing</a>)."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The word &ldquo;free&rdquo; in &ldquo;free software&rdquo; pertains to <a "
 "href=\"/philosophy/free-sw.html\">freedom</a>, not price.  You may or may "
@@ -95,7 +110,14 @@
 "prestationen för att distribuera en kopia, men du får också distribuera "
 "denna mjukvara gratis.)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The {+project to develop the GNU system is called the &ldquo;GNU
+# | Project.&rdquo; The+} GNU Project [-started-] {+was conceived+} in
+# | 198[-4-]{+3+} as [-an attempt to bring-] {+a way of bringing+} back the
+# | cooperative spirit that prevailed in the computing community in earlier
+# | [-days---to-] {+days&mdash;to+} make cooperation possible once again by
+# | removing the obstacles to cooperation imposed by the owners of proprietary
+# | software.
 #, fuzzy
 #| msgid ""
 #| "The GNU Project started in 1984 as an attempt to bring back the "
@@ -103,18 +125,18 @@
 #| "days---to make cooperation possible once again by removing the obstacles "
 #| "to cooperation imposed by the owners of proprietary software."
 msgid ""
-"The project to develop the GNU system is called the &ldquo;GNU "
-"Project&rdquo;.  The GNU Project was conceived in 1983 as a way of bringing "
-"back the cooperative spirit that prevailed in the computing community in "
-"earlier days&mdash;to make cooperation possible once again by removing the "
-"obstacles to cooperation imposed by the owners of proprietary software."
+"The project to develop the GNU system is called the &ldquo;GNU Project."
+"&rdquo; The GNU Project was conceived in 1983 as a way of bringing back the "
+"cooperative spirit that prevailed in the computing community in earlier "
+"days&mdash;to make cooperation possible once again by removing the obstacles "
+"to cooperation imposed by the owners of proprietary software."
 msgstr ""
 "GNU-projektet startade 1984 som ett sätt att gå tillbaka till den 
hjälpsamma "
 "andan som genomsyrade datavärlden under de tidigaste åren — att göra "
 "samarbete möjligt återigen genom att ta bort hindren som satts av ägarna "
 "till privatägd mjukvara."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In 1971, when Richard Stallman started his career at MIT, he worked in a "
 "group which used <a href=\"/philosophy/free-sw.html\">free software</a> "
@@ -126,7 +148,7 @@
 "a>. Även datorföretag distribuerade fri mjukvara. Programmerare var fria 
att "
 "samarbeta, och gjorde ofta så."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By the 1980s, almost all software was <a href=\"/philosophy/categories."
 "html#ProprietarySoftware\">proprietary</a>, which means that it had owners "
@@ -138,7 +160,7 @@
 "förbjöd och förebyggde samarbete mellan dess användare. Det var detta som 
"
 "gjorde GNU-projektet till en nödvändighet."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Every computer user needs an operating system; if there is no free operating "
 "system, then you can't even get started using a computer without resorting "
@@ -150,7 +172,7 @@
 "använda privatägd mjukvara. Så det första som behövde göras var att 
skapa "
 "ett fritt operativsystem."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We decided to make the operating system compatible with Unix because the "
 "overall design was already proven and portable, and because compatibility "
@@ -160,7 +182,14 @@
 "grundläggande designen var redan testad och bevisad, och därför att "
 "kompabiliteten gör det lättare för Unix-användare attbyta från Unix till 
GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | [-An-]{+A Unix-like+} operating system [-is not just a kernel; it also-]
+# | includes {+a kernel,+} compilers, editors, text formatters, mail software,
+# | {+graphical interfaces, libraries, games+} and many other things.  Thus,
+# | writing a whole operating system is a very large job.  [-It took many
+# | years.-]  {+We started in January 1984.  The <a
+# | href=\"https://www.fsf.org/\";> Free Software Foundation</a> was founded in
+# | October 1985, initially to raise funds to help develop GNU.+}
 #, fuzzy
 #| msgid ""
 #| "An operating system is not just a kernel; it also includes compilers, "
@@ -170,16 +199,30 @@
 "A Unix-like operating system includes a kernel, compilers, editors, text "
 "formatters, mail software, graphical interfaces, libraries, games and many "
 "other things.  Thus, writing a whole operating system is a very large job.  "
-"We started in January 1984.  The <a href=\"http://fsf.org/\";> Free Software "
-"Foundation</a> was founded in October 1985, initially to raise funds to help "
-"develop GNU."
+"We started in January 1984.  The <a href=\"https://www.fsf.org/\";> Free "
+"Software Foundation</a> was founded in October 1985, initially to raise "
+"funds to help develop GNU."
 msgstr ""
 "Ett operativsystem består av mer än en kärna; det innefattar dessutom "
 "kompilatorer, text formatterare, epost mjukvara och mycket mer. Allt detta "
 "innebär att det är ett enormt arbete att skriva ett komplett 
operativsystem. "
 "Detta tog många år att genomföra."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | [-The initial goal of a free Unix-like operating system has been
+# | achieved.-]By [-the 1990s,-] {+1990+} we had either found or written all
+# | the major components except [-one--the-] {+one&mdash;the+} kernel.  Then
+# | Linux, a [-free-] {+Unix-like+} kernel, was developed by Linus
+# | [-Torvalds.-] {+Torvalds in 1991 and made free software in 1992.+} 
+# | Combining Linux with the almost-complete GNU system resulted in a complete
+# | operating system: [-a Linux-based GNU-] {+the GNU/Linux+} system. 
+# | Estimates are that [-hundreds-] {+tens+} of [-thousands-] {+millions+} of
+# | people now use [-Linux-based GNU-] {+GNU/Linux+} systems, [-including
+# | Slackware, Debian, Red Hat, and others.-] {+typically via <a
+# | href=\"/distros/distros.html\">GNU/Linux distributions</a>.  The principal
+# | version of Linux now contains nonfree firmware &ldquo;blobs&rdquo;; free
+# | software activists now maintain a modified free version of Linux, called
+# | <a href=\"https://directory.fsf.org/wiki/Linux-libre\";> Linux-libre</a>.+}
 #, fuzzy
 #| msgid ""
 #| "The initial goal of a free Unix-like operating system has been achieved. "
@@ -196,10 +239,10 @@
 "the almost-complete GNU system resulted in a complete operating system: the "
 "GNU/Linux system.  Estimates are that tens of millions of people now use GNU/"
 "Linux systems, typically via <a href=\"/distros/distros.html\">GNU/Linux "
-"distributions</a>.  The principal version of Linux now contains non-free "
+"distributions</a>.  The principal version of Linux now contains nonfree "
 "firmware &ldquo;blobs&rdquo;; free software activists now maintain a "
-"modified free version of Linux, called <a href=\"http://directory.fsf.org/";
-"project/linux\"> Linux-libre</a>."
+"modified free version of Linux, called <a href=\"https://directory.fsf.org/";
+"wiki/Linux-libre\"> Linux-libre</a>."
 msgstr ""
 "Vårt första mål, att ha ett fritt, Unix-liknande operativsystem är nu "
 "uppnått. Under 1990-talet hade vi antingen skrivit eller hittat alla "
@@ -209,7 +252,15 @@
 "att hundratusentals människor nu använder Linux-baserade GNU-system. Dessa "
 "innefattar Slackware, Debian, Red Hat och andra."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | However, the GNU Project is not limited to {+the core+} operating
+# | system[-s-].  We aim to provide [-<a href=\"/directory\">a-] {+a+} whole
+# | spectrum of [-software</a>,-] {+software,+} whatever many users want to
+# | have.  This includes application software.  [-We already have a
+# | spreadsheet.  We hope to extend GNU Emacs into a WYSIWYG desktop
+# | publishing system over-]  {+See+} the [-coming years.-] {+<a
+# | href=\"https://directory.fsf.org/wiki/Main_Page\";>Free Software
+# | Directory</a> for a catalogue of free software application programs.+}
 #, fuzzy
 #| msgid ""
 #| "However, the GNU Project is not limited to operating systems.  We aim to "
@@ -220,9 +271,9 @@
 msgid ""
 "However, the GNU Project is not limited to the core operating system.  We "
 "aim to provide a whole spectrum of software, whatever many users want to "
-"have.  This includes application software.  See the <a href=\"/directory"
-"\">Free Software Directory</a> for a catalogue of free software application "
-"programs."
+"have.  This includes application software.  See the <a href=\"https://";
+"directory.fsf.org/wiki/Main_Page\">Free Software Directory</a> for a "
+"catalogue of free software application programs."
 msgstr ""
 "GNU-projektet är dock inte begränsat till operativsystem. Vi vill "
 "tillhandahålla <a href=\"/directory\">ett helt spektrum av mjukvara</a>, "
@@ -231,7 +282,12 @@
 "med att bygga ut GNU Emacs till ett komplett WYSIWYG desktop "
 "publishingsystem under kommande år."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | We also want to provide software for users who are not computer experts. 
+# | Therefore we [-are now working on-] {+developed+} a <a
+# | [-href=\"http://www.gnome.org/\";>drag-and-drop icon-]
+# | {+href=\"https://www.gnome.org/\";>graphical+} desktop [-(GNOME)</a>-]
+# | {+(called GNOME)</a>+} to help beginners use the GNU system.
 #, fuzzy
 #| msgid ""
 #| "We also want to provide software for users who are not computer experts.  "
@@ -239,15 +295,18 @@
 #| "and-drop icon desktop (GNOME)</a> to help beginners use the GNU system."
 msgid ""
 "We also want to provide software for users who are not computer experts.  "
-"Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical desktop "
-"(called GNOME)</a> to help beginners use the GNU system."
+"Therefore we developed a <a href=\"https://www.gnome.org/\";>graphical "
+"desktop (called GNOME)</a> to help beginners use the GNU system."
 msgstr ""
 "Vi vill också tillhandahålla mjukvara för användare som inte är "
 "dataexperter. Vi arbetar därför på en <a href=\"http://www.gnome.org/";
 "\">skrivbordshanterare (GNOME)</a> för att hjälpa nybörjare att använda 
ett "
 "GNU-system."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | We also want to provide games and other recreations.  [-Some-]  {+Plenty
+# | of+} <a href=\"http{+s+}://directory.fsf.org/wiki/Category/Game\">free
+# | games</a> are already available.
 #, fuzzy
 #| msgid ""
 #| "We also want to provide games and other recreations.  Some <a href="
@@ -255,14 +314,19 @@
 #| "already available."
 msgid ""
 "We also want to provide games and other recreations.  Plenty of <a href="
-"\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
+"\"https://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
 "available."
 msgstr ""
 "Vi vill också tillhandahålla spel och andra nöjesprogram. Det finns redan "
 "flera <a href=\"http://directory.fsf.org/wiki/Category/Game\";>fria spel</a> "
 "tillgängliga."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | How far can free software go? There are no limits, except when <a
+# | href=\"/philosophy/fighting-software-patents.html\">laws such as the
+# | patent system prohibit free software</a>.  The ultimate goal is to provide
+# | free software to do all of the jobs computer users want to do&mdash;and
+# | thus make proprietary software [-obsolete.-] {+a thing of the past.+}
 #, fuzzy
 #| msgid ""
 #| "How far can free software go? There are no limits, except when <a href=\"/"
@@ -309,15 +373,23 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# | Please see the <a
+# | href=\"/server/standards/README.translations.html\">Translations
+# | README</a> for information on coordinating and [-submitting-]
+# | {+contributing+} translations of this article.
 #, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and submitting "
+#| "translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Var god läs <a href=\"/server/standards/README.translations.html\">README "
@@ -325,17 +397,24 @@
 "översättningar till den här artikeln."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; 1996, 1997, [-1998, 2001, 2007-] {+2003, 2005, 2008,
+# | 2012, 2017, 2021+} Free Software Foundation, Inc.[-,-]
 #, fuzzy
 #| msgid ""
-#| "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
-#| "2009, 2012, 2014 Free Software Foundation, Inc."
+#| "Copyright &copy; 1996, 1997, 1998, 2001, 2007 Free Software Foundation, "
+#| "Inc.,"
 msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017 Free Software Foundation, Inc."
+"Copyright &copy; 1996, 1997, 2003, 2005, 2008, 2012, 2017, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001 Free Software Foundation, Inc."
+"Copyright &copy; 1996, 1997, 1998, 2001, 2007 Free Software Foundation, Inc.,"
 
 #. type: Content of: <div><p>
+# | This page is licensed under a <a rel=\"license\"
+# | [-href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative-]
+# | {+href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Creative+}
+# | Commons [-Attribution-NoDerivs 3.0 United States-]
+# | {+Attribution-NoDerivatives 4.0 International+} License</a>.
 #, fuzzy
 #| msgid ""
 #| "This page is licensed under a <a rel=\"license\" href=\"http://";
@@ -360,6 +439,27 @@
 msgid "Updated:"
 msgstr "Updaterat:"
 
+#, fuzzy
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "Var god läs <a href=\"/server/standards/README.translations.html\">README 
"
+#~ "för Översättningar</a> för information om att samarbeta och skicka in "
+#~ "översättningar till den här artikeln."
+
+#, fuzzy
+#~| msgid ""
+#~| "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~| "2009, 2012, 2014 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001 Free Software Foundation, "
+#~ "Inc."
+
 #~ msgid ""
 #~ "This page is licensed under a <a rel=\"license\" href=\"http://";
 #~ "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"

Index: po/gnu-history.tr.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-history.tr.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- po/gnu-history.tr.po        2 Nov 2021 13:25:56 -0000       1.6
+++ po/gnu-history.tr.po        2 Nov 2021 14:41:50 -0000       1.7
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-history.html\n"
-"POT-Creation-Date: 2017-09-04 10:56+0000\n"
+"POT-Creation-Date: 2021-11-02 13:26+0000\n"
 "PO-Revision-Date: 2020-04-01 22:16+0300\n"
 "Last-Translator: The FLOSS Information <theflossinformation@gmail.com>\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-11-02 13:26+0000\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Lokalize 19.12.3\n"
 
@@ -25,21 +26,32 @@
 msgid "GNU, GNU Project, FSF, Free Software, Free Software Foundation, History"
 msgstr "GNU, GNU Projesi, FSF, Özgür Yazılım, Özgür Yazılım Vakfı, 
Tarihçe"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Overview of the GNU System"
 msgstr "GNU Sistemi'ne Genel Bakış"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The GNU operating system is a complete free software system, upward-"
+#| "compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.  It "
+#| "is pronounced as <a href=\"/gnu/pronunciation.html\">one syllable with a "
+#| "hard g</a>.  <a href=\"http://www.stallman.org/\";>Richard Stallman</a> "
+#| "made the <a href=\"/gnu/initial-announcement.html\">Initial Announcement</"
+#| "a> of the GNU Project in September 1983.  A longer version called the <a "
+#| "href=\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March "
+#| "1985.  It has been translated into several <a href=\"/gnu/manifesto."
+#| "html#translations\">other languages</a>."
 msgid ""
 "The GNU operating system is a complete free software system, upward-"
-"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.  It is "
+"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix.&rdquo; It is "
 "pronounced as <a href=\"/gnu/pronunciation.html\">one syllable with a hard "
-"g</a>.  <a href=\"http://www.stallman.org/\";>Richard Stallman</a> made the "
-"<a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> of the "
-"GNU Project in September 1983.  A longer version called the <a href=\"/gnu/"
-"manifesto.html\">GNU Manifesto</a> was published in March 1985.  It has been "
-"translated into several <a href=\"/gnu/manifesto.html#translations\">other "
-"languages</a>."
+"<i>g</i></a>.  <a href=\"https://www.stallman.org/\";>Richard Stallman</a> "
+"made the <a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> "
+"of the GNU Project in September 1983.  A longer version called the <a href="
+"\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March 1985.  It "
+"has been translated into several <a href=\"/gnu/manifesto.html#translations"
+"\">other languages</a>."
 msgstr ""
 "GNU işletim sistemi, Unix ile ileriye doğru uyumlu tam bir özgür 
yazılım "
 "sistemidir. GNU, &ldquo;\"GNU's Not Unix\" (GNU, Unix Değildir)&rdquo; "
@@ -50,12 +62,18 @@
 "manifesto.html\">GNU Bildirisi</a> adlı daha uzun bir sürüm yayımlandı. 
Bazı "
 "<a href=\"/gnu/manifesto.html#translations\">diğer dillere</a> çevrildi."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
+#| "first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, "
+#| "second, because it was a real word, and third, it was fun to say (or <a "
+#| "href=\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
 msgid ""
 "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
-"first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, second, "
+"first, it was a recursive acronym for &ldquo;GNU's Not Unix,&rdquo; second, "
 "because it was a real word, and third, it was fun to say (or <a href="
-"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
+"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>sing</a>)."
 msgstr ""
 "Birkaç gereksinimi karşıladığı için &ldquo;GNU&rdquo; adı seçildi; "
 "Birincisi, &ldquo;\"GNU's Not Unix\" (GNU, Unix Değildir)&rdquo; ifadesinin "
@@ -63,7 +81,7 @@
 "söylemek (veya <a href=\"http://www.poppyfields.net/poppy/songs/gnu.html";
 "\">Şarkı Söylemek</a>) eğlenceliydi."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The word &ldquo;free&rdquo; in &ldquo;free software&rdquo; pertains to <a "
 "href=\"/philosophy/free-sw.html\">freedom</a>, not price.  You may or may "
@@ -88,13 +106,21 @@
 "bir kopyayı aktarmanın fiziksel eylemi için bir ücret talep edebilir veya 
"
 "kopyaları ücretsiz verebilirsiniz.)"
 
-#. type: Content of: <p>
-msgid ""
-"The project to develop the GNU system is called the &ldquo;GNU "
-"Project&rdquo;.  The GNU Project was conceived in 1983 as a way of bringing "
-"back the cooperative spirit that prevailed in the computing community in "
-"earlier days&mdash;to make cooperation possible once again by removing the "
-"obstacles to cooperation imposed by the owners of proprietary software."
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The project to develop the GNU system is called the &ldquo;GNU "
+#| "Project&rdquo;.  The GNU Project was conceived in 1983 as a way of "
+#| "bringing back the cooperative spirit that prevailed in the computing "
+#| "community in earlier days&mdash;to make cooperation possible once again "
+#| "by removing the obstacles to cooperation imposed by the owners of "
+#| "proprietary software."
+msgid ""
+"The project to develop the GNU system is called the &ldquo;GNU Project."
+"&rdquo; The GNU Project was conceived in 1983 as a way of bringing back the "
+"cooperative spirit that prevailed in the computing community in earlier "
+"days&mdash;to make cooperation possible once again by removing the obstacles "
+"to cooperation imposed by the owners of proprietary software."
 msgstr ""
 "GNU sistemini geliştirme projesine &ldquo;GNU Projesi&rdquo; denir. GNU "
 "Projesi, 1983 yılında bilişim topluluğunda daha önceki günlerde egemen 
olan "
@@ -102,7 +128,7 @@
 "birliğinin önüne konulan engelleri kaldırarak bir kez daha iş birliğini 
"
 "mümkün kılmanın) bir yolu olarak tasarlandı."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In 1971, when Richard Stallman started his career at MIT, he worked in a "
 "group which used <a href=\"/philosophy/free-sw.html\">free software</a> "
@@ -114,7 +140,7 @@
 "Bilgisayar şirketleri bile çoğu kez özgür yazılım dağıtıyordu. 
Programcılar "
 "birbirleriyle iş birliği yapmakta özgürdü ve çoğu zaman da 
yapıyorlardı."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By the 1980s, almost all software was <a href=\"/philosophy/categories."
 "html#ProprietarySoftware\">proprietary</a>, which means that it had owners "
@@ -126,7 +152,7 @@
 "iş birliğini yasaklayan ve engelleyen sahipleri vardı. Bu, GNU Projesi'ni "
 "gerekli kıldı."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Every computer user needs an operating system; if there is no free operating "
 "system, then you can't even get started using a computer without resorting "
@@ -138,7 +164,7 @@
 "kullanmaya bile başlayamazsınız. Dolayısıyla özgür yazılım 
gündemindeki ilk "
 "ögenin açıkça bir işletim sistemi olması gerekiyordu."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We decided to make the operating system compatible with Unix because the "
 "overall design was already proven and portable, and because compatibility "
@@ -148,14 +174,22 @@
 "kullanıcılarının Unix'ten GNU'ya geçişini kolaylaştırdığı için 
işletim "
 "sistemini Unix ile uyumlu hâle getirmeye karar verdik."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "A Unix-like operating system includes a kernel, compilers, editors, text "
+#| "formatters, mail software, graphical interfaces, libraries, games and "
+#| "many other things.  Thus, writing a whole operating system is a very "
+#| "large job.  We started in January 1984.  The <a href=\"http://fsf.org/\";> "
+#| "Free Software Foundation</a> was founded in October 1985, initially to "
+#| "raise funds to help develop GNU."
 msgid ""
 "A Unix-like operating system includes a kernel, compilers, editors, text "
 "formatters, mail software, graphical interfaces, libraries, games and many "
 "other things.  Thus, writing a whole operating system is a very large job.  "
-"We started in January 1984.  The <a href=\"http://fsf.org/\";> Free Software "
-"Foundation</a> was founded in October 1985, initially to raise funds to help "
-"develop GNU."
+"We started in January 1984.  The <a href=\"https://www.fsf.org/\";> Free "
+"Software Foundation</a> was founded in October 1985, initially to raise "
+"funds to help develop GNU."
 msgstr ""
 "Unix benzeri bir işletim sistemi bir çekirdek, derleyiciler, 
düzenleyiciler, "
 "metin biçimlendiricileri, e-posta yazılımı, grafiksel arayüzler, "
@@ -165,7 +199,19 @@
 "geliştirilmesine yardımcı olmak için fon toplamak amacıyla Ekim 1985'te "
 "kuruldu."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "By 1990 we had either found or written all the major components except "
+#| "one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by "
+#| "Linus Torvalds in 1991 and made free software in 1992.  Combining Linux "
+#| "with the almost-complete GNU system resulted in a complete operating "
+#| "system: the GNU/Linux system.  Estimates are that tens of millions of "
+#| "people now use GNU/Linux systems, typically via <a href=\"/distros/"
+#| "distros.html\">GNU/Linux distributions</a>.  The principal version of "
+#| "Linux now contains non-free firmware &ldquo;blobs&rdquo;; free software "
+#| "activists now maintain a modified free version of Linux, called <a href="
+#| "\"http://directory.fsf.org/project/linux\";> Linux-libre</a>."
 msgid ""
 "By 1990 we had either found or written all the major components except "
 "one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by "
@@ -173,10 +219,10 @@
 "the almost-complete GNU system resulted in a complete operating system: the "
 "GNU/Linux system.  Estimates are that tens of millions of people now use GNU/"
 "Linux systems, typically via <a href=\"/distros/distros.html\">GNU/Linux "
-"distributions</a>.  The principal version of Linux now contains non-free "
+"distributions</a>.  The principal version of Linux now contains nonfree "
 "firmware &ldquo;blobs&rdquo;; free software activists now maintain a "
-"modified free version of Linux, called <a href=\"http://directory.fsf.org/";
-"project/linux\"> Linux-libre</a>."
+"modified free version of Linux, called <a href=\"https://directory.fsf.org/";
+"wiki/Linux-libre\"> Linux-libre</a>."
 msgstr ""
 "1990'a gelindiğinde biri hariç (çekirdek) bütün önemli bileşenleri 
bulduk "
 "veya yazdık. Daha sonra 1991 yılında Unix benzeri bir çekirdek olan 
Linux; "
@@ -190,13 +236,20 @@
 "linux\">Linux-libre</a> adı verilen değiştirilmiş bir Linux sürümünü "
 "sürdürmektedir."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "However, the GNU Project is not limited to the core operating system.  We "
+#| "aim to provide a whole spectrum of software, whatever many users want to "
+#| "have.  This includes application software.  See the <a href=\"/directory"
+#| "\">Free Software Directory</a> for a catalogue of free software "
+#| "application programs."
 msgid ""
 "However, the GNU Project is not limited to the core operating system.  We "
 "aim to provide a whole spectrum of software, whatever many users want to "
-"have.  This includes application software.  See the <a href=\"/directory"
-"\">Free Software Directory</a> for a catalogue of free software application "
-"programs."
+"have.  This includes application software.  See the <a href=\"https://";
+"directory.fsf.org/wiki/Main_Page\">Free Software Directory</a> for a "
+"catalogue of free software application programs."
 msgstr ""
 "Ancak GNU Projesi çekirdek işletim sistemiyle sınırlı değildir. Birçok 
"
 "kullanıcının sahip olmak istediği her türlü yazılımı sağlamayı 
amaçlıyoruz. "
@@ -204,28 +257,38 @@
 "bir kataloğu için <a href=\"/directory\">Özgür Yazılım Dizini</a>'ne "
 "bakabilirsiniz."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "We also want to provide software for users who are not computer experts.  "
+#| "Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical "
+#| "desktop (called GNOME)</a> to help beginners use the GNU system."
 msgid ""
 "We also want to provide software for users who are not computer experts.  "
-"Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical desktop "
-"(called GNOME)</a> to help beginners use the GNU system."
+"Therefore we developed a <a href=\"https://www.gnome.org/\";>graphical "
+"desktop (called GNOME)</a> to help beginners use the GNU system."
 msgstr ""
 "Ayrıca bilgisayar uzmanı olmayan kullanıcılara da yazılım sağlamak "
 "istiyoruz. Bu nedenle yeni başlayanların GNU sistemini kullanmasına 
yardımcı "
 "olmak için <a href=\"http://www.gnome.org/\";>grafiksel bir masaüstü (GNOME 
"
 "adlı)</a> de geliştirdik."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "We also want to provide games and other recreations.  Plenty of <a href="
+#| "\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are "
+#| "already available."
 msgid ""
 "We also want to provide games and other recreations.  Plenty of <a href="
-"\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
+"\"https://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
 "available."
 msgstr ""
 "Ayrıca oyunlar ve başka boş zaman araçları sunmak istiyoruz. Pek çok <a 
href="
 "\"http://directory.fsf.org/wiki/Category/Game\";>özgür oyun</a> halihazırda 
"
 "mevcut."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "How far can free software go? There are no limits, except when <a href=\"/"
 "philosophy/fighting-software-patents.html\">laws such as the patent system "
@@ -269,14 +332,19 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Çevirilerimizde bulmuş olabileceğiniz hataları, aklınızdaki soru ve "
@@ -290,12 +358,16 @@
 "\">çalışma&nbsp;sayfamızı</a> ziyaret edebilirsiniz."
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2014, 2015, 2016, 2017, 2018, 2019, 2020 Free Software "
+#| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017 Free Software Foundation, Inc."
+"Copyright &copy; 1996, 1997, 2003, 2005, 2008, 2012, 2017, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017 Free Software Foundation, Inc."
+"Copyright &copy; 2014, 2015, 2016, 2017, 2018, 2019, 2020 Free Software "
+"Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -322,10 +394,16 @@
 msgid "Updated:"
 msgstr "Son Güncelleme:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017, 2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017, 2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017 Free Software Foundation, Inc."
+
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017, 2021 Free Software Foundation, Inc."

Index: po/gnu-history.uk.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-history.uk.po,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- po/gnu-history.uk.po        2 Nov 2021 13:25:56 -0000       1.12
+++ po/gnu-history.uk.po        2 Nov 2021 14:41:50 -0000       1.13
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-history.html\n"
-"POT-Creation-Date: 2017-09-04 10:56+0000\n"
+"POT-Creation-Date: 2021-11-02 13:26+0000\n"
 "PO-Revision-Date: 2017-12-10 14:43+0200\n"
 "Last-Translator: Andriy Bandura <andriykopanytsia@gmail.com>\n"
 "Language-Team: Ukrainian <>\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-11-02 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"
@@ -30,21 +31,32 @@
 "GNU, проект GNU, ФСПО, вільні програми, Фонд 
вільного програмного "
 "забезпечення, історія"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Overview of the GNU System"
 msgstr "Огляд системи GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The GNU operating system is a complete free software system, upward-"
+#| "compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.  It "
+#| "is pronounced as <a href=\"/gnu/pronunciation.html\">one syllable with a "
+#| "hard g</a>.  <a href=\"http://www.stallman.org/\";>Richard Stallman</a> "
+#| "made the <a href=\"/gnu/initial-announcement.html\">Initial Announcement</"
+#| "a> of the GNU Project in September 1983.  A longer version called the <a "
+#| "href=\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March "
+#| "1985.  It has been translated into several <a href=\"/gnu/manifesto."
+#| "html#translations\">other languages</a>."
 msgid ""
 "The GNU operating system is a complete free software system, upward-"
-"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.  It is "
+"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix.&rdquo; It is "
 "pronounced as <a href=\"/gnu/pronunciation.html\">one syllable with a hard "
-"g</a>.  <a href=\"http://www.stallman.org/\";>Richard Stallman</a> made the "
-"<a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> of the "
-"GNU Project in September 1983.  A longer version called the <a href=\"/gnu/"
-"manifesto.html\">GNU Manifesto</a> was published in March 1985.  It has been "
-"translated into several <a href=\"/gnu/manifesto.html#translations\">other "
-"languages</a>."
+"<i>g</i></a>.  <a href=\"https://www.stallman.org/\";>Richard Stallman</a> "
+"made the <a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> "
+"of the GNU Project in September 1983.  A longer version called the <a href="
+"\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March 1985.  It "
+"has been translated into several <a href=\"/gnu/manifesto.html#translations"
+"\">other languages</a>."
 msgstr ""
 "Операційна система GNU&nbsp;&mdash; це повністю 
вільна програмна система, "
 "сумісна знизу вгору з Unix. GNU означає 
&ldquo;GNU&nbsp;&mdash; це не "
@@ -57,12 +69,18 @@
 "року. Вона була перекладена на кілька <a 
href=\"/gnu/manifesto."
 "html#translations\">інших мов</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
+#| "first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, "
+#| "second, because it was a real word, and third, it was fun to say (or <a "
+#| "href=\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
 msgid ""
 "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
-"first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, second, "
+"first, it was a recursive acronym for &ldquo;GNU's Not Unix,&rdquo; second, "
 "because it was a real word, and third, it was fun to say (or <a href="
-"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
+"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>sing</a>)."
 msgstr ""
 "Назва &ldquo;GNU&rdquo; була обрано тому, що вона 
відповідала декільком "
 "вимогам; по-перше, це було рекурсивне 
скорочення, що означає &ldquo;GNU&nbsp;"
@@ -70,7 +88,7 @@
 "його кумедно вимовляти (або й навіть <a 
href=\"http://www.poppyfields.net/";
 "poppy/songs/gnu.html\">співати</a>)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The word &ldquo;free&rdquo; in &ldquo;free software&rdquo; pertains to <a "
 "href=\"/philosophy/free-sw.html\">freedom</a>, not price.  You may or may "
@@ -94,13 +112,21 @@
 "GNU, ви можете брати плату за акт фізичної 
передачі копії або роздавати "
 "копії задарма.)"
 
-#. type: Content of: <p>
-msgid ""
-"The project to develop the GNU system is called the &ldquo;GNU "
-"Project&rdquo;.  The GNU Project was conceived in 1983 as a way of bringing "
-"back the cooperative spirit that prevailed in the computing community in "
-"earlier days&mdash;to make cooperation possible once again by removing the "
-"obstacles to cooperation imposed by the owners of proprietary software."
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The project to develop the GNU system is called the &ldquo;GNU "
+#| "Project&rdquo;.  The GNU Project was conceived in 1983 as a way of "
+#| "bringing back the cooperative spirit that prevailed in the computing "
+#| "community in earlier days&mdash;to make cooperation possible once again "
+#| "by removing the obstacles to cooperation imposed by the owners of "
+#| "proprietary software."
+msgid ""
+"The project to develop the GNU system is called the &ldquo;GNU Project."
+"&rdquo; The GNU Project was conceived in 1983 as a way of bringing back the "
+"cooperative spirit that prevailed in the computing community in earlier "
+"days&mdash;to make cooperation possible once again by removing the obstacles "
+"to cooperation imposed by the owners of proprietary software."
 msgstr ""
 "Проект по розробці системи GNU називається 
проектом GNU. Проект GNU був "
 "задуманий в 1983&nbsp;році як спосіб відродити 
дух співпраці, який панував у "
@@ -108,7 +134,7 @@
 "можливість співпраці, усунувши перешкоди, 
встановлені власниками невільних "
 "програм."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In 1971, when Richard Stallman started his career at MIT, he worked in a "
 "group which used <a href=\"/philosophy/free-sw.html\">free software</a> "
@@ -121,7 +147,7 @@
 "комп'ютерні компанії нерідко поширювали 
вільні програми. Програмісти могли "
 "вільно співпрацювати один з одним і часто 
так  чинили."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By the 1980s, almost all software was <a href=\"/philosophy/categories."
 "html#ProprietarySoftware\">proprietary</a>, which means that it had owners "
@@ -133,7 +159,7 @@
 "що у них були власники, які забороняли і 
запобігали співпраці між "
 "користувачами. Це створило потребу в 
проекті GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Every computer user needs an operating system; if there is no free operating "
 "system, then you can't even get started using a computer without resorting "
@@ -146,7 +172,7 @@
 "першим пунктом на порядку денному 
вільного програмного забезпечення, "
 "очевидно, повинна була стати вільна 
операційна система."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We decided to make the operating system compatible with Unix because the "
 "overall design was already proven and portable, and because compatibility "
@@ -156,14 +182,22 @@
 "в цілому було вже випробувана і переносна, 
а також тому, що сумісність "
 "полегшує перехід з Unix на GNU для 
користувачів Unix."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "A Unix-like operating system includes a kernel, compilers, editors, text "
+#| "formatters, mail software, graphical interfaces, libraries, games and "
+#| "many other things.  Thus, writing a whole operating system is a very "
+#| "large job.  We started in January 1984.  The <a href=\"http://fsf.org/\";> "
+#| "Free Software Foundation</a> was founded in October 1985, initially to "
+#| "raise funds to help develop GNU."
 msgid ""
 "A Unix-like operating system includes a kernel, compilers, editors, text "
 "formatters, mail software, graphical interfaces, libraries, games and many "
 "other things.  Thus, writing a whole operating system is a very large job.  "
-"We started in January 1984.  The <a href=\"http://fsf.org/\";> Free Software "
-"Foundation</a> was founded in October 1985, initially to raise funds to help "
-"develop GNU."
+"We started in January 1984.  The <a href=\"https://www.fsf.org/\";> Free "
+"Software Foundation</a> was founded in October 1985, initially to raise "
+"funds to help develop GNU."
 msgstr ""
 "Операційна система типу Unix включає в себе 
ядро, компілятори, редактори, "
 "програми для форматування тексту, поштові 
програми, графічні оболонки, "
@@ -173,7 +207,19 @@
 "\">Фонд вільного програмного 
забезпечення</a>, спочатку для збору фондів 
на "
 "підтримку розробки GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "By 1990 we had either found or written all the major components except "
+#| "one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by "
+#| "Linus Torvalds in 1991 and made free software in 1992.  Combining Linux "
+#| "with the almost-complete GNU system resulted in a complete operating "
+#| "system: the GNU/Linux system.  Estimates are that tens of millions of "
+#| "people now use GNU/Linux systems, typically via <a href=\"/distros/"
+#| "distros.html\">GNU/Linux distributions</a>.  The principal version of "
+#| "Linux now contains non-free firmware &ldquo;blobs&rdquo;; free software "
+#| "activists now maintain a modified free version of Linux, called <a href="
+#| "\"http://directory.fsf.org/project/linux\";> Linux-libre</a>."
 msgid ""
 "By 1990 we had either found or written all the major components except "
 "one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by "
@@ -181,10 +227,10 @@
 "the almost-complete GNU system resulted in a complete operating system: the "
 "GNU/Linux system.  Estimates are that tens of millions of people now use GNU/"
 "Linux systems, typically via <a href=\"/distros/distros.html\">GNU/Linux "
-"distributions</a>.  The principal version of Linux now contains non-free "
+"distributions</a>.  The principal version of Linux now contains nonfree "
 "firmware &ldquo;blobs&rdquo;; free software activists now maintain a "
-"modified free version of Linux, called <a href=\"http://directory.fsf.org/";
-"project/linux\"> Linux-libre</a>."
+"modified free version of Linux, called <a href=\"https://directory.fsf.org/";
+"wiki/Linux-libre\"> Linux-libre</a>."
 msgstr ""
 "У 1990 р.&nbsp;році ми уже знайшли або написали 
всі основні компоненти, крім "
 "одного&nbsp;&nbsp; ядра. У 1991 р.&nbsp;року Лінус 
Торвальдс розробив Linux, "
@@ -198,13 +244,20 @@
 "Linux під назвою <a href=\"http://directory.fsf.org/project/linux\";> 
Linux-"
 "libre</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "However, the GNU Project is not limited to the core operating system.  We "
+#| "aim to provide a whole spectrum of software, whatever many users want to "
+#| "have.  This includes application software.  See the <a href=\"/directory"
+#| "\">Free Software Directory</a> for a catalogue of free software "
+#| "application programs."
 msgid ""
 "However, the GNU Project is not limited to the core operating system.  We "
 "aim to provide a whole spectrum of software, whatever many users want to "
-"have.  This includes application software.  See the <a href=\"/directory"
-"\">Free Software Directory</a> for a catalogue of free software application "
-"programs."
+"have.  This includes application software.  See the <a href=\"https://";
+"directory.fsf.org/wiki/Main_Page\">Free Software Directory</a> for a "
+"catalogue of free software application programs."
 msgstr ""
 "Однак проект GNU не обмежується лише 
базовою операційною системою. Наша "
 "мета&nbsp;&nbsp; створення всього спектру 
програм, які можуть знадобитися "
@@ -212,28 +265,38 @@
 "directory\">&ldquo;Каталог вільного програмного 
забезпечення&rdquo;</a>, щоб "
 "ознайомитися з переліком вільних програм."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "We also want to provide software for users who are not computer experts.  "
+#| "Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical "
+#| "desktop (called GNOME)</a> to help beginners use the GNU system."
 msgid ""
 "We also want to provide software for users who are not computer experts.  "
-"Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical desktop "
-"(called GNOME)</a> to help beginners use the GNU system."
+"Therefore we developed a <a href=\"https://www.gnome.org/\";>graphical "
+"desktop (called GNOME)</a> to help beginners use the GNU system."
 msgstr ""
 "Ми також хочемо надати програми 
користувачам, що не є фахівцями з "
 "комп'ютерів. Тому ми розробили <a 
href=\"http://www.gnome.org/\";>графічне "
 "робоче середовище (назване GNOME)</a>, щоб 
допомогти початківцям "
 "користуватися системою GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "We also want to provide games and other recreations.  Plenty of <a href="
+#| "\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are "
+#| "already available."
 msgid ""
 "We also want to provide games and other recreations.  Plenty of <a href="
-"\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
+"\"https://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
 "available."
 msgstr ""
 "Ми також хочемо надати ігри та інші 
програми для відпочинку і розваг. Безліч "
 "<a href=\"http://directory.fsf.org/wiki/Category/Game\";>вільних 
ігор</a> вже "
 "доступно."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "How far can free software go? There are no limits, except when <a href=\"/"
 "philosophy/fighting-software-patents.html\">laws such as the patent system "
@@ -274,14 +337,19 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Ми намагалися зробити цей переклад точним 
та якісним, але виключити "
@@ -292,9 +360,13 @@
 "translations.html\">&ldquo;Посібнику з 
перекладу&rdquo;</a>."
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#| "2009, 2012, 2014, 2017 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017 Free Software Foundation, Inc."
+"Copyright &copy; 1996, 1997, 2003, 2005, 2008, 2012, 2017, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
 "2012, 2014, 2017 Free Software Foundation, Inc. (Фонд вільного 
програмного "
@@ -322,11 +394,23 @@
 msgid "Updated:"
 msgstr "Оновлено:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017, 2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017, 2021 Free Software Foundation, Inc. (Фонд 
вільного "
-"програмного забезпечення, Inc.)"
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "Ми намагалися зробити цей переклад 
точним та якісним, але виключити "
+#~ "можливість помилки ми не можемо. 
Надсилайте, будь ласка, свої зауваження "
+#~ "і пропозиції щодо перекладу за адресою <a 
href=\"mailto:web-";
+#~ "translators@gnu.org\">&lt;web-translators@gnu.org&gt;</a>. </"
+#~ "p><p>Відомості з координації та 
пропозицій перекладів наших статей див. у "
+#~ "<a 
href=\"/server/standards/README.translations.html\">&ldquo;Посібнику 
з "
+#~ "перекладу&rdquo;</a>."
+
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017, 2021 Free Software Foundation, Inc. (Фонд "
+#~ "вільного програмного забезпечення, Inc.)"

Index: po/gnu-history.zh-cn.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-history.zh-cn.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- po/gnu-history.zh-cn.po     2 Nov 2021 13:25:56 -0000       1.2
+++ po/gnu-history.zh-cn.po     2 Nov 2021 14:41:50 -0000       1.3
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-history.html\n"
-"POT-Creation-Date: 2017-09-04 10:56+0000\n"
+"POT-Creation-Date: 2021-11-02 13:26+0000\n"
 "PO-Revision-Date: 2017-12-30 21:45+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-11-02 13:26+0000\n"
 
 #. type: Content of: <title>
 msgid "Overview of the GNU System - GNU Project - Free Software Foundation"
@@ -24,21 +25,32 @@
 msgid "GNU, GNU Project, FSF, Free Software, Free Software Foundation, History"
 msgstr "GNU、GNU工程、FSF、自由软件、自由软件基金会、历史"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Overview of the GNU System"
 msgstr "GNU系统概览"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The GNU operating system is a complete free software system, upward-"
+#| "compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.  It "
+#| "is pronounced as <a href=\"/gnu/pronunciation.html\">one syllable with a "
+#| "hard g</a>.  <a href=\"http://www.stallman.org/\";>Richard Stallman</a> "
+#| "made the <a href=\"/gnu/initial-announcement.html\">Initial Announcement</"
+#| "a> of the GNU Project in September 1983.  A longer version called the <a "
+#| "href=\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March "
+#| "1985.  It has been translated into several <a href=\"/gnu/manifesto."
+#| "html#translations\">other languages</a>."
 msgid ""
 "The GNU operating system is a complete free software system, upward-"
-"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.  It is "
+"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix.&rdquo; It is "
 "pronounced as <a href=\"/gnu/pronunciation.html\">one syllable with a hard "
-"g</a>.  <a href=\"http://www.stallman.org/\";>Richard Stallman</a> made the "
-"<a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> of the "
-"GNU Project in September 1983.  A longer version called the <a href=\"/gnu/"
-"manifesto.html\">GNU Manifesto</a> was published in March 1985.  It has been "
-"translated into several <a href=\"/gnu/manifesto.html#translations\">other "
-"languages</a>."
+"<i>g</i></a>.  <a href=\"https://www.stallman.org/\";>Richard Stallman</a> "
+"made the <a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> "
+"of the GNU Project in September 1983.  A longer version called the <a href="
+"\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March 1985.  It "
+"has been translated into several <a href=\"/gnu/manifesto.html#translations"
+"\">other languages</a>."
 msgstr ""
 "GNU系统是一套向上兼容Unix的完å…
¨è‡ªç”±çš„操作系统。GNU代表&ldquo;GNU's Not "
 "Unix&rdquo;。它的发音是<a 
href=\"/gnu/pronunciation.html\">带有g音的单音节</"
@@ -47,18 +59,24 @@
 "1985年3月又发表了更长的版本,叫做<a 
href=\"/gnu/manifesto.html\">GNU宣言</"
 "a>。它被翻译成多种<a href=\"/gnu/manifesto.html#translations\">å…
¶ä»–语言</a>。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
+#| "first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, "
+#| "second, because it was a real word, and third, it was fun to say (or <a "
+#| "href=\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
 msgid ""
 "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
-"first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, second, "
+"first, it was a recursive acronym for &ldquo;GNU's Not Unix,&rdquo; second, "
 "because it was a real word, and third, it was fun to say (or <a href="
-"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
+"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>sing</a>)."
 msgstr ""
 "起&ldquo;GNU&rdquo;这个名字是因为它满足了几
个要求:第一,它是&ldquo;GNU's "
 "Not 
Unix&rdquo;的递归缩写;第二,它是一个真正的单词;第三,它说(或<a
 href="
 "\"http://www.poppyfields.net/poppy/songs/gnu.html\";>唱</a>)起来有趣。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The word &ldquo;free&rdquo; in &ldquo;free software&rdquo; pertains to <a "
 "href=\"/philosophy/free-sw.html\">freedom</a>, not price.  You may or may "
@@ -78,19 +96,27 @@
 "的完å…
¨æŽ§åˆ¶è€Œæ”¹è¿›ç¨‹åºï¼›æœ‰è‡ªç”±å‘布改进的版本从而帮助社区建设。(如果您再发布GNU"
 
"软件,您可以为发布拷贝过程中的物理行为收取一定的费用,您也可以èµ
 é€æ‹·è´ã€‚)"
 
-#. type: Content of: <p>
-msgid ""
-"The project to develop the GNU system is called the &ldquo;GNU "
-"Project&rdquo;.  The GNU Project was conceived in 1983 as a way of bringing "
-"back the cooperative spirit that prevailed in the computing community in "
-"earlier days&mdash;to make cooperation possible once again by removing the "
-"obstacles to cooperation imposed by the owners of proprietary software."
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The project to develop the GNU system is called the &ldquo;GNU "
+#| "Project&rdquo;.  The GNU Project was conceived in 1983 as a way of "
+#| "bringing back the cooperative spirit that prevailed in the computing "
+#| "community in earlier days&mdash;to make cooperation possible once again "
+#| "by removing the obstacles to cooperation imposed by the owners of "
+#| "proprietary software."
+msgid ""
+"The project to develop the GNU system is called the &ldquo;GNU Project."
+"&rdquo; The GNU Project was conceived in 1983 as a way of bringing back the "
+"cooperative spirit that prevailed in the computing community in earlier "
+"days&mdash;to make cooperation possible once again by removing the obstacles "
+"to cooperation imposed by the owners of proprietary software."
 msgstr ""
 
"开发GNU系统的工程叫做&ldquo;GNU工程&rdquo;。GNU工程构思于1983年,意在找回在早"
 
"期计算机社区中广泛存在的合作精神&mdash;通过除去专属软件所有è€
…设置的障碍而使得"
 "合作再次成为可能。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In 1971, when Richard Stallman started his career at MIT, he worked in a "
 "group which used <a href=\"/philosophy/free-sw.html\">free software</a> "
@@ -101,7 +127,7 @@
 
"philosophy/free-sw.html\">自由软件</a>的小组中工作。当时,甚至计算机å
…¬å¸éƒ½ç»"
 
"常发布自由软件。程序员们可以自由地相互合作,他们也经常这æ
 ·ä½œã€‚"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By the 1980s, almost all software was <a href=\"/philosophy/categories."
 "html#ProprietarySoftware\">proprietary</a>, which means that it had owners "
@@ -112,7 +138,7 @@
 
"html#ProprietarySoftware\">专属软件</a>,这意味着它有了一个禁止和阻止用户合作"
 "的所有者。这使得GNU项目成为必然。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Every computer user needs an operating system; if there is no free operating "
 "system, then you can't even get started using a computer without resorting "
@@ -123,7 +149,7 @@
 "在不使用专属软件的情
况下开始使用计算机。所以自由软件议程上的第一件事显然就是"
 "一个自由的操作系统。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We decided to make the operating system compatible with Unix because the "
 "overall design was already proven and portable, and because compatibility "
@@ -132,21 +158,41 @@
 "我们决定将此操作系统与Unix兼容是因
为它的整体设计历经考验并且可移植,而且还因"
 "为兼容性使得Unix的用户很容易从Unix上转移到GNU。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "A Unix-like operating system includes a kernel, compilers, editors, text "
+#| "formatters, mail software, graphical interfaces, libraries, games and "
+#| "many other things.  Thus, writing a whole operating system is a very "
+#| "large job.  We started in January 1984.  The <a href=\"http://fsf.org/\";> "
+#| "Free Software Foundation</a> was founded in October 1985, initially to "
+#| "raise funds to help develop GNU."
 msgid ""
 "A Unix-like operating system includes a kernel, compilers, editors, text "
 "formatters, mail software, graphical interfaces, libraries, games and many "
 "other things.  Thus, writing a whole operating system is a very large job.  "
-"We started in January 1984.  The <a href=\"http://fsf.org/\";> Free Software "
-"Foundation</a> was founded in October 1985, initially to raise funds to help "
-"develop GNU."
+"We started in January 1984.  The <a href=\"https://www.fsf.org/\";> Free "
+"Software Foundation</a> was founded in October 1985, initially to raise "
+"funds to help develop GNU."
 msgstr ""
 "一个类似Unix操作系统包括内核、编译器、编辑器、文本æ 
¼å¼åŒ–软件、邮件软件、图形"
 "界面、应用库、游戏以及其他很多别的东西。因
此,编写一个完全的操作系统是一项巨"
 "大的工作。我们从1984年1月开始,并在1985年10月创立<a 
href=\"http://fsf.org/\";>"
 "自由软件基金会</a>,它初期为开发GNU募集资金。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "By 1990 we had either found or written all the major components except "
+#| "one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by "
+#| "Linus Torvalds in 1991 and made free software in 1992.  Combining Linux "
+#| "with the almost-complete GNU system resulted in a complete operating "
+#| "system: the GNU/Linux system.  Estimates are that tens of millions of "
+#| "people now use GNU/Linux systems, typically via <a href=\"/distros/"
+#| "distros.html\">GNU/Linux distributions</a>.  The principal version of "
+#| "Linux now contains non-free firmware &ldquo;blobs&rdquo;; free software "
+#| "activists now maintain a modified free version of Linux, called <a href="
+#| "\"http://directory.fsf.org/project/linux\";> Linux-libre</a>."
 msgid ""
 "By 1990 we had either found or written all the major components except "
 "one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by "
@@ -154,10 +200,10 @@
 "the almost-complete GNU system resulted in a complete operating system: the "
 "GNU/Linux system.  Estimates are that tens of millions of people now use GNU/"
 "Linux systems, typically via <a href=\"/distros/distros.html\">GNU/Linux "
-"distributions</a>.  The principal version of Linux now contains non-free "
+"distributions</a>.  The principal version of Linux now contains nonfree "
 "firmware &ldquo;blobs&rdquo;; free software activists now maintain a "
-"modified free version of Linux, called <a href=\"http://directory.fsf.org/";
-"project/linux\"> Linux-libre</a>."
+"modified free version of Linux, called <a href=\"https://directory.fsf.org/";
+"wiki/Linux-libre\"> Linux-libre</a>."
 msgstr ""
 "到1990年,我们或者找到或者
写出了所有主要的组件,除了一个&mdash;内核。当时,"
 "Linus Torvalds在1991年开发了一个类似Unix的内æ 
¸Linux,并在1992年将其变成自由软"
@@ -167,37 +213,54 @@
 
"blobs&rdquo;;自由软件活动家目前也维护着一个自由版本的Linux,叫做<a
 href="
 "\"http://directory.fsf.org/project/linux\";>Linux-libre</a>。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "However, the GNU Project is not limited to the core operating system.  We "
+#| "aim to provide a whole spectrum of software, whatever many users want to "
+#| "have.  This includes application software.  See the <a href=\"/directory"
+#| "\">Free Software Directory</a> for a catalogue of free software "
+#| "application programs."
 msgid ""
 "However, the GNU Project is not limited to the core operating system.  We "
 "aim to provide a whole spectrum of software, whatever many users want to "
-"have.  This includes application software.  See the <a href=\"/directory"
-"\">Free Software Directory</a> for a catalogue of free software application "
-"programs."
+"have.  This includes application software.  See the <a href=\"https://";
+"directory.fsf.org/wiki/Main_Page\">Free Software Directory</a> for a "
+"catalogue of free software application programs."
 msgstr ""
 "然而,GNU工程并不限于核心操作系统。我们的目æ 
‡æ˜¯æä¾›ä¸€ä¸ªå®Œæ•´çš„软件系列,满足很"
 "多用户的任何要求。这包括应用软件。参看<a 
href=\"/directory\">自由软件目录</a>"
 "来了解分类展示的自由应用软件。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "We also want to provide software for users who are not computer experts.  "
+#| "Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical "
+#| "desktop (called GNOME)</a> to help beginners use the GNU system."
 msgid ""
 "We also want to provide software for users who are not computer experts.  "
-"Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical desktop "
-"(called GNOME)</a> to help beginners use the GNU system."
+"Therefore we developed a <a href=\"https://www.gnome.org/\";>graphical "
+"desktop (called GNOME)</a> to help beginners use the GNU system."
 msgstr ""
 
"我们也为非计算机专家的普通用户提供软件。所以我们开发了一套<a
 href=\"http://";
 
"www.gnome.org/\">图形桌面(叫做GNOME)</a>以帮助初级用户使用GNU系统。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "We also want to provide games and other recreations.  Plenty of <a href="
+#| "\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are "
+#| "already available."
 msgid ""
 "We also want to provide games and other recreations.  Plenty of <a href="
-"\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
+"\"https://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
 "available."
 msgstr ""
 "我们还想要提供游戏和其他娱乐应用。已经有很多<a 
href=\"http://directory.fsf.";
 "org/wiki/Category/Game\">自由的游戏</a>。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "How far can free software go? There are no limits, except when <a href=\"/"
 "philosophy/fighting-software-patents.html\">laws such as the patent system "
@@ -228,9 +291,7 @@
 "建议发送给<a 
href=\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</"
 "a>。"
 
-#
-#
-#
+# TODO: submitting -> contributing.
 #.  TRANSLATORS: Ignore the original text in this paragraph,
 #.         replace it with the translation of these two:
 #.         We work hard and do our best to provide accurate, good quality
@@ -238,26 +299,35 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
-"若您想翻译本文,请参看<a 
href=\"/server/standards/README.translations.html\">"
-"翻译须知</a>。"
+"请参考 <a 
href=\"/server/standards/README.translations.html\">翻译说明</a> 了"
+"解有关协调和提交文章翻译的信息。"
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2014, 2015, 2016, 2017, 2018, 2019 Free Software "
+#| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017 Free Software Foundation, Inc."
+"Copyright &copy; 1996, 1997, 2003, 2005, 2008, 2012, 2017, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017 Free Software Foundation, Inc."
+"Copyright &copy; 2014, 2015, 2016, 2017, 2018, 2019 Free Software "
+"Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -285,10 +355,27 @@
 msgid "Updated:"
 msgstr "最后更新:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017, 2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017, 2021 Free Software Foundation, Inc."
+#
+#
+#
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "若您想翻译本文,请参看<a 
href=\"/server/standards/README.translations.html"
+#~ "\">翻译须知</a>。"
+
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017 Free Software Foundation, Inc."
+
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017, 2021 Free Software Foundation, Inc."

Index: po/gnu-history.zh-tw.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-history.zh-tw.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- po/gnu-history.zh-tw.po     2 Nov 2021 13:25:56 -0000       1.16
+++ po/gnu-history.zh-tw.po     2 Nov 2021 14:41:50 -0000       1.17
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-history.html\n"
-"POT-Creation-Date: 2017-09-04 10:56+0000\n"
+"POT-Creation-Date: 2021-11-02 13:26+0000\n"
 "PO-Revision-Date: 2017-12-05 21:04+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
 "Language-Team: Traditional Chinese <www-zh-tw-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-11-02 13:26+0000\n"
 "X-Generator: Poedit 2.0.3\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
@@ -27,21 +28,42 @@
 "GNU, GNU Project, GNU 專案, FSF, Free Software, 自由軟體, Free Software 
"
 "Foundation, 自由軟體基金會, History, 歷史"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Overview of the GNU System"
 msgstr "GNU 系統概覽"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The GNU operating system is a complete free software system,
+# | upward-compatible with Unix.  GNU stands for &ldquo;GNU's Not
+# | [-Unix&rdquo;.-] {+Unix.&rdquo;+} It is pronounced as <a
+# | href=\"/gnu/pronunciation.html\">one syllable with a hard [-g</a>.-]
+# | {+<i>g</i></a>.+}  <a href=\"http{+s+}://www.stallman.org/\">Richard
+# | Stallman</a> made the <a href=\"/gnu/initial-announcement.html\">Initial
+# | Announcement</a> of the GNU Project in September 1983.  A longer version
+# | called the <a href=\"/gnu/manifesto.html\">GNU Manifesto</a> was published
+# | in March 1985.  It has been translated into several <a
+# | href=\"/gnu/manifesto.html#translations\">other languages</a>.
+#, fuzzy
+#| msgid ""
+#| "The GNU operating system is a complete free software system, upward-"
+#| "compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.  It "
+#| "is pronounced as <a href=\"/gnu/pronunciation.html\">one syllable with a "
+#| "hard g</a>.  <a href=\"http://www.stallman.org/\";>Richard Stallman</a> "
+#| "made the <a href=\"/gnu/initial-announcement.html\">Initial Announcement</"
+#| "a> of the GNU Project in September 1983.  A longer version called the <a "
+#| "href=\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March "
+#| "1985.  It has been translated into several <a href=\"/gnu/manifesto."
+#| "html#translations\">other languages</a>."
 msgid ""
 "The GNU operating system is a complete free software system, upward-"
-"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix&rdquo;.  It is "
+"compatible with Unix.  GNU stands for &ldquo;GNU's Not Unix.&rdquo; It is "
 "pronounced as <a href=\"/gnu/pronunciation.html\">one syllable with a hard "
-"g</a>.  <a href=\"http://www.stallman.org/\";>Richard Stallman</a> made the "
-"<a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> of the "
-"GNU Project in September 1983.  A longer version called the <a href=\"/gnu/"
-"manifesto.html\">GNU Manifesto</a> was published in March 1985.  It has been "
-"translated into several <a href=\"/gnu/manifesto.html#translations\">other "
-"languages</a>."
+"<i>g</i></a>.  <a href=\"https://www.stallman.org/\";>Richard Stallman</a> "
+"made the <a href=\"/gnu/initial-announcement.html\">Initial Announcement</a> "
+"of the GNU Project in September 1983.  A longer version called the <a href="
+"\"/gnu/manifesto.html\">GNU Manifesto</a> was published in March 1985.  It "
+"has been translated into several <a href=\"/gnu/manifesto.html#translations"
+"\">other languages</a>."
 msgstr ""
 "GNU 作業系統是一套完整的自由軟體系統,向上相容 
Unix。GNU 代表「GNU's Not "
 "Unix」,意即「GNU 並非 Unix」,其英語發音為<a 
href=\"/gnu/pronunciation.html"
@@ -52,18 +74,30 @@
 "(GNU Manifesto)</a>。這份宣言已翻譯為<a href=\"/gnu/manifesto."
 "html#translations\">許多語言</a>。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The name &ldquo;GNU&rdquo; was chosen because it met a few requirements;
+# | first, it was a recursive acronym for &ldquo;GNU's Not [-Unix&rdquo;,-]
+# | {+Unix,&rdquo;+} second, because it was a real word, and third, it was fun
+# | to say (or <a
+# | href=\"http://www.poppyfields.net/poppy/songs/gnu.html\";>[-S-]{+s+}ing</a>)
+# | .
+#, fuzzy
+#| msgid ""
+#| "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
+#| "first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, "
+#| "second, because it was a real word, and third, it was fun to say (or <a "
+#| "href=\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
 msgid ""
 "The name &ldquo;GNU&rdquo; was chosen because it met a few requirements; "
-"first, it was a recursive acronym for &ldquo;GNU's Not Unix&rdquo;, second, "
+"first, it was a recursive acronym for &ldquo;GNU's Not Unix,&rdquo; second, "
 "because it was a real word, and third, it was fun to say (or <a href="
-"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>Sing</a>)."
+"\"http://www.poppyfields.net/poppy/songs/gnu.html\";>sing</a>)."
 msgstr ""
 "之所以採用「GNU」這個名稱,是因
為它滿足下列條件:第一、它是「GNU's Not Unix」"
 "的遞迴式é 
­æ–‡å­—縮寫,第二、它是真實世界中存在的英文單字,第三、唸(或是<a
 "
 
"href=\"http://www.poppyfields.net/poppy/songs/gnu.html\";>唱</a>)起來很有趣。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The word &ldquo;free&rdquo; in &ldquo;free software&rdquo; pertains to <a "
 "href=\"/philosophy/free-sw.html\">freedom</a>, not price.  You may or may "
@@ -84,19 +118,33 @@
 "由。(如果你要再次散布 GNU 軟體,你
可以為傳輸軟體副本的實體行為收取費用,或者"
 "你也可以免費分送軟體副本。)"
 
-#. type: Content of: <p>
-msgid ""
-"The project to develop the GNU system is called the &ldquo;GNU "
-"Project&rdquo;.  The GNU Project was conceived in 1983 as a way of bringing "
-"back the cooperative spirit that prevailed in the computing community in "
-"earlier days&mdash;to make cooperation possible once again by removing the "
-"obstacles to cooperation imposed by the owners of proprietary software."
+#. type: Content of: <div><p>
+# | The project to develop the GNU system is called the &ldquo;GNU
+# | [-Project&rdquo;.-] {+Project.&rdquo;+} The GNU Project was conceived in
+# | 1983 as a way of bringing back the cooperative spirit that prevailed in
+# | the computing community in earlier days&mdash;to make cooperation possible
+# | once again by removing the obstacles to cooperation imposed by the owners
+# | of proprietary software.
+#, fuzzy
+#| msgid ""
+#| "The project to develop the GNU system is called the &ldquo;GNU "
+#| "Project&rdquo;.  The GNU Project was conceived in 1983 as a way of "
+#| "bringing back the cooperative spirit that prevailed in the computing "
+#| "community in earlier days&mdash;to make cooperation possible once again "
+#| "by removing the obstacles to cooperation imposed by the owners of "
+#| "proprietary software."
+msgid ""
+"The project to develop the GNU system is called the &ldquo;GNU Project."
+"&rdquo; The GNU Project was conceived in 1983 as a way of bringing back the "
+"cooperative spirit that prevailed in the computing community in earlier "
+"days&mdash;to make cooperation possible once again by removing the obstacles "
+"to cooperation imposed by the owners of proprietary software."
 msgstr ""
 "開發 GNU 系統的專案稱為「GNU 專案」,英文為「GNU 
Project」。GNU 專案在1983年"
 "孕育而生,想法是希望能將早期電è…
¦ç¤¾ç¾¤æ™®éçš„互助精神帶回我們生活之中——藉由除去"
 "專有軟體所有者施加
的重重障礙,重新讓人們再次合作起來。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In 1971, when Richard Stallman started his career at MIT, he worked in a "
 "group which used <a href=\"/philosophy/free-sw.html\">free software</a> "
@@ -108,7 +156,7 @@
 
"司也都散布自由軟體。程式設計師可以自由和他人互助合作改善軟體,而且也經常這樣"
 "做。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By the 1980s, almost all software was <a href=\"/philosophy/categories."
 "html#ProprietarySoftware\">proprietary</a>, which means that it had owners "
@@ -119,7 +167,7 @@
 "html#ProprietarySoftware\">專有軟體</a>,這代表這些軟體有å…
¶æ‰€æœ‰è€…,他們禁止並"
 "且防止使用者之間互助合作。這件事使得 GNU 專案必
然出現。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Every computer user needs an operating system; if there is no free operating "
 "system, then you can't even get started using a computer without resorting "
@@ -130,7 +178,7 @@
 "助專有軟體的情況下開始使用電è…
¦ã€‚所以在自由軟體工作事項裡的第一件事,毫無疑問"
 "就是要先寫出一個自由的作業系統。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We decided to make the operating system compatible with Unix because the "
 "overall design was already proven and portable, and because compatibility "
@@ -139,21 +187,58 @@
 "我們決定讓作業系統與 Unix 相容,因為å…
¶æ•´é«”設計在當年已歷經驗證、實為可行作法"
 "且具備可攜性;此外,若可與之相容還能讓 Unix 使用者
更容易轉換到 GNU。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | A Unix-like operating system includes a kernel, compilers, editors, text
+# | formatters, mail software, graphical interfaces, libraries, games and many
+# | other things.  Thus, writing a whole operating system is a very large job.
+# |  We started in January 1984.  The <a [-href=\"http://fsf.org/\";>-]
+# | {+href=\"https://www.fsf.org/\";>+} Free Software Foundation</a> was
+# | founded in October 1985, initially to raise funds to help develop GNU.
+#, fuzzy
+#| msgid ""
+#| "A Unix-like operating system includes a kernel, compilers, editors, text "
+#| "formatters, mail software, graphical interfaces, libraries, games and "
+#| "many other things.  Thus, writing a whole operating system is a very "
+#| "large job.  We started in January 1984.  The <a href=\"http://fsf.org/\";> "
+#| "Free Software Foundation</a> was founded in October 1985, initially to "
+#| "raise funds to help develop GNU."
 msgid ""
 "A Unix-like operating system includes a kernel, compilers, editors, text "
 "formatters, mail software, graphical interfaces, libraries, games and many "
 "other things.  Thus, writing a whole operating system is a very large job.  "
-"We started in January 1984.  The <a href=\"http://fsf.org/\";> Free Software "
-"Foundation</a> was founded in October 1985, initially to raise funds to help "
-"develop GNU."
+"We started in January 1984.  The <a href=\"https://www.fsf.org/\";> Free "
+"Software Foundation</a> was founded in October 1985, initially to raise "
+"funds to help develop GNU."
 msgstr ""
 "Unix 風的作業系統涵蓋內核心、編譯器、編輯器、文書æ 
¼å¼è™•ç†å™¨ã€éƒµä»¶è»Ÿé«”、圖形介"
 "面、函式庫、遊戲,和å…
¶ä»–種種組件。所以,要寫出整套作業系統著實是個大工程。我"
 "們從1984年1月展開專案。<a 
href=\"http://fsf.org/\";>自由軟體基金會</a>則成立於"
 "1985年10月,其最早目標是要募集資金以協助 GNU 的開發。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | By 1990 we had either found or written all the major components except
+# | one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by
+# | Linus Torvalds in 1991 and made free software in 1992.  Combining Linux
+# | with the almost-complete GNU system resulted in a complete operating
+# | system: the GNU/Linux system.  Estimates are that tens of millions of
+# | people now use GNU/Linux systems, typically via <a
+# | href=\"/distros/distros.html\">GNU/Linux distributions</a>.  The principal
+# | version of Linux now contains non[---]free firmware &ldquo;blobs&rdquo;;
+# | free software activists now maintain a modified free version of Linux,
+# | called <a [-href=\"http://directory.fsf.org/project/linux\";>-]
+# | {+href=\"https://directory.fsf.org/wiki/Linux-libre\";>+} Linux-libre</a>.
+#, fuzzy
+#| msgid ""
+#| "By 1990 we had either found or written all the major components except "
+#| "one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by "
+#| "Linus Torvalds in 1991 and made free software in 1992.  Combining Linux "
+#| "with the almost-complete GNU system resulted in a complete operating "
+#| "system: the GNU/Linux system.  Estimates are that tens of millions of "
+#| "people now use GNU/Linux systems, typically via <a href=\"/distros/"
+#| "distros.html\">GNU/Linux distributions</a>.  The principal version of "
+#| "Linux now contains non-free firmware &ldquo;blobs&rdquo;; free software "
+#| "activists now maintain a modified free version of Linux, called <a href="
+#| "\"http://directory.fsf.org/project/linux\";> Linux-libre</a>."
 msgid ""
 "By 1990 we had either found or written all the major components except "
 "one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by "
@@ -161,10 +246,10 @@
 "the almost-complete GNU system resulted in a complete operating system: the "
 "GNU/Linux system.  Estimates are that tens of millions of people now use GNU/"
 "Linux systems, typically via <a href=\"/distros/distros.html\">GNU/Linux "
-"distributions</a>.  The principal version of Linux now contains non-free "
+"distributions</a>.  The principal version of Linux now contains nonfree "
 "firmware &ldquo;blobs&rdquo;; free software activists now maintain a "
-"modified free version of Linux, called <a href=\"http://directory.fsf.org/";
-"project/linux\"> Linux-libre</a>."
+"modified free version of Linux, called <a href=\"https://directory.fsf.org/";
+"wiki/Linux-libre\"> Linux-libre</a>."
 msgstr ""
 
"時間來到1990年,我們已幾乎找來或寫出系統的各大組件,除了å
…¶ä¸­ä¸€æ¨£â€”—內核心 "
 "(kernel)。接著在1991年的時候,林納思・托瓦茲 (Linus Torvalds) 
開發了 Linux,"
@@ -175,37 +260,66 @@
 "自由軟體推行者目前有維護一個修改過的自由版本 
Linux,稱為<a href=\"http://";
 "directory.fsf.org/project/linux\"> Linux-libre</a>。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | However, the GNU Project is not limited to the core operating system.  We
+# | aim to provide a whole spectrum of software, whatever many users want to
+# | have.  This includes application software.  See the <a
+# | [-href=\"/directory\">Free-]
+# | {+href=\"https://directory.fsf.org/wiki/Main_Page\";>Free+} Software
+# | Directory</a> for a catalogue of free software application programs.
+#, fuzzy
+#| msgid ""
+#| "However, the GNU Project is not limited to the core operating system.  We "
+#| "aim to provide a whole spectrum of software, whatever many users want to "
+#| "have.  This includes application software.  See the <a href=\"/directory"
+#| "\">Free Software Directory</a> for a catalogue of free software "
+#| "application programs."
 msgid ""
 "However, the GNU Project is not limited to the core operating system.  We "
 "aim to provide a whole spectrum of software, whatever many users want to "
-"have.  This includes application software.  See the <a href=\"/directory"
-"\">Free Software Directory</a> for a catalogue of free software application "
-"programs."
+"have.  This includes application software.  See the <a href=\"https://";
+"directory.fsf.org/wiki/Main_Page\">Free Software Directory</a> for a "
+"catalogue of free software application programs."
 msgstr ""
 "然而,GNU 專案不僅限於æ 
¸å¿ƒçš„作業系統而已。我們的宗旨是催生出完整的軟體生態"
 "系,創造許多使用者希望有的任何軟體,這包
括各類應用軟體。請見<a href=\"/"
 "directory\">自由軟體目錄</a>查看自由軟體應用程式。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | We also want to provide software for users who are not computer experts. 
+# | Therefore we developed a <a href=\"http{+s+}://www.gnome.org/\">graphical
+# | desktop (called GNOME)</a> to help beginners use the GNU system.
+#, fuzzy
+#| msgid ""
+#| "We also want to provide software for users who are not computer experts.  "
+#| "Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical "
+#| "desktop (called GNOME)</a> to help beginners use the GNU system."
 msgid ""
 "We also want to provide software for users who are not computer experts.  "
-"Therefore we developed a <a href=\"http://www.gnome.org/\";>graphical desktop "
-"(called GNOME)</a> to help beginners use the GNU system."
+"Therefore we developed a <a href=\"https://www.gnome.org/\";>graphical "
+"desktop (called GNOME)</a> to help beginners use the GNU system."
 msgstr ""
 "我們也希望提供軟體給非電腦專家的使用者運用。因
此,我們開發了<a href=\"http://";
 "www.gnome.org/\">圖形化桌面環境(稱為 GNOME)</a>協助入門者
操作 GNU 系統。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | We also want to provide games and other recreations.  Plenty of <a
+# | href=\"http{+s+}://directory.fsf.org/wiki/Category/Game\">free games</a>
+# | are already available.
+#, fuzzy
+#| msgid ""
+#| "We also want to provide games and other recreations.  Plenty of <a href="
+#| "\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are "
+#| "already available."
 msgid ""
 "We also want to provide games and other recreations.  Plenty of <a href="
-"\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
+"\"https://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
 "available."
 msgstr ""
 "我們也希望能提供遊戲和其他的消遣娛樂。目前已有許多<a 
href=\"http://directory.";
 "fsf.org/wiki/Category/Game\">自由遊戲</a>。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "How far can free software go? There are no limits, except when <a href=\"/"
 "philosophy/fighting-software-patents.html\">laws such as the patent system "
@@ -243,14 +357,23 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# | Please see the <a
+# | href=\"/server/standards/README.translations.html\">Translations
+# | README</a> for information on coordinating and [-submitting-]
+# | {+contributing+} translations of this article.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and submitting "
+#| "translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 
"我們努力盡所能提供貼切、品質良善的翻譯。然而,我們無法十å
…¨åç¾Žï¼Œé‚„請將你的意"
@@ -260,12 +383,18 @@
 "宜。"
 
 #. type: Content of: <div><p>
+# | Copyright &copy; [-2014, 2015, 2016,-] {+1996, 1997, 2003, 2005, 2008,
+# | 2012,+} 2017, [-2018, 2019-] {+2021+} Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2014, 2015, 2016, 2017, 2018, 2019 Free Software "
+#| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017 Free Software Foundation, Inc."
+"Copyright &copy; 1996, 1997, 2003, 2005, 2008, 2012, 2017, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017 Free Software Foundation, Inc."
+"Copyright &copy; 2014, 2015, 2016, 2017, 2018, 2019 Free Software "
+"Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -288,10 +417,16 @@
 msgid "Updated:"
 msgstr "更新時間︰"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017, 2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009, "
-"2012, 2014, 2017, 2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017 Free Software Foundation, Inc."
+
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, "
+#~ "2009, 2012, 2014, 2017, 2021 Free Software Foundation, Inc."

Index: po/gnu-linux-faq.ar.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.ar.po,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- po/gnu-linux-faq.ar.po      31 Aug 2021 10:37:07 -0000      1.74
+++ po/gnu-linux-faq.ar.po      2 Nov 2021 14:41:50 -0000       1.75
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-linux-faq.html\n"
-"POT-Creation-Date: 2021-08-31 10:27+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2010-03-30 16:12+0300\n"
 "Last-Translator: Hossam Hossny <hossam@gnu.org>\n"
 "Language-Team: Arabic <>\n"
@@ -35,10 +35,19 @@
 msgid "by Richard Stallman"
 msgstr "بقلم ريتشارد ستولمن"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+# | When people see that we use and recommend the name GNU/Linux for a system
+# | that many others call just [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} they ask many questions.  Here are common
+# | questions, and our answers.
+#, fuzzy
+#| 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."
 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.  "
+"that many others call just &ldquo;Linux,&rdquo; they ask many questions.  "
 "Here are common questions, and our answers."
 msgstr ""
 "يسأل الناس أسئلة كثيرة عندما يلاحظون أننا 
نستخدم وننصح باسم غنو/لينكس لنظام "
@@ -268,11 +277,22 @@
 "تسمية النظام &ldquo;غنو&rdquo; فحسب؟</a>"
 
 #. type: Content of: <div><div><ul><li>
+# | <a href=\"#trademarkfee\">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;.-] {+&ldquo;GNU/Linux.&rdquo;+} Is it
+# | wrong if I use &ldquo;GNU&rdquo; without [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} to save the fee?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#trademarkfee\">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 wrong if I use &ldquo;GNU&rdquo; without "
+#| "&ldquo;Linux&rdquo;, to save the fee?</a>"
 msgid ""
 "<a href=\"#trademarkfee\">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 wrong if I use &ldquo;GNU&rdquo; without "
-"&ldquo;Linux&rdquo;, to save the fee?</a>"
+"&ldquo;GNU/Linux.&rdquo; Is it wrong if I use &ldquo;GNU&rdquo; without "
+"&ldquo;Linux,&rdquo; to save the fee?</a>"
 msgstr ""
 "<a href=\"#trademarkfee\">سوف يتوجب علي دفع رسم مقابل 
استخدام &rdquo;"
 "لينكس&ldquo; في اسم منتج، ونفس الأمر ينطبق 
على &rdquo;غنو/لينكس&ldquo;. هل "
@@ -392,11 +412,22 @@
 "غنو&ldquo;؟</a>"
 
 #. type: Content of: <div><div><ul><li>
+# | <a [-href=\"#distronames\">My distro is called-]
+# | {+href=\"#distronames0\">My distro's developers call it+} &ldquo;Foobar
+# | [-Linux&rdquo;; doesn't-] {+Linux,&rdquo; but+} that [-show it's really
+# | Linux?</a>-] {+doesn't say anything about what the system consists of. 
+# | Why shouldn't they call it whatever they like?</a>+}
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#distronames\">My distro is called &ldquo;Foobar Linux&rdquo;; "
+#| "doesn't that show it's really Linux?</a>"
 msgid ""
-"<a href=\"#distronames0\">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 whatever they like?</a>"
+"<a href=\"#distronames0\">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 whatever they like?</a>"
 msgstr ""
+"<a href=\"#distronames\">اسم توزيعتي &rdquo;س لينكس&ldquo;، 
ألا يعني هذا "
+"أنها فعلا لينكس؟</a>"
 
 #. type: Content of: <div><div><ul><li>
 msgid ""
@@ -636,9 +667,18 @@
 "الناس بتسمية النظام &rdquo;غنو&ldquo;؟</a>"
 
 #. type: Content of: <div><div><ul><li>
+# | <a href=\"#deserve\">Since you failed to put something in the GNU GPL to
+# | require people to call the system [-&ldquo;GNU&rdquo;,-]
+# | {+&ldquo;GNU,&rdquo;+} you deserve what happened; why are you complaining
+# | now?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#deserve\">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 complaining now?</a>"
 msgid ""
 "<a href=\"#deserve\">Since you failed to put something in the GNU GPL to "
-"require people to call the system &ldquo;GNU&rdquo;, you deserve what "
+"require people to call the system &ldquo;GNU,&rdquo; you deserve what "
 "happened; why are you complaining now?</a>"
 msgstr ""
 "<a href=\"#deserve\">أنتم تستحقون ما حصل لأنكم 
تقاعستم عن وضع متطلب في غنو "
@@ -653,8 +693,15 @@
 "الناس؟</a>"
 
 #. type: Content of: <div><div><ul><li>
+# | <a href=\"#somanyright\">Since many people call it
+# | [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} doesn't that make it
+# | right?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#somanyright\">Since many people call it &ldquo;Linux&rdquo;, "
+#| "doesn't that make it right?</a>"
 msgid ""
-"<a href=\"#somanyright\">Since many people call it &ldquo;Linux&rdquo;, "
+"<a href=\"#somanyright\">Since many people call it &ldquo;Linux,&rdquo; "
 "doesn't that make it right?</a>"
 msgstr ""
 "<a href=\"#somanyright\">بما أن كثيرًا من الناس يسم
ونه &rdquo;لينكس&ldquo;، "
@@ -836,6 +883,24 @@
 "كان اللغط قد شاع."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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 it must be right.  The name &ldquo;Linux&rdquo; also spreads a
+# | false picture of the system's origin, because people tend to suppose that
+# | the system's history was such as to fit that name.  For instance, they
+# | often believe its development was started by Linus Torvalds in 1991.  This
+# | false picture tends to reinforce the idea that the system should be called
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+}
+#, fuzzy
+#| 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 it must be right.  The name &ldquo;Linux&rdquo; also spreads a "
+#| "false picture of the system's origin, because people tend to suppose that "
+#| "the system's history was such as to fit that name.  For instance, they "
+#| "often believe its development was started by Linus Torvalds in 1991.  "
+#| "This false picture tends to reinforce the idea that the system should be "
+#| "called &ldquo;Linux&rdquo;."
 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 "
@@ -843,7 +908,7 @@
 "of the system's origin, because people tend to suppose that the system's "
 "history was such as to fit that name.  For instance, they often believe its "
 "development was started by Linus Torvalds in 1991.  This false picture tends "
-"to reinforce the idea that the system should be called &ldquo;Linux&rdquo;."
+"to reinforce the idea that the system should be called &ldquo;Linux.&rdquo;"
 msgstr ""
 "معظم الذين يسمون النظام &rdquo;لينكس&ldquo; لم 
ينبهوا أبدًا عن أن الذي يقومون "
 "به ليس صحيحًا. لقد افتضروا أن الذين يقمنون 
به صحيح لأن الآخرين يستخدمونه. اسم "
@@ -869,21 +934,45 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#always\">#always</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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;,-] {+&ldquo;Linux,&rdquo;+} the name its developer
+# | chose.
+#, fuzzy
+#| 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."
 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."
+"you're referring specifically to the kernel, you should call it &ldquo;Linux,"
+"&rdquo; the name its developer chose."
 msgstr ""
 "ليس دائمًا&mdash;فقط عندما تتحدث عن النظام 
كله. عندما ترغب في الإشارة إلى "
 "النواة، ينبغي عليك استخدام الاسم 
&rdquo;لينكس&ldquo; الذي اختاره مطوروها."
 
 #. type: Content of: <div><dl><dd><p>
+# | When people call the whole system [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} as a consequence they call the whole system by
+# | the same name as the kernel.  This causes many kinds of confusion, because
+# | only experts can tell whether a statement is about the kernel or the whole
+# | system.  By calling the whole system [-&ldquo;GNU/Linux&rdquo;,-]
+# | {+&ldquo;GNU/Linux,&rdquo;+} and calling the kernel
+# | [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} you avoid the ambiguity.
+#, fuzzy
+#| 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 kinds of confusion, because only experts can tell whether a "
+#| "statement is about the kernel or the whole system.  By calling the whole "
+#| "system &ldquo;GNU/Linux&rdquo;, and calling the kernel &ldquo;"
+#| "Linux&rdquo;, you avoid the ambiguity."
 msgid ""
-"When people call the whole system &ldquo;Linux&rdquo;, as a consequence they "
+"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 "
 "kinds of confusion, because only experts can tell whether a statement is "
 "about the kernel or the whole system.  By calling the whole system &ldquo;"
-"GNU/Linux&rdquo;, and calling the kernel &ldquo;Linux&rdquo;, you avoid the "
+"GNU/Linux,&rdquo; and calling the kernel &ldquo;Linux,&rdquo; you avoid the "
 "ambiguity."
 msgstr ""
 "عندما يسمي الناس النظام كله &rdquo;لينكس&ldquo;، 
فهم يسمون النظام كله على "
@@ -947,8 +1036,17 @@
 "reference-id\">(<a href=\"#divide\">#divide</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | When we ask people to say [-&ldquo;GNU/Linux&rdquo;,-]
+# | {+&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.
+#, fuzzy
+#| 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."
 msgid ""
-"When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing "
+"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 ""
@@ -998,10 +1096,34 @@
 "المفتوحة بغرض البرمجيات الحرة</a>."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | freedom are more likely to call the system [-&ldquo;GNU/Linux&rdquo;,-]
+# | {+&ldquo;GNU/Linux,&rdquo;+} and people who learn that the system is
+# | &ldquo;GNU/Linux&rdquo; are more likely to pay attention to our
+# | philosophical arguments for freedom and community (which is why the choice
+# | of name for the system makes a real difference for society).  However, the
+# | disagreement would probably exist even if everyone knew the system's real
+# | origin and its proper name, because the issue is a real one.  It can only
+# | go away if we who value freedom either persuade everyone (which won't be
+# | easy) or are defeated entirely (let's hope not).
+#, fuzzy
+#| 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 freedom are more likely to call the system &ldquo;GNU/"
+#| "Linux&rdquo;, and people who learn that the system is &ldquo;GNU/"
+#| "Linux&rdquo; are more likely to pay attention to our philosophical "
+#| "arguments for freedom and community (which is why the choice of name for "
+#| "the system makes a real difference for society).  However, the "
+#| "disagreement would probably exist even if everyone knew the system's real "
+#| "origin and its proper name, because the issue is a real one.  It can only "
+#| "go away if we who value freedom either persuade everyone (which won't be "
+#| "easy) or are defeated entirely (let's hope not)."
 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 "
-"freedom are more likely to call the system &ldquo;GNU/Linux&rdquo;, and "
+"freedom are more likely to call the system &ldquo;GNU/Linux,&rdquo; and "
 "people who learn that the system is &ldquo;GNU/Linux&rdquo; are more likely "
 "to pay attention to our philosophical arguments for freedom and community "
 "(which is why the choice of name for the system makes a real difference for "
@@ -1060,10 +1182,23 @@
 "\"#everyoneknows\">#everyoneknows</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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
+# | system do not mention the name [-&ldquo;GNU&rdquo;,-]
+# | {+&ldquo;GNU,&rdquo;+} or the ideals that GNU stands for.  <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never
+# | Heard of GNU</a> explains further.
+#, fuzzy
+#| 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 system do not mention the name &ldquo;GNU&rdquo;, or the ideals that "
+#| "GNU stands for.  <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU "
+#| "Users Who Have Never Heard of GNU</a> explains further."
 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 "
-"system do not mention the name &ldquo;GNU&rdquo;, or the ideals that GNU "
+"system do not mention the name &ldquo;GNU,&rdquo; or the ideals that GNU "
 "stands for.  <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users "
 "Who Have Never Heard of GNU</a> explains further."
 msgstr ""
@@ -1074,11 +1209,22 @@
 "تشرح المزيد عن هذا."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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 GNU is.  For instance, many think it is a collection of [-<a
+# | href=\"#tools\">&ldquo;tools&rdquo;</a>,-] {+&ldquo;<a
+# | href=\"#tools\">tools</a>,&rdquo;+} or a project to develop tools.
+#, fuzzy
+#| 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 GNU is.  For instance, many think it is a collection of <a "
+#| "href=\"#tools\">&ldquo;tools&rdquo;</a>, or a project to develop tools."
 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 "
-"GNU is.  For instance, many think it is a collection of <a href=\"#tools"
-"\">&ldquo;tools&rdquo;</a>, or a project to develop tools."
+"GNU is.  For instance, many think it is a collection of &ldquo;<a href="
+"\"#tools\">tools</a>,&rdquo; or a project to develop tools."
 msgstr ""
 "الذين يقولون ذلك هم غالبًا مهوسون. الم
هوسون عادة ما يعرفون غنو، لكنهم كثيرا "
 "منهم لديه تصور خاطئ تمامًا عن ما هو غنو. 
على سبيل المثال، كثير يعتقدون أنه "
@@ -1106,11 +1252,23 @@
 "reference-id\">(<a href=\"#everyoneknows2\">#everyoneknows2</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | 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;,-] {+&ldquo;Linux,&rdquo;+} that it was started by
+# | Linus Torvalds, and that it was intended to be &ldquo;open
+# | [-source&rdquo;.-] {+source.&rdquo;+} If you don't tell them, who will?
+#, fuzzy
+#| 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;"
+#| "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?"
 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;"
-"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?"
+"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?"
 msgstr ""
 "إذا لم تعكس كلماتك فهمك، فإنك لا تعلم 
الناس. معظم الذين سمعوا عن نظام غنو/"
 "لينكس يعتقدون أنه &rdquo;لينكس&ldquo; (الذي بدأه 
ليوناس تورفلدز) وأنه بدأه "
@@ -1162,14 +1320,31 @@
 "reference-id\">(<a href=\"#tools\">#tools</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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
+# | that GNU is the name of a collection of programs&mdash;often they say
+# | &ldquo;programming [-tools&rdquo;,-] {+tools,&rdquo;+} since some of our
+# | programming tools became popular on their own.  The idea that
+# | &ldquo;GNU&rdquo; is the name of an operating system is hard to fit into a
+# | conceptual framework in which that operating system is labeled
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+}
+#, fuzzy
+#| 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 "
+#| "that GNU is the name of a collection of programs&mdash;often they say "
+#| "&ldquo;programming tools&rdquo;, since some of our programming tools "
+#| "became popular on their own.  The idea that &ldquo;GNU&rdquo; is the name "
+#| "of an operating system is hard to fit into a conceptual framework in "
+#| "which that operating system is labeled &ldquo;Linux&rdquo;."
 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 "
 "that GNU is the name of a collection of programs&mdash;often they say &ldquo;"
-"programming tools&rdquo;, since some of our programming tools became popular "
+"programming tools,&rdquo; since some of our programming tools became popular "
 "on their own.  The idea that &ldquo;GNU&rdquo; is the name of an operating "
 "system is hard to fit into a conceptual framework in which that operating "
-"system is labeled &ldquo;Linux&rdquo;."
+"system is labeled &ldquo;Linux.&rdquo;"
 msgstr ""
 "إن الذين يعتقدون أن لينكس هو نظام تشغيل كام
ل لديهم تصور خاطئ عما هو غنو. قد "
 "يعتقدون أن غنو اسم مجموعة من البرامج، 
وأحيانًا يقولون &rdquo;أدوات "
@@ -1228,12 +1403,32 @@
 "بقية البرامج الذي تعمل. تتولَ النواة أيضا 
بدء وتشغيل البرامج الأخرى."
 
 #. type: Content of: <div><dl><dd><p>
+# | To confuse matters, some people use the term &ldquo;operating
+# | system&rdquo; to mean [-&ldquo;kernel&rdquo;.-] {+&ldquo;kernel.&rdquo;+}
+# | Both uses of the term go back many years.  The use of &ldquo;operating
+# | system&rdquo; to mean &ldquo;kernel&rdquo; is found in a number of
+# | textbooks on system design, going back to the 80s.  At the same time, in
+# | the 80s, the &ldquo;Unix operating system&rdquo; was understood to include
+# | all the system programs, and Berkeley's version of Unix included even
+# | games. Since we intended GNU to be a Unix-like operating system, we use
+# | the term &ldquo;operating system&rdquo; in the same way.
+#, fuzzy
+#| 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.  The use of &ldquo;operating system&rdquo; to mean "
+#| "&ldquo;kernel&rdquo; is found in a number of textbooks on system design, "
+#| "going back to the 80s.  At the same time, in the 80s, the &ldquo;Unix "
+#| "operating system&rdquo; was understood to include all the system "
+#| "programs, and Berkeley's version of Unix included even games. Since we "
+#| "intended GNU to be a Unix-like operating system, we use the term &ldquo;"
+#| "operating system&rdquo; in the same way."
 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.  "
-"The use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is "
-"found in a number of textbooks on system design, going back to the 80s.  At "
-"the same time, in the 80s, the &ldquo;Unix operating system&rdquo; was "
+"to mean &ldquo;kernel.&rdquo; Both uses of the term go back many years.  The "
+"use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is found "
+"in a number of textbooks on system design, going back to the 80s.  At the "
+"same time, in the 80s, the &ldquo;Unix operating system&rdquo; was "
 "understood to include all the system programs, and Berkeley's version of "
 "Unix included even games. Since we intended GNU to be a Unix-like operating "
 "system, we use the term &ldquo;operating system&rdquo; in the same way."
@@ -1247,11 +1442,28 @@
 "بيونكس، فإننا نستخدم المصطلح &rdquo;نظام 
التشغيل&ldquo; في نفس السياق."
 
 #. type: Content of: <div><dl><dd><p>
+# | Most of the time when people speak of the &ldquo;Linux operating
+# | system&rdquo; they are using &ldquo;operating system&rdquo; in the same
+# | sense we use: they mean the whole collection of programs.  If that's what
+# | you are referring to, please call it [-&ldquo;GNU/Linux&rdquo;.-]
+# | {+&ldquo;GNU/Linux.&rdquo;+} If you mean just the kernel, then
+# | &ldquo;Linux&rdquo; is the right name for it, but please say
+# | &ldquo;kernel&rdquo; also to avoid ambiguity about which body of software
+# | you mean.
+#, fuzzy
+#| 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 "
+#| "sense we use: they mean the whole collection of programs.  If that's what "
+#| "you are referring to, please call it &ldquo;GNU/Linux&rdquo;.  If you "
+#| "mean just the kernel, then &ldquo;Linux&rdquo; is the right name for it, "
+#| "but please say &ldquo;kernel&rdquo; also to avoid ambiguity about which "
+#| "body of software you mean."
 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 "
 "sense we use: they mean the whole collection of programs.  If that's what "
-"you are referring to, please call it &ldquo;GNU/Linux&rdquo;.  If you mean "
+"you are referring to, please call it &ldquo;GNU/Linux.&rdquo; If you mean "
 "just the kernel, then &ldquo;Linux&rdquo; is the right name for it, but "
 "please say &ldquo;kernel&rdquo; also to avoid ambiguity about which body of "
 "software you mean."
@@ -1264,10 +1476,20 @@
 "الجزء الذي تشير إليه."
 
 #. type: Content of: <div><dl><dd><p>
+# | If you prefer to use some other term such as &ldquo;system
+# | distribution&rdquo; for the entire collection of programs, instead of
+# | &ldquo;operating [-system&rdquo;,-] {+system,&rdquo;+} that's fine.  Then
+# | you would talk about GNU/Linux system distributions.
+#, fuzzy
+#| msgid ""
+#| "If you prefer to use some other term such as &ldquo;system "
+#| "distribution&rdquo; for the entire collection of programs, instead of "
+#| "&ldquo;operating system&rdquo;, that's fine.  Then you would talk about "
+#| "GNU/Linux system distributions."
 msgid ""
 "If you prefer to use some other term such as &ldquo;system "
 "distribution&rdquo; for the entire collection of programs, instead of &ldquo;"
-"operating system&rdquo;, that's fine.  Then you would talk about GNU/Linux "
+"operating system,&rdquo; that's fine.  Then you would talk about GNU/Linux "
 "system distributions."
 msgstr ""
 "إذا كنت تفضل استخدام مصطلح آخر مثل 
&rdquo;توزيعة نظام&ldquo; لمجموعة كاملة "
@@ -1367,9 +1589,9 @@
 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, "
-"window systems, libraries, and much more &mdash; hundreds of programs, even "
-"to match what BSD systems included in 1983.  Since Torvalds didn't develop "
-"any of those, how can the system be &ldquo;Linux&rdquo;?"
+"window systems, libraries, and much more&mdash;hundreds of programs, even to "
+"match what BSD systems included in 1983.  Since Torvalds didn't develop any "
+"of those, how can the system be &ldquo;Linux&rdquo;?"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><p>
@@ -1395,7 +1617,7 @@
 #. 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</a> are available.  None of them is called simply &ldquo;GNU,&rdquo; but "
 "GNU is what they basically are."
 msgstr ""
 
@@ -1428,8 +1650,8 @@
 
 #. 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 "
+"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 ""
 
@@ -1444,13 +1666,28 @@
 "\"#afterkernel\">#afterkernel</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | That practice seems to be very rare&mdash;we can't find any examples other
+# | than the misuse of the name [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+} Normally an operating system is developed as a
+# | single unified project, and the developers choose a name for the system as
+# | a whole.  The kernel usually does not have a name of its
+# | own&mdash;instead, people say &ldquo;the kernel of such-and-such&rdquo; or
+# | &ldquo;the such-and-such [-kernel&rdquo;.-] {+kernel.&rdquo;+}
+#, fuzzy
+#| 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 system is developed as a single unified project, and the "
+#| "developers choose a name for the system as a whole.  The kernel usually "
+#| "does not have a name of its own&mdash;instead, people say &ldquo;the "
+#| "kernel of such-and-such&rdquo; or &ldquo;the such-and-such kernel&rdquo;."
 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 "
+"than the misuse of the name &ldquo;Linux.&rdquo; Normally an operating "
 "system is developed as a single unified project, and the developers choose a "
 "name for the system as a whole.  The kernel usually does not have a name of "
 "its own&mdash;instead, people say &ldquo;the kernel of such-and-such&rdquo; "
-"or &ldquo;the such-and-such kernel&rdquo;."
+"or &ldquo;the such-and-such kernel.&rdquo;"
 msgstr ""
 "هذه الممارسة نادرة جدًا، لم نجد أي مثال 
عدا سوء استخدام الاسم &rdquo;"
 "لينكس&ldquo;. يتم تطوير نظام التشغيل عادة في م
شروع واحد منظم، ويختار "
@@ -1495,9 +1732,18 @@
 "class=\"anchor-reference-id\">(<a href=\"#long\">#long</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | For a while we tried the name [-&ldquo;LiGNUx&rdquo;,-]
+# | {+&ldquo;LiGNUx,&rdquo;+} which combines the words &ldquo;GNU&rdquo; and
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} The reaction was very
+# | bad.  People accept &ldquo;GNU/Linux&rdquo; much better.
+#, fuzzy
+#| 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."
 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.  "
+"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 ""
 "جربنا لفترة الاسم ليغنوكس والذي يجمع بين 
الاسمين &rdquo;غنو&ldquo; و &rdquo;"
@@ -1505,8 +1751,16 @@
 "لينكس&ldquo; قبول أكثر."
 
 #. type: Content of: <div><dl><dd><p>
+# | The shortest legitimate name for this system is [-&ldquo;GNU&rdquo;,-]
+# | {+&ldquo;GNU,&rdquo;+} but we call it &ldquo;GNU/Linux&rdquo; <a
+# | href=\"#justgnu\"> for the reasons given below</a>.
+#, fuzzy
+#| 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>."
 msgid ""
-"The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but we "
+"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 ""
@@ -1543,7 +1797,7 @@
 
 #. type: Content of: <div><dl><dd><p>
 msgid ""
-"It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you appreciate "
+"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 ""
@@ -1642,10 +1896,21 @@
 "بإقصائه من نسب مساهمته إلى النظام إليه."
 
 #. type: Content of: <div><dl><dd><ul><li>
+# | Since many people know of the system as [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} if we say &ldquo;GNU&rdquo; they may simply not
+# | recognize we're talking about the same system.  If we say
+# | [-&ldquo;GNU/Linux&rdquo;,-] {+&ldquo;GNU/Linux,&rdquo;+} they can make a
+# | connection to what they have heard about.
+#, fuzzy
+#| 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 system.  If we say &ldquo;GNU/Linux&rdquo;, they can make a "
+#| "connection to what they have heard about."
 msgid ""
-"Since many people know of the system as &ldquo;Linux&rdquo;, if we say "
+"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 "
-"system.  If we say &ldquo;GNU/Linux&rdquo;, they can make a connection to "
+"system.  If we say &ldquo;GNU/Linux,&rdquo; they can make a connection to "
 "what they have heard about."
 msgstr ""
 "إن كثيرا من الناس يسمون النظام 
&rdquo;لينكس&ldquo;. لو قلنا &rdquo;"
@@ -1653,10 +1918,23 @@
 "لينكس&ldquo; فسيربطون بينه وبين ما سمعوا عنه."
 
 #. type: Content of: <div><dl><dt>
+# | 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;.-]
+# | {+&ldquo;GNU/Linux.&rdquo;+} Is it wrong if I use &ldquo;GNU&rdquo;
+# | without [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} to save the fee?
+# | <span class=\"anchor-reference-id\">(<a
+# | href=\"#trademarkfee\">#trademarkfee</a>)</span>
+#, fuzzy
+#| 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 wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to save "
+#| "the fee? <span class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
+#| "\">#trademarkfee</a>)</span>"
 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 "
-"wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to save the "
+"product, and that would also apply if I say &ldquo;GNU/Linux.&rdquo; Is it "
+"wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux,&rdquo; to save the "
 "fee? <span class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
 "\">#trademarkfee</a>)</span>"
 msgstr ""
@@ -1675,9 +1953,17 @@
 "تنسبه إلى ليوناس تورفلدز أيضا، لكنك لست م
طالبا بالدفع للقيام بذلك."
 
 #. type: Content of: <div><dl><dd><p>
+# | So if you want to refer to the system simply as [-&ldquo;GNU&rdquo;,-]
+# | {+&ldquo;GNU,&rdquo;+} to avoid paying the fee for calling it
+# | [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} we won't criticize you.
+#, fuzzy
+#| 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."
 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."
+"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 ""
 "لذا إذا أردت الإشارة إلى النظام الكامل 
ب&rdquo;غنو&ldquo; لتجنب دفع رسوم "
 "تسميته &rdquo;لينكس&ldquo; فإننا لن نتقدك."
@@ -1732,12 +2018,25 @@
 "نجادلك فيه."
 
 #. type: Content of: <div><dl><dd><p>
+# | Different threshold levels would lead to different choices of name for the
+# | system.  But one name that cannot result from concerns of fairness and
+# | giving credit, not for any possible threshold level, is
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} It can't be fair to give
+# | all the credit to one secondary contribution (Linux) while omitting the
+# | principal contribution (GNU).
+#, fuzzy
+#| 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 giving credit, not for any possible threshold level, is &ldquo;"
+#| "Linux&rdquo;.  It can't be fair to give all the credit to one secondary "
+#| "contribution (Linux) while omitting the principal contribution (GNU)."
 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 "
-"giving credit, not for any possible threshold level, is &ldquo;"
-"Linux&rdquo;.  It can't be fair to give all the credit to one secondary "
-"contribution (Linux) while omitting the principal contribution (GNU)."
+"giving credit, not for any possible threshold level, is &ldquo;Linux.&rdquo; "
+"It can't be fair to give all the credit to one secondary contribution "
+"(Linux) while omitting the principal contribution (GNU)."
 msgstr ""
 "الحدود الفاصلة المختلفة سوف تقود إلى 
اختيار أسماء مخنلفة للنظام؛ لكن اسمًا "
 "واحدًا لن ينتج من محاولة العدل ونسب النظام 
إلى كاتبيه مهما كان الحد الفاصل "
@@ -1771,7 +2070,7 @@
 "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."
+"system &ldquo;GNU/systemd/Linux,&rdquo; there is nothing wrong with doing so."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
@@ -1814,11 +2113,21 @@
 "reference-id\">(<a href=\"#allsmall\">#allsmall</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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 the same argument would apply even more strongly to calling it
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+}
+#, fuzzy
+#| 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 the same argument would apply even more strongly to calling it &ldquo;"
+#| "Linux&rdquo;."
 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 "
-"the same argument would apply even more strongly to calling it &ldquo;"
-"Linux&rdquo;."
+"the same argument would apply even more strongly to calling it &ldquo;Linux."
+"&rdquo;"
 msgstr ""
 "وجدنا في 2008 أن حزم غنو كوّنت 15% من مخزن 
&rdquo;main&ldquo; لتوزيعة غنيوسنس "
 "غنو/لينكس. شكل لينكس 1.5% منها. ولذا فإن نفس 
الحجة سوف تنطبق أكثر على من "
@@ -1876,9 +2185,21 @@
 "class=\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | Following the rules of English, in the construction &ldquo;GNU
+# | Linux&rdquo; the word &ldquo;GNU&rdquo; modifies [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+} This can mean either &ldquo;GNU's version of
+# | Linux&rdquo; or &ldquo;Linux, which is a GNU package.&rdquo; Neither of
+# | those meanings fits the situation at hand.
+#, fuzzy
+#| 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 either &ldquo;GNU's version of Linux&rdquo; or &ldquo;"
+#| "Linux, which is a GNU package.&rdquo; Neither of those meanings fits the "
+#| "situation at hand."
 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 "
+"the word &ldquo;GNU&rdquo; modifies &ldquo;Linux.&rdquo; This can mean "
 "either &ldquo;GNU's version of Linux&rdquo; or &ldquo;Linux, which is a GNU "
 "package.&rdquo; Neither of those meanings fits the situation at hand."
 msgstr ""
@@ -1904,9 +2225,10 @@
 # | [-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.
+# | non[---]free firmware [-&ldquo;blobs&rdquo;.-] {+&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 "
@@ -1920,7 +2242,7 @@
 "We're not talking about a distinct GNU version of Linux, the kernel.  The "
 "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 "
+"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."
@@ -1932,11 +2254,24 @@
 "نريد أن نسميها بهذا، لأن هذا محير جدًا."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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 &ldquo;combination.&rdquo; (Think of
+# | [-&ldquo;Input/Output&rdquo;.)-] {+&ldquo;Input/Output.&rdquo;)+}  This
+# | system is the combination of GNU and Linux; hence,
+# | [-&ldquo;GNU/Linux&rdquo;.-] {+&ldquo;GNU/Linux.&rdquo;+}
+#, fuzzy
+#| 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 &ldquo;combination.&rdquo; (Think of &ldquo;Input/Output&rdquo;.)  "
+#| "This system is the combination of GNU and Linux; hence, &ldquo;GNU/"
+#| "Linux&rdquo;."
 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 "
-"&ldquo;combination.&rdquo; (Think of &ldquo;Input/Output&rdquo;.)  This "
-"system is the combination of GNU and Linux; hence, &ldquo;GNU/Linux&rdquo;."
+"&ldquo;combination.&rdquo; (Think of &ldquo;Input/Output.&rdquo;)  This "
+"system is the combination of GNU and Linux; hence, &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "نحن نتحدث عن نسخة من غنو (نظام التشغيل)، مم
يزة بأنها تستخدم لينكس كنواة لها. "
 "الشرطة المائلة مناسبة لهذه الحالة لأنها 
تعني &rdquo;الجمع&ldquo; (تذكر "
@@ -1944,11 +2279,22 @@
 "&rdquo;غنو/لينكس&ldquo;."
 
 #. 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: "
-"&ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes say &ldquo;GNU con "
-"Linux&rdquo;."
+# | There are other ways to express [-&ldquo;combination&rdquo;.-]
+# | {+&ldquo;combination.&rdquo;+} If you think that a plus-sign is clearer,
+# | please use that.  In French, a hyphen is clear:
+# | [-&ldquo;GNU-Linux&rdquo;.-] {+&ldquo;GNU-Linux.&rdquo;+} In Spanish, we
+# | sometimes say &ldquo;GNU con [-Linux&rdquo;.-] {+Linux.&rdquo;+}
+#, fuzzy
+#| 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: &ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes say &ldquo;GNU "
+#| "con Linux&rdquo;."
+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: "
+"&ldquo;GNU-Linux.&rdquo; In Spanish, we sometimes say &ldquo;GNU con Linux."
+"&rdquo;"
 msgstr ""
 "&rdquo;الجمع&ldquo;توجد طرق أخرى للتعبير عن. إذا 
كنت تعتقد أن علامة الزائد "
 "أوضح، فمن فضلك استخدمها. في الإسبانية 
الشرطة المرتفعة واضحة: &rdquo;غنو-"
@@ -2000,7 +2346,7 @@
 # | 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
-# | Linux&rdquo; or &ldquo;Linux,-] {+&ldquo;Emacs&rdquo;.  That is the right
+# | Linux&rdquo; or &ldquo;Linux,-] {+&ldquo;Emacs.&rdquo; That is the right
 # | way to describe a program called Emacs+} which is a GNU [-package.&rdquo;
 # | Neither of those meanings fits the situation at hand.-] {+package.+}
 #, fuzzy
@@ -2012,7 +2358,7 @@
 #| "situation at hand."
 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 "
+"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 ""
 "استنادًا إلى قواعد اللغة الإنجليزية، فإن 
تفسير &rdquo;غنو لينكس&ldquo; أن "
@@ -2051,8 +2397,17 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dd><p>
+# | However, if you prefer to call the system [-&ldquo;Linux/GNU&rdquo;,-]
+# | {+&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.
+#, fuzzy
+#| 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."
 msgid ""
-"However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a "
+"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 ""
@@ -2061,12 +2416,26 @@
 "لينكس."
 
 #. type: Content of: <div><dl><dt>
+# | My [-distro is called-] {+distro's developers call it+} &ldquo;Foobar
+# | [-Linux&rdquo;; doesn't-] {+Linux,&rdquo; but+} that [-show it's really
+# | Linux?-] {+doesn't say anything about what the system consists of.  Why
+# | shouldn't they call it whatever they like?+} <span
+# | class=\"anchor-reference-id\">(<a
+# | [-href=\"#distronames\">#distronames</a>)</span>-]
+# | {+href=\"#distronames0\">#distronames0</a>)</span>+}
+#, fuzzy
+#| 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>"
 msgid ""
-"My distro's developers call it &ldquo;Foobar Linux&rdquo;, but that doesn't "
+"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 "
 "whatever they like? <span class=\"anchor-reference-id\">(<a href="
 "\"#distronames0\">#distronames0</a>)</span>"
 msgstr ""
+"اسم توزيعتي &rdquo;س لينكس&ldquo;، ألا يعني هذا 
أنها فعلا لينكس؟ <span class="
+"\"anchor-reference-id\">(<a href=\"#distronames\">#distronames</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
 msgid ""
@@ -2122,12 +2491,12 @@
 
 #. 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+}
-# | for you to [-change it back and call the distro &ldquo;Foobar
-# | 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;.+}
+# | changing+} &ldquo;GNU&rdquo; to {+&ldquo;Linux,&rdquo; and call their
+# | version of it+} &ldquo;Foobar [-Linux&rdquo;,-] {+Linux,&rdquo;+} it's
+# | [-allowed-] {+proper+} for you to [-change it back and call the distro
+# | &ldquo;Foobar 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;+}
 #, fuzzy
 #| msgid ""
 #| "If it's allowed for them to change &ldquo;GNU&rdquo; to &ldquo;Foobar "
@@ -2136,9 +2505,9 @@
 #| "mistake than it was to make the mistake."
 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 "
+"Linux,&rdquo; and call their version of it &ldquo;Foobar Linux,&rdquo; it's "
 "proper for you to correct the misinformation by calling it &ldquo;Foobar GNU/"
-"Linux&rdquo;."
+"Linux.&rdquo;"
 msgstr ""
 "يسمح لهم بتغيير &rdquo;غنو&ldquo; إلى &rdquo;س 
لينكس&ldquo; يسمح لك بإعادته "
 "إلى ما كان عليه وتسمية التوزيعة &rdquo;س 
غنو/لينكس&ldquo;. تصحيح الخطأ ليس "
@@ -2173,12 +2542,24 @@
 "بعبارة أخرى، لم تكترث الشركة بما هو صائب."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | 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;.-] {+&ldquo;GNU/Linux.&rdquo;+}
+#, fuzzy
+#| 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 "
+#| "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;."
 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 "
 "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;."
+"&ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "لا نملك إجبارهم على فعل الصواب، لكننا 
ليسنا من النوع الذي يستسلم لمجرد أن "
 "الطريق ليس سهلا. قد لا تملك نفس نفوذ آي بي 
إم أو ردهات، لكنك تستطيع "
@@ -2200,12 +2581,12 @@
 # | 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.
+# | [-&ldquo;Linux&rdquo;.-] {+&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 "
@@ -2220,13 +2601,12 @@
 msgid ""
 "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 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 nonfree "
-"applications and drivers), or making the system more popular even at the "
-"cost of freedom."
+"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 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 nonfree applications "
+"and drivers), or making the system more popular even at the cost of freedom."
 msgstr ""
 "انتشار إضافة البرمجيات غير الحرة إلى نظام 
غنو/لينكس مشكلة كبيرة يعاني منها "
 "مجتمعنا. إنها تعطي المستخدمين انطباعًا 
أنه لا بأس في البرمجيات غير الحرة، وأن "
@@ -2260,7 +2640,8 @@
 # | 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;.
+# | they are proper and appropriate &ldquo;versions of [-Linux&rdquo;.-]
+# | {+Linux.&rdquo;+}
 #, fuzzy
 #| msgid ""
 #| "The way to lead these users to see a connection with freedom is exactly "
@@ -2277,7 +2658,7 @@
 "specifically for the sake of the users' freedom.  With this understanding, "
 "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;."
+"proper and appropriate &ldquo;versions of Linux.&rdquo;"
 msgstr ""
 "الوسيلة التي يمكن من خلالها تعريف هؤلاء 
المستخدمين على الحرية هي عكس ذلك "
 "تمامًا، بإعلامهم بأن كل الأنظمة 
<em>أساسًا</em> نسخة من غنو، وبأنها كلها تأسست "
@@ -2371,11 +2752,22 @@
 "الأوان)."
 
 #. type: Content of: <div><dl><dd><p>
+# | If we were to take an existing version of GNU/Linux and relabel it as
+# | [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} that would be somewhat like
+# | making a version of the GNU system and labeling it
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} That wasn't right, and
+# | we don't want to act like that.
+#, fuzzy
+#| 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 and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and "
+#| "we don't want to act like that."
 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 "
-"and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and we don't want "
-"to act like that."
+"GNU,&rdquo; that would be somewhat like making a version of the GNU system "
+"and labeling it &ldquo;Linux.&rdquo; That wasn't right, and we don't want to "
+"act like that."
 msgstr ""
 "أخذ نسخة ن غنو/لينكس وتسميتها &rdquo;غنو&ldquo; م
شابه لأخذ نسخة من نظام غنو "
 "وتسميتها &rdquo;لينكس&ldquo;. إنها ليست فكرة م
لائمة، ونحن لا نحب انتهاجها."
@@ -2405,11 +2797,29 @@
 "لينكس، لكن كثيرا من التعديلات لم تكن محم
ولة واحتاجت إلى تعديل."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | with the GNU Project because he was a &ldquo;Linux [-user&rdquo;.-]
+# | {+user.&rdquo;+} That came as a shock, because the people who ported GNU
+# | packages to other systems had generally wanted to work with us to get
+# | their changes installed.  Yet these people, developing a system that was
+# | primarily based on GNU, were the first (and still practically the only)
+# | group that was unwilling to work with us.
+#, fuzzy
+#| 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 "
+#| "with the GNU Project because he was a &ldquo;Linux user&rdquo;.  That "
+#| "came as a shock, because the people who ported GNU packages to other "
+#| "systems had generally wanted to work with us to get their changes "
+#| "installed.  Yet these people, developing a system that was primarily "
+#| "based on GNU, were the first (and still practically the only) group that "
+#| "was unwilling to work with us."
 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 "
-"with the GNU Project because he was a &ldquo;Linux user&rdquo;.  That came "
-"as a shock, because the people who ported GNU packages to other systems had "
+"with the GNU Project because he was a &ldquo;Linux user.&rdquo; That came as "
+"a shock, because the people who ported GNU packages to other systems had "
 "generally wanted to work with us to get their changes installed.  Yet these "
 "people, developing a system that was primarily based on GNU, were the first "
 "(and still practically the only) group that was unwilling to work with us."
@@ -2421,9 +2831,22 @@
 "بشكل أساسي على غنو كانوا أول (ولازالوا 
الوحيدين) الذين رفضوا العمل معنا."
 
 #. type: Content of: <div><dl><dd><p>
+# | It was this experience that first showed us that people were calling a
+# | version of the GNU system [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} and that this confusion was obstructing our work.
+# |  Asking you to call the system &ldquo;GNU/Linux&rdquo; is our response to
+# | that problem, and to the other problems caused by the &ldquo;Linux&rdquo;
+# | misnomer.
+#, fuzzy
+#| 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 obstructing our work.  Asking you to call the system &ldquo;GNU/"
+#| "Linux&rdquo; is our response to that problem, and to the other problems "
+#| "caused by the &ldquo;Linux&rdquo; misnomer."
 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 "
+"version of the GNU system &ldquo;Linux,&rdquo; and that this confusion was "
 "obstructing our work.  Asking you to call the system &ldquo;GNU/Linux&rdquo; "
 "is our response to that problem, and to the other problems caused by the "
 "&ldquo;Linux&rdquo; misnomer."
@@ -2461,10 +2884,18 @@
 "\"anchor-reference-id\">(<a href=\"#allgpled\">#allgpled</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | We never refer to individual programs as
+# | [-&ldquo;GNU/<i>name</i>&rdquo;.-] {+&ldquo;GNU/<i>name</i>.&rdquo;+} When
+# | a program is a GNU package, we may call it &ldquo;GNU
+# | [-<i>name</i>&rdquo;.-] {+<i>name</i>.&rdquo;+}
+#, fuzzy
+#| 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;."
 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;."
+"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 ""
 "لم نسمِ أبدًا برامج منفردة &rdquo;غنو/<i>الاسم
</i>&ldquo;. عندما يكون البرنامج "
 "حزمة غنو فقد نطلق عليه اسم &rdquo;غنو <i>الاسم
</i>&ldquo;"
@@ -2568,10 +2999,24 @@
 "أو حتى أجزاء منها، لقد كتبنا كل شيء من 
الصفر."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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. 
+# | The name [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} which stands for
+# | &ldquo;GNU's Not [-Unix&rdquo;,-] {+Unix,&rdquo;+} is a humorous way of
+# | giving credit to Unix for this, following a hacker tradition of recursive
+# | acronyms that started in the 70s.
+#, fuzzy
+#| 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.  The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not "
+#| "Unix&rdquo;, is a humorous way of giving credit to Unix for this, "
+#| "following a hacker tradition of recursive acronyms that started in the "
+#| "70s."
 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.  "
-"The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not Unix&rdquo;, "
+"The name &ldquo;GNU,&rdquo; which stands for &ldquo;GNU's Not Unix,&rdquo; "
 "is a humorous way of giving credit to Unix for this, following a hacker "
 "tradition of recursive acronyms that started in the 70s."
 msgstr ""
@@ -2581,11 +3026,12 @@
 "الثمانينات."
 
 #. 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
+# | The first such recursive acronym was TINT, &ldquo;TINT Is Not
+# | [-TECO&rdquo;.-] {+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;,-] {+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
@@ -2598,10 +3044,10 @@
 #| "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 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 "
+"like &ldquo;<em>somethingorother</em> TECO,&rdquo; he thought of a clever "
 "amusing name.  (That's what hacking means: <a href=\"https://stallman.org/";
 "articles/on-hacking.html\">playful cleverness</a>.)"
 msgstr ""
@@ -2611,13 +3057,28 @@
 "href=\"http://stallman.org/articles/on-hacking.html\";>الذكاء الم
رح</a>)."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | was similar to some existing program (let's imagine its name was
+# | &ldquo;Klever&rdquo;), you could give it a recursive acronym name, such as
+# | &ldquo;MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same
+# | spirit we called our replacement for Unix &ldquo;GNU's Not
+# | [-Unix&rdquo;.-] {+Unix.&rdquo;+}
+#, fuzzy
+#| 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 was similar to some existing program (let's imagine its name was "
+#| "&ldquo;Klever&rdquo;), you could give it a recursive acronym name, such "
+#| "as &ldquo;MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same "
+#| "spirit we called our replacement for Unix &ldquo;GNU's Not Unix&rdquo;."
 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 "
 "was similar to some existing program (let's imagine its name was &ldquo;"
 "Klever&rdquo;), you could give it a recursive acronym name, such as &ldquo;"
 "MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same spirit we "
-"called our replacement for Unix &ldquo;GNU's Not Unix&rdquo;."
+"called our replacement for Unix &ldquo;GNU's Not Unix.&rdquo;"
 msgstr ""
 "أعجب هذا الاسم الهاكرز الآخرين لدرجة أنهم 
قلدوا هذا التصرف حتى أصبح عادة "
 "مألوفة، فعندما تريد كتابة برنامج آخر شبيه 
لبرنامج آخر (دعنا نتخيل أن اسم "
@@ -2626,13 +3087,28 @@
 "المنطلق سمينا بدلينا ليونكس &rdquo;GNU's Not 
Unix&ldquo;."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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 in a system 99% copied from Unix.  AT&amp;T actually threatened to
+# | sue anyone giving AT&amp;T credit in that way.  This is why each of the
+# | various modified versions of Unix (all proprietary, like Unix) had a
+# | completely different name that didn't include [-&ldquo;Unix&rdquo;.-]
+# | {+&ldquo;Unix.&rdquo;+}
+#, fuzzy
+#| 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 in a system 99% copied from Unix.  AT&amp;T actually threatened "
+#| "to sue anyone giving AT&amp;T credit in that way.  This is why each of "
+#| "the various modified versions of Unix (all proprietary, like Unix) had a "
+#| "completely different name that didn't include &ldquo;Unix&rdquo;."
 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 "
 "in a system 99% copied from Unix.  AT&amp;T actually threatened to sue "
 "anyone giving AT&amp;T credit in that way.  This is why each of the various "
 "modified versions of Unix (all proprietary, like Unix) had a completely "
-"different name that didn't include &ldquo;Unix&rdquo;."
+"different name that didn't include &ldquo;Unix.&rdquo;"
 msgstr ""
 "تاريخيًا، AT&amp;T (التي طورت يونكس) لم ترد أن 
ينسب أحد إليها النظام باستخدام "
 "&rdquo;يونكس&ldquo; في اسم الأنظمة الشبيهة، ولا 
حتى في الأنظمة المستنسخة "
@@ -2710,9 +3186,22 @@
 "ملائم له."
 
 #. type: Content of: <div><dl><dd><p>
+# | There is a version of GNU which uses the kernel from NetBSD.  Its
+# | developers call it &ldquo;Debian [-GNU/NetBSD&rdquo;,-]
+# | {+GNU/NetBSD,&rdquo;+} but &ldquo;GNU/kernelofNetBSD&rdquo; would be more
+# | accurate, since NetBSD is an entire system, not just the kernel.  This is
+# | not a BSD system, since most of the system is the same as the GNU/Linux
+# | system.
+#, fuzzy
+#| 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/"
+#| "kernelofNetBSD&rdquo; would be more accurate, since NetBSD is an entire "
+#| "system, not just the kernel.  This is not a BSD system, since most of the "
+#| "system is the same as the GNU/Linux system."
 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/"
+"call it &ldquo;Debian GNU/NetBSD,&rdquo; but &ldquo;GNU/"
 "kernelofNetBSD&rdquo; would be more accurate, since NetBSD is an entire "
 "system, not just the kernel.  This is not a BSD system, since most of the "
 "system is the same as the GNU/Linux system."
@@ -2733,8 +3222,21 @@
 "span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | Not in the same sense that we mean by [-&ldquo;GNU/Linux&rdquo;.-]
+# | {+&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.
+#, fuzzy
+#| 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 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."
 msgid ""
-"Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of "
+"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 "
@@ -2877,7 +3379,7 @@
 
 #. type: Content of: <div><dl><dd><p>
 msgid ""
-"If you call the whole GNU/Linux system &ldquo;Linux&rdquo;, you will find it "
+"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 "
 "Linux, because it doesn't have the usual Linux [sic] libraries and utilities "
 "[meaning the GNU system].&rdquo;"
@@ -2924,7 +3426,7 @@
 #. 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 "
+"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 ""
 
@@ -2932,7 +3434,7 @@
 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;."
+"of the whole system as &ldquo;Linux.&rdquo;"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><p>
@@ -2942,7 +3444,7 @@
 "contain Linux is irrelevant to using them, just as the fact that a car and a "
 "bicycle both have a structure of metal is irrelevant to using those two.  If "
 "you wish to talk about using cars and bikes, you wouldn't speak of &ldquo;"
-"riding metal objects&rdquo; &mdash; not unless you're playing games with the "
+"riding metal objects&rdquo;&mdash;not unless you're playing games with the "
 "reader.  You would say, &ldquo;using cars and bikes.&rdquo; Likewise, the "
 "clear way to talk about using GNU/Linux and Android is to say &ldquo;using "
 "GNU/Linux and Android.&rdquo;"
@@ -3037,11 +3539,22 @@
 "(<a href=\"#claimlinux\">#claimlinux</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | 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;.-] {+&ldquo;GNU.&rdquo;+} When we talk
+# | about the whole system, the name &ldquo;GNU/Linux&rdquo; gives him a share
+# | of the credit.
+#, fuzzy
+#| 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 "
+#| "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."
 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 "
-"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."
+"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."
 msgstr ""
 "بلى، من الخطأ القيام بذلك ولذا فإننا لا 
نقوم به. عمل تورفلدز هو لينكس وهي "
 "النواة؛ ونحن على حذر من ألا ننسب عمله إلى م
شروه غنو أو نسميه &rdquo;"
@@ -3057,12 +3570,38 @@
 "reference-id\">(<a href=\"#linusagreed\">#linusagreed</a>)</span>"
 
 #. 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\">
+# | He recognized this at the beginning.  The {+<a
+# | 
href=\"https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\";>+}
+# | 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>.
+# |  for more info&rdquo;</a>.-] {+notes</a> said:+}
+#, 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 <a href=\"https://ftp.funet.fi/pub/";
+"linux/historical/kernel/old-versions/RELNOTES-0.01\"> earliest Linux release "
+"notes</a> said:"
+msgstr ""
+"لقد اعترف بذلك في البداية، فملاحظات إصدار 
لينكس الأولى تنصل على أن: <a href="
+"\"http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
+"RELNOTES-0.01\">&rdquo;معظم الأدوات المستخدمة مع 
لينكس هي برمجيات غنو وهي "
+"تحت حقوق غنو المتروكة. هذه الأدوات ليست في 
التوزيعة - اسألني (أو اسأل غنو) "
+"لمزيد من المعلومات.&ldquo;</a>."
+
+#. type: Content of: <div><dl><dd><blockquote><p>
+# | [-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-]{+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>.-] {+info.+}
 #, fuzzy
 #| msgid ""
 #| "He recognized this at the beginning.  The earliest Linux release notes "
@@ -3071,11 +3610,9 @@
 #| "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=\"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>."
+"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."
 msgstr ""
 "لقد اعترف بذلك في البداية، فملاحظات إصدار 
لينكس الأولى تنصل على أن: <a href="
 "\"http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
@@ -3116,11 +3653,26 @@
 "\">#lost</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | 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;,-]
+# | {+&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.
+#, fuzzy
+#| 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;: 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."
 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;: "
 "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 "
+"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."
 msgstr ""
@@ -3140,13 +3692,32 @@
 "\">#whatgood</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | 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;,-] {+&ldquo;GNU/Linux,&rdquo;+} you will help
+# | others learn the system's true history, origin, and reason for being.  You
+# | can't correct the misnomer 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;,-] {+&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.
+#, fuzzy
+#| 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;GNU/Linux&rdquo;, you will help others learn the system's true "
+#| "history, origin, and reason for being.  You can't correct the misnomer "
+#| "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."
 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;"
-"GNU/Linux&rdquo;, you will help others learn the system's true history, "
+"GNU/Linux,&rdquo; you will help others learn the system's true history, "
 "origin, and reason for being.  You can't correct the misnomer 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 "
+"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."
 msgstr ""
@@ -3168,22 +3739,48 @@
 "\"#explain\">#explain</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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;,-]
+# | {+&ldquo;GNU/Linux,&rdquo;+} and uses your time inefficiently.
+#, fuzzy
+#| 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."
 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."
+"the system &ldquo;GNU/Linux,&rdquo; and uses your time inefficiently."
 msgstr ""
 "إذا ساعدتنا بتوضيح الأمر للآخرين فسوف 
نقدر جهدك، لكن هذه ليست الوسيلة "
 "المثالية، فليس لها نفس تأثير تسمية النظام 
&rdquo;غنو/لينكس&ldquo;، وسوف يضيع "
 "وقتك بدون أثر كبير."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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, and they may learn a correct picture of the system's origin. 
+# | But they are unlikely to repeat the explanation to others whenever they
+# | talk about the system.  They will probably just call it
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} Without particularly
+# | intending to, they will help spread the incorrect picture.
+#, fuzzy
+#| 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, and they may learn a correct picture of the system's origin.  "
+#| "But they are unlikely to repeat the explanation to others whenever they "
+#| "talk about the system.  They will probably just call it &ldquo;"
+#| "Linux&rdquo;.  Without particularly intending to, they will help spread "
+#| "the incorrect picture."
 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, "
 "and they may learn a correct picture of the system's origin.  But they are "
 "unlikely to repeat the explanation to others whenever they talk about the "
-"system.  They will probably just call it &ldquo;Linux&rdquo;.  Without "
+"system.  They will probably just call it &ldquo;Linux.&rdquo; Without "
 "particularly intending to, they will help spread the incorrect picture."
 msgstr ""
 "لن يكون ذلك ذا تأثير لأنك سوف تمل، وحتمًا 
لن ينتشر الأمر. قد يتنبه بعض الذين "
@@ -3308,9 +3905,16 @@
 "\"anchor-reference-id\">(<a href=\"#force\">#force</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | It would be wrong to force them, and we don't try.  We call the system
+# | [-&ldquo;GNU/Linux&rdquo;,-] {+&ldquo;GNU/Linux,&rdquo;+} and we ask you
+# | to do it too.
+#, fuzzy
+#| 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."
 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."
+"&ldquo;GNU/Linux,&rdquo; and we ask you to do it too."
 msgstr ""
 "إجبار الناس خطأ، ونحن لا نحاول إجبار أحد. 
نحن نسمي النظام &rdquo;غنو/"
 "لينكس&ldquo; ونطلب منك أن تفعل الأمر ذاته."
@@ -3406,9 +4010,19 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
+# | Since you failed to put something in the GNU GPL to require people to call
+# | the system [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} you deserve what
+# | happened; why are you complaining now? <span
+# | class=\"anchor-reference-id\">(<a href=\"#deserve\">#deserve</a>)</span>
+#, fuzzy
+#| 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 "
+#| "complaining now? <span class=\"anchor-reference-id\">(<a href=\"#deserve"
+#| "\">#deserve</a>)</span>"
 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 "
+"the system &ldquo;GNU,&rdquo; you deserve what happened; why are you "
 "complaining now? <span class=\"anchor-reference-id\">(<a href=\"#deserve"
 "\">#deserve</a>)</span>"
 msgstr ""
@@ -3457,8 +4071,17 @@
 "معظم الناس أن البرمجيات الاحتكارية مشروعة 
ومقبولة."
 
 #. type: Content of: <div><dl><dt>
+# | Since many people call it [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} doesn't that make it right? <span
+# | class=\"anchor-reference-id\">(<a
+# | href=\"#somanyright\">#somanyright</a>)</span>
+#, fuzzy
+#| 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>"
 msgid ""
-"Since many people call it &ldquo;Linux&rdquo;, doesn't that make it right? "
+"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 ""
@@ -3480,7 +4103,7 @@
 #. 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 "
+"&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."
 msgstr ""

Index: po/gnu-linux-faq.ca-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.ca-diff.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- po/gnu-linux-faq.ca-diff.html       31 Aug 2021 10:37:07 -0000      1.24
+++ po/gnu-linux-faq.ca-diff.html       2 Nov 2021 14:41:50 -0000       1.25
@@ -12,30 +12,35 @@
 <body><pre>
 &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;!-- This page is derived from /server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="gnulinux" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</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="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&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"&gt;by</em></ins></span> Richard <span 
class="removed"><del><strong>Stallman&lt;/h2&gt;
+&lt;address class="byline"&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;</em></ins></span>
 
-&lt;div class="announcement"&gt;
+&lt;div <span class="removed"><del><strong>class="announcement"&gt;
   &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 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&gt;</strong></del></span> <span 
class="inserted"><ins><em>class="introduction"&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.
+system that many others call just <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> they ask many 
questions.
 Here are common questions, and our answers.&lt;/p&gt;
+<span class="inserted"><ins><em>&lt;/div&gt;
 
-<span class="inserted"><ins><em>&lt;div class="toc"&gt;
+&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;
@@ -130,8 +135,8 @@
 
 &lt;li&gt;&lt;a <span class="removed"><del><strong>href="#trademarkfee" 
id="TOCtrademarkfee"&gt;I</strong></del></span> <span 
class="inserted"><ins><em>href="#trademarkfee"&gt;I</em></ins></span> 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
-    wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to
+    that would also apply if I say <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux.&rdquo;</em></ins></span>  Is 
it
+    wrong if I use &ldquo;GNU&rdquo; without <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> to
     save the fee?&lt;/a&gt;&lt;/li&gt;
 
 &lt;li&gt;&lt;a <span class="removed"><del><strong>href="#many" 
id="TOCmany"&gt;Many</strong></del></span> <span 
class="inserted"><ins><em>href="#many"&gt;Many</em></ins></span> other projects 
contributed to the
@@ -169,7 +174,7 @@
 rather than &ldquo;Linux/GNU&rdquo;?&lt;/a&gt;&lt;/li&gt;
 
 &lt;li&gt;&lt;a <span class="removed"><del><strong>href="#distronames0" 
id="TOCdistronames0"&gt;My</strong></del></span> <span 
class="inserted"><ins><em>href="#distronames0"&gt;My</em></ins></span> distro's 
developers call it
-    &ldquo;Foobar Linux&rdquo;, but that doesn't say anything about
+    &ldquo;Foobar <span 
class="removed"><del><strong>Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>Linux,&rdquo;</em></ins></span> but that doesn't say 
anything about
     what the system consists of.  Why shouldn't they call it whatever
     they like?&lt;/a&gt;&lt;/li&gt;
 
@@ -281,14 +286,16 @@
 
 &lt;li&gt;&lt;a <span class="removed"><del><strong>href="#deserve" 
id="TOCdeserve"&gt;Since</strong></del></span> <span 
class="inserted"><ins><em>href="#deserve"&gt;Since</em></ins></span> 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
+    <span class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span>
+    <span class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> you 
deserve what happened; why are you
     complaining now?&lt;/a&gt;&lt;/li&gt;
 
 &lt;li&gt;&lt;a <span class="removed"><del><strong>href="#contradict" 
id="TOCcontradict"&gt;Wouldn't</strong></del></span> <span 
class="inserted"><ins><em>href="#contradict"&gt;Wouldn't</em></ins></span> you 
be better off
     not contradicting what so many people believe?&lt;/a&gt;&lt;/li&gt;
 
 &lt;li&gt;&lt;a <span class="removed"><del><strong>href="#somanyright" 
id="TOCsomanyright"&gt;Since</strong></del></span> <span 
class="inserted"><ins><em>href="#somanyright"&gt;Since</em></ins></span> many 
people call it
-    &ldquo;Linux&rdquo;, doesn't that make it right?&lt;/a&gt;&lt;/li&gt;
+    <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span>
+    <span class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> 
doesn't that make it right?&lt;/a&gt;&lt;/li&gt;
 
 &lt;li&gt;&lt;a <span class="removed"><del><strong>href="#knownname" 
id="TOCknownname"&gt;Isn't</strong></del></span> <span 
class="inserted"><ins><em>href="#knownname"&gt;Isn't</em></ins></span> it 
better to call the
     system by the name most users already know?&lt;/a&gt;&lt;/li&gt;
@@ -377,7 +384,7 @@
 the system's history was such as to fit that name.  For
 instance, they often believe its development was started by Linus
 Torvalds in 1991.  This false picture tends to reinforce the idea
-that the system should be called &ldquo;Linux&rdquo;.&lt;/p&gt;
+that the system should be called <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.&lt;/p&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;&lt;/p&gt;</em></ins></span>
 &lt;p&gt;
 Many of the questions in this file represent people's attempts to
 justify the name they are accustomed to using.&lt;/p&gt;
@@ -388,14 +395,16 @@
 &lt;dd&gt;
 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.
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> the 
name its developer chose.
 &lt;p&gt;
-When people call the whole system &ldquo;Linux&rdquo;, as a consequence
+When people call the whole system <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> as a 
consequence
 they call the whole system by the same name as the kernel.
 This causes many kinds of confusion, because only experts can tell
 whether a statement is about the kernel or the whole system.
-By calling the whole system &ldquo;GNU/Linux&rdquo;, and calling the kernel
-&ldquo;Linux&rdquo;, you avoid the ambiguity.&lt;/p&gt;
+By calling the whole 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> and 
calling the kernel
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> you 
avoid the ambiguity.&lt;/p&gt;
 &lt;/dd&gt;
 
 &lt;dt id="linuxalone"&gt;Would Linux have
@@ -425,7 +434,7 @@
     community if you did not divide people with this request? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#divide"&gt;#divide&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing people. 
 We
+When we ask people to say <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 
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.
 &lt;p&gt;
@@ -453,7 +462,8 @@
 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 freedom are more likely to call the system
-&ldquo;GNU/Linux&rdquo;, and people who learn that the system is 
&ldquo;GNU/Linux&rdquo; are
+<span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> and 
people who learn that the system is &ldquo;GNU/Linux&rdquo; are
 more likely to pay attention to our philosophical arguments for
 freedom and community (which is why the choice of name for the system
 makes a real difference for society).  However, the disagreement would
@@ -482,7 +492,7 @@
 
 &lt;dd&gt;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 system do not mention the name &ldquo;GNU&rdquo;, or the 
ideals
+articles about the system do not mention the name <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> or the ideals
 that GNU stands for.  &lt;a
 href="/gnu/gnu-users-never-heard-of-gnu.html"&gt;GNU Users Who Have Never
 Heard of GNU&lt;/a&gt; explains further.
@@ -490,7 +500,7 @@
 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 GNU is.  For instance, many think it is a collection
-of &lt;a href="#tools"&gt;&ldquo;tools&rdquo;&lt;/a&gt;, or a project to 
develop tools.&lt;/p&gt;
+of <span class="removed"><del><strong>&lt;a 
href="#tools"&gt;&ldquo;tools&rdquo;&lt;/a&gt;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;&lt;a 
href="#tools"&gt;tools&lt;/a&gt;,&rdquo;</em></ins></span> or a project to 
develop tools.&lt;/p&gt;
 &lt;p&gt;
 The wording of this question, which is typical, illustrates another
 common misconception.  To speak of &ldquo;GNU's role&rdquo; in developing
@@ -506,8 +516,9 @@
 <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
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> that it 
was started by Linus Torvalds, and that
+it was intended to be &ldquo;open <span 
class="removed"><del><strong>source&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>source.&rdquo;</em></ins></span>  If you don't tell
 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;
 
@@ -536,10 +547,10 @@
 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 that GNU is the name of a collection of programs&mdash;often they
-say &ldquo;programming tools&rdquo;, since some of our programming tools became
+say &ldquo;programming <span 
class="removed"><del><strong>tools&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>tools,&rdquo;</em></ins></span> since some of our 
programming tools became
 popular on their own.  The idea that &ldquo;GNU&rdquo; is the name of an 
operating
 system is hard to fit into a conceptual framework in which that
-operating system is labeled &ldquo;Linux&rdquo;.
+operating system is labeled <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>
 &lt;p&gt;
 The GNU Project was named after the GNU operating system&mdash;it's the project
 to develop the GNU system.  (See &lt;a
@@ -568,7 +579,7 @@
 programs.&lt;/p&gt;
 &lt;p&gt;
 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.  The
+mean <span 
class="removed"><del><strong>&ldquo;kernel&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;kernel.&rdquo;</em></ins></span>  Both uses of 
the term go back many years.  The
 use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is found in 
a number of
 textbooks on system design, going back to the 80s.  At the same time,
 in the 80s, the &ldquo;Unix operating system&rdquo; was understood to include 
all
@@ -579,12 +590,12 @@
 Most of the time when people speak of the &ldquo;Linux operating system&rdquo;
 they are using &ldquo;operating system&rdquo; in the same sense we use: they 
mean
 the whole collection of programs.  If that's what you are referring
-to, please call it &ldquo;GNU/Linux&rdquo;.  If you mean just the kernel, then
+to, please call it <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux.&rdquo;</em></ins></span>  If 
you mean just the kernel, then
 &ldquo;Linux&rdquo; is the right name for it, but please say 
&ldquo;kernel&rdquo; also to
 avoid ambiguity about which body of software you mean.&lt;/p&gt;
 &lt;p&gt;
 If you prefer to use some other term such as &ldquo;system distribution&rdquo; 
for
-the entire collection of programs, instead of &ldquo;operating system&rdquo;,
+the entire collection of programs, instead of &ldquo;operating <span 
class="removed"><del><strong>system&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>system,&rdquo;</em></ins></span>
 that's fine.  Then you would talk about GNU/Linux system
 distributions.&lt;/p&gt;
 &lt;/dd&gt;
@@ -636,8 +647,8 @@
 &lt;dd&gt;
 The people who argue that way for calling the system
 &ldquo;Linux&rdquo; are using a double standard.  An operating system
-requires compilers, editors, window systems, libraries, and much more
-&mdash; hundreds of programs, even to match what BSD systems included
+requires compilers, editors, window systems, libraries, and much
+more&mdash;hundreds of programs, even to match what BSD systems included
 in 1983.  Since Torvalds didn't develop any of those, how can the
 system be &ldquo;Linux&rdquo;?
 
@@ -658,7 +669,8 @@
 &lt;dd&gt;
 Many &lt;a href="/distros/distros.html"&gt; packaged and installable
 versions of GNU&lt;/a&gt; are available.  None of them is called simply
-&ldquo;GNU&rdquo;, but GNU is what they basically are.
+<span class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> but GNU 
is what they basically are.
 
 &lt;p&gt;
 We expected to release the GNU system packaged for installation, but
@@ -685,7 +697,8 @@
 
 &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.
+<span class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> but that 
doesn't alter what kind of thing GNU is.
 GNU is an operating system.&lt;/p&gt;
 &lt;/dd&gt;
 
@@ -695,11 +708,11 @@
 
 &lt;dd&gt;
 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 system 
is
+than the misuse of the name <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  Normally an 
operating system is
 developed as a single unified project, and the developers choose a
 name for the system as a whole.  The kernel usually does not have a
 name of its own&mdash;instead, people say &ldquo;the kernel of 
such-and-such&rdquo; or
-&ldquo;the such-and-such kernel&rdquo;.
+&ldquo;the such-and-such <span 
class="removed"><del><strong>kernel&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>kernel.&rdquo;</em></ins></span>
 &lt;p&gt;
 Because those two constructions are used synonymously, the expression
 &ldquo;the Linux kernel&rdquo; can easily be misunderstood as meaning 
&ldquo;the kernel
@@ -724,11 +737,11 @@
     How about recommending a shorter name? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#long"&gt;#long&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-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;
+For a while we tried the name <span 
class="removed"><del><strong>&ldquo;LiGNUx&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;LiGNUx,&rdquo;</em></ins></span> which 
combines the words &ldquo;GNU&rdquo;
+and <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  The reaction 
was very bad.  People accept &ldquo;GNU/Linux&rdquo;
 much better.
 &lt;p&gt;
-The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but
+The shortest legitimate name for this system is <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> but
 we call it &ldquo;GNU/Linux&rdquo; &lt;a href="#justgnu"&gt; for the reasons
 given below&lt;/a&gt;.&lt;/p&gt;
 &lt;/dd&gt;
@@ -753,7 +766,7 @@
     &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#long2"&gt;#long2&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-&lt;p&gt;It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you
+&lt;p&gt;It only takes a second to say or type <span 
class="removed"><del><strong>&ldquo;GNU/&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU/.&rdquo;</em></ins></span>  If you
 appreciate the system that we developed, can't you take one second
 to recognize our work?&lt;/p&gt;
 &lt;/dd&gt;
@@ -804,9 +817,9 @@
 honorably and openly, rather than by trying to cut him out of the
 credit for his contribution to the system.&lt;/li&gt;
 &lt;li&gt;
-Since many people know of the system as &ldquo;Linux&rdquo;, if we say 
&ldquo;GNU&rdquo; they
+Since many people know of the system as <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> if we say 
&ldquo;GNU&rdquo; they
 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
+say <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> they 
can make a connection to what they have heard
 about.&lt;/li&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>
@@ -814,16 +827,16 @@
 
 &lt;dt id="trademarkfee"&gt;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 wrong if I use 
&ldquo;GNU&rdquo;
-    without &ldquo;Linux&rdquo;, to save the fee? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#trademarkfee"&gt;#trademarkfee&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
+    would also apply if I say <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux.&rdquo;</em></ins></span>  Is 
it wrong if I use &ldquo;GNU&rdquo;
+    without <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> to save the 
fee? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#trademarkfee"&gt;#trademarkfee&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 &lt;dd&gt;
 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.
 &lt;p&gt;
-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.&lt;/p&gt;
+So if you want to refer to the system simply as <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> to avoid paying
+the fee for calling it <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> we won't 
criticize you.&lt;/p&gt;
 &lt;/dd&gt;
 
 &lt;dt id="many"&gt;Many other projects contributed to
@@ -853,7 +866,7 @@
 &lt;p&gt;
 Different threshold levels would lead to different choices of name for
 the system.  But one name that cannot result from concerns of fairness
-and giving credit, not for any possible threshold level, is 
&ldquo;Linux&rdquo;.
+and giving credit, not for any possible threshold level, is <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>
 It can't be fair to give all the credit to one secondary contribution
 (Linux) while omitting the principal contribution (GNU).&lt;/p&gt;
 &lt;/dd&gt;
@@ -867,7 +880,7 @@
 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
+by calling the system &ldquo;GNU/systemd/Linux,&rdquo; there is nothing
 wrong with doing so.&lt;/p&gt;
 &lt;/dd&gt;
 
@@ -892,7 +905,7 @@
 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 the same argument would apply even more
-strongly to calling it &ldquo;Linux&rdquo;.
+strongly to calling it <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>
 
 &lt;p&gt;
 GNU is a small fraction of the system nowadays, and Linux is an
@@ -929,7 +942,7 @@
 
 &lt;dd&gt;
 Following the rules of English, in the construction &ldquo;GNU Linux&rdquo; the
-word &ldquo;GNU&rdquo; modifies &ldquo;Linux&rdquo;.  This can mean either 
&ldquo;GNU's version of
+word &ldquo;GNU&rdquo; modifies <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  This can mean 
either &ldquo;GNU's version of
 Linux&rdquo; or &ldquo;Linux, which is a GNU package.&rdquo;  Neither of those 
meanings
 fits the situation at hand.
 &lt;p&gt;
@@ -942,23 +955,24 @@
 The free GNU/Linux distros do have
 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,
+firmware <span 
class="removed"><del><strong>&ldquo;blobs&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;blobs.&rdquo;</em></ins></span>  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;
 &lt;p&gt;
 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 &ldquo;combination.&rdquo; (Think of
-&ldquo;Input/Output&rdquo;.)  This system is the combination of GNU
-and Linux; hence, &ldquo;GNU/Linux&rdquo;.&lt;/p&gt;
+<span 
class="removed"><del><strong>&ldquo;Input/Output&rdquo;.)</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Input/Output.&rdquo;)</em></ins></span> 
 This system is the combination of GNU
+and Linux; hence, <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;
-There are other ways to express &ldquo;combination&rdquo;.  If you
+There are other ways to express <span 
class="removed"><del><strong>&ldquo;combination&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;combination.&rdquo;</em></ins></span>  
If you
 think that a plus-sign is clearer, please use that.  In French, a
-hyphen is clear: &ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes
-say &ldquo;GNU con Linux&rdquo;.&lt;/p&gt;
+hyphen is clear: <span 
class="removed"><del><strong>&ldquo;GNU-Linux&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU-Linux.&rdquo;</em></ins></span>  In 
Spanish, we sometimes
+say &ldquo;GNU con <span 
class="removed"><del><strong>Linux&rdquo;.&lt;/p&gt;</strong></del></span> 
<span class="inserted"><ins><em>Linux.&rdquo;&lt;/p&gt;
 &lt;/dd&gt;
 
-&lt;dt <span class="inserted"><ins><em>id="pronounce"&gt;How is the name 
&ldquo;GNU/Linux&rdquo;
+&lt;dt id="pronounce"&gt;How is the name &ldquo;GNU/Linux&rdquo;
 pronounced? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#pronounce"&gt;#pronounce&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 &lt;dd&gt;
 &lt;p&gt;
@@ -974,16 +988,16 @@
 &lt;dd&gt;
 &lt;p&gt;
 Following the rules of English, in the construction &ldquo;GNU
-Emacs&rdquo; the word &ldquo;GNU&rdquo; modifies &ldquo;Emacs&rdquo;.
+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.&lt;/p&gt;
 &lt;p&gt;
 &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.&lt;/p&gt;
+program, so &ldquo;GNU/Emacs&rdquo; is the wrong way to refer to 
it.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
-&lt;dt</em></ins></span> id="whyorder"&gt;Why &ldquo;GNU/Linux&rdquo; rather
+&lt;dt id="whyorder"&gt;Why &ldquo;GNU/Linux&rdquo; rather
 than &ldquo;Linux/GNU&rdquo;? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#whyorder"&gt;#whyorder&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
@@ -995,13 +1009,13 @@
 In addition, &ldquo;GNU/Linux&rdquo; fits the fact that Linux is the
 lowest level of the system and GNU fills technically higher 
levels.&lt;/p&gt;</em></ins></span>
 &lt;p&gt;
-However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a 
lot
+However, if you prefer to call the system <span 
class="removed"><del><strong>&ldquo;Linux/GNU&rdquo;,</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;Linux/GNU,&rdquo;</em></ins></span> 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.&lt;/p&gt;
 &lt;/dd&gt;
 
 &lt;dt id="distronames0"&gt;My distro's developers call it
-    &ldquo;Foobar Linux&rdquo;, but that doesn't say anything about
+    &ldquo;Foobar <span 
class="removed"><del><strong>Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>Linux,&rdquo;</em></ins></span> but that doesn't say 
anything about
     what the system consists of.  Why shouldn't they call it whatever
     they like? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#distronames0"&gt;#distronames0&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 &lt;dd&gt;
@@ -1030,9 +1044,10 @@
     anything but &ldquo;Foobar Linux&rdquo;? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#distronames1"&gt;#distronames1&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;&lt;p&gt;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 proper for you to correct the misinformation by
-calling it &ldquo;Foobar GNU/Linux&rdquo;.&lt;/p&gt;&lt;/dd&gt;
+to <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> and call their 
version of it &ldquo;Foobar
+<span class="removed"><del><strong>Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>Linux,&rdquo;</em></ins></span> it's proper 
for you to correct the misinformation by
+calling it &ldquo;Foobar <span 
class="removed"><del><strong>GNU/Linux&rdquo;.&lt;/p&gt;&lt;/dd&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>GNU/Linux.&rdquo;&lt;/p&gt;&lt;/dd&gt;</em></ins></span>
 
 &lt;dt id="companies"&gt;Wouldn't it be more
     effective to ask companies such as Mandrake, Red Hat and IBM to
@@ -1053,7 +1068,7 @@
 just because the road isn't easy.  You may not have as much 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;.&lt;/p&gt;
+more profit calling it <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;/dd&gt;
 
 &lt;dt id="reserve"&gt;Wouldn't it be better to
@@ -1064,7 +1079,7 @@
 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 <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
+of <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  Many 
&ldquo;Linux&rdquo; User Groups make it part of their mission to
 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 <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span>
@@ -1087,7 +1102,8 @@
 With this understanding, they can start to recognize the distributions
 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;
+<span 
class="removed"><del><strong>Linux&rdquo;.&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>Linux.&rdquo;&lt;/p&gt;</em></ins></span>
 &lt;p&gt;
 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
@@ -1127,8 +1143,9 @@
 GNU Hurd to work, we might have done that.  (Alas, that is hindsight.)
 &lt;p&gt;
 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
-and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and we don't
+<span class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> that 
would be somewhat like making a version of the GNU system
+and labeling it <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  That wasn't 
right, and we don't
 want to act like that.&lt;/p&gt;
 &lt;/dd&gt;
 
@@ -1147,7 +1164,7 @@
 &lt;p&gt;
 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 with the GNU Project because he was a &ldquo;Linux user&rdquo;.
+about working with the GNU Project because he was a &ldquo;Linux <span 
class="removed"><del><strong>user&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>user.&rdquo;</em></ins></span>
 That came as a shock, because the people who ported GNU packages to
 other systems had generally wanted to work with us to get their
 changes installed.  Yet these people, developing a system that was
@@ -1155,7 +1172,7 @@
 only) group that was unwilling to work with us.&lt;/p&gt;
 &lt;p&gt;
 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
+version of the GNU system <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> and that this 
confusion was
 obstructing our work.  Asking you to call the system &ldquo;GNU/Linux&rdquo; is
 our response to that problem, and to the other problems caused by the
 &ldquo;Linux&rdquo; misnomer.&lt;/p&gt;
@@ -1174,8 +1191,8 @@
     convention be applied to all programs that are GPL'ed? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#allgpled"&gt;#allgpled&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-We never refer to individual programs as 
&ldquo;GNU/&lt;i&gt;name&lt;/i&gt;&rdquo;.  When a program
-is a GNU package, we may call it &ldquo;GNU &lt;i&gt;name&lt;/i&gt;&rdquo;.
+We never refer to individual programs as <span 
class="removed"><del><strong>&ldquo;GNU/&lt;i&gt;name&lt;/i&gt;&rdquo;.</strong></del></span>
 <span 
class="inserted"><ins><em>&ldquo;GNU/&lt;i&gt;name&lt;/i&gt;.&rdquo;</em></ins></span>
  When a program
+is a GNU package, we may call it &ldquo;GNU <span 
class="removed"><del><strong>&lt;i&gt;name&lt;/i&gt;&rdquo;.</strong></del></span>
 <span 
class="inserted"><ins><em>&lt;i&gt;name&lt;/i&gt;.&rdquo;</em></ins></span>
 &lt;p&gt;
 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
@@ -1228,15 +1245,17 @@
 &lt;p&gt;
 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.  The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not
-Unix&rdquo;, is a humorous way of giving credit to Unix for this,
+Unix.  The name <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> which stands for 
&ldquo;GNU's Not
+<span class="removed"><del><strong>Unix&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>Unix,&rdquo;</em></ins></span> is a humorous 
way of giving credit to Unix for this,
 following a hacker tradition of recursive acronyms that started in the
 70s.&lt;/p&gt;
 &lt;p&gt;
 The first such recursive acronym was TINT, &ldquo;TINT Is Not
-TECO&rdquo;.  The author of TINT wrote another implementation of TECO
+<span class="removed"><del><strong>TECO&rdquo;.</strong></del></span>
+<span class="inserted"><ins><em>TECO.&rdquo;</em></ins></span>  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;&lt;em&gt;somethingorother&lt;/em&gt; 
TECO&rdquo;, he
+calling it by a dull name like &ldquo;&lt;em&gt;somethingorother&lt;/em&gt; 
<span class="removed"><del><strong>TECO&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>TECO,&rdquo;</em></ins></span> he
 thought of a clever amusing name.  (That's what hacking
 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;
@@ -1246,7 +1265,7 @@
 program that was similar to some existing program (let's imagine its
 name was &ldquo;Klever&rdquo;), you could give it a recursive acronym name, 
such
 as &ldquo;MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo;  In this same 
spirit we called our
-replacement for Unix &ldquo;GNU's Not Unix&rdquo;.&lt;/p&gt;
+replacement for Unix &ldquo;GNU's Not <span 
class="removed"><del><strong>Unix&rdquo;.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>Unix.&rdquo;&lt;/p&gt;</em></ins></span>
 &lt;p&gt;
 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
@@ -1254,7 +1273,8 @@
 threatened to sue anyone giving AT&amp;T credit in that way.  This is
 why each of the various modified versions of Unix (all proprietary,
 like Unix) had a completely different name that didn't include
-&ldquo;Unix&rdquo;.&lt;/p&gt;
+<span 
class="removed"><del><strong>&ldquo;Unix&rdquo;.&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Unix.&rdquo;&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="bsd"&gt;Should we say &ldquo;GNU/BSD&rdquo;
@@ -1285,7 +1305,7 @@
 why the name &ldquo;GNU/Linux&rdquo; is appropriate for it.&lt;/p&gt;
 &lt;p&gt;
 There is a version of GNU which uses the kernel from NetBSD.  Its
-developers call it &ldquo;Debian GNU/NetBSD&rdquo;, but 
&ldquo;GNU/kernelofNetBSD&rdquo;
+developers call it &ldquo;Debian <span 
class="removed"><del><strong>GNU/NetBSD&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>GNU/NetBSD,&rdquo;</em></ins></span> but 
&ldquo;GNU/kernelofNetBSD&rdquo;
 would be more accurate, since NetBSD is an entire system, not just
 the kernel.  This is not a BSD system, since most of the system
 is the same as the GNU/Linux system.&lt;/p&gt;
@@ -1296,7 +1316,7 @@
 
 &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
+Not in the same sense that we mean by <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux.&rdquo;</em></ins></span>  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,
@@ -1347,7 +1367,7 @@
 the two have very little code in common.  In fact, the only thing they
 have in common is Linux.&lt;/p&gt;
 &lt;p&gt;
-If you call the whole GNU/Linux system &ldquo;Linux&rdquo;,
+If you call the whole GNU/Linux system <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span>
 you will find it necessary to say things like, &ldquo;Android contains
 Linux, but it isn't Linux, because it doesn't have the usual Linux
 [sic] libraries and utilities [meaning the GNU system].&rdquo;&lt;/p&gt;
@@ -1368,7 +1388,7 @@
 people will</em></ins></span> not <span class="inserted"><ins><em>understand 
the intended meaning.
 &lt;p&gt;
 The public will find it very strange to speak of using Android as
-&ldquo;using Linux&rdquo;.  It's like having</em></ins></span> a <span 
class="removed"><del><strong>meaningful question because</strong></del></span> 
<span class="inserted"><ins><em>conversation, then
+&ldquo;using Linux.&rdquo;  It's like having</em></ins></span> a <span 
class="removed"><del><strong>meaningful question because</strong></del></span> 
<span class="inserted"><ins><em>conversation, then
 saying you were conversing with</em></ins></span> the <span 
class="removed"><del><strong>GNU
 system does not have precise boundaries.</strong></del></span> <span 
class="inserted"><ins><em>person's intestines or the
 person's circulatory system.&lt;/p&gt;</em></ins></span>
@@ -1378,7 +1398,7 @@
 Linux&rdquo; when it's really GNU/Linux,</em></ins></span> by <span 
class="removed"><del><strong>a community.  It includes far
 more than just</strong></del></span> <span class="inserted"><ins><em>way 
of</em></ins></span> the <span class="removed"><del><strong>GNU software 
packages (of which we have</strong></del></span> <span 
class="inserted"><ins><em>usual
 misunderstanding: thinking of the whole system as
-&ldquo;Linux&rdquo;.&lt;/p&gt;
+&ldquo;Linux.&rdquo;&lt;/p&gt;
 &lt;p&gt;
 Use of Android and use of GNU/Linux are totally different, as
 different as driving</em></ins></span> a <span 
class="removed"><del><strong>specific
@@ -1388,8 +1408,8 @@
 fact</em></ins></span> that <span class="removed"><del><strong>yields
 GNU/Linux.</strong></del></span> <span class="inserted"><ins><em>a car and a 
bicycle both have a structure of metal is
 irrelevant to using those two.</em></ins></span>  If you <span 
class="removed"><del><strong>use part</strong></del></span> <span 
class="inserted"><ins><em>wish to talk about using cars
-and bikes, you wouldn't speak</em></ins></span> of <span 
class="inserted"><ins><em>&ldquo;riding metal objects&rdquo;
-&mdash; not unless you're playing games with</em></ins></span> the <span 
class="removed"><del><strong>GNU system</strong></del></span> <span 
class="inserted"><ins><em>reader.  You would
+and bikes, you wouldn't speak</em></ins></span> of <span 
class="inserted"><ins><em>&ldquo;riding metal objects&rdquo;&mdash;not
+unless you're playing games with</em></ins></span> the <span 
class="removed"><del><strong>GNU system</strong></del></span> <span 
class="inserted"><ins><em>reader.  You would
 say, &ldquo;using cars</em></ins></span> and <span 
class="removed"><del><strong>omit part, there is
 no meaningful</strong></del></span> <span 
class="inserted"><ins><em>bikes.&rdquo; Likewise, the clear</em></ins></span> 
way to <span class="removed"><del><strong>say &ldquo;how much&rdquo; you 
used.&lt;/p&gt;
 &lt;p&gt;
@@ -1442,7 +1462,7 @@
 <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
+or label it as <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU.&rdquo;</em></ins></span>  When we talk 
about the whole
 system, the name &ldquo;GNU/Linux&rdquo; gives him a share of the
 <span class="removed"><del><strong>credit.</strong></del></span>
 <span class="inserted"><ins><em>credit.&lt;/p&gt;</em></ins></span>
@@ -1453,13 +1473,17 @@
     agree that Linux is just the kernel? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#linusagreed"&gt;#linusagreed&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-&lt;p&gt;He recognized this at the beginning.  The earliest Linux release notes
+&lt;p&gt;He recognized this at the beginning.  The <span 
class="inserted"><ins><em>&lt;a
+href="https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;</em></ins></span>
+earliest Linux release <span class="removed"><del><strong>notes
 said, &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>
-&ldquo;Most of the tools used with linux are GNU software and are under the
+href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;
+&ldquo;Most</strong></del></span> <span 
class="inserted"><ins><em>notes&lt;/a&gt; said:&lt;/p&gt;
+&lt;blockquote&gt;&lt;p&gt;
+Most</em></ins></span> 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;
+for more <span 
class="removed"><del><strong>info&rdquo;&lt;/a&gt;.&lt;/p&gt;</strong></del></span>
 <span class="inserted"><ins><em>info.
+&lt;/p&gt;&lt;/blockquote&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="finishhurd"&gt;Why not finish the GNU Hurd kernel, release the GNU 
system
@@ -1487,7 +1511,7 @@
 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
+name to use.  You can't make others say <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> but
 you can decide to call the system &ldquo;GNU/Linux&rdquo;
 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;
@@ -1500,10 +1524,10 @@
 <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
+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> you 
will help others learn the system's true
 history, origin, and reason for being.  You can't correct the misnomer
 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
+only a few hundred people see you use the term <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> you 
will
 have educated a substantial number of people with very little work.
 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;
@@ -1515,14 +1539,15 @@
 &lt;dd&gt;
 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.
+calling 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> and 
uses your time inefficiently.
 &lt;p&gt;
 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, and they may learn a correct picture of the system's
 origin.  But they are unlikely to repeat the explanation to others
 whenever they talk about the system.  They will probably just call it
-&ldquo;Linux&rdquo;.  Without particularly intending to, they will help spread 
the
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  
Without particularly intending to, they will help spread the
 incorrect picture.&lt;/p&gt;
 &lt;p&gt;
 It is inefficient because it takes a lot more time.  Saying and
@@ -1588,7 +1613,8 @@
 &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 <span 
class="removed"><del><strong>too.</strong></del></span> <span 
class="inserted"><ins><em>too.&lt;/p&gt;</em></ins></span>
+<span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> 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
@@ -1632,7 +1658,7 @@
 &lt;/dd&gt;
 
 &lt;dt id="deserve"&gt;Since you failed to put
-    something in the GNU GPL to require people to call the system 
&ldquo;GNU&rdquo;,
+    something in the GNU GPL to require people to call the system <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span>
     you deserve what happened; why are you complaining now? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#deserve"&gt;#deserve&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
@@ -1658,7 +1684,7 @@
 &lt;/dd&gt;
 
 &lt;dt id="somanyright"&gt;Since many people call
-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;
+it <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> 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;
 <span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
@@ -1671,7 +1697,7 @@
 &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
+includes <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> 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 <span 
class="removed"><del><strong>understand.</strong></del></span> <span 
class="inserted"><ins><em>understand.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
@@ -1752,7 +1778,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/08/31 10:37:07 $
+$Date: 2021/11/02 14:41:50 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: po/gnu-linux-faq.ca.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.ca.po,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -b -r1.98 -r1.99
--- po/gnu-linux-faq.ca.po      31 Aug 2021 10:37:07 -0000      1.98
+++ po/gnu-linux-faq.ca.po      2 Nov 2021 14:41:50 -0000       1.99
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnu-linux-faq\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-31 10:27+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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"
@@ -35,10 +35,19 @@
 msgid "by Richard Stallman"
 msgstr "per Richard Stallman"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+# | When people see that we use and recommend the name GNU/Linux for a system
+# | that many others call just [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} they ask many questions.  Here are common
+# | questions, and our answers.
+#, fuzzy
+#| 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."
 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.  "
+"that many others call just &ldquo;Linux,&rdquo; they ask many questions.  "
 "Here are common questions, and our answers."
 msgstr ""
 "Quan algunes persones veuen que emprem i recomanem el nom GNU/Linux per un "
@@ -250,11 +259,22 @@
 "faltar a la veritat anomenar al sistema simplement «GNU»?</a>"
 
 #. type: Content of: <div><div><ul><li>
+# | <a href=\"#trademarkfee\">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;.-] {+&ldquo;GNU/Linux.&rdquo;+} Is it
+# | wrong if I use &ldquo;GNU&rdquo; without [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} to save the fee?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#trademarkfee\">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 wrong if I use &ldquo;GNU&rdquo; without "
+#| "&ldquo;Linux&rdquo;, to save the fee?</a>"
 msgid ""
 "<a href=\"#trademarkfee\">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 wrong if I use &ldquo;GNU&rdquo; without "
-"&ldquo;Linux&rdquo;, to save the fee?</a>"
+"&ldquo;GNU/Linux.&rdquo; Is it wrong if I use &ldquo;GNU&rdquo; without "
+"&ldquo;Linux,&rdquo; to save the fee?</a>"
 msgstr ""
 "<a href=\"#trademarkfee\">Hauria que pagar un canon si utilitze «Linux» en "
 "el nom d'un producte i hauria també de pagar-lo si utilitze el nom «GNU/"
@@ -361,10 +381,19 @@
 msgstr "<a href=\"#whyorder\">Per què «GNU/Linux» en lloc de 
«Linux/GNU»?</a>"
 
 #. type: Content of: <div><div><ul><li>
-msgid ""
-"<a href=\"#distronames0\">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 whatever they like?</a>"
+# | <a href=\"#distronames0\">My distro's developers call it &ldquo;Foobar
+# | [-Linux&rdquo;,-] {+Linux,&rdquo;+} but that doesn't say anything about
+# | what the system consists of.  Why shouldn't they call it whatever they
+# | like?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#distronames0\">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 whatever they like?</a>"
+msgid ""
+"<a href=\"#distronames0\">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 whatever they like?</a>"
 msgstr ""
 "<a href=\"#distronames0\">Els desenvolupadors de la meva distribució "
 "l'anomenen »Foobar Linux», però no expliquen en què consisteix el 
sistema. "
@@ -615,9 +644,18 @@
 "requerir a la gent a anomenar al sistema «GNU»?</a>"
 
 #. type: Content of: <div><div><ul><li>
+# | <a href=\"#deserve\">Since you failed to put something in the GNU GPL to
+# | require people to call the system [-&ldquo;GNU&rdquo;,-]
+# | {+&ldquo;GNU,&rdquo;+} you deserve what happened; why are you complaining
+# | now?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#deserve\">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 complaining now?</a>"
 msgid ""
 "<a href=\"#deserve\">Since you failed to put something in the GNU GPL to "
-"require people to call the system &ldquo;GNU&rdquo;, you deserve what "
+"require people to call the system &ldquo;GNU,&rdquo; you deserve what "
 "happened; why are you complaining now?</a>"
 msgstr ""
 "<a href=\"#deserve\">Ja que no vau afegir cap clàusula a la GNU GPL per "
@@ -633,8 +671,15 @@
 "</a>"
 
 #. type: Content of: <div><div><ul><li>
+# | <a href=\"#somanyright\">Since many people call it
+# | [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} doesn't that make it
+# | right?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#somanyright\">Since many people call it &ldquo;Linux&rdquo;, "
+#| "doesn't that make it right?</a>"
 msgid ""
-"<a href=\"#somanyright\">Since many people call it &ldquo;Linux&rdquo;, "
+"<a href=\"#somanyright\">Since many people call it &ldquo;Linux,&rdquo; "
 "doesn't that make it right?</a>"
 msgstr ""
 "<a href=\"#somanyright\">Atès que molta gent l'anomena «Linux», no el "
@@ -812,6 +857,24 @@
 "Per aquells temps, la confusió ja s'havia estès."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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 it must be right.  The name &ldquo;Linux&rdquo; also spreads a
+# | false picture of the system's origin, because people tend to suppose that
+# | the system's history was such as to fit that name.  For instance, they
+# | often believe its development was started by Linus Torvalds in 1991.  This
+# | false picture tends to reinforce the idea that the system should be called
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+}
+#, fuzzy
+#| 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 it must be right.  The name &ldquo;Linux&rdquo; also spreads a "
+#| "false picture of the system's origin, because people tend to suppose that "
+#| "the system's history was such as to fit that name.  For instance, they "
+#| "often believe its development was started by Linus Torvalds in 1991.  "
+#| "This false picture tends to reinforce the idea that the system should be "
+#| "called &ldquo;Linux&rdquo;."
 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 "
@@ -819,7 +882,7 @@
 "of the system's origin, because people tend to suppose that the system's "
 "history was such as to fit that name.  For instance, they often believe its "
 "development was started by Linus Torvalds in 1991.  This false picture tends "
-"to reinforce the idea that the system should be called &ldquo;Linux&rdquo;."
+"to reinforce the idea that the system should be called &ldquo;Linux.&rdquo;"
 msgstr ""
 "Gran part de la gent que anomena «Linux» al sistema mai ha sentit parlar de 
"
 "perquè aquest no és el nom correcte. Ells veuen a altres utilitzant aquest "
@@ -846,22 +909,46 @@
 "reference-id\">(<a href=\"#always\">#always</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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;,-] {+&ldquo;Linux,&rdquo;+} the name its developer
+# | chose.
+#, fuzzy
+#| 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."
 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."
+"you're referring specifically to the kernel, you should call it &ldquo;Linux,"
+"&rdquo; the name its developer chose."
 msgstr ""
 "No sempre—sols quan estigueu parlant sobre el sistema en conjunt. Quan us "
 "estigueu referint al nucli en especial, deuríeu d'anomenar-lo «Linux», el "
 "nom que elegí el seu desenvolupador."
 
 #. type: Content of: <div><dl><dd><p>
+# | When people call the whole system [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} as a consequence they call the whole system by
+# | the same name as the kernel.  This causes many kinds of confusion, because
+# | only experts can tell whether a statement is about the kernel or the whole
+# | system.  By calling the whole system [-&ldquo;GNU/Linux&rdquo;,-]
+# | {+&ldquo;GNU/Linux,&rdquo;+} and calling the kernel
+# | [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} you avoid the ambiguity.
+#, fuzzy
+#| 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 kinds of confusion, because only experts can tell whether a "
+#| "statement is about the kernel or the whole system.  By calling the whole "
+#| "system &ldquo;GNU/Linux&rdquo;, and calling the kernel &ldquo;"
+#| "Linux&rdquo;, you avoid the ambiguity."
 msgid ""
-"When people call the whole system &ldquo;Linux&rdquo;, as a consequence they "
+"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 "
 "kinds of confusion, because only experts can tell whether a statement is "
 "about the kernel or the whole system.  By calling the whole system &ldquo;"
-"GNU/Linux&rdquo;, and calling the kernel &ldquo;Linux&rdquo;, you avoid the "
+"GNU/Linux,&rdquo; and calling the kernel &ldquo;Linux,&rdquo; you avoid the "
 "ambiguity."
 msgstr ""
 "Quan la gent anomena «Linux» al sistema en conjunt, com a conseqüència "
@@ -930,8 +1017,17 @@
 "a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | When we ask people to say [-&ldquo;GNU/Linux&rdquo;,-]
+# | {+&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.
+#, fuzzy
+#| 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."
 msgid ""
-"When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing "
+"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 ""
@@ -987,10 +1083,34 @@
 "codi obert</a>."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | freedom are more likely to call the system [-&ldquo;GNU/Linux&rdquo;,-]
+# | {+&ldquo;GNU/Linux,&rdquo;+} and people who learn that the system is
+# | &ldquo;GNU/Linux&rdquo; are more likely to pay attention to our
+# | philosophical arguments for freedom and community (which is why the choice
+# | of name for the system makes a real difference for society).  However, the
+# | disagreement would probably exist even if everyone knew the system's real
+# | origin and its proper name, because the issue is a real one.  It can only
+# | go away if we who value freedom either persuade everyone (which won't be
+# | easy) or are defeated entirely (let's hope not).
+#, fuzzy
+#| 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 freedom are more likely to call the system &ldquo;GNU/"
+#| "Linux&rdquo;, and people who learn that the system is &ldquo;GNU/"
+#| "Linux&rdquo; are more likely to pay attention to our philosophical "
+#| "arguments for freedom and community (which is why the choice of name for "
+#| "the system makes a real difference for society).  However, the "
+#| "disagreement would probably exist even if everyone knew the system's real "
+#| "origin and its proper name, because the issue is a real one.  It can only "
+#| "go away if we who value freedom either persuade everyone (which won't be "
+#| "easy) or are defeated entirely (let's hope not)."
 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 "
-"freedom are more likely to call the system &ldquo;GNU/Linux&rdquo;, and "
+"freedom are more likely to call the system &ldquo;GNU/Linux,&rdquo; and "
 "people who learn that the system is &ldquo;GNU/Linux&rdquo; are more likely "
 "to pay attention to our philosophical arguments for freedom and community "
 "(which is why the choice of name for the system makes a real difference for "
@@ -1046,10 +1166,23 @@
 "href=\"#everyoneknows\">#everyoneknows</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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
+# | system do not mention the name [-&ldquo;GNU&rdquo;,-]
+# | {+&ldquo;GNU,&rdquo;+} or the ideals that GNU stands for.  <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never
+# | Heard of GNU</a> explains further.
+#, fuzzy
+#| 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 system do not mention the name &ldquo;GNU&rdquo;, or the ideals that "
+#| "GNU stands for.  <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU "
+#| "Users Who Have Never Heard of GNU</a> explains further."
 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 "
-"system do not mention the name &ldquo;GNU&rdquo;, or the ideals that GNU "
+"system do not mention the name &ldquo;GNU,&rdquo; or the ideals that GNU "
 "stands for.  <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users "
 "Who Have Never Heard of GNU</a> explains further."
 msgstr ""
@@ -1061,11 +1194,22 @@
 "amb més detall."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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 GNU is.  For instance, many think it is a collection of [-<a
+# | href=\"#tools\">&ldquo;tools&rdquo;</a>,-] {+&ldquo;<a
+# | href=\"#tools\">tools</a>,&rdquo;+} or a project to develop tools.
+#, fuzzy
+#| 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 GNU is.  For instance, many think it is a collection of <a "
+#| "href=\"#tools\">&ldquo;tools&rdquo;</a>, or a project to develop tools."
 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 "
-"GNU is.  For instance, many think it is a collection of <a href=\"#tools"
-"\">&ldquo;tools&rdquo;</a>, or a project to develop tools."
+"GNU is.  For instance, many think it is a collection of &ldquo;<a href="
+"\"#tools\">tools</a>,&rdquo; or a project to develop tools."
 msgstr ""
 "La gent que diu això són probablement geeks (amants de la tecnologia) "
 "pensant en altres geeks que coneixen. Els geeks solen saber una mica del "
@@ -1098,11 +1242,23 @@
 "\"#everyoneknows2\">#everyoneknows2</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | 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;,-] {+&ldquo;Linux,&rdquo;+} that it was started by
+# | Linus Torvalds, and that it was intended to be &ldquo;open
+# | [-source&rdquo;.-] {+source.&rdquo;+} If you don't tell them, who will?
+#, fuzzy
+#| 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;"
+#| "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?"
 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;"
-"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?"
+"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?"
 msgstr ""
 "Si les vostres paraules no reflecteixen el vostre coneixement, no podrà "
 "ensenyar a altres. Molta gent que ha sentit parlar del sistema GNU/Linux "
@@ -1160,14 +1316,31 @@
 "</span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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
+# | that GNU is the name of a collection of programs&mdash;often they say
+# | &ldquo;programming [-tools&rdquo;,-] {+tools,&rdquo;+} since some of our
+# | programming tools became popular on their own.  The idea that
+# | &ldquo;GNU&rdquo; is the name of an operating system is hard to fit into a
+# | conceptual framework in which that operating system is labeled
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+}
+#, fuzzy
+#| 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 "
+#| "that GNU is the name of a collection of programs&mdash;often they say "
+#| "&ldquo;programming tools&rdquo;, since some of our programming tools "
+#| "became popular on their own.  The idea that &ldquo;GNU&rdquo; is the name "
+#| "of an operating system is hard to fit into a conceptual framework in "
+#| "which that operating system is labeled &ldquo;Linux&rdquo;."
 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 "
 "that GNU is the name of a collection of programs&mdash;often they say &ldquo;"
-"programming tools&rdquo;, since some of our programming tools became popular "
+"programming tools,&rdquo; since some of our programming tools became popular "
 "on their own.  The idea that &ldquo;GNU&rdquo; is the name of an operating "
 "system is hard to fit into a conceptual framework in which that operating "
-"system is labeled &ldquo;Linux&rdquo;."
+"system is labeled &ldquo;Linux.&rdquo;"
 msgstr ""
 "La gent que pensa que Linux és un sistema operatiu complet, si escolten "
 "parlar del GNU, a sovint prenen una idea equivocada del que és. Solen creure 
"
@@ -1235,12 +1408,32 @@
 "programes."
 
 #. type: Content of: <div><dl><dd><p>
+# | To confuse matters, some people use the term &ldquo;operating
+# | system&rdquo; to mean [-&ldquo;kernel&rdquo;.-] {+&ldquo;kernel.&rdquo;+}
+# | Both uses of the term go back many years.  The use of &ldquo;operating
+# | system&rdquo; to mean &ldquo;kernel&rdquo; is found in a number of
+# | textbooks on system design, going back to the 80s.  At the same time, in
+# | the 80s, the &ldquo;Unix operating system&rdquo; was understood to include
+# | all the system programs, and Berkeley's version of Unix included even
+# | games. Since we intended GNU to be a Unix-like operating system, we use
+# | the term &ldquo;operating system&rdquo; in the same way.
+#, fuzzy
+#| 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.  The use of &ldquo;operating system&rdquo; to mean "
+#| "&ldquo;kernel&rdquo; is found in a number of textbooks on system design, "
+#| "going back to the 80s.  At the same time, in the 80s, the &ldquo;Unix "
+#| "operating system&rdquo; was understood to include all the system "
+#| "programs, and Berkeley's version of Unix included even games. Since we "
+#| "intended GNU to be a Unix-like operating system, we use the term &ldquo;"
+#| "operating system&rdquo; in the same way."
 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.  "
-"The use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is "
-"found in a number of textbooks on system design, going back to the 80s.  At "
-"the same time, in the 80s, the &ldquo;Unix operating system&rdquo; was "
+"to mean &ldquo;kernel.&rdquo; Both uses of the term go back many years.  The "
+"use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is found "
+"in a number of textbooks on system design, going back to the 80s.  At the "
+"same time, in the 80s, the &ldquo;Unix operating system&rdquo; was "
 "understood to include all the system programs, and Berkeley's version of "
 "Unix included even games. Since we intended GNU to be a Unix-like operating "
 "system, we use the term &ldquo;operating system&rdquo; in the same way."
@@ -1255,11 +1448,28 @@
 "l'Unix, empràrem el terme «sistema operatiu» de la mateixa manera."
 
 #. type: Content of: <div><dl><dd><p>
+# | Most of the time when people speak of the &ldquo;Linux operating
+# | system&rdquo; they are using &ldquo;operating system&rdquo; in the same
+# | sense we use: they mean the whole collection of programs.  If that's what
+# | you are referring to, please call it [-&ldquo;GNU/Linux&rdquo;.-]
+# | {+&ldquo;GNU/Linux.&rdquo;+} If you mean just the kernel, then
+# | &ldquo;Linux&rdquo; is the right name for it, but please say
+# | &ldquo;kernel&rdquo; also to avoid ambiguity about which body of software
+# | you mean.
+#, fuzzy
+#| 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 "
+#| "sense we use: they mean the whole collection of programs.  If that's what "
+#| "you are referring to, please call it &ldquo;GNU/Linux&rdquo;.  If you "
+#| "mean just the kernel, then &ldquo;Linux&rdquo; is the right name for it, "
+#| "but please say &ldquo;kernel&rdquo; also to avoid ambiguity about which "
+#| "body of software you mean."
 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 "
 "sense we use: they mean the whole collection of programs.  If that's what "
-"you are referring to, please call it &ldquo;GNU/Linux&rdquo;.  If you mean "
+"you are referring to, please call it &ldquo;GNU/Linux.&rdquo; If you mean "
 "just the kernel, then &ldquo;Linux&rdquo; is the right name for it, but "
 "please say &ldquo;kernel&rdquo; also to avoid ambiguity about which body of "
 "software you mean."
@@ -1272,10 +1482,20 @@
 "«nucli» també per evitar l'ambigüitat sobre el programari al que us 
referiu."
 
 #. type: Content of: <div><dl><dd><p>
+# | If you prefer to use some other term such as &ldquo;system
+# | distribution&rdquo; for the entire collection of programs, instead of
+# | &ldquo;operating [-system&rdquo;,-] {+system,&rdquo;+} that's fine.  Then
+# | you would talk about GNU/Linux system distributions.
+#, fuzzy
+#| msgid ""
+#| "If you prefer to use some other term such as &ldquo;system "
+#| "distribution&rdquo; for the entire collection of programs, instead of "
+#| "&ldquo;operating system&rdquo;, that's fine.  Then you would talk about "
+#| "GNU/Linux system distributions."
 msgid ""
 "If you prefer to use some other term such as &ldquo;system "
 "distribution&rdquo; for the entire collection of programs, instead of &ldquo;"
-"operating system&rdquo;, that's fine.  Then you would talk about GNU/Linux "
+"operating system,&rdquo; that's fine.  Then you would talk about GNU/Linux "
 "system distributions."
 msgstr ""
 "Si preferiu utilitzar un altre terme com ara «distribució del sistema» per 
a "
@@ -1385,9 +1605,9 @@
 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, "
-"window systems, libraries, and much more &mdash; hundreds of programs, even "
-"to match what BSD systems included in 1983.  Since Torvalds didn't develop "
-"any of those, how can the system be &ldquo;Linux&rdquo;?"
+"window systems, libraries, and much more&mdash;hundreds of programs, even to "
+"match what BSD systems included in 1983.  Since Torvalds didn't develop any "
+"of those, how can the system be &ldquo;Linux&rdquo;?"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><p>
@@ -1414,9 +1634,18 @@
 "\"#notinstallable\">#notinstallable</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | Many <a href=\"/distros/distros.html\"> packaged and installable versions
+# | of GNU</a> are available.  None of them is called simply
+# | [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} but GNU is what they
+# | basically are.
+#, fuzzy
+#| 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."
 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</a> are available.  None of them is called simply &ldquo;GNU,&rdquo; but "
 "GNU is what they basically are."
 msgstr ""
 "Hi ha disponibles molts <a href=\"/distros/distros.html\">paquets i versions "
@@ -1467,9 +1696,17 @@
 "inclou reorganitzar una part substancial del sistema GNU."
 
 #. type: Content of: <div><dl><dd><p>
+# | We never took the last step of packaging GNU under the name
+# | [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} but that doesn't alter what
+# | kind of thing GNU is.  GNU is an operating system.
+#, fuzzy
+#| 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."
 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 "
+"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 ""
 "Mai vam arribar a l'últim pas de distribuir GNU amb el nom «GNU», però 
això "
@@ -1486,13 +1723,28 @@
 "reference-id\">(<a href=\"#afterkernel\">#afterkernel</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | That practice seems to be very rare&mdash;we can't find any examples other
+# | than the misuse of the name [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+} Normally an operating system is developed as a
+# | single unified project, and the developers choose a name for the system as
+# | a whole.  The kernel usually does not have a name of its
+# | own&mdash;instead, people say &ldquo;the kernel of such-and-such&rdquo; or
+# | &ldquo;the such-and-such [-kernel&rdquo;.-] {+kernel.&rdquo;+}
+#, fuzzy
+#| 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 system is developed as a single unified project, and the "
+#| "developers choose a name for the system as a whole.  The kernel usually "
+#| "does not have a name of its own&mdash;instead, people say &ldquo;the "
+#| "kernel of such-and-such&rdquo; or &ldquo;the such-and-such kernel&rdquo;."
 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 "
+"than the misuse of the name &ldquo;Linux.&rdquo; Normally an operating "
 "system is developed as a single unified project, and the developers choose a "
 "name for the system as a whole.  The kernel usually does not have a name of "
 "its own&mdash;instead, people say &ldquo;the kernel of such-and-such&rdquo; "
-"or &ldquo;the such-and-such kernel&rdquo;."
+"or &ldquo;the such-and-such kernel.&rdquo;"
 msgstr ""
 "Aquesta pràctica sembla ser molt estranya—no trobem altres exemples 
d'errors "
 "semblants al mal ús del nom «Linux». Normalment un sistema operatiu es "
@@ -1546,9 +1798,18 @@
 "</span>"
 
 #. type: Content of: <div><dl><dd>
+# | For a while we tried the name [-&ldquo;LiGNUx&rdquo;,-]
+# | {+&ldquo;LiGNUx,&rdquo;+} which combines the words &ldquo;GNU&rdquo; and
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} The reaction was very
+# | bad.  People accept &ldquo;GNU/Linux&rdquo; much better.
+#, fuzzy
+#| 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."
 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.  "
+"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 ""
 "Durant un temps provàrem amb el nom «LiGNUx», que combina les paraules 
«GNU» "
@@ -1556,8 +1817,16 @@
 "«GNU/Linux»."
 
 #. type: Content of: <div><dl><dd><p>
+# | The shortest legitimate name for this system is [-&ldquo;GNU&rdquo;,-]
+# | {+&ldquo;GNU,&rdquo;+} but we call it &ldquo;GNU/Linux&rdquo; <a
+# | href=\"#justgnu\"> for the reasons given below</a>.
+#, fuzzy
+#| 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>."
 msgid ""
-"The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but we "
+"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 ""
@@ -1604,8 +1873,16 @@
 "\"#long2\">#long2</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | It only takes a second to say or type [-&ldquo;GNU/&rdquo;.-]
+# | {+&ldquo;GNU/.&rdquo;+} If you appreciate the system that we developed,
+# | can't you take one second to recognize our work?
+#, fuzzy
+#| 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?"
 msgid ""
-"It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you appreciate "
+"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 ""
@@ -1714,10 +1991,21 @@
 "seva contribució al sistema."
 
 #. type: Content of: <div><dl><dd><ul><li>
+# | Since many people know of the system as [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} if we say &ldquo;GNU&rdquo; they may simply not
+# | recognize we're talking about the same system.  If we say
+# | [-&ldquo;GNU/Linux&rdquo;,-] {+&ldquo;GNU/Linux,&rdquo;+} they can make a
+# | connection to what they have heard about.
+#, fuzzy
+#| 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 system.  If we say &ldquo;GNU/Linux&rdquo;, they can make a "
+#| "connection to what they have heard about."
 msgid ""
-"Since many people know of the system as &ldquo;Linux&rdquo;, if we say "
+"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 "
-"system.  If we say &ldquo;GNU/Linux&rdquo;, they can make a connection to "
+"system.  If we say &ldquo;GNU/Linux,&rdquo; they can make a connection to "
 "what they have heard about."
 msgstr ""
 "Atès que molta gent coneix al sistema amb el nom de «Linux», si nosaltres "
@@ -1726,10 +2014,23 @@
 "sentit."
 
 #. type: Content of: <div><dl><dt>
+# | 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;.-]
+# | {+&ldquo;GNU/Linux.&rdquo;+} Is it wrong if I use &ldquo;GNU&rdquo;
+# | without [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} to save the fee?
+# | <span class=\"anchor-reference-id\">(<a
+# | href=\"#trademarkfee\">#trademarkfee</a>)</span>
+#, fuzzy
+#| 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 wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to save "
+#| "the fee? <span class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
+#| "\">#trademarkfee</a>)</span>"
 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 "
-"wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to save the "
+"product, and that would also apply if I say &ldquo;GNU/Linux.&rdquo; Is it "
+"wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux,&rdquo; to save the "
 "fee? <span class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
 "\">#trademarkfee</a>)</span>"
 msgstr ""
@@ -1749,9 +2050,17 @@
 "no teniu l'obligació de pagar pel privilegi de donar-se'l."
 
 #. type: Content of: <div><dl><dd><p>
+# | So if you want to refer to the system simply as [-&ldquo;GNU&rdquo;,-]
+# | {+&ldquo;GNU,&rdquo;+} to avoid paying the fee for calling it
+# | [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} we won't criticize you.
+#, fuzzy
+#| 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."
 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."
+"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 ""
 "Així que si us voleu referir al sistema simplement com «GNU», per evitar "
 "pagar un canon per anomenar-lo «Linux», no us criticarem."
@@ -1811,12 +2120,25 @@
 "de tall, per tant no direm res en contra de la teva elecció."
 
 #. type: Content of: <div><dl><dd><p>
+# | Different threshold levels would lead to different choices of name for the
+# | system.  But one name that cannot result from concerns of fairness and
+# | giving credit, not for any possible threshold level, is
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} It can't be fair to give
+# | all the credit to one secondary contribution (Linux) while omitting the
+# | principal contribution (GNU).
+#, fuzzy
+#| 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 giving credit, not for any possible threshold level, is &ldquo;"
+#| "Linux&rdquo;.  It can't be fair to give all the credit to one secondary "
+#| "contribution (Linux) while omitting the principal contribution (GNU)."
 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 "
-"giving credit, not for any possible threshold level, is &ldquo;"
-"Linux&rdquo;.  It can't be fair to give all the credit to one secondary "
-"contribution (Linux) while omitting the principal contribution (GNU)."
+"giving credit, not for any possible threshold level, is &ldquo;Linux.&rdquo; "
+"It can't be fair to give all the credit to one secondary contribution "
+"(Linux) while omitting the principal contribution (GNU)."
 msgstr ""
 "Diferents punts de tall durien a diferents opcions per a cridar al sistema. "
 "Però un nom que no respecta el reconeixement correcte del sistema, ni àdhuc 
"
@@ -1852,7 +2174,7 @@
 "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."
+"system &ldquo;GNU/systemd/Linux,&rdquo; there is nothing wrong with doing so."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
@@ -1899,11 +2221,21 @@
 "span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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 the same argument would apply even more strongly to calling it
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+}
+#, fuzzy
+#| 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 the same argument would apply even more strongly to calling it &ldquo;"
+#| "Linux&rdquo;."
 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 "
-"the same argument would apply even more strongly to calling it &ldquo;"
-"Linux&rdquo;."
+"the same argument would apply even more strongly to calling it &ldquo;Linux."
+"&rdquo;"
 msgstr ""
 "Al 2008 vam trobar que el 15% del repositori <cite>main</cite> de la "
 "distribuició gNewSense GNU/Linux eren paquets GNU. Linux representava "
@@ -1966,9 +2298,21 @@
 "reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | Following the rules of English, in the construction &ldquo;GNU
+# | Linux&rdquo; the word &ldquo;GNU&rdquo; modifies [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+} This can mean either &ldquo;GNU's version of
+# | Linux&rdquo; or &ldquo;Linux, which is a GNU package.&rdquo; Neither of
+# | those meanings fits the situation at hand.
+#, fuzzy
+#| 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 either &ldquo;GNU's version of Linux&rdquo; or &ldquo;"
+#| "Linux, which is a GNU package.&rdquo; Neither of those meanings fits the "
+#| "situation at hand."
 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 "
+"the word &ldquo;GNU&rdquo; modifies &ldquo;Linux.&rdquo; This can mean "
 "either &ldquo;GNU's version of Linux&rdquo; or &ldquo;Linux, which is a GNU "
 "package.&rdquo; Neither of those meanings fits the situation at hand."
 msgstr ""
@@ -1996,9 +2340,10 @@
 # | [-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.
+# | non[---]free firmware [-&ldquo;blobs&rdquo;.-] {+&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 "
@@ -2012,7 +2357,7 @@
 "We're not talking about a distinct GNU version of Linux, the kernel.  The "
 "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 "
+"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."
@@ -2024,11 +2369,24 @@
 "Linux», però no volem anomenar-lo així perquè crearia confusió."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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 &ldquo;combination.&rdquo; (Think of
+# | [-&ldquo;Input/Output&rdquo;.)-] {+&ldquo;Input/Output.&rdquo;)+}  This
+# | system is the combination of GNU and Linux; hence,
+# | [-&ldquo;GNU/Linux&rdquo;.-] {+&ldquo;GNU/Linux.&rdquo;+}
+#, fuzzy
+#| 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 &ldquo;combination.&rdquo; (Think of &ldquo;Input/Output&rdquo;.)  "
+#| "This system is the combination of GNU and Linux; hence, &ldquo;GNU/"
+#| "Linux&rdquo;."
 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 "
-"&ldquo;combination.&rdquo; (Think of &ldquo;Input/Output&rdquo;.)  This "
-"system is the combination of GNU and Linux; hence, &ldquo;GNU/Linux&rdquo;."
+"&ldquo;combination.&rdquo; (Think of &ldquo;Input/Output.&rdquo;)  This "
+"system is the combination of GNU and Linux; hence, &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "Nosaltres parlem sobre una versió del GNU, el sistema operatiu, que es "
 "distingeix per tenir el Linux com a nucli. La barra està per donar-li un "
@@ -2037,11 +2395,22 @@
 "Linux»."
 
 #. 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: "
-"&ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes say &ldquo;GNU con "
-"Linux&rdquo;."
+# | There are other ways to express [-&ldquo;combination&rdquo;.-]
+# | {+&ldquo;combination.&rdquo;+} If you think that a plus-sign is clearer,
+# | please use that.  In French, a hyphen is clear:
+# | [-&ldquo;GNU-Linux&rdquo;.-] {+&ldquo;GNU-Linux.&rdquo;+} In Spanish, we
+# | sometimes say &ldquo;GNU con [-Linux&rdquo;.-] {+Linux.&rdquo;+}
+#, fuzzy
+#| 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: &ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes say &ldquo;GNU "
+#| "con Linux&rdquo;."
+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: "
+"&ldquo;GNU-Linux.&rdquo; In Spanish, we sometimes say &ldquo;GNU con Linux."
+"&rdquo;"
 msgstr ""
 "No hi ha altres maneres d'expressar «combinació». Si penseu que el signe 
de "
 "la suma (+) és clar, si us plau utilitzeu-lo. En francès, un guió és "
@@ -2093,7 +2462,7 @@
 # | 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
-# | Linux&rdquo; or &ldquo;Linux,-] {+&ldquo;Emacs&rdquo;.  That is the right
+# | Linux&rdquo; or &ldquo;Linux,-] {+&ldquo;Emacs.&rdquo; That is the right
 # | way to describe a program called Emacs+} which is a GNU [-package.&rdquo;
 # | Neither of those meanings fits the situation at hand.-] {+package.+}
 #, fuzzy
@@ -2105,7 +2474,7 @@
 #| "situation at hand."
 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 "
+"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 ""
 "Seguint les regles de l'anglès, en al construcció «GNU Linux» la paraula "
@@ -2145,8 +2514,17 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dd><p>
+# | However, if you prefer to call the system [-&ldquo;Linux/GNU&rdquo;,-]
+# | {+&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.
+#, fuzzy
+#| 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."
 msgid ""
-"However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a "
+"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 ""
@@ -2155,8 +2533,19 @@
 "parèixer que Linux és el sistema complet."
 
 #. type: Content of: <div><dl><dt>
+# | My distro's developers call it &ldquo;Foobar [-Linux&rdquo;,-]
+# | {+Linux,&rdquo;+} but that doesn't say anything about what the system
+# | consists of.  Why shouldn't they call it whatever they like? <span
+# | class=\"anchor-reference-id\">(<a
+# | href=\"#distronames0\">#distronames0</a>)</span>
+#, fuzzy
+#| 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 whatever they like? <span class=\"anchor-reference-id\">(<a "
+#| "href=\"#distronames0\">#distronames0</a>)</span>"
 msgid ""
-"My distro's developers call it &ldquo;Foobar Linux&rdquo;, but that doesn't "
+"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 "
 "whatever they like? <span class=\"anchor-reference-id\">(<a href="
 "\"#distronames0\">#distronames0</a>)</span>"
@@ -2220,11 +2609,22 @@
 "\"anchor-reference-id\">(<a href=\"#distronames1\">#distronames1</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | When they spread misinformation by changing &ldquo;GNU&rdquo; to
+# | [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} and call their version
+# | of it &ldquo;Foobar [-Linux&rdquo;,-] {+Linux,&rdquo;+} it's proper for
+# | you to correct the misinformation by calling it &ldquo;Foobar
+# | [-GNU/Linux&rdquo;.-] {+GNU/Linux.&rdquo;+}
+#, fuzzy
+#| 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 proper for you to correct the misinformation by calling it &ldquo;"
+#| "Foobar GNU/Linux&rdquo;."
 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 "
+"Linux,&rdquo; and call their version of it &ldquo;Foobar Linux,&rdquo; it's "
 "proper for you to correct the misinformation by calling it &ldquo;Foobar GNU/"
-"Linux&rdquo;."
+"Linux.&rdquo;"
 msgstr ""
 "Quan ells difonen informació falsa canviant «GNU» per «Linux», i 
anomenen la "
 "seva versió «Foobar Linux», és adient corregir aquesta tergiversació "
@@ -2261,12 +2661,24 @@
 "importava el que era cert."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | 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;.-] {+&ldquo;GNU/Linux.&rdquo;+}
+#, fuzzy
+#| 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 "
+#| "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;."
 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 "
 "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;."
+"&ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "No podem fer que canviïn, però no som dels que es rendeixen perquè el 
camí "
 "no sigui fàcil. Podeu no tenir tanta influència com IBM o Red Hat, però "
@@ -2290,12 +2702,12 @@
 # | 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.
+# | [-&ldquo;Linux&rdquo;.-] {+&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 "
@@ -2310,13 +2722,12 @@
 msgid ""
 "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 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 nonfree "
-"applications and drivers), or making the system more popular even at the "
-"cost of freedom."
+"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 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 nonfree applications "
+"and drivers), or making the system more popular even at the cost of freedom."
 msgstr ""
 "La pràctica àmpliament estesa d'afegir programari no lliure als sistemes 
GNU/"
 "Linux és un gran problema per a la nostra comunitat. Això ensenya als "
@@ -2354,7 +2765,7 @@
 # | they can start to recognize [-Lindows and so-called &ldquo;United
 # | 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;.+}
+# | 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 "
@@ -2370,7 +2781,7 @@
 "specifically for the sake of the users' freedom.  With this understanding, "
 "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;."
+"proper and appropriate &ldquo;versions of Linux.&rdquo;"
 msgstr ""
 "La forma correcta per a tractar que aquests usuaris vegin una connexió amb "
 "el concepte de llibertat és exactament la contrària: informar-los que "
@@ -2471,11 +2882,22 @@
 "funcionar el GNU Hurd, segurament ho hauríem fet."
 
 #. type: Content of: <div><dl><dd><p>
+# | If we were to take an existing version of GNU/Linux and relabel it as
+# | [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} that would be somewhat like
+# | making a version of the GNU system and labeling it
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} That wasn't right, and
+# | we don't want to act like that.
+#, fuzzy
+#| 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 and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and "
+#| "we don't want to act like that."
 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 "
-"and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and we don't want "
-"to act like that."
+"GNU,&rdquo; that would be somewhat like making a version of the GNU system "
+"and labeling it &ldquo;Linux.&rdquo; That wasn't right, and we don't want to "
+"act like that."
 msgstr ""
 "Si agaféssim una versió existent del GNU/Linux i la rebategéssim com 
«GNU», "
 "seria com agafar una versió del sistema GNU i rebatejar-la com «Linux». 
Això "
@@ -2509,11 +2931,29 @@
 "en Linux. Però els canvis a sovint es feren a propòsit i no eren portables."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | with the GNU Project because he was a &ldquo;Linux [-user&rdquo;.-]
+# | {+user.&rdquo;+} That came as a shock, because the people who ported GNU
+# | packages to other systems had generally wanted to work with us to get
+# | their changes installed.  Yet these people, developing a system that was
+# | primarily based on GNU, were the first (and still practically the only)
+# | group that was unwilling to work with us.
+#, fuzzy
+#| 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 "
+#| "with the GNU Project because he was a &ldquo;Linux user&rdquo;.  That "
+#| "came as a shock, because the people who ported GNU packages to other "
+#| "systems had generally wanted to work with us to get their changes "
+#| "installed.  Yet these people, developing a system that was primarily "
+#| "based on GNU, were the first (and still practically the only) group that "
+#| "was unwilling to work with us."
 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 "
-"with the GNU Project because he was a &ldquo;Linux user&rdquo;.  That came "
-"as a shock, because the people who ported GNU packages to other systems had "
+"with the GNU Project because he was a &ldquo;Linux user.&rdquo; That came as "
+"a shock, because the people who ported GNU packages to other systems had "
 "generally wanted to work with us to get their changes installed.  Yet these "
 "people, developing a system that was primarily based on GNU, were the first "
 "(and still practically the only) group that was unwilling to work with us."
@@ -2528,9 +2968,22 @@
 "nosaltres."
 
 #. type: Content of: <div><dl><dd><p>
+# | It was this experience that first showed us that people were calling a
+# | version of the GNU system [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} and that this confusion was obstructing our work.
+# |  Asking you to call the system &ldquo;GNU/Linux&rdquo; is our response to
+# | that problem, and to the other problems caused by the &ldquo;Linux&rdquo;
+# | misnomer.
+#, fuzzy
+#| 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 obstructing our work.  Asking you to call the system &ldquo;GNU/"
+#| "Linux&rdquo; is our response to that problem, and to the other problems "
+#| "caused by the &ldquo;Linux&rdquo; misnomer."
 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 "
+"version of the GNU system &ldquo;Linux,&rdquo; and that this confusion was "
 "obstructing our work.  Asking you to call the system &ldquo;GNU/Linux&rdquo; "
 "is our response to that problem, and to the other problems caused by the "
 "&ldquo;Linux&rdquo; misnomer."
@@ -2569,10 +3022,18 @@
 "\"#allgpled\">#allgpled</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | We never refer to individual programs as
+# | [-&ldquo;GNU/<i>name</i>&rdquo;.-] {+&ldquo;GNU/<i>name</i>.&rdquo;+} When
+# | a program is a GNU package, we may call it &ldquo;GNU
+# | [-<i>name</i>&rdquo;.-] {+<i>name</i>.&rdquo;+}
+#, fuzzy
+#| 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;."
 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;."
+"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 ""
 "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>»."
@@ -2687,10 +3148,24 @@
 "l'Unix; tot havia de ser escrit de nou."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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. 
+# | The name [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} which stands for
+# | &ldquo;GNU's Not [-Unix&rdquo;,-] {+Unix,&rdquo;+} is a humorous way of
+# | giving credit to Unix for this, following a hacker tradition of recursive
+# | acronyms that started in the 70s.
+#, fuzzy
+#| 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.  The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not "
+#| "Unix&rdquo;, is a humorous way of giving credit to Unix for this, "
+#| "following a hacker tradition of recursive acronyms that started in the "
+#| "70s."
 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.  "
-"The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not Unix&rdquo;, "
+"The name &ldquo;GNU,&rdquo; which stands for &ldquo;GNU's Not Unix,&rdquo; "
 "is a humorous way of giving credit to Unix for this, following a hacker "
 "tradition of recursive acronyms that started in the 70s."
 msgstr ""
@@ -2701,11 +3176,12 @@
 "anys 70."
 
 #. 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
+# | The first such recursive acronym was TINT, &ldquo;TINT Is Not
+# | [-TECO&rdquo;.-] {+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;,-] {+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
@@ -2718,10 +3194,10 @@
 #| "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 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 "
+"like &ldquo;<em>somethingorother</em> TECO,&rdquo; he thought of a clever "
 "amusing name.  (That's what hacking means: <a href=\"https://stallman.org/";
 "articles/on-hacking.html\">playful cleverness</a>.)"
 msgstr ""
@@ -2733,13 +3209,28 @@
 "\"http://stallman.org/articles/on-hacking.html\";>diversió amb astúcia</a>.)"
 
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | was similar to some existing program (let's imagine its name was
+# | &ldquo;Klever&rdquo;), you could give it a recursive acronym name, such as
+# | &ldquo;MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same
+# | spirit we called our replacement for Unix &ldquo;GNU's Not
+# | [-Unix&rdquo;.-] {+Unix.&rdquo;+}
+#, fuzzy
+#| 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 was similar to some existing program (let's imagine its name was "
+#| "&ldquo;Klever&rdquo;), you could give it a recursive acronym name, such "
+#| "as &ldquo;MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same "
+#| "spirit we called our replacement for Unix &ldquo;GNU's Not Unix&rdquo;."
 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 "
 "was similar to some existing program (let's imagine its name was &ldquo;"
 "Klever&rdquo;), you could give it a recursive acronym name, such as &ldquo;"
 "MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same spirit we "
-"called our replacement for Unix &ldquo;GNU's Not Unix&rdquo;."
+"called our replacement for Unix &ldquo;GNU's Not Unix.&rdquo;"
 msgstr ""
 "A altres hackers els agradà tant el nom que decidirem imitar la proposta. Es 
"
 "convertí en una tradició que, quan escrivies un programa que era semblant a 
"
@@ -2749,13 +3240,28 @@
 "alternativa per a l'Unix <cite>GNU's Not Unix</cite>."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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 in a system 99% copied from Unix.  AT&amp;T actually threatened to
+# | sue anyone giving AT&amp;T credit in that way.  This is why each of the
+# | various modified versions of Unix (all proprietary, like Unix) had a
+# | completely different name that didn't include [-&ldquo;Unix&rdquo;.-]
+# | {+&ldquo;Unix.&rdquo;+}
+#, fuzzy
+#| 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 in a system 99% copied from Unix.  AT&amp;T actually threatened "
+#| "to sue anyone giving AT&amp;T credit in that way.  This is why each of "
+#| "the various modified versions of Unix (all proprietary, like Unix) had a "
+#| "completely different name that didn't include &ldquo;Unix&rdquo;."
 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 "
 "in a system 99% copied from Unix.  AT&amp;T actually threatened to sue "
 "anyone giving AT&amp;T credit in that way.  This is why each of the various "
 "modified versions of Unix (all proprietary, like Unix) had a completely "
-"different name that didn't include &ldquo;Unix&rdquo;."
+"different name that didn't include &ldquo;Unix.&rdquo;"
 msgstr ""
 "Històricament, AT&amp;T que fou qui desenvolupà l'Unix no donà permís a "
 "ningú per usar el mot «Unix» en el nom d'un sistema similar, no ho 
permetien "
@@ -2840,9 +3346,22 @@
 "nom «GNU/Linux» és apropiat per al sistema."
 
 #. type: Content of: <div><dl><dd><p>
+# | There is a version of GNU which uses the kernel from NetBSD.  Its
+# | developers call it &ldquo;Debian [-GNU/NetBSD&rdquo;,-]
+# | {+GNU/NetBSD,&rdquo;+} but &ldquo;GNU/kernelofNetBSD&rdquo; would be more
+# | accurate, since NetBSD is an entire system, not just the kernel.  This is
+# | not a BSD system, since most of the system is the same as the GNU/Linux
+# | system.
+#, fuzzy
+#| 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/"
+#| "kernelofNetBSD&rdquo; would be more accurate, since NetBSD is an entire "
+#| "system, not just the kernel.  This is not a BSD system, since most of the "
+#| "system is the same as the GNU/Linux system."
 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/"
+"call it &ldquo;Debian GNU/NetBSD,&rdquo; but &ldquo;GNU/"
 "kernelofNetBSD&rdquo; would be more accurate, since NetBSD is an entire "
 "system, not just the kernel.  This is not a BSD system, since most of the "
 "system is the same as the GNU/Linux system."
@@ -2864,8 +3383,21 @@
 "href=\"#othersys\">#othersys</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | Not in the same sense that we mean by [-&ldquo;GNU/Linux&rdquo;.-]
+# | {+&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.
+#, fuzzy
+#| 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 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."
 msgid ""
-"Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of "
+"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 "
@@ -2972,8 +3504,19 @@
 "poc codi en comú. De fet, l'única cosa que tenen en comú és Linux."
 
 #. type: Content of: <div><dl><dd><p>
+# | If you call the whole GNU/Linux system [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} you will find it necessary to say things like,
+# | &ldquo;Android contains Linux, but it isn't Linux, because it doesn't have
+# | the usual Linux [sic] libraries and utilities [meaning the GNU
+# | system].&rdquo;
+#, fuzzy
+#| 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 Linux, because it doesn't have the usual Linux [sic] libraries and "
+#| "utilities [meaning the GNU system].&rdquo;"
 msgid ""
-"If you call the whole GNU/Linux system &ldquo;Linux&rdquo;, you will find it "
+"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 "
 "Linux, because it doesn't have the usual Linux [sic] libraries and utilities "
 "[meaning the GNU system].&rdquo;"
@@ -3012,7 +3555,7 @@
 #. 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 "
+"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 ""
 
@@ -3020,7 +3563,7 @@
 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;."
+"of the whole system as &ldquo;Linux.&rdquo;"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><p>
@@ -3030,7 +3573,7 @@
 "contain Linux is irrelevant to using them, just as the fact that a car and a "
 "bicycle both have a structure of metal is irrelevant to using those two.  If "
 "you wish to talk about using cars and bikes, you wouldn't speak of &ldquo;"
-"riding metal objects&rdquo; &mdash; not unless you're playing games with the "
+"riding metal objects&rdquo;&mdash;not unless you're playing games with the "
 "reader.  You would say, &ldquo;using cars and bikes.&rdquo; Likewise, the "
 "clear way to talk about using GNU/Linux and Android is to say &ldquo;using "
 "GNU/Linux and Android.&rdquo;"
@@ -3135,11 +3678,22 @@
 "\">#claimlinux</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | 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;.-] {+&ldquo;GNU.&rdquo;+} When we talk
+# | about the whole system, the name &ldquo;GNU/Linux&rdquo; gives him a share
+# | of the credit.
+#, fuzzy
+#| 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 "
+#| "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."
 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 "
-"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."
+"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."
 msgstr ""
 "Seria erroni, i per això no ho fem. L'obra de Torvalds és Linux, el nucli; "
 "nosaltres tenim cura de no atribuir aquesta obra al Projecte GNU i no la "
@@ -3155,12 +3709,39 @@
 "\"anchor-reference-id\">(<a href=\"#linusagreed\">#linusagreed</a>)</span>"
 
 #. 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\">
+# | He recognized this at the beginning.  The {+<a
+# | 
href=\"https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\";>+}
+# | 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>.
+# |  for more info&rdquo;</a>.-] {+notes</a> said:+}
+#, 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 <a href=\"https://ftp.funet.fi/pub/";
+"linux/historical/kernel/old-versions/RELNOTES-0.01\"> earliest Linux release "
+"notes</a> said:"
+msgstr ""
+"Ho reconegué al començament. En les notes de les primeres publicacions del "
+"Linux escrigué: <a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/";
+"old-versions/RELNOTES-0.01\">«La majoria de les ferramentes utilitzades amb "
+"el linux són programari del GNU i tenen la llicència copyleft del GNU. "
+"Aquestes ferramentes no estan en la distribució — pregunteu-me (a mi o a "
+"GNU) per més informació.»</a>"
+
+#. type: Content of: <div><dl><dd><blockquote><p>
+# | [-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-]{+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>.-] {+info.+}
 #, fuzzy
 #| msgid ""
 #| "He recognized this at the beginning.  The earliest Linux release notes "
@@ -3169,11 +3750,9 @@
 #| "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=\"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>."
+"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."
 msgstr ""
 "Ho reconegué al començament. En les notes de les primeres publicacions del "
 "Linux escrigué: <a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/";
@@ -3240,11 +3819,26 @@
 "reference-id\">(<a href=\"#lost\">#lost</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | 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;,-]
+# | {+&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.
+#, fuzzy
+#| 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;: 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."
 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;: "
 "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 "
+"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."
 msgstr ""
@@ -3265,13 +3859,32 @@
 "(<a href=\"#whatgood\">#whatgood</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | 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;,-] {+&ldquo;GNU/Linux,&rdquo;+} you will help
+# | others learn the system's true history, origin, and reason for being.  You
+# | can't correct the misnomer 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;,-] {+&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.
+#, fuzzy
+#| 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;GNU/Linux&rdquo;, you will help others learn the system's true "
+#| "history, origin, and reason for being.  You can't correct the misnomer "
+#| "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."
 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;"
-"GNU/Linux&rdquo;, you will help others learn the system's true history, "
+"GNU/Linux,&rdquo; you will help others learn the system's true history, "
 "origin, and reason for being.  You can't correct the misnomer 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 "
+"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."
 msgstr ""
@@ -3296,22 +3909,48 @@
 "reference-id\">(<a href=\"#explain\">#explain</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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;,-]
+# | {+&ldquo;GNU/Linux,&rdquo;+} and uses your time inefficiently.
+#, fuzzy
+#| 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."
 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."
+"the system &ldquo;GNU/Linux,&rdquo; and uses your time inefficiently."
 msgstr ""
 "Si voleu ajudar-nos explicant a altres d'aquesta forma, apreciem el vostre "
 "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><dl><dd><p>
+# | 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, and they may learn a correct picture of the system's origin. 
+# | But they are unlikely to repeat the explanation to others whenever they
+# | talk about the system.  They will probably just call it
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} Without particularly
+# | intending to, they will help spread the incorrect picture.
+#, fuzzy
+#| 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, and they may learn a correct picture of the system's origin.  "
+#| "But they are unlikely to repeat the explanation to others whenever they "
+#| "talk about the system.  They will probably just call it &ldquo;"
+#| "Linux&rdquo;.  Without particularly intending to, they will help spread "
+#| "the incorrect picture."
 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, "
 "and they may learn a correct picture of the system's origin.  But they are "
 "unlikely to repeat the explanation to others whenever they talk about the "
-"system.  They will probably just call it &ldquo;Linux&rdquo;.  Without "
+"system.  They will probably just call it &ldquo;Linux.&rdquo; Without "
 "particularly intending to, they will help spread the incorrect picture."
 msgstr ""
 " És ineficient perquè pot no penetrar en la societat i segurament no es "
@@ -3448,9 +4087,16 @@
 "class=\"anchor-reference-id\">(<a href=\"#force\">#force</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | It would be wrong to force them, and we don't try.  We call the system
+# | [-&ldquo;GNU/Linux&rdquo;,-] {+&ldquo;GNU/Linux,&rdquo;+} and we ask you
+# | to do it too.
+#, fuzzy
+#| 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."
 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."
+"&ldquo;GNU/Linux,&rdquo; and we ask you to do it too."
 msgstr ""
 "Seria equivocat forçar-la i no ho intentem. Nosaltres anomenem «GNU/Linux» 
"
 "al sistema i us demanem que també ho feu vosaltres."
@@ -3553,9 +4199,19 @@
 "l'expressió «llicència BSD» sense especificar quina."
 
 #. type: Content of: <div><dl><dt>
+# | Since you failed to put something in the GNU GPL to require people to call
+# | the system [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} you deserve what
+# | happened; why are you complaining now? <span
+# | class=\"anchor-reference-id\">(<a href=\"#deserve\">#deserve</a>)</span>
+#, fuzzy
+#| 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 "
+#| "complaining now? <span class=\"anchor-reference-id\">(<a href=\"#deserve"
+#| "\">#deserve</a>)</span>"
 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 "
+"the system &ldquo;GNU,&rdquo; you deserve what happened; why are you "
 "complaining now? <span class=\"anchor-reference-id\">(<a href=\"#deserve"
 "\">#deserve</a>)</span>"
 msgstr ""
@@ -3609,8 +4265,17 @@
 "privatiu era legítim i acceptable."
 
 #. type: Content of: <div><dl><dt>
+# | Since many people call it [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} doesn't that make it right? <span
+# | class=\"anchor-reference-id\">(<a
+# | href=\"#somanyright\">#somanyright</a>)</span>
+#, fuzzy
+#| 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>"
 msgid ""
-"Since many people call it &ldquo;Linux&rdquo;, doesn't that make it right? "
+"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 ""
@@ -3633,9 +4298,20 @@
 "\">#knownname</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | Users are not incapable of learning.  Since &ldquo;GNU/Linux&rdquo;
+# | includes [-&ldquo;Linux&rdquo;,-] {+&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.
+#, fuzzy
+#| 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 add &ldquo;(often erroneously referred to as &lsquo;"
+#| "Linux&rsquo;)&rdquo; once in a while, they will all understand."
 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 "
+"&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."
 msgstr ""

Index: po/gnu-linux-faq.de-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.de-diff.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- po/gnu-linux-faq.de-diff.html       31 Aug 2021 10:37:07 -0000      1.12
+++ po/gnu-linux-faq.de-diff.html       2 Nov 2021 14:41:51 -0000       1.13
@@ -12,30 +12,35 @@
 <body><pre>
 &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;!-- This page is derived from /server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="gnulinux" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</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="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&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"&gt;by</em></ins></span> Richard <span 
class="removed"><del><strong>Stallman&lt;/h2&gt;
+&lt;address class="byline"&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;</em></ins></span>
 
-&lt;div class="announcement"&gt;
+&lt;div <span class="removed"><del><strong>class="announcement"&gt;
   &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 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&gt;</strong></del></span> <span 
class="inserted"><ins><em>class="introduction"&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.
+system that many others call just <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> they ask many 
questions.
 Here are common questions, and our answers.&lt;/p&gt;
+<span class="inserted"><ins><em>&lt;/div&gt;
 
-<span class="inserted"><ins><em>&lt;div class="toc"&gt;
+&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;
@@ -130,8 +135,8 @@
 
 &lt;li&gt;&lt;a href="#trademarkfee"&gt;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
-    wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to
+    that would also apply if I say <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux.&rdquo;</em></ins></span>  Is 
it
+    wrong if I use &ldquo;GNU&rdquo; without <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> to
     save the fee?&lt;/a&gt;&lt;/li&gt;
 
 &lt;li&gt;&lt;a href="#many"&gt;Many other projects contributed to the
@@ -169,7 +174,7 @@
 rather than &ldquo;Linux/GNU&rdquo;?&lt;/a&gt;&lt;/li&gt;
 
 &lt;li&gt;&lt;a href="#distronames0"&gt;My distro's developers call it
-    &ldquo;Foobar Linux&rdquo;, but that doesn't say anything about
+    &ldquo;Foobar <span 
class="removed"><del><strong>Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>Linux,&rdquo;</em></ins></span> but that doesn't say 
anything about
     what the system consists of.  Why shouldn't they call it whatever
     they like?&lt;/a&gt;&lt;/li&gt;
 
@@ -281,14 +286,16 @@
 
 &lt;li&gt;&lt;a href="#deserve"&gt;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
+    <span class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span>
+    <span class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> you 
deserve what happened; why are you
     complaining now?&lt;/a&gt;&lt;/li&gt;
 
 &lt;li&gt;&lt;a href="#contradict"&gt;Wouldn't you be better off
     not contradicting what so many people believe?&lt;/a&gt;&lt;/li&gt;
 
 &lt;li&gt;&lt;a href="#somanyright"&gt;Since many people call it
-    &ldquo;Linux&rdquo;, doesn't that make it right?&lt;/a&gt;&lt;/li&gt;
+    <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span>
+    <span class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> 
doesn't that make it right?&lt;/a&gt;&lt;/li&gt;
 
 &lt;li&gt;&lt;a href="#knownname"&gt;Isn't it better to call the
     system by the name most users already know?&lt;/a&gt;&lt;/li&gt;
@@ -380,7 +387,7 @@
 the system's history was such as to fit that name.  For
 instance, they often believe its development was started by Linus
 Torvalds in 1991.  This false picture tends to reinforce the idea
-that the system should be called &ldquo;Linux&rdquo;.&lt;/p&gt;
+that the system should be called <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.&lt;/p&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;&lt;/p&gt;</em></ins></span>
 &lt;p&gt;
 Many of the questions in this file represent people's attempts to
 justify the name they are accustomed to using.&lt;/p&gt;
@@ -391,14 +398,16 @@
 &lt;dd&gt;
 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.
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> the 
name its developer chose.
 &lt;p&gt;
-When people call the whole system &ldquo;Linux&rdquo;, as a consequence
+When people call the whole system <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> as a 
consequence
 they call the whole system by the same name as the kernel.
 This causes many kinds of confusion, because only experts can tell
 whether a statement is about the kernel or the whole system.
-By calling the whole system &ldquo;GNU/Linux&rdquo;, and calling the kernel
-&ldquo;Linux&rdquo;, you avoid the ambiguity.&lt;/p&gt;
+By calling the whole 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> and 
calling the kernel
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> you 
avoid the ambiguity.&lt;/p&gt;
 &lt;/dd&gt;
 
 &lt;dt id="linuxalone"&gt;Would Linux have
@@ -428,7 +437,7 @@
     community if you did not divide people with this request? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#divide"&gt;#divide&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing people. 
 We
+When we ask people to say <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 
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.
 &lt;p&gt;
@@ -456,7 +465,8 @@
 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 freedom are more likely to call the system
-&ldquo;GNU/Linux&rdquo;, and people who learn that the system is 
&ldquo;GNU/Linux&rdquo; are
+<span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> and 
people who learn that the system is &ldquo;GNU/Linux&rdquo; are
 more likely to pay attention to our philosophical arguments for
 freedom and community (which is why the choice of name for the system
 makes a real difference for society).  However, the disagreement would
@@ -484,7 +494,7 @@
 
 &lt;dd&gt;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 system do not mention the name &ldquo;GNU&rdquo;, or the 
ideals
+articles about the system do not mention the name <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> or the ideals
 that GNU stands for.  &lt;a
 href="/gnu/gnu-users-never-heard-of-gnu.html"&gt;GNU Users Who Have Never
 Heard of GNU&lt;/a&gt; explains further.
@@ -492,7 +502,7 @@
 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 GNU is.  For instance, many think it is a collection
-of &lt;a href="#tools"&gt;&ldquo;tools&rdquo;&lt;/a&gt;, or a project to 
develop tools.&lt;/p&gt;
+of <span class="removed"><del><strong>&lt;a 
href="#tools"&gt;&ldquo;tools&rdquo;&lt;/a&gt;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;&lt;a 
href="#tools"&gt;tools&lt;/a&gt;,&rdquo;</em></ins></span> or a project to 
develop tools.&lt;/p&gt;
 &lt;p&gt;
 The wording of this question, which is typical, illustrates another
 common misconception.  To speak of &ldquo;GNU's role&rdquo; in developing
@@ -508,8 +518,9 @@
 <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
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> that it 
was started by Linus Torvalds, and that
+it was intended to be &ldquo;open <span 
class="removed"><del><strong>source&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>source.&rdquo;</em></ins></span>  If you don't tell
 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;
 
@@ -538,10 +549,10 @@
 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 that GNU is the name of a collection of programs&mdash;often they
-say &ldquo;programming tools&rdquo;, since some of our programming tools became
+say &ldquo;programming <span 
class="removed"><del><strong>tools&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>tools,&rdquo;</em></ins></span> since some of our 
programming tools became
 popular on their own.  The idea that &ldquo;GNU&rdquo; is the name of an 
operating
 system is hard to fit into a conceptual framework in which that
-operating system is labeled &ldquo;Linux&rdquo;.
+operating system is labeled <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>
 &lt;p&gt;
 The GNU Project was named after the GNU operating system&mdash;it's the project
 to develop the GNU system.  (See &lt;a
@@ -570,7 +581,7 @@
 programs.&lt;/p&gt;
 &lt;p&gt;
 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.  The
+mean <span 
class="removed"><del><strong>&ldquo;kernel&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;kernel.&rdquo;</em></ins></span>  Both uses of 
the term go back many years.  The
 use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is found in 
a number of
 textbooks on system design, going back to the 80s.  At the same time,
 in the 80s, the &ldquo;Unix operating system&rdquo; was understood to include 
all
@@ -581,12 +592,12 @@
 Most of the time when people speak of the &ldquo;Linux operating system&rdquo;
 they are using &ldquo;operating system&rdquo; in the same sense we use: they 
mean
 the whole collection of programs.  If that's what you are referring
-to, please call it &ldquo;GNU/Linux&rdquo;.  If you mean just the kernel, then
+to, please call it <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux.&rdquo;</em></ins></span>  If 
you mean just the kernel, then
 &ldquo;Linux&rdquo; is the right name for it, but please say 
&ldquo;kernel&rdquo; also to
 avoid ambiguity about which body of software you mean.&lt;/p&gt;
 &lt;p&gt;
 If you prefer to use some other term such as &ldquo;system distribution&rdquo; 
for
-the entire collection of programs, instead of &ldquo;operating system&rdquo;,
+the entire collection of programs, instead of &ldquo;operating <span 
class="removed"><del><strong>system&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>system,&rdquo;</em></ins></span>
 that's fine.  Then you would talk about GNU/Linux system
 distributions.&lt;/p&gt;
 &lt;/dd&gt;
@@ -638,8 +649,8 @@
 &lt;dd&gt;
 The people who argue that way for calling the system
 &ldquo;Linux&rdquo; are using a double standard.  An operating system
-requires compilers, editors, window systems, libraries, and much more
-&mdash; hundreds of programs, even to match what BSD systems included
+requires compilers, editors, window systems, libraries, and much
+more&mdash;hundreds of programs, even to match what BSD systems included
 in 1983.  Since Torvalds didn't develop any of those, how can the
 system be &ldquo;Linux&rdquo;?
 
@@ -660,7 +671,8 @@
 &lt;dd&gt;
 Many &lt;a href="/distros/distros.html"&gt; packaged and installable
 versions of GNU&lt;/a&gt; are available.  None of them is called simply
-&ldquo;GNU&rdquo;, but GNU is what they basically are.
+<span class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> but GNU 
is what they basically are.
 
 &lt;p&gt;
 We expected to release the GNU system packaged for installation, but
@@ -687,7 +699,8 @@
 
 &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.
+<span class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> but that 
doesn't alter what kind of thing GNU is.
 GNU is an operating system.&lt;/p&gt;
 &lt;/dd&gt;
 
@@ -697,11 +710,11 @@
 
 &lt;dd&gt;
 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 system 
is
+than the misuse of the name <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  Normally an 
operating system is
 developed as a single unified project, and the developers choose a
 name for the system as a whole.  The kernel usually does not have a
 name of its own&mdash;instead, people say &ldquo;the kernel of 
such-and-such&rdquo; or
-&ldquo;the such-and-such kernel&rdquo;.
+&ldquo;the such-and-such <span 
class="removed"><del><strong>kernel&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>kernel.&rdquo;</em></ins></span>
 &lt;p&gt;
 Because those two constructions are used synonymously, the expression
 &ldquo;the Linux kernel&rdquo; can easily be misunderstood as meaning 
&ldquo;the kernel
@@ -726,11 +739,11 @@
     How about recommending a shorter name? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#long"&gt;#long&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-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;
+For a while we tried the name <span 
class="removed"><del><strong>&ldquo;LiGNUx&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;LiGNUx,&rdquo;</em></ins></span> which 
combines the words &ldquo;GNU&rdquo;
+and <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  The reaction 
was very bad.  People accept &ldquo;GNU/Linux&rdquo;
 much better.
 &lt;p&gt;
-The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but
+The shortest legitimate name for this system is <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> but
 we call it &ldquo;GNU/Linux&rdquo; &lt;a href="#justgnu"&gt; for the reasons
 given below&lt;/a&gt;.&lt;/p&gt;
 &lt;/dd&gt;
@@ -755,7 +768,7 @@
     &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#long2"&gt;#long2&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-&lt;p&gt;It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you
+&lt;p&gt;It only takes a second to say or type <span 
class="removed"><del><strong>&ldquo;GNU/&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU/.&rdquo;</em></ins></span>  If you
 appreciate the system that we developed, can't you take one second
 to recognize our work?&lt;/p&gt;
 &lt;/dd&gt;
@@ -806,9 +819,9 @@
 honorably and openly, rather than by trying to cut him out of the
 credit for his contribution to the system.&lt;/li&gt;
 &lt;li&gt;
-Since many people know of the system as &ldquo;Linux&rdquo;, if we say 
&ldquo;GNU&rdquo; they
+Since many people know of the system as <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> if we say 
&ldquo;GNU&rdquo; they
 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
+say <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> they 
can make a connection to what they have heard
 about.&lt;/li&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>
@@ -816,16 +829,16 @@
 
 &lt;dt id="trademarkfee"&gt;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 wrong if I use 
&ldquo;GNU&rdquo;
-    without &ldquo;Linux&rdquo;, to save the fee? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#trademarkfee"&gt;#trademarkfee&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
+    would also apply if I say <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux.&rdquo;</em></ins></span>  Is 
it wrong if I use &ldquo;GNU&rdquo;
+    without <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> to save the 
fee? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#trademarkfee"&gt;#trademarkfee&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 &lt;dd&gt;
 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.
 &lt;p&gt;
-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.&lt;/p&gt;
+So if you want to refer to the system simply as <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> to avoid paying
+the fee for calling it <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> we won't 
criticize you.&lt;/p&gt;
 &lt;/dd&gt;
 
 &lt;dt id="many"&gt;Many other projects contributed to
@@ -855,7 +868,7 @@
 &lt;p&gt;
 Different threshold levels would lead to different choices of name for
 the system.  But one name that cannot result from concerns of fairness
-and giving credit, not for any possible threshold level, is 
&ldquo;Linux&rdquo;.
+and giving credit, not for any possible threshold level, is <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>
 It can't be fair to give all the credit to one secondary contribution
 (Linux) while omitting the principal contribution (GNU).&lt;/p&gt;
 &lt;/dd&gt;
@@ -869,7 +882,7 @@
 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
+by calling the system &ldquo;GNU/systemd/Linux,&rdquo; there is nothing
 wrong with doing so.&lt;/p&gt;
 &lt;/dd&gt;
 
@@ -894,7 +907,7 @@
 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 the same argument would apply even more
-strongly to calling it &ldquo;Linux&rdquo;.
+strongly to calling it <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>
 
 &lt;p&gt;
 GNU is a small fraction of the system nowadays, and Linux is an
@@ -931,7 +944,7 @@
 
 &lt;dd&gt;
 Following the rules of English, in the construction &ldquo;GNU Linux&rdquo; the
-word &ldquo;GNU&rdquo; modifies &ldquo;Linux&rdquo;.  This can mean either 
&ldquo;GNU's version of
+word &ldquo;GNU&rdquo; modifies <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  This can mean 
either &ldquo;GNU's version of
 Linux&rdquo; or &ldquo;Linux, which is a GNU package.&rdquo;  Neither of those 
meanings
 fits the situation at hand.
 &lt;p&gt;
@@ -944,23 +957,24 @@
 The free GNU/Linux distros do have
 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,
+firmware <span 
class="removed"><del><strong>&ldquo;blobs&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;blobs.&rdquo;</em></ins></span>  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;
 &lt;p&gt;
 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 &ldquo;combination.&rdquo; (Think of
-&ldquo;Input/Output&rdquo;.)  This system is the combination of GNU
-and Linux; hence, &ldquo;GNU/Linux&rdquo;.&lt;/p&gt;
+<span 
class="removed"><del><strong>&ldquo;Input/Output&rdquo;.)</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Input/Output.&rdquo;)</em></ins></span> 
 This system is the combination of GNU
+and Linux; hence, <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;
-There are other ways to express &ldquo;combination&rdquo;.  If you
+There are other ways to express <span 
class="removed"><del><strong>&ldquo;combination&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;combination.&rdquo;</em></ins></span>  
If you
 think that a plus-sign is clearer, please use that.  In French, a
-hyphen is clear: &ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes
-say &ldquo;GNU con Linux&rdquo;.&lt;/p&gt;
+hyphen is clear: <span 
class="removed"><del><strong>&ldquo;GNU-Linux&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU-Linux.&rdquo;</em></ins></span>  In 
Spanish, we sometimes
+say &ldquo;GNU con <span 
class="removed"><del><strong>Linux&rdquo;.&lt;/p&gt;</strong></del></span> 
<span class="inserted"><ins><em>Linux.&rdquo;&lt;/p&gt;
 &lt;/dd&gt;
 
-&lt;dt <span class="inserted"><ins><em>id="pronounce"&gt;How is the name 
&ldquo;GNU/Linux&rdquo;
+&lt;dt id="pronounce"&gt;How is the name &ldquo;GNU/Linux&rdquo;
 pronounced? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#pronounce"&gt;#pronounce&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 &lt;dd&gt;
 &lt;p&gt;
@@ -976,16 +990,16 @@
 &lt;dd&gt;
 &lt;p&gt;
 Following the rules of English, in the construction &ldquo;GNU
-Emacs&rdquo; the word &ldquo;GNU&rdquo; modifies &ldquo;Emacs&rdquo;.
+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.&lt;/p&gt;
 &lt;p&gt;
 &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.&lt;/p&gt;
+program, so &ldquo;GNU/Emacs&rdquo; is the wrong way to refer to 
it.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
-&lt;dt</em></ins></span> id="whyorder"&gt;Why &ldquo;GNU/Linux&rdquo; rather
+&lt;dt id="whyorder"&gt;Why &ldquo;GNU/Linux&rdquo; rather
 than &ldquo;Linux/GNU&rdquo;? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#whyorder"&gt;#whyorder&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
@@ -997,13 +1011,13 @@
 In addition, &ldquo;GNU/Linux&rdquo; fits the fact that Linux is the
 lowest level of the system and GNU fills technically higher levels.&lt;/p&gt;
 &lt;p&gt;
-However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a 
lot
+However, if you prefer to call the system <span 
class="removed"><del><strong>&ldquo;Linux/GNU&rdquo;,</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;Linux/GNU,&rdquo;</em></ins></span> 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.&lt;/p&gt;
 &lt;/dd&gt;
 
 &lt;dt id="distronames0"&gt;My distro's developers call it
-    &ldquo;Foobar Linux&rdquo;, but that doesn't say anything about
+    &ldquo;Foobar <span 
class="removed"><del><strong>Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>Linux,&rdquo;</em></ins></span> but that doesn't say 
anything about
     what the system consists of.  Why shouldn't they call it whatever
     they like? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#distronames0"&gt;#distronames0&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 &lt;dd&gt;
@@ -1032,9 +1046,10 @@
     anything but &ldquo;Foobar Linux&rdquo;? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#distronames1"&gt;#distronames1&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;&lt;p&gt;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 proper for you to correct the misinformation by
-calling it &ldquo;Foobar GNU/Linux&rdquo;.&lt;/p&gt;&lt;/dd&gt;
+to <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> and call their 
version of it &ldquo;Foobar
+<span class="removed"><del><strong>Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>Linux,&rdquo;</em></ins></span> it's proper 
for you to correct the misinformation by
+calling it &ldquo;Foobar <span 
class="removed"><del><strong>GNU/Linux&rdquo;.&lt;/p&gt;&lt;/dd&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>GNU/Linux.&rdquo;&lt;/p&gt;&lt;/dd&gt;</em></ins></span>
 
 &lt;dt id="companies"&gt;Wouldn't it be more
     effective to ask companies such as Mandrake, Red Hat and IBM to
@@ -1055,7 +1070,7 @@
 just because the road isn't easy.  You may not have as much 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;.&lt;/p&gt;
+more profit calling it <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;/dd&gt;
 
 &lt;dt id="reserve"&gt;Wouldn't it be better to
@@ -1066,7 +1081,7 @@
 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 <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
+of <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  Many 
&ldquo;Linux&rdquo; User Groups make it part of their mission to
 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 <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span>
@@ -1089,7 +1104,8 @@
 With this understanding, they can start to recognize the distributions
 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;
+<span 
class="removed"><del><strong>Linux&rdquo;.&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>Linux.&rdquo;&lt;/p&gt;</em></ins></span>
 &lt;p&gt;
 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
@@ -1129,8 +1145,9 @@
 GNU Hurd to work, we might have done that.  (Alas, that is hindsight.)
 &lt;p&gt;
 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
-and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and we don't
+<span class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> that 
would be somewhat like making a version of the GNU system
+and labeling it <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  That wasn't 
right, and we don't
 want to act like that.&lt;/p&gt;
 &lt;/dd&gt;
 
@@ -1149,7 +1166,7 @@
 &lt;p&gt;
 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 with the GNU Project because he was a &ldquo;Linux user&rdquo;.
+about working with the GNU Project because he was a &ldquo;Linux <span 
class="removed"><del><strong>user&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>user.&rdquo;</em></ins></span>
 That came as a shock, because the people who ported GNU packages to
 other systems had generally wanted to work with us to get their
 changes installed.  Yet these people, developing a system that was
@@ -1157,7 +1174,7 @@
 only) group that was unwilling to work with us.&lt;/p&gt;
 &lt;p&gt;
 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
+version of the GNU system <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> and that this 
confusion was
 obstructing our work.  Asking you to call the system &ldquo;GNU/Linux&rdquo; is
 our response to that problem, and to the other problems caused by the
 &ldquo;Linux&rdquo; misnomer.&lt;/p&gt;
@@ -1176,8 +1193,8 @@
     convention be applied to all programs that are GPL'ed? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#allgpled"&gt;#allgpled&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-We never refer to individual programs as 
&ldquo;GNU/&lt;i&gt;name&lt;/i&gt;&rdquo;.  When a program
-is a GNU package, we may call it &ldquo;GNU &lt;i&gt;name&lt;/i&gt;&rdquo;.
+We never refer to individual programs as <span 
class="removed"><del><strong>&ldquo;GNU/&lt;i&gt;name&lt;/i&gt;&rdquo;.</strong></del></span>
 <span 
class="inserted"><ins><em>&ldquo;GNU/&lt;i&gt;name&lt;/i&gt;.&rdquo;</em></ins></span>
  When a program
+is a GNU package, we may call it &ldquo;GNU <span 
class="removed"><del><strong>&lt;i&gt;name&lt;/i&gt;&rdquo;.</strong></del></span>
 <span 
class="inserted"><ins><em>&lt;i&gt;name&lt;/i&gt;.&rdquo;</em></ins></span>
 &lt;p&gt;
 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
@@ -1230,15 +1247,17 @@
 &lt;p&gt;
 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.  The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not
-Unix&rdquo;, is a humorous way of giving credit to Unix for this,
+Unix.  The name <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> which stands for 
&ldquo;GNU's Not
+<span class="removed"><del><strong>Unix&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>Unix,&rdquo;</em></ins></span> is a humorous 
way of giving credit to Unix for this,
 following a hacker tradition of recursive acronyms that started in the
 70s.&lt;/p&gt;
 &lt;p&gt;
 The first such recursive acronym was TINT, &ldquo;TINT Is Not
-TECO&rdquo;.  The author of TINT wrote another implementation of TECO
+<span class="removed"><del><strong>TECO&rdquo;.</strong></del></span>
+<span class="inserted"><ins><em>TECO.&rdquo;</em></ins></span>  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;&lt;em&gt;somethingorother&lt;/em&gt; 
TECO&rdquo;, he
+calling it by a dull name like &ldquo;&lt;em&gt;somethingorother&lt;/em&gt; 
<span class="removed"><del><strong>TECO&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>TECO,&rdquo;</em></ins></span> he
 thought of a clever amusing name.  (That's what hacking
 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;
@@ -1248,7 +1267,7 @@
 program that was similar to some existing program (let's imagine its
 name was &ldquo;Klever&rdquo;), you could give it a recursive acronym name, 
such
 as &ldquo;MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo;  In this same 
spirit we called our
-replacement for Unix &ldquo;GNU's Not Unix&rdquo;.&lt;/p&gt;
+replacement for Unix &ldquo;GNU's Not <span 
class="removed"><del><strong>Unix&rdquo;.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>Unix.&rdquo;&lt;/p&gt;</em></ins></span>
 &lt;p&gt;
 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
@@ -1256,7 +1275,8 @@
 threatened to sue anyone giving AT&amp;T credit in that way.  This is
 why each of the various modified versions of Unix (all proprietary,
 like Unix) had a completely different name that didn't include
-&ldquo;Unix&rdquo;.&lt;/p&gt;
+<span 
class="removed"><del><strong>&ldquo;Unix&rdquo;.&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Unix.&rdquo;&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="bsd"&gt;Should we say &ldquo;GNU/BSD&rdquo;
@@ -1287,7 +1307,7 @@
 why the name &ldquo;GNU/Linux&rdquo; is appropriate for it.&lt;/p&gt;
 &lt;p&gt;
 There is a version of GNU which uses the kernel from NetBSD.  Its
-developers call it &ldquo;Debian GNU/NetBSD&rdquo;, but 
&ldquo;GNU/kernelofNetBSD&rdquo;
+developers call it &ldquo;Debian <span 
class="removed"><del><strong>GNU/NetBSD&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>GNU/NetBSD,&rdquo;</em></ins></span> but 
&ldquo;GNU/kernelofNetBSD&rdquo;
 would be more accurate, since NetBSD is an entire system, not just
 the kernel.  This is not a BSD system, since most of the system
 is the same as the GNU/Linux system.&lt;/p&gt;
@@ -1298,7 +1318,7 @@
 
 &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
+Not in the same sense that we mean by <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux.&rdquo;</em></ins></span>  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,
@@ -1349,7 +1369,7 @@
 the two have very little code in common.  In fact, the only thing they
 have in common is Linux.&lt;/p&gt;
 &lt;p&gt;
-If you call the whole GNU/Linux system &ldquo;Linux&rdquo;,
+If you call the whole GNU/Linux system <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span>
 you will find it necessary to say things like, &ldquo;Android contains
 Linux, but it isn't Linux, because it doesn't have the usual Linux
 [sic] libraries and utilities [meaning the GNU system].&rdquo;&lt;/p&gt;
@@ -1368,22 +1388,24 @@
 people will not understand the intended meaning.
 &lt;p&gt;
 The public will find it very strange to speak of using Android as
-&ldquo;using Linux&rdquo;.  It's like having a conversation, then
+&ldquo;using <span 
class="removed"><del><strong>Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>Linux.&rdquo;</em></ins></span>  It's like having a 
conversation, then
 saying you were conversing with the person's intestines or the
 person's circulatory system.&lt;/p&gt;
 &lt;p&gt;
 The public &lt;em&gt;will&lt;/em&gt; 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;.&lt;/p&gt;
+<span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.&lt;/p&gt;</strong></del></span>
+<span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;&lt;/p&gt;</em></ins></span>
 &lt;p&gt;
 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 contain Linux is irrelevant to using them, just as the
 fact that a car and a bicycle both have a structure of metal is
 irrelevant to using those two.  If you wish to talk about using cars
-and bikes, you wouldn't speak of &ldquo;riding metal objects&rdquo;
-&mdash; not unless you're playing games with the reader.  You would
+and bikes, you wouldn't speak of &ldquo;riding metal <span 
class="removed"><del><strong>objects&rdquo;
+&mdash; not</strong></del></span> <span 
class="inserted"><ins><em>objects&rdquo;&mdash;not</em></ins></span>
+unless you're playing games with the reader.  You would
 say, &ldquo;using cars and bikes.&rdquo; Likewise, the clear way to
 talk about using GNU/Linux and Android is to say &ldquo;using
 GNU/Linux and Android.&rdquo;&lt;/p&gt;
@@ -1430,7 +1452,7 @@
 <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
+or label it as <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU.&rdquo;</em></ins></span>  When we talk 
about the whole
 system, the name &ldquo;GNU/Linux&rdquo; gives him a share of the
 <span class="removed"><del><strong>credit.</strong></del></span>
 <span class="inserted"><ins><em>credit.&lt;/p&gt;</em></ins></span>
@@ -1441,13 +1463,17 @@
     agree that Linux is just the kernel? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#linusagreed"&gt;#linusagreed&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-&lt;p&gt;He recognized this at the beginning.  The earliest Linux release notes
+&lt;p&gt;He recognized this at the beginning.  The <span 
class="inserted"><ins><em>&lt;a
+href="https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;</em></ins></span>
+earliest Linux release <span class="removed"><del><strong>notes
 said, &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>
-&ldquo;Most of the tools used with linux are GNU software and are under the
+href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;
+&ldquo;Most</strong></del></span> <span 
class="inserted"><ins><em>notes&lt;/a&gt; said:&lt;/p&gt;
+&lt;blockquote&gt;&lt;p&gt;
+Most</em></ins></span> 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;
+for more <span 
class="removed"><del><strong>info&rdquo;&lt;/a&gt;.&lt;/p&gt;</strong></del></span>
 <span class="inserted"><ins><em>info.
+&lt;/p&gt;&lt;/blockquote&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="finishhurd"&gt;Why not finish the GNU Hurd kernel, release the GNU 
system
@@ -1475,7 +1501,7 @@
 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
+name to use.  You can't make others say <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> but
 you can decide to call the system &ldquo;GNU/Linux&rdquo;
 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;
@@ -1488,10 +1514,10 @@
 <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
+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> you 
will help others learn the system's true
 history, origin, and reason for being.  You can't correct the misnomer
 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
+only a few hundred people see you use the term <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> you 
will
 have educated a substantial number of people with very little work.
 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;
@@ -1503,14 +1529,15 @@
 &lt;dd&gt;
 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.
+calling 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> and 
uses your time inefficiently.
 &lt;p&gt;
 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, and they may learn a correct picture of the system's
 origin.  But they are unlikely to repeat the explanation to others
 whenever they talk about the system.  They will probably just call it
-&ldquo;Linux&rdquo;.  Without particularly intending to, they will help spread 
the
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  
Without particularly intending to, they will help spread the
 incorrect picture.&lt;/p&gt;
 &lt;p&gt;
 It is inefficient because it takes a lot more time.  Saying and
@@ -1576,7 +1603,8 @@
 &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 <span 
class="removed"><del><strong>too.</strong></del></span> <span 
class="inserted"><ins><em>too.&lt;/p&gt;</em></ins></span>
+<span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> 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
@@ -1620,7 +1648,7 @@
 &lt;/dd&gt;
 
 &lt;dt id="deserve"&gt;Since you failed to put
-    something in the GNU GPL to require people to call the system 
&ldquo;GNU&rdquo;,
+    something in the GNU GPL to require people to call the system <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span>
     you deserve what happened; why are you complaining now? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#deserve"&gt;#deserve&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
@@ -1646,7 +1674,7 @@
 &lt;/dd&gt;
 
 &lt;dt id="somanyright"&gt;Since many people call
-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;
+it <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> 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;
 <span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
@@ -1659,7 +1687,7 @@
 &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
+includes <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> 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 <span 
class="removed"><del><strong>understand.</strong></del></span> <span 
class="inserted"><ins><em>understand.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
@@ -1740,7 +1768,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/08/31 10:37:07 $
+$Date: 2021/11/02 14:41:51 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: po/gnu-linux-faq.de.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.de.po,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -b -r1.126 -r1.127
--- po/gnu-linux-faq.de.po      31 Aug 2021 10:37:07 -0000      1.126
+++ po/gnu-linux-faq.de.po      2 Nov 2021 14:41:51 -0000       1.127
@@ -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-08-31 10:27+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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"
@@ -33,10 +33,19 @@
 msgid "by Richard Stallman"
 msgstr "von <strong>Richard Stallman</strong>"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+# | When people see that we use and recommend the name GNU/Linux for a system
+# | that many others call just [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} they ask many questions.  Here are common
+# | questions, and our answers.
+#, fuzzy
+#| 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."
 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.  "
+"that many others call just &ldquo;Linux,&rdquo; they ask many questions.  "
 "Here are common questions, and our answers."
 msgstr ""
 "Wenn wir den Namen <b>GNU/Linux</b> für ein System verwenden und empfehlen, "
@@ -261,11 +270,22 @@
 "das System tatsächlich einfach <em>GNU</em> zu nennen?</a>"
 
 #. type: Content of: <div><div><ul><li>
+# | <a href=\"#trademarkfee\">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;.-] {+&ldquo;GNU/Linux.&rdquo;+} Is it
+# | wrong if I use &ldquo;GNU&rdquo; without [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} to save the fee?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#trademarkfee\">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 wrong if I use &ldquo;GNU&rdquo; without "
+#| "&ldquo;Linux&rdquo;, to save the fee?</a>"
 msgid ""
 "<a href=\"#trademarkfee\">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 wrong if I use &ldquo;GNU&rdquo; without "
-"&ldquo;Linux&rdquo;, to save the fee?</a>"
+"&ldquo;GNU/Linux.&rdquo; Is it wrong if I use &ldquo;GNU&rdquo; without "
+"&ldquo;Linux,&rdquo; to save the fee?</a>"
 msgstr ""
 "<a href=\"#trademarkfee\">Für die Nutzung von <em>Linux</em> im Namen eines "
 "Produktes würde eine Gebühr entrichtet werden müssen, auch, wenn es 
<em>GNU/"
@@ -373,10 +393,19 @@
 "<a href=\"#whyorder\">Warum <b>GNU/Linux</b> statt <em>Linux/GNU</em>?</a>"
 
 #. type: Content of: <div><div><ul><li>
-msgid ""
-"<a href=\"#distronames0\">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 whatever they like?</a>"
+# | <a href=\"#distronames0\">My distro's developers call it &ldquo;Foobar
+# | [-Linux&rdquo;,-] {+Linux,&rdquo;+} but that doesn't say anything about
+# | what the system consists of.  Why shouldn't they call it whatever they
+# | like?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#distronames0\">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 whatever they like?</a>"
+msgid ""
+"<a href=\"#distronames0\">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 whatever they like?</a>"
 msgstr ""
 "<a href=\"#distronames0\">Die Entwickler meiner Distribution nennen es <em>"
 "„Fubar Linux“</em>, aber das sagt nichts darüber aus, woraus das System "
@@ -636,9 +665,18 @@
 "um zu verlangen, das System GNU zu nennen?</a>"
 
 #. type: Content of: <div><div><ul><li>
+# | <a href=\"#deserve\">Since you failed to put something in the GNU GPL to
+# | require people to call the system [-&ldquo;GNU&rdquo;,-]
+# | {+&ldquo;GNU,&rdquo;+} you deserve what happened; why are you complaining
+# | now?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#deserve\">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 complaining now?</a>"
 msgid ""
 "<a href=\"#deserve\">Since you failed to put something in the GNU GPL to "
-"require people to call the system &ldquo;GNU&rdquo;, you deserve what "
+"require people to call the system &ldquo;GNU,&rdquo; you deserve what "
 "happened; why are you complaining now?</a>"
 msgstr ""
 "<a href=\"#deserve\">Da ihr versäumt habt etwas in die GNU GPL aufzunehmen, "
@@ -654,8 +692,15 @@
 "so viele glauben?</a>"
 
 #. type: Content of: <div><div><ul><li>
+# | <a href=\"#somanyright\">Since many people call it
+# | [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} doesn't that make it
+# | right?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#somanyright\">Since many people call it &ldquo;Linux&rdquo;, "
+#| "doesn't that make it right?</a>"
 msgid ""
-"<a href=\"#somanyright\">Since many people call it &ldquo;Linux&rdquo;, "
+"<a href=\"#somanyright\">Since many people call it &ldquo;Linux,&rdquo; "
 "doesn't that make it right?</a>"
 msgstr ""
 "<a href=\"#somanyright\">Da es viele <em>„Linux“</em> nennen, macht es 
das "
@@ -844,6 +889,24 @@
 "Durcheinander schon einen großen Vorsprung."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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 it must be right.  The name &ldquo;Linux&rdquo; also spreads a
+# | false picture of the system's origin, because people tend to suppose that
+# | the system's history was such as to fit that name.  For instance, they
+# | often believe its development was started by Linus Torvalds in 1991.  This
+# | false picture tends to reinforce the idea that the system should be called
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+}
+#, fuzzy
+#| 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 it must be right.  The name &ldquo;Linux&rdquo; also spreads a "
+#| "false picture of the system's origin, because people tend to suppose that "
+#| "the system's history was such as to fit that name.  For instance, they "
+#| "often believe its development was started by Linus Torvalds in 1991.  "
+#| "This false picture tends to reinforce the idea that the system should be "
+#| "called &ldquo;Linux&rdquo;."
 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 "
@@ -851,7 +914,7 @@
 "of the system's origin, because people tend to suppose that the system's "
 "history was such as to fit that name.  For instance, they often believe its "
 "development was started by Linus Torvalds in 1991.  This false picture tends "
-"to reinforce the idea that the system should be called &ldquo;Linux&rdquo;."
+"to reinforce the idea that the system should be called &ldquo;Linux.&rdquo;"
 msgstr ""
 "Die meisten Menschen, die das System <em>„Linux“</em> nennen, haben noch 
nie "
 "gehört, warum das nicht Richtig ist. Sie sahen andere diesen Namen verwenden 
"
@@ -879,22 +942,46 @@
 "class=\"anchor-reference-id\">(<a href=\"#always\">#always</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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;,-] {+&ldquo;Linux,&rdquo;+} the name its developer
+# | chose.
+#, fuzzy
+#| 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."
 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."
+"you're referring specifically to the kernel, you should call it &ldquo;Linux,"
+"&rdquo; the name its developer chose."
 msgstr ""
 "Nicht immer&#160;&#8209;&#160;nur, wenn man über das Gesamtsystem spricht. "
 "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><dl><dd><p>
+# | When people call the whole system [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} as a consequence they call the whole system by
+# | the same name as the kernel.  This causes many kinds of confusion, because
+# | only experts can tell whether a statement is about the kernel or the whole
+# | system.  By calling the whole system [-&ldquo;GNU/Linux&rdquo;,-]
+# | {+&ldquo;GNU/Linux,&rdquo;+} and calling the kernel
+# | [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} you avoid the ambiguity.
+#, fuzzy
+#| 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 kinds of confusion, because only experts can tell whether a "
+#| "statement is about the kernel or the whole system.  By calling the whole "
+#| "system &ldquo;GNU/Linux&rdquo;, and calling the kernel &ldquo;"
+#| "Linux&rdquo;, you avoid the ambiguity."
 msgid ""
-"When people call the whole system &ldquo;Linux&rdquo;, as a consequence they "
+"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 "
 "kinds of confusion, because only experts can tell whether a statement is "
 "about the kernel or the whole system.  By calling the whole system &ldquo;"
-"GNU/Linux&rdquo;, and calling the kernel &ldquo;Linux&rdquo;, you avoid the "
+"GNU/Linux,&rdquo; and calling the kernel &ldquo;Linux,&rdquo; you avoid the "
 "ambiguity."
 msgstr ""
 "Wenn das Gesamtsystem <em>„Linux“</em> genannt wird, wird als Konsequenz 
das "
@@ -965,8 +1052,17 @@
 "\"#divide\">#divide</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | When we ask people to say [-&ldquo;GNU/Linux&rdquo;,-]
+# | {+&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.
+#, fuzzy
+#| 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."
 msgid ""
-"When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing "
+"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 ""
@@ -1023,10 +1119,34 @@
 "Software verfehlt</cite></a>."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | freedom are more likely to call the system [-&ldquo;GNU/Linux&rdquo;,-]
+# | {+&ldquo;GNU/Linux,&rdquo;+} and people who learn that the system is
+# | &ldquo;GNU/Linux&rdquo; are more likely to pay attention to our
+# | philosophical arguments for freedom and community (which is why the choice
+# | of name for the system makes a real difference for society).  However, the
+# | disagreement would probably exist even if everyone knew the system's real
+# | origin and its proper name, because the issue is a real one.  It can only
+# | go away if we who value freedom either persuade everyone (which won't be
+# | easy) or are defeated entirely (let's hope not).
+#, fuzzy
+#| 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 freedom are more likely to call the system &ldquo;GNU/"
+#| "Linux&rdquo;, and people who learn that the system is &ldquo;GNU/"
+#| "Linux&rdquo; are more likely to pay attention to our philosophical "
+#| "arguments for freedom and community (which is why the choice of name for "
+#| "the system makes a real difference for society).  However, the "
+#| "disagreement would probably exist even if everyone knew the system's real "
+#| "origin and its proper name, because the issue is a real one.  It can only "
+#| "go away if we who value freedom either persuade everyone (which won't be "
+#| "easy) or are defeated entirely (let's hope not)."
 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 "
-"freedom are more likely to call the system &ldquo;GNU/Linux&rdquo;, and "
+"freedom are more likely to call the system &ldquo;GNU/Linux,&rdquo; and "
 "people who learn that the system is &ldquo;GNU/Linux&rdquo; are more likely "
 "to pay attention to our philosophical arguments for freedom and community "
 "(which is why the choice of name for the system makes a real difference for "
@@ -1085,10 +1205,23 @@
 "</span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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
+# | system do not mention the name [-&ldquo;GNU&rdquo;,-]
+# | {+&ldquo;GNU,&rdquo;+} or the ideals that GNU stands for.  <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never
+# | Heard of GNU</a> explains further.
+#, fuzzy
+#| 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 system do not mention the name &ldquo;GNU&rdquo;, or the ideals that "
+#| "GNU stands for.  <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU "
+#| "Users Who Have Never Heard of GNU</a> explains further."
 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 "
-"system do not mention the name &ldquo;GNU&rdquo;, or the ideals that GNU "
+"system do not mention the name &ldquo;GNU,&rdquo; or the ideals that GNU "
 "stands for.  <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users "
 "Who Have Never Heard of GNU</a> explains further."
 msgstr ""
@@ -1100,11 +1233,22 @@
 "weitere Auskunft."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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 GNU is.  For instance, many think it is a collection of [-<a
+# | href=\"#tools\">&ldquo;tools&rdquo;</a>,-] {+&ldquo;<a
+# | href=\"#tools\">tools</a>,&rdquo;+} or a project to develop tools.
+#, fuzzy
+#| 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 GNU is.  For instance, many think it is a collection of <a "
+#| "href=\"#tools\">&ldquo;tools&rdquo;</a>, or a project to develop tools."
 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 "
-"GNU is.  For instance, many think it is a collection of <a href=\"#tools"
-"\">&ldquo;tools&rdquo;</a>, or a project to develop tools."
+"GNU is.  For instance, many think it is a collection of &ldquo;<a href="
+"\"#tools\">tools</a>,&rdquo; or a project to develop tools."
 msgstr ""
 "Die Leute, die das sagen, sind wahrscheinlich Geeks, die an die Geeks "
 "denken, die sie kennen. Geeks wissen oft über GNU Bescheid, aber viele 
haben "
@@ -1138,11 +1282,23 @@
 "\"#everyoneknows2\">#everyoneknows2</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | 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;,-] {+&ldquo;Linux,&rdquo;+} that it was started by
+# | Linus Torvalds, and that it was intended to be &ldquo;open
+# | [-source&rdquo;.-] {+source.&rdquo;+} If you don't tell them, who will?
+#, fuzzy
+#| 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;"
+#| "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?"
 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;"
-"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?"
+"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?"
 msgstr ""
 "Wenn Worte kein Wissen widerspiegeln, sollte man andere nicht unterrichtet. "
 "Die meisten Menschen, die vom GNU/Linux-System gehört haben, denken es sei "
@@ -1200,14 +1356,31 @@
 "\">#tools</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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
+# | that GNU is the name of a collection of programs&mdash;often they say
+# | &ldquo;programming [-tools&rdquo;,-] {+tools,&rdquo;+} since some of our
+# | programming tools became popular on their own.  The idea that
+# | &ldquo;GNU&rdquo; is the name of an operating system is hard to fit into a
+# | conceptual framework in which that operating system is labeled
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+}
+#, fuzzy
+#| 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 "
+#| "that GNU is the name of a collection of programs&mdash;often they say "
+#| "&ldquo;programming tools&rdquo;, since some of our programming tools "
+#| "became popular on their own.  The idea that &ldquo;GNU&rdquo; is the name "
+#| "of an operating system is hard to fit into a conceptual framework in "
+#| "which that operating system is labeled &ldquo;Linux&rdquo;."
 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 "
 "that GNU is the name of a collection of programs&mdash;often they say &ldquo;"
-"programming tools&rdquo;, since some of our programming tools became popular "
+"programming tools,&rdquo; since some of our programming tools became popular "
 "on their own.  The idea that &ldquo;GNU&rdquo; is the name of an operating "
 "system is hard to fit into a conceptual framework in which that operating "
-"system is labeled &ldquo;Linux&rdquo;."
+"system is labeled &ldquo;Linux.&rdquo;"
 msgstr ""
 "Menschen, die„Linux für ein vollständiges Betriebssystem betrachten, "
 "bekommen häufig, wenn sie überhaupt von GNU erfahren, eine falsche "
@@ -1278,12 +1451,32 @@
 "Starten und Stoppen anderer Programme."
 
 #. type: Content of: <div><dl><dd><p>
+# | To confuse matters, some people use the term &ldquo;operating
+# | system&rdquo; to mean [-&ldquo;kernel&rdquo;.-] {+&ldquo;kernel.&rdquo;+}
+# | Both uses of the term go back many years.  The use of &ldquo;operating
+# | system&rdquo; to mean &ldquo;kernel&rdquo; is found in a number of
+# | textbooks on system design, going back to the 80s.  At the same time, in
+# | the 80s, the &ldquo;Unix operating system&rdquo; was understood to include
+# | all the system programs, and Berkeley's version of Unix included even
+# | games. Since we intended GNU to be a Unix-like operating system, we use
+# | the term &ldquo;operating system&rdquo; in the same way.
+#, fuzzy
+#| 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.  The use of &ldquo;operating system&rdquo; to mean "
+#| "&ldquo;kernel&rdquo; is found in a number of textbooks on system design, "
+#| "going back to the 80s.  At the same time, in the 80s, the &ldquo;Unix "
+#| "operating system&rdquo; was understood to include all the system "
+#| "programs, and Berkeley's version of Unix included even games. Since we "
+#| "intended GNU to be a Unix-like operating system, we use the term &ldquo;"
+#| "operating system&rdquo; in the same way."
 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.  "
-"The use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is "
-"found in a number of textbooks on system design, going back to the 80s.  At "
-"the same time, in the 80s, the &ldquo;Unix operating system&rdquo; was "
+"to mean &ldquo;kernel.&rdquo; Both uses of the term go back many years.  The "
+"use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is found "
+"in a number of textbooks on system design, going back to the 80s.  At the "
+"same time, in the 80s, the &ldquo;Unix operating system&rdquo; was "
 "understood to include all the system programs, and Berkeley's version of "
 "Unix included even games. Since we intended GNU to be a Unix-like operating "
 "system, we use the term &ldquo;operating system&rdquo; in the same way."
@@ -1299,11 +1492,28 @@
 "verwendeten wir den Begriff <em>Betriebssystem</em> auf die gleiche Weise."
 
 #. type: Content of: <div><dl><dd><p>
+# | Most of the time when people speak of the &ldquo;Linux operating
+# | system&rdquo; they are using &ldquo;operating system&rdquo; in the same
+# | sense we use: they mean the whole collection of programs.  If that's what
+# | you are referring to, please call it [-&ldquo;GNU/Linux&rdquo;.-]
+# | {+&ldquo;GNU/Linux.&rdquo;+} If you mean just the kernel, then
+# | &ldquo;Linux&rdquo; is the right name for it, but please say
+# | &ldquo;kernel&rdquo; also to avoid ambiguity about which body of software
+# | you mean.
+#, fuzzy
+#| 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 "
+#| "sense we use: they mean the whole collection of programs.  If that's what "
+#| "you are referring to, please call it &ldquo;GNU/Linux&rdquo;.  If you "
+#| "mean just the kernel, then &ldquo;Linux&rdquo; is the right name for it, "
+#| "but please say &ldquo;kernel&rdquo; also to avoid ambiguity about which "
+#| "body of software you mean."
 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 "
 "sense we use: they mean the whole collection of programs.  If that's what "
-"you are referring to, please call it &ldquo;GNU/Linux&rdquo;.  If you mean "
+"you are referring to, please call it &ldquo;GNU/Linux.&rdquo; If you mean "
 "just the kernel, then &ldquo;Linux&rdquo; is the right name for it, but "
 "please say &ldquo;kernel&rdquo; also to avoid ambiguity about which body of "
 "software you mean."
@@ -1316,10 +1526,20 @@
 "Unklarheiten zu vermeiden, welcher Teil der Software gemeint ist."
 
 #. type: Content of: <div><dl><dd><p>
+# | If you prefer to use some other term such as &ldquo;system
+# | distribution&rdquo; for the entire collection of programs, instead of
+# | &ldquo;operating [-system&rdquo;,-] {+system,&rdquo;+} that's fine.  Then
+# | you would talk about GNU/Linux system distributions.
+#, fuzzy
+#| msgid ""
+#| "If you prefer to use some other term such as &ldquo;system "
+#| "distribution&rdquo; for the entire collection of programs, instead of "
+#| "&ldquo;operating system&rdquo;, that's fine.  Then you would talk about "
+#| "GNU/Linux system distributions."
 msgid ""
 "If you prefer to use some other term such as &ldquo;system "
 "distribution&rdquo; for the entire collection of programs, instead of &ldquo;"
-"operating system&rdquo;, that's fine.  Then you would talk about GNU/Linux "
+"operating system,&rdquo; that's fine.  Then you would talk about GNU/Linux "
 "system distributions."
 msgstr ""
 "Wenn Sie einen anderen Begriff wie <em>Systemdistribution</em> anstelle von "
@@ -1428,9 +1648,9 @@
 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, "
-"window systems, libraries, and much more &mdash; hundreds of programs, even "
-"to match what BSD systems included in 1983.  Since Torvalds didn't develop "
-"any of those, how can the system be &ldquo;Linux&rdquo;?"
+"window systems, libraries, and much more&mdash;hundreds of programs, even to "
+"match what BSD systems included in 1983.  Since Torvalds didn't develop any "
+"of those, how can the system be &ldquo;Linux&rdquo;?"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><p>
@@ -1457,9 +1677,18 @@
 "reference-id\">(<a href=\"#notinstallable\">#notinstallable</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | Many <a href=\"/distros/distros.html\"> packaged and installable versions
+# | of GNU</a> are available.  None of them is called simply
+# | [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} but GNU is what they
+# | basically are.
+#, fuzzy
+#| 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."
 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</a> are available.  None of them is called simply &ldquo;GNU,&rdquo; but "
 "GNU is what they basically are."
 msgstr ""
 "Viele <a href=\"/distros/\">zusammengestellte und installierbare Varianten "
@@ -1513,9 +1742,17 @@
 "neu zu verpacken ein."
 
 #. type: Content of: <div><dl><dd><p>
+# | We never took the last step of packaging GNU under the name
+# | [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} but that doesn't alter what
+# | kind of thing GNU is.  GNU is an operating system.
+#, fuzzy
+#| 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."
 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 "
+"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 ""
 "Wir machten niemals den letzten Schritt, GNU unter dem Namen 
<em>‚GNU‘</em> "
@@ -1534,13 +1771,28 @@
 "span>"
 
 #. type: Content of: <div><dl><dd>
+# | That practice seems to be very rare&mdash;we can't find any examples other
+# | than the misuse of the name [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+} Normally an operating system is developed as a
+# | single unified project, and the developers choose a name for the system as
+# | a whole.  The kernel usually does not have a name of its
+# | own&mdash;instead, people say &ldquo;the kernel of such-and-such&rdquo; or
+# | &ldquo;the such-and-such [-kernel&rdquo;.-] {+kernel.&rdquo;+}
+#, fuzzy
+#| 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 system is developed as a single unified project, and the "
+#| "developers choose a name for the system as a whole.  The kernel usually "
+#| "does not have a name of its own&mdash;instead, people say &ldquo;the "
+#| "kernel of such-and-such&rdquo; or &ldquo;the such-and-such kernel&rdquo;."
 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 "
+"than the misuse of the name &ldquo;Linux.&rdquo; Normally an operating "
 "system is developed as a single unified project, and the developers choose a "
 "name for the system as a whole.  The kernel usually does not have a name of "
 "its own&mdash;instead, people say &ldquo;the kernel of such-and-such&rdquo; "
-"or &ldquo;the such-and-such kernel&rdquo;."
+"or &ldquo;the such-and-such kernel.&rdquo;"
 msgstr ""
 "Diese Praxis scheint sehr selten zu sein&#160;&#8209;&#160;außer dem "
 "Missbrauch des Namens <em>„Linux“</em> können wir keine anderen 
Beispiele "
@@ -1599,9 +1851,18 @@
 "\"#long\">#long</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | For a while we tried the name [-&ldquo;LiGNUx&rdquo;,-]
+# | {+&ldquo;LiGNUx,&rdquo;+} which combines the words &ldquo;GNU&rdquo; and
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} The reaction was very
+# | bad.  People accept &ldquo;GNU/Linux&rdquo; much better.
+#, fuzzy
+#| 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."
 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.  "
+"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 ""
 "Eine Zeit lang versuchten wir den Namen <em>LiGNUx</em>, der die Worte "
@@ -1609,8 +1870,16 @@
 "<b>GNU/Linux</b> wurde viel besser akzeptiert."
 
 #. type: Content of: <div><dl><dd><p>
+# | The shortest legitimate name for this system is [-&ldquo;GNU&rdquo;,-]
+# | {+&ldquo;GNU,&rdquo;+} but we call it &ldquo;GNU/Linux&rdquo; <a
+# | href=\"#justgnu\"> for the reasons given below</a>.
+#, fuzzy
+#| 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>."
 msgid ""
-"The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but we "
+"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 ""
@@ -1661,8 +1930,16 @@
 
 # en: sprich "GNU Slash"
 #. type: Content of: <div><dl><dd><p>
+# | It only takes a second to say or type [-&ldquo;GNU/&rdquo;.-]
+# | {+&ldquo;GNU/.&rdquo;+} If you appreciate the system that we developed,
+# | can't you take one second to recognize our work?
+#, fuzzy
+#| 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?"
 msgid ""
-"It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you appreciate "
+"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 ""
@@ -1786,10 +2063,21 @@
 "seinen Beitrag zum System nicht anzuerkennen."
 
 #. type: Content of: <div><dl><dd><ul><li>
+# | Since many people know of the system as [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} if we say &ldquo;GNU&rdquo; they may simply not
+# | recognize we're talking about the same system.  If we say
+# | [-&ldquo;GNU/Linux&rdquo;,-] {+&ldquo;GNU/Linux,&rdquo;+} they can make a
+# | connection to what they have heard about.
+#, fuzzy
+#| 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 system.  If we say &ldquo;GNU/Linux&rdquo;, they can make a "
+#| "connection to what they have heard about."
 msgid ""
-"Since many people know of the system as &ldquo;Linux&rdquo;, if we say "
+"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 "
-"system.  If we say &ldquo;GNU/Linux&rdquo;, they can make a connection to "
+"system.  If we say &ldquo;GNU/Linux,&rdquo; they can make a connection to "
 "what they have heard about."
 msgstr ""
 "Da viele das System nur als <em>„Linux“</em> kennen, können sie einfach "
@@ -1798,10 +2086,23 @@
 "herstellen, worüber sie gehört haben."
 
 #. type: Content of: <div><dl><dt>
+# | 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;.-]
+# | {+&ldquo;GNU/Linux.&rdquo;+} Is it wrong if I use &ldquo;GNU&rdquo;
+# | without [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} to save the fee?
+# | <span class=\"anchor-reference-id\">(<a
+# | href=\"#trademarkfee\">#trademarkfee</a>)</span>
+#, fuzzy
+#| 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 wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to save "
+#| "the fee? <span class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
+#| "\">#trademarkfee</a>)</span>"
 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 "
-"wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to save the "
+"product, and that would also apply if I say &ldquo;GNU/Linux.&rdquo; Is it "
+"wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux,&rdquo; to save the "
 "fee? <span class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
 "\">#trademarkfee</a>)</span>"
 msgstr ""
@@ -1822,9 +2123,17 @@
 "zu lassen, aber man ist dazu nicht verpflichtet."
 
 #. type: Content of: <div><dl><dd><p>
+# | So if you want to refer to the system simply as [-&ldquo;GNU&rdquo;,-]
+# | {+&ldquo;GNU,&rdquo;+} to avoid paying the fee for calling it
+# | [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} we won't criticize you.
+#, fuzzy
+#| 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."
 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."
+"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 ""
 "Wenn man sich auf das System einfach mit <em>GNU</em> beziehen möchte, um "
 "die Gebühr für den Namen <em>Linux</em> nicht zahlen zu müssen, werden wir 
"
@@ -1886,12 +2195,25 @@
 "sprechen uns nicht dagegen aus."
 
 #. type: Content of: <div><dl><dd><p>
+# | Different threshold levels would lead to different choices of name for the
+# | system.  But one name that cannot result from concerns of fairness and
+# | giving credit, not for any possible threshold level, is
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} It can't be fair to give
+# | all the credit to one secondary contribution (Linux) while omitting the
+# | principal contribution (GNU).
+#, fuzzy
+#| 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 giving credit, not for any possible threshold level, is &ldquo;"
+#| "Linux&rdquo;.  It can't be fair to give all the credit to one secondary "
+#| "contribution (Linux) while omitting the principal contribution (GNU)."
 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 "
-"giving credit, not for any possible threshold level, is &ldquo;"
-"Linux&rdquo;.  It can't be fair to give all the credit to one secondary "
-"contribution (Linux) while omitting the principal contribution (GNU)."
+"giving credit, not for any possible threshold level, is &ldquo;Linux.&rdquo; "
+"It can't be fair to give all the credit to one secondary contribution "
+"(Linux) while omitting the principal contribution (GNU)."
 msgstr ""
 "Unterschiedliche Grenzwerte würden zu unterschiedlichen Systemnamen führen. 
"
 "Aber ein Name, der sich nicht im Interesse von Fairness und Anerkennung bei "
@@ -1927,7 +2249,7 @@
 "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."
+"system &ldquo;GNU/systemd/Linux,&rdquo; there is nothing wrong with doing so."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
@@ -1974,11 +2296,21 @@
 "\">#allsmall</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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 the same argument would apply even more strongly to calling it
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+}
+#, fuzzy
+#| 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 the same argument would apply even more strongly to calling it &ldquo;"
+#| "Linux&rdquo;."
 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 "
-"the same argument would apply even more strongly to calling it &ldquo;"
-"Linux&rdquo;."
+"the same argument would apply even more strongly to calling it &ldquo;Linux."
+"&rdquo;"
 msgstr ""
 "Im Jahr 2008 stellten wir fest, dass GNU-Pakete 15&#160;% des offiziellen "
 "Projektarchivs (<em>main</em>) der gNewSense GNU/Linux-Distribution "
@@ -2043,9 +2375,21 @@
 "class=\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | Following the rules of English, in the construction &ldquo;GNU
+# | Linux&rdquo; the word &ldquo;GNU&rdquo; modifies [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+} This can mean either &ldquo;GNU's version of
+# | Linux&rdquo; or &ldquo;Linux, which is a GNU package.&rdquo; Neither of
+# | those meanings fits the situation at hand.
+#, fuzzy
+#| 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 either &ldquo;GNU's version of Linux&rdquo; or &ldquo;"
+#| "Linux, which is a GNU package.&rdquo; Neither of those meanings fits the "
+#| "situation at hand."
 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 "
+"the word &ldquo;GNU&rdquo; modifies &ldquo;Linux.&rdquo; This can mean "
 "either &ldquo;GNU's version of Linux&rdquo; or &ldquo;Linux, which is a GNU "
 "package.&rdquo; Neither of those meanings fits the situation at hand."
 msgstr ""
@@ -2074,9 +2418,10 @@
 # | [-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.
+# | non[---]free firmware [-&ldquo;blobs&rdquo;.-] {+&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 "
@@ -2090,7 +2435,7 @@
 "We're not talking about a distinct GNU version of Linux, the kernel.  The "
 "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 "
+"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."
@@ -2105,11 +2450,24 @@
 "wäre."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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 &ldquo;combination.&rdquo; (Think of
+# | [-&ldquo;Input/Output&rdquo;.)-] {+&ldquo;Input/Output.&rdquo;)+}  This
+# | system is the combination of GNU and Linux; hence,
+# | [-&ldquo;GNU/Linux&rdquo;.-] {+&ldquo;GNU/Linux.&rdquo;+}
+#, fuzzy
+#| 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 &ldquo;combination.&rdquo; (Think of &ldquo;Input/Output&rdquo;.)  "
+#| "This system is the combination of GNU and Linux; hence, &ldquo;GNU/"
+#| "Linux&rdquo;."
 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 "
-"&ldquo;combination.&rdquo; (Think of &ldquo;Input/Output&rdquo;.)  This "
-"system is the combination of GNU and Linux; hence, &ldquo;GNU/Linux&rdquo;."
+"&ldquo;combination.&rdquo; (Think of &ldquo;Input/Output.&rdquo;)  This "
+"system is the combination of GNU and Linux; hence, &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "Wir reden über eine Version von GNU, dem Betriebssystem, bei der sich Linux "
 "als Systemkern auszeichnet. Ein Schrägstrich liegt auf der Hand, weil er "
@@ -2118,11 +2476,22 @@
 "strong>."
 
 #. 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: "
-"&ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes say &ldquo;GNU con "
-"Linux&rdquo;."
+# | There are other ways to express [-&ldquo;combination&rdquo;.-]
+# | {+&ldquo;combination.&rdquo;+} If you think that a plus-sign is clearer,
+# | please use that.  In French, a hyphen is clear:
+# | [-&ldquo;GNU-Linux&rdquo;.-] {+&ldquo;GNU-Linux.&rdquo;+} In Spanish, we
+# | sometimes say &ldquo;GNU con [-Linux&rdquo;.-] {+Linux.&rdquo;+}
+#, fuzzy
+#| 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: &ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes say &ldquo;GNU "
+#| "con Linux&rdquo;."
+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: "
+"&ldquo;GNU-Linux.&rdquo; In Spanish, we sometimes say &ldquo;GNU con Linux."
+"&rdquo;"
 msgstr ""
 "Es gibt andere Möglichkeiten, um <em>Verbindung</em> auszudrücken. Wenn Sie 
"
 "ein Pluszeichen für eindeutiger halten, verwenden Sie es bitte. Im "
@@ -2176,7 +2545,7 @@
 # | 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
-# | Linux&rdquo; or &ldquo;Linux,-] {+&ldquo;Emacs&rdquo;.  That is the right
+# | Linux&rdquo; or &ldquo;Linux,-] {+&ldquo;Emacs.&rdquo; That is the right
 # | way to describe a program called Emacs+} which is a GNU [-package.&rdquo;
 # | Neither of those meanings fits the situation at hand.-] {+package.+}
 #, fuzzy
@@ -2188,7 +2557,7 @@
 #| "situation at hand."
 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 "
+"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 ""
 "Nach den Regeln der englischen Sprache wird in der Konstruktion <em>‚GNU "
@@ -2232,8 +2601,17 @@
 "erfüllt."
 
 #. type: Content of: <div><dl><dd><p>
+# | However, if you prefer to call the system [-&ldquo;Linux/GNU&rdquo;,-]
+# | {+&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.
+#, fuzzy
+#| 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."
 msgid ""
-"However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a "
+"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 ""
@@ -2242,8 +2620,19 @@
 "weglassen und den Anschein erwecken, das Gesamtsystem sei 
<em>„Linux“</em>."
 
 #. type: Content of: <div><dl><dt>
+# | My distro's developers call it &ldquo;Foobar [-Linux&rdquo;,-]
+# | {+Linux,&rdquo;+} but that doesn't say anything about what the system
+# | consists of.  Why shouldn't they call it whatever they like? <span
+# | class=\"anchor-reference-id\">(<a
+# | href=\"#distronames0\">#distronames0</a>)</span>
+#, fuzzy
+#| 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 whatever they like? <span class=\"anchor-reference-id\">(<a "
+#| "href=\"#distronames0\">#distronames0</a>)</span>"
 msgid ""
-"My distro's developers call it &ldquo;Foobar Linux&rdquo;, but that doesn't "
+"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 "
 "whatever they like? <span class=\"anchor-reference-id\">(<a href="
 "\"#distronames0\">#distronames0</a>)</span>"
@@ -2311,11 +2700,22 @@
 "\"#distronames1\">#distronames1</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | When they spread misinformation by changing &ldquo;GNU&rdquo; to
+# | [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} and call their version
+# | of it &ldquo;Foobar [-Linux&rdquo;,-] {+Linux,&rdquo;+} it's proper for
+# | you to correct the misinformation by calling it &ldquo;Foobar
+# | [-GNU/Linux&rdquo;.-] {+GNU/Linux.&rdquo;+}
+#, fuzzy
+#| 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 proper for you to correct the misinformation by calling it &ldquo;"
+#| "Foobar GNU/Linux&rdquo;."
 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 "
+"Linux,&rdquo; and call their version of it &ldquo;Foobar Linux,&rdquo; it's "
 "proper for you to correct the misinformation by calling it &ldquo;Foobar GNU/"
-"Linux&rdquo;."
+"Linux.&rdquo;"
 msgstr ""
 "Wenn Fehlinformation verbreitet werden, indem man <em>GNU</em> zu <em>"
 "„Linux“</em> ändert und deren Version davon <em>„Fubar Linux“</em> 
nennt, "
@@ -2354,12 +2754,24 @@
 "Unternehmen interessierte sich nicht dafür, was richtig war."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | 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;.-] {+&ldquo;GNU/Linux.&rdquo;+}
+#, fuzzy
+#| 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 "
+#| "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;."
 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 "
 "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;."
+"&ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "Wir können sie nicht dazu bringen, das richtigzustellen, aber wir sind nicht 
"
 "diejenigen, die aufgeben, nur weil der Weg nicht einfach ist. Möglicherweise 
"
@@ -2384,12 +2796,12 @@
 # | 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.
+# | [-&ldquo;Linux&rdquo;.-] {+&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 "
@@ -2404,13 +2816,12 @@
 msgid ""
 "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 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 nonfree "
-"applications and drivers), or making the system more popular even at the "
-"cost of freedom."
+"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 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 nonfree applications "
+"and drivers), or making the system more popular even at the cost of freedom."
 msgstr ""
 "Die weit verbreitete Praxis, dem GNU/Linux-System unfreie Software "
 "hinzuzufügen, ist für unsere Gemeinschaft ein großes Problem. Es lehrt "
@@ -2451,7 +2862,8 @@
 # | 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;.
+# | they are proper and appropriate &ldquo;versions of [-Linux&rdquo;.-]
+# | {+Linux.&rdquo;+}
 #, fuzzy
 #| msgid ""
 #| "The way to lead these users to see a connection with freedom is exactly "
@@ -2468,7 +2880,7 @@
 "specifically for the sake of the users' freedom.  With this understanding, "
 "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;."
+"proper and appropriate &ldquo;versions of Linux.&rdquo;"
 msgstr ""
 "Der Weg, diese Nutzer dahin zu führen eine Verbindung mit Freiheit zu sehen, 
"
 "ist genau entgegengesetzt: sie zu informieren, dass all diese "
@@ -2573,11 +2985,22 @@
 "ist das nachträgliche Einsicht)."
 
 #. type: Content of: <div><dl><dd><p>
+# | If we were to take an existing version of GNU/Linux and relabel it as
+# | [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} that would be somewhat like
+# | making a version of the GNU system and labeling it
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} That wasn't right, and
+# | we don't want to act like that.
+#, fuzzy
+#| 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 and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and "
+#| "we don't want to act like that."
 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 "
-"and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and we don't want "
-"to act like that."
+"GNU,&rdquo; that would be somewhat like making a version of the GNU system "
+"and labeling it &ldquo;Linux.&rdquo; That wasn't right, and we don't want to "
+"act like that."
 msgstr ""
 "Wenn wir eine vorhandene Version von GNU/Linux nehmen und als <em>GNU</em> "
 "bezeichnen würden, wäre das ein wenig wie eine Version des GNU-Systems "
@@ -2614,11 +3037,29 @@
 "bereinigt werden."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | with the GNU Project because he was a &ldquo;Linux [-user&rdquo;.-]
+# | {+user.&rdquo;+} That came as a shock, because the people who ported GNU
+# | packages to other systems had generally wanted to work with us to get
+# | their changes installed.  Yet these people, developing a system that was
+# | primarily based on GNU, were the first (and still practically the only)
+# | group that was unwilling to work with us.
+#, fuzzy
+#| 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 "
+#| "with the GNU Project because he was a &ldquo;Linux user&rdquo;.  That "
+#| "came as a shock, because the people who ported GNU packages to other "
+#| "systems had generally wanted to work with us to get their changes "
+#| "installed.  Yet these people, developing a system that was primarily "
+#| "based on GNU, were the first (and still practically the only) group that "
+#| "was unwilling to work with us."
 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 "
-"with the GNU Project because he was a &ldquo;Linux user&rdquo;.  That came "
-"as a shock, because the people who ported GNU packages to other systems had "
+"with the GNU Project because he was a &ldquo;Linux user.&rdquo; That came as "
+"a shock, because the people who ported GNU packages to other systems had "
 "generally wanted to work with us to get their changes installed.  Yet these "
 "people, developing a system that was primarily based on GNU, were the first "
 "(and still practically the only) group that was unwilling to work with us."
@@ -2634,9 +3075,22 @@
 "uns zu arbeiten."
 
 #. type: Content of: <div><dl><dd><p>
+# | It was this experience that first showed us that people were calling a
+# | version of the GNU system [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} and that this confusion was obstructing our work.
+# |  Asking you to call the system &ldquo;GNU/Linux&rdquo; is our response to
+# | that problem, and to the other problems caused by the &ldquo;Linux&rdquo;
+# | misnomer.
+#, fuzzy
+#| 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 obstructing our work.  Asking you to call the system &ldquo;GNU/"
+#| "Linux&rdquo; is our response to that problem, and to the other problems "
+#| "caused by the &ldquo;Linux&rdquo; misnomer."
 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 "
+"version of the GNU system &ldquo;Linux,&rdquo; and that this confusion was "
 "obstructing our work.  Asking you to call the system &ldquo;GNU/Linux&rdquo; "
 "is our response to that problem, and to the other problems caused by the "
 "&ldquo;Linux&rdquo; misnomer."
@@ -2678,10 +3132,18 @@
 "\">#allgpled</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | We never refer to individual programs as
+# | [-&ldquo;GNU/<i>name</i>&rdquo;.-] {+&ldquo;GNU/<i>name</i>.&rdquo;+} When
+# | a program is a GNU package, we may call it &ldquo;GNU
+# | [-<i>name</i>&rdquo;.-] {+<i>name</i>.&rdquo;+}
+#, fuzzy
+#| 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;."
 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;."
+"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 ""
 "Wir nennen niemals einzelne Programme <em>GNU/[Name]</em>. Ist ein Programm "
 "ein GNU-Paket, können wir es <em>GNU [Name]</em> nennen."
@@ -2797,10 +3259,24 @@
 "kopieren, nicht einmal Teile davon; alles musste neu geschrieben werden."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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. 
+# | The name [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} which stands for
+# | &ldquo;GNU's Not [-Unix&rdquo;,-] {+Unix,&rdquo;+} is a humorous way of
+# | giving credit to Unix for this, following a hacker tradition of recursive
+# | acronyms that started in the 70s.
+#, fuzzy
+#| 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.  The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not "
+#| "Unix&rdquo;, is a humorous way of giving credit to Unix for this, "
+#| "following a hacker tradition of recursive acronyms that started in the "
+#| "70s."
 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.  "
-"The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not Unix&rdquo;, "
+"The name &ldquo;GNU,&rdquo; which stands for &ldquo;GNU's Not Unix,&rdquo; "
 "is a humorous way of giving credit to Unix for this, following a hacker "
 "tradition of recursive acronyms that started in the 70s."
 msgstr ""
@@ -2811,11 +3287,12 @@
 "rekursiven Akronymen, die in den 70ern begannen."
 
 #. 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
+# | The first such recursive acronym was TINT, &ldquo;TINT Is Not
+# | [-TECO&rdquo;.-] {+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;,-] {+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
@@ -2828,10 +3305,10 @@
 #| "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 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 "
+"like &ldquo;<em>somethingorother</em> TECO,&rdquo; he thought of a clever "
 "amusing name.  (That's what hacking means: <a href=\"https://stallman.org/";
 "articles/on-hacking.html\">playful cleverness</a>.)"
 msgstr ""
@@ -2844,13 +3321,28 @@
 "org/articles/on-hacking.html\">spielerische Klugheit</a>)."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | was similar to some existing program (let's imagine its name was
+# | &ldquo;Klever&rdquo;), you could give it a recursive acronym name, such as
+# | &ldquo;MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same
+# | spirit we called our replacement for Unix &ldquo;GNU's Not
+# | [-Unix&rdquo;.-] {+Unix.&rdquo;+}
+#, fuzzy
+#| 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 was similar to some existing program (let's imagine its name was "
+#| "&ldquo;Klever&rdquo;), you could give it a recursive acronym name, such "
+#| "as &ldquo;MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same "
+#| "spirit we called our replacement for Unix &ldquo;GNU's Not Unix&rdquo;."
 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 "
 "was similar to some existing program (let's imagine its name was &ldquo;"
 "Klever&rdquo;), you could give it a recursive acronym name, such as &ldquo;"
 "MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same spirit we "
-"called our replacement for Unix &ldquo;GNU's Not Unix&rdquo;."
+"called our replacement for Unix &ldquo;GNU's Not Unix.&rdquo;"
 msgstr ""
 "Anderen Hackern hatte dieser Name so sehr gefallen, dass wir den Ansatz "
 "imitierten. Es wurde zur Tradition, ein von Grund auf neu geschriebenes "
@@ -2860,13 +3352,28 @@
 "nannten wir unseren Ersatz für Unix <em>GNU&#8217; Nicht Unix</em>."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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 in a system 99% copied from Unix.  AT&amp;T actually threatened to
+# | sue anyone giving AT&amp;T credit in that way.  This is why each of the
+# | various modified versions of Unix (all proprietary, like Unix) had a
+# | completely different name that didn't include [-&ldquo;Unix&rdquo;.-]
+# | {+&ldquo;Unix.&rdquo;+}
+#, fuzzy
+#| 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 in a system 99% copied from Unix.  AT&amp;T actually threatened "
+#| "to sue anyone giving AT&amp;T credit in that way.  This is why each of "
+#| "the various modified versions of Unix (all proprietary, like Unix) had a "
+#| "completely different name that didn't include &ldquo;Unix&rdquo;."
 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 "
 "in a system 99% copied from Unix.  AT&amp;T actually threatened to sue "
 "anyone giving AT&amp;T credit in that way.  This is why each of the various "
 "modified versions of Unix (all proprietary, like Unix) had a completely "
-"different name that didn't include &ldquo;Unix&rdquo;."
+"different name that didn't include &ldquo;Unix.&rdquo;"
 msgstr ""
 "Historisch gesehen wollte AT&amp;T, welche Unix entwickelten, nicht, dass "
 "ihnen irgendjemand durch das Verwenden von <em>Unix</em> im Namen eines "
@@ -2953,9 +3460,22 @@
 "der Name <b>GNU/Linux</b> angemessen."
 
 #. type: Content of: <div><dl><dd><p>
+# | There is a version of GNU which uses the kernel from NetBSD.  Its
+# | developers call it &ldquo;Debian [-GNU/NetBSD&rdquo;,-]
+# | {+GNU/NetBSD,&rdquo;+} but &ldquo;GNU/kernelofNetBSD&rdquo; would be more
+# | accurate, since NetBSD is an entire system, not just the kernel.  This is
+# | not a BSD system, since most of the system is the same as the GNU/Linux
+# | system.
+#, fuzzy
+#| 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/"
+#| "kernelofNetBSD&rdquo; would be more accurate, since NetBSD is an entire "
+#| "system, not just the kernel.  This is not a BSD system, since most of the "
+#| "system is the same as the GNU/Linux system."
 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/"
+"call it &ldquo;Debian GNU/NetBSD,&rdquo; but &ldquo;GNU/"
 "kernelofNetBSD&rdquo; would be more accurate, since NetBSD is an entire "
 "system, not just the kernel.  This is not a BSD system, since most of the "
 "system is the same as the GNU/Linux system."
@@ -2978,8 +3498,21 @@
 
 # …situation _than_ from GNU/Linux.
 #. type: Content of: <div><dl><dd><p>
+# | Not in the same sense that we mean by [-&ldquo;GNU/Linux&rdquo;.-]
+# | {+&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.
+#, fuzzy
+#| 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 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."
 msgid ""
-"Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of "
+"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 "
@@ -3090,8 +3623,19 @@
 "was sie gemein haben, ist Linux."
 
 #. type: Content of: <div><dl><dd><p>
+# | If you call the whole GNU/Linux system [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} you will find it necessary to say things like,
+# | &ldquo;Android contains Linux, but it isn't Linux, because it doesn't have
+# | the usual Linux [sic] libraries and utilities [meaning the GNU
+# | system].&rdquo;
+#, fuzzy
+#| 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 Linux, because it doesn't have the usual Linux [sic] libraries and "
+#| "utilities [meaning the GNU system].&rdquo;"
 msgid ""
-"If you call the whole GNU/Linux system &ldquo;Linux&rdquo;, you will find it "
+"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 "
 "Linux, because it doesn't have the usual Linux [sic] libraries and utilities "
 "[meaning the GNU system].&rdquo;"
@@ -3134,9 +3678,19 @@
 "gemeinte Bedeutung nicht verstanden wird."
 
 #. type: Content of: <div><dl><dd><p>
+# | The public will find it very strange to speak of using Android as
+# | &ldquo;using [-Linux&rdquo;.-] {+Linux.&rdquo;+} It's like having a
+# | conversation, then saying you were conversing with the person's intestines
+# | or the person's circulatory system.
+#, fuzzy
+#| 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."
 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 "
+"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 ""
 "Die Öffentlichkeit wird es wohl als sehr sonderbar empfinden von Android als 
"
@@ -3145,10 +3699,18 @@
 "Kreislaufsystem dieser Person unterhielt."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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;.-] {+&ldquo;Linux.&rdquo;+}
+#, fuzzy
+#| 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;."
 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;."
+"of the whole system as &ldquo;Linux.&rdquo;"
 msgstr ""
 "Sollte es sich dabei tatsächlich um GNU/Linux handeln, <em>wird</em> die "
 "Öffentlichkeit die Vorstellung von <em>‚mit 
Linux‘</em>&#160;&#8209;&#160;"
@@ -3156,13 +3718,34 @@
 "das Gesamtsystem als „Linux“ denkend."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | contain Linux is irrelevant to using them, just as the fact that a car and
+# | a bicycle both have a structure of metal is irrelevant to using those two.
+# |  If you wish to talk about using cars and bikes, you wouldn't speak of
+# | &ldquo;riding metal [-objects&rdquo; &mdash; not-]
+# | {+objects&rdquo;&mdash;not+} unless you're playing games with the reader. 
+# | You would say, &ldquo;using cars and bikes.&rdquo; Likewise, the clear way
+# | to talk about using GNU/Linux and Android is to say &ldquo;using GNU/Linux
+# | and Android.&rdquo;
+#, fuzzy
+#| 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 "
+#| "contain Linux is irrelevant to using them, just as the fact that a car "
+#| "and a bicycle both have a structure of metal is irrelevant to using those "
+#| "two.  If you wish to talk about using cars and bikes, you wouldn't speak "
+#| "of &ldquo;riding metal objects&rdquo; &mdash; not unless you're playing "
+#| "games with the reader.  You would say, &ldquo;using cars and bikes."
+#| "&rdquo; Likewise, the clear way to talk about using GNU/Linux and Android "
+#| "is to say &ldquo;using GNU/Linux and Android.&rdquo;"
 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 "
 "contain Linux is irrelevant to using them, just as the fact that a car and a "
 "bicycle both have a structure of metal is irrelevant to using those two.  If "
 "you wish to talk about using cars and bikes, you wouldn't speak of &ldquo;"
-"riding metal objects&rdquo; &mdash; not unless you're playing games with the "
+"riding metal objects&rdquo;&mdash;not unless you're playing games with the "
 "reader.  You would say, &ldquo;using cars and bikes.&rdquo; Likewise, the "
 "clear way to talk about using GNU/Linux and Android is to say &ldquo;using "
 "GNU/Linux and Android.&rdquo;"
@@ -3278,11 +3861,22 @@
 "</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | 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;.-] {+&ldquo;GNU.&rdquo;+} When we talk
+# | about the whole system, the name &ldquo;GNU/Linux&rdquo; gives him a share
+# | of the credit.
+#, fuzzy
+#| 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 "
+#| "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."
 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 "
-"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."
+"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."
 msgstr ""
 "Es wäre falsch, also machen wir das nicht. Die Arbeit von Torvalds ist "
 "Linux, der Betriebssystemkern; wir sind darauf bedacht, diese Arbeit nicht "
@@ -3300,12 +3894,39 @@
 "\"#linusagreed\">#linusagreed</a>)</span>"
 
 #. 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\">
+# | He recognized this at the beginning.  The {+<a
+# | 
href=\"https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\";>+}
+# | 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>.
+# |  for more info&rdquo;</a>.-] {+notes</a> said:+}
+#, 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 <a href=\"https://ftp.funet.fi/pub/";
+"linux/historical/kernel/old-versions/RELNOTES-0.01\"> earliest Linux release "
+"notes</a> said:"
+msgstr ""
+"Anfangs erkannte er das an. Der erste Versionshinweis von Linux besagt: <a "
+"href=\"http://www.kernel.org/pub/linux/kernel/Historic/old-versions/";
+"RELNOTES-0.01\"><cite>&#8222;Die meisten der mit Linux verwendeten "
+"Dienstprogramme sind GNU-Software und stehen unter dem GNU Copyleft. Diese "
+"Dienstprogramme sind nicht in der Distribution&#160;&#8209;&#160;fragt mich "
+"(oder GNU) für weitere Informationen.&#8220;</cite></a>"
+
+#. type: Content of: <div><dl><dd><blockquote><p>
+# | [-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-]{+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>.-] {+info.+}
 #, fuzzy
 #| msgid ""
 #| "He recognized this at the beginning.  The earliest Linux release notes "
@@ -3314,11 +3935,9 @@
 #| "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=\"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>."
+"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."
 msgstr ""
 "Anfangs erkannte er das an. Der erste Versionshinweis von Linux besagt: <a "
 "href=\"http://www.kernel.org/pub/linux/kernel/Historic/old-versions/";
@@ -3387,11 +4006,26 @@
 "\">#lost</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | 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;,-]
+# | {+&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.
+#, fuzzy
+#| 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;: 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."
 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;: "
 "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 "
+"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."
 msgstr ""
@@ -3414,13 +4048,32 @@
 "\"anchor-reference-id\">(<a href=\"#whatgood\">#whatgood</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | 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;,-] {+&ldquo;GNU/Linux,&rdquo;+} you will help
+# | others learn the system's true history, origin, and reason for being.  You
+# | can't correct the misnomer 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;,-] {+&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.
+#, fuzzy
+#| 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;GNU/Linux&rdquo;, you will help others learn the system's true "
+#| "history, origin, and reason for being.  You can't correct the misnomer "
+#| "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."
 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;"
-"GNU/Linux&rdquo;, you will help others learn the system's true history, "
+"GNU/Linux,&rdquo; you will help others learn the system's true history, "
 "origin, and reason for being.  You can't correct the misnomer 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 "
+"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."
 msgstr ""
@@ -3445,10 +4098,20 @@
 "reference-id\">(<a href=\"#explain\">#explain</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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;,-]
+# | {+&ldquo;GNU/Linux,&rdquo;+} and uses your time inefficiently.
+#, fuzzy
+#| 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."
 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."
+"the system &ldquo;GNU/Linux,&rdquo; and uses your time inefficiently."
 msgstr ""
 "Wenn Sie uns helfen, indem Sie anderen auf diese Weise erklären, wissen wir "
 "Ihr Engagement zu schätzen, aber das ist nicht die beste Methode. Es ist "
@@ -3456,12 +4119,28 @@
 "Ihre Zeit ineffektiv."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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, and they may learn a correct picture of the system's origin. 
+# | But they are unlikely to repeat the explanation to others whenever they
+# | talk about the system.  They will probably just call it
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} Without particularly
+# | intending to, they will help spread the incorrect picture.
+#, fuzzy
+#| 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, and they may learn a correct picture of the system's origin.  "
+#| "But they are unlikely to repeat the explanation to others whenever they "
+#| "talk about the system.  They will probably just call it &ldquo;"
+#| "Linux&rdquo;.  Without particularly intending to, they will help spread "
+#| "the incorrect picture."
 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, "
 "and they may learn a correct picture of the system's origin.  But they are "
 "unlikely to repeat the explanation to others whenever they talk about the "
-"system.  They will probably just call it &ldquo;Linux&rdquo;.  Without "
+"system.  They will probably just call it &ldquo;Linux.&rdquo; Without "
 "particularly intending to, they will help spread the incorrect picture."
 msgstr ""
 "Es ist ineffektiv, weil es vielleicht keine Wirkung erzielt und sicherlich "
@@ -3606,9 +4285,16 @@
 "\">#force</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | It would be wrong to force them, and we don't try.  We call the system
+# | [-&ldquo;GNU/Linux&rdquo;,-] {+&ldquo;GNU/Linux,&rdquo;+} and we ask you
+# | to do it too.
+#, fuzzy
+#| 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."
 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."
+"&ldquo;GNU/Linux,&rdquo; and we ask you to do it too."
 msgstr ""
 "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."
@@ -3717,9 +4403,19 @@
 "gemeint ist."
 
 #. type: Content of: <div><dl><dt>
+# | Since you failed to put something in the GNU GPL to require people to call
+# | the system [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} you deserve what
+# | happened; why are you complaining now? <span
+# | class=\"anchor-reference-id\">(<a href=\"#deserve\">#deserve</a>)</span>
+#, fuzzy
+#| 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 "
+#| "complaining now? <span class=\"anchor-reference-id\">(<a href=\"#deserve"
+#| "\">#deserve</a>)</span>"
 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 "
+"the system &ldquo;GNU,&rdquo; you deserve what happened; why are you "
 "complaining now? <span class=\"anchor-reference-id\">(<a href=\"#deserve"
 "\">#deserve</a>)</span>"
 msgstr ""
@@ -3776,8 +4472,17 @@
 "Software legitim und hinnehmbar wäre."
 
 #. type: Content of: <div><dl><dt>
+# | Since many people call it [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} doesn't that make it right? <span
+# | class=\"anchor-reference-id\">(<a
+# | href=\"#somanyright\">#somanyright</a>)</span>
+#, fuzzy
+#| 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>"
 msgid ""
-"Since many people call it &ldquo;Linux&rdquo;, doesn't that make it right? "
+"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 ""
@@ -3801,9 +4506,20 @@
 "\"#knownname\">#knownname</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | Users are not incapable of learning.  Since &ldquo;GNU/Linux&rdquo;
+# | includes [-&ldquo;Linux&rdquo;,-] {+&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.
+#, fuzzy
+#| 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 add &ldquo;(often erroneously referred to as &lsquo;"
+#| "Linux&rsquo;)&rdquo; once in a while, they will all understand."
 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 "
+"&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."
 msgstr ""

Index: po/gnu-linux-faq.es.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.es.po,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -b -r1.144 -r1.145
--- po/gnu-linux-faq.es.po      31 Aug 2021 11:35:27 -0000      1.144
+++ po/gnu-linux-faq.es.po      2 Nov 2021 14:41:51 -0000       1.145
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: gnu-linux-faq.es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-31 10:27+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2021-08-31 12:54+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-11-02 14:27+0000\n"
 "X-Generator: Poedit 2.2.1\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
@@ -37,10 +38,19 @@
 msgstr "por Richard Stallman"
 
 # type: Content of: <p>
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+# | When people see that we use and recommend the name GNU/Linux for a system
+# | that many others call just [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} they ask many questions.  Here are common
+# | questions, and our answers.
+#, fuzzy
+#| 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."
 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.  "
+"that many others call just &ldquo;Linux,&rdquo; they ask many questions.  "
 "Here are common questions, and our answers."
 msgstr ""
 "Cuando la gente ve que empleamos y recomendamos el nombre GNU/Linux para "
@@ -258,11 +268,22 @@
 "equivocado llamar al sistema simplemente «GNU»?</a>"
 
 #. type: Content of: <div><div><ul><li>
+# | <a href=\"#trademarkfee\">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;.-] {+&ldquo;GNU/Linux.&rdquo;+} Is it
+# | wrong if I use &ldquo;GNU&rdquo; without [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} to save the fee?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#trademarkfee\">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 wrong if I use &ldquo;GNU&rdquo; without "
+#| "&ldquo;Linux&rdquo;, to save the fee?</a>"
 msgid ""
 "<a href=\"#trademarkfee\">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 wrong if I use &ldquo;GNU&rdquo; without "
-"&ldquo;Linux&rdquo;, to save the fee?</a>"
+"&ldquo;GNU/Linux.&rdquo; Is it wrong if I use &ldquo;GNU&rdquo; without "
+"&ldquo;Linux,&rdquo; to save the fee?</a>"
 msgstr ""
 "<a href=\"#trademarkfee\">Si tuviera que pagar una tasa por emplear «Linux» 
"
 "en el nombre de un producto, y si eso también sucediera si dijera «GNU/"
@@ -347,10 +368,19 @@
 msgstr "<a href=\"#whyorder\">¿Por qué «GNU/Linux» en vez de 
«Linux/GNU»?</a>"
 
 #. type: Content of: <div><div><ul><li>
-msgid ""
-"<a href=\"#distronames0\">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 whatever they like?</a>"
+# | <a href=\"#distronames0\">My distro's developers call it &ldquo;Foobar
+# | [-Linux&rdquo;,-] {+Linux,&rdquo;+} but that doesn't say anything about
+# | what the system consists of.  Why shouldn't they call it whatever they
+# | like?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#distronames0\">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 whatever they like?</a>"
+msgid ""
+"<a href=\"#distronames0\">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 whatever they like?</a>"
 msgstr ""
 "<a href=\"#distronames0\">Los desarrolladores de mi distribución la llaman "
 "«XYZ Linux», pero eso no dice nada acerca de en qué consiste el sistema. "
@@ -607,9 +637,18 @@
 "a la gente que llame al sistema «GNU»?</a>"
 
 #. type: Content of: <div><div><ul><li>
+# | <a href=\"#deserve\">Since you failed to put something in the GNU GPL to
+# | require people to call the system [-&ldquo;GNU&rdquo;,-]
+# | {+&ldquo;GNU,&rdquo;+} you deserve what happened; why are you complaining
+# | now?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#deserve\">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 complaining now?</a>"
 msgid ""
 "<a href=\"#deserve\">Since you failed to put something in the GNU GPL to "
-"require people to call the system &ldquo;GNU&rdquo;, you deserve what "
+"require people to call the system &ldquo;GNU,&rdquo; you deserve what "
 "happened; why are you complaining now?</a>"
 msgstr ""
 "<a href=\"#deserve\">Dado que en la GPL de GNU no pusieron nada para exigir "
@@ -625,8 +664,15 @@
 "tantas personas?</a>"
 
 #. type: Content of: <div><div><ul><li>
+# | <a href=\"#somanyright\">Since many people call it
+# | [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} doesn't that make it
+# | right?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#somanyright\">Since many people call it &ldquo;Linux&rdquo;, "
+#| "doesn't that make it right?</a>"
 msgid ""
-"<a href=\"#somanyright\">Since many people call it &ldquo;Linux&rdquo;, "
+"<a href=\"#somanyright\">Since many people call it &ldquo;Linux,&rdquo; "
 "doesn't that make it right?</a>"
 msgstr ""
 "<a href=\"#somanyright\">El hecho de que muchas personas lo llamen «Linux», 
"
@@ -812,6 +858,24 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
+# | 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 it must be right.  The name &ldquo;Linux&rdquo; also spreads a
+# | false picture of the system's origin, because people tend to suppose that
+# | the system's history was such as to fit that name.  For instance, they
+# | often believe its development was started by Linus Torvalds in 1991.  This
+# | false picture tends to reinforce the idea that the system should be called
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+}
+#, fuzzy
+#| 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 it must be right.  The name &ldquo;Linux&rdquo; also spreads a "
+#| "false picture of the system's origin, because people tend to suppose that "
+#| "the system's history was such as to fit that name.  For instance, they "
+#| "often believe its development was started by Linus Torvalds in 1991.  "
+#| "This false picture tends to reinforce the idea that the system should be "
+#| "called &ldquo;Linux&rdquo;."
 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 "
@@ -819,7 +883,7 @@
 "of the system's origin, because people tend to suppose that the system's "
 "history was such as to fit that name.  For instance, they often believe its "
 "development was started by Linus Torvalds in 1991.  This false picture tends "
-"to reinforce the idea that the system should be called &ldquo;Linux&rdquo;."
+"to reinforce the idea that the system should be called &ldquo;Linux.&rdquo;"
 msgstr ""
 "La mayoría de la gente que llama «Linux» al sistema nunca ha oído la 
razón "
 "por la que no es la forma correcta. Vieron que otros usaban ese nombre y "
@@ -849,10 +913,19 @@
 
 # type: Content of: <dl><dd>
 #. type: Content of: <div><dl><dd>
+# | 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;,-] {+&ldquo;Linux,&rdquo;+} the name its developer
+# | chose.
+#, fuzzy
+#| 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."
 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."
+"you're referring specifically to the kernel, you should call it &ldquo;Linux,"
+"&rdquo; the name its developer chose."
 msgstr ""
 "No, no siempre, solo cuando se esté hablando del sistema completo. Cuando se 
"
 "refiera específicamente al núcleo, hay que llamarlo «Linux», que es el "
@@ -860,12 +933,27 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
+# | When people call the whole system [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} as a consequence they call the whole system by
+# | the same name as the kernel.  This causes many kinds of confusion, because
+# | only experts can tell whether a statement is about the kernel or the whole
+# | system.  By calling the whole system [-&ldquo;GNU/Linux&rdquo;,-]
+# | {+&ldquo;GNU/Linux,&rdquo;+} and calling the kernel
+# | [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} you avoid the ambiguity.
+#, fuzzy
+#| 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 kinds of confusion, because only experts can tell whether a "
+#| "statement is about the kernel or the whole system.  By calling the whole "
+#| "system &ldquo;GNU/Linux&rdquo;, and calling the kernel &ldquo;"
+#| "Linux&rdquo;, you avoid the ambiguity."
 msgid ""
-"When people call the whole system &ldquo;Linux&rdquo;, as a consequence they "
+"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 "
 "kinds of confusion, because only experts can tell whether a statement is "
 "about the kernel or the whole system.  By calling the whole system &ldquo;"
-"GNU/Linux&rdquo;, and calling the kernel &ldquo;Linux&rdquo;, you avoid the "
+"GNU/Linux,&rdquo; and calling the kernel &ldquo;Linux,&rdquo; you avoid the "
 "ambiguity."
 msgstr ""
 "Cuando la gente llama «Linux» al sistema completo, está dando el mismo "
@@ -940,8 +1028,17 @@
 
 # type: Content of: <dl><dd>
 #. type: Content of: <div><dl><dd>
+# | When we ask people to say [-&ldquo;GNU/Linux&rdquo;,-]
+# | {+&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.
+#, fuzzy
+#| 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."
 msgid ""
-"When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing "
+"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 ""
@@ -1001,10 +1098,34 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | freedom are more likely to call the system [-&ldquo;GNU/Linux&rdquo;,-]
+# | {+&ldquo;GNU/Linux,&rdquo;+} and people who learn that the system is
+# | &ldquo;GNU/Linux&rdquo; are more likely to pay attention to our
+# | philosophical arguments for freedom and community (which is why the choice
+# | of name for the system makes a real difference for society).  However, the
+# | disagreement would probably exist even if everyone knew the system's real
+# | origin and its proper name, because the issue is a real one.  It can only
+# | go away if we who value freedom either persuade everyone (which won't be
+# | easy) or are defeated entirely (let's hope not).
+#, fuzzy
+#| 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 freedom are more likely to call the system &ldquo;GNU/"
+#| "Linux&rdquo;, and people who learn that the system is &ldquo;GNU/"
+#| "Linux&rdquo; are more likely to pay attention to our philosophical "
+#| "arguments for freedom and community (which is why the choice of name for "
+#| "the system makes a real difference for society).  However, the "
+#| "disagreement would probably exist even if everyone knew the system's real "
+#| "origin and its proper name, because the issue is a real one.  It can only "
+#| "go away if we who value freedom either persuade everyone (which won't be "
+#| "easy) or are defeated entirely (let's hope not)."
 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 "
-"freedom are more likely to call the system &ldquo;GNU/Linux&rdquo;, and "
+"freedom are more likely to call the system &ldquo;GNU/Linux,&rdquo; and "
 "people who learn that the system is &ldquo;GNU/Linux&rdquo; are more likely "
 "to pay attention to our philosophical arguments for freedom and community "
 "(which is why the choice of name for the system makes a real difference for "
@@ -1066,10 +1187,23 @@
 
 # type: Content of: <dl><dd>
 #. type: Content of: <div><dl><dd>
+# | 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
+# | system do not mention the name [-&ldquo;GNU&rdquo;,-]
+# | {+&ldquo;GNU,&rdquo;+} or the ideals that GNU stands for.  <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never
+# | Heard of GNU</a> explains further.
+#, fuzzy
+#| 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 system do not mention the name &ldquo;GNU&rdquo;, or the ideals that "
+#| "GNU stands for.  <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU "
+#| "Users Who Have Never Heard of GNU</a> explains further."
 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 "
-"system do not mention the name &ldquo;GNU&rdquo;, or the ideals that GNU "
+"system do not mention the name &ldquo;GNU,&rdquo; or the ideals that GNU "
 "stands for.  <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users "
 "Who Have Never Heard of GNU</a> explains further."
 msgstr ""
@@ -1082,11 +1216,22 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
+# | 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 GNU is.  For instance, many think it is a collection of [-<a
+# | href=\"#tools\">&ldquo;tools&rdquo;</a>,-] {+&ldquo;<a
+# | href=\"#tools\">tools</a>,&rdquo;+} or a project to develop tools.
+#, fuzzy
+#| 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 GNU is.  For instance, many think it is a collection of <a "
+#| "href=\"#tools\">&ldquo;tools&rdquo;</a>, or a project to develop tools."
 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 "
-"GNU is.  For instance, many think it is a collection of <a href=\"#tools"
-"\">&ldquo;tools&rdquo;</a>, or a project to develop tools."
+"GNU is.  For instance, many think it is a collection of &ldquo;<a href="
+"\"#tools\">tools</a>,&rdquo; or a project to develop tools."
 msgstr ""
 "Quienes lo dicen son probablemente informáticos que piensan en los "
 "informáticos que conocen. Los informáticos a menudo han oído hablar de 
GNU, "
@@ -1121,11 +1266,23 @@
 
 # type: Content of: <dl><dd>
 #. type: Content of: <div><dl><dd><p>
+# | 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;,-] {+&ldquo;Linux,&rdquo;+} that it was started by
+# | Linus Torvalds, and that it was intended to be &ldquo;open
+# | [-source&rdquo;.-] {+source.&rdquo;+} If you don't tell them, who will?
+#, fuzzy
+#| 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;"
+#| "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?"
 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;"
-"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?"
+"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?"
 msgstr ""
 "Si sus palabras no reflejan lo que sabe, no enseña a los demás. La mayoría 
"
 "de la gente que ha oído hablar del sistema GNU/Linux cree que es «Linux», "
@@ -1188,14 +1345,31 @@
 
 # type: Content of: <dl><dd>
 #. type: Content of: <div><dl><dd>
+# | 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
+# | that GNU is the name of a collection of programs&mdash;often they say
+# | &ldquo;programming [-tools&rdquo;,-] {+tools,&rdquo;+} since some of our
+# | programming tools became popular on their own.  The idea that
+# | &ldquo;GNU&rdquo; is the name of an operating system is hard to fit into a
+# | conceptual framework in which that operating system is labeled
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+}
+#, fuzzy
+#| 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 "
+#| "that GNU is the name of a collection of programs&mdash;often they say "
+#| "&ldquo;programming tools&rdquo;, since some of our programming tools "
+#| "became popular on their own.  The idea that &ldquo;GNU&rdquo; is the name "
+#| "of an operating system is hard to fit into a conceptual framework in "
+#| "which that operating system is labeled &ldquo;Linux&rdquo;."
 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 "
 "that GNU is the name of a collection of programs&mdash;often they say &ldquo;"
-"programming tools&rdquo;, since some of our programming tools became popular "
+"programming tools,&rdquo; since some of our programming tools became popular "
 "on their own.  The idea that &ldquo;GNU&rdquo; is the name of an operating "
 "system is hard to fit into a conceptual framework in which that operating "
-"system is labeled &ldquo;Linux&rdquo;."
+"system is labeled &ldquo;Linux.&rdquo;"
 msgstr ""
 "Quienes creen que Linux es un sistema operativo completo, si es que oyen "
 "hablar de GNU, a menudo se hacen una idea equivocada de lo que es GNU. Es "
@@ -1269,12 +1443,32 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
+# | To confuse matters, some people use the term &ldquo;operating
+# | system&rdquo; to mean [-&ldquo;kernel&rdquo;.-] {+&ldquo;kernel.&rdquo;+}
+# | Both uses of the term go back many years.  The use of &ldquo;operating
+# | system&rdquo; to mean &ldquo;kernel&rdquo; is found in a number of
+# | textbooks on system design, going back to the 80s.  At the same time, in
+# | the 80s, the &ldquo;Unix operating system&rdquo; was understood to include
+# | all the system programs, and Berkeley's version of Unix included even
+# | games. Since we intended GNU to be a Unix-like operating system, we use
+# | the term &ldquo;operating system&rdquo; in the same way.
+#, fuzzy
+#| 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.  The use of &ldquo;operating system&rdquo; to mean "
+#| "&ldquo;kernel&rdquo; is found in a number of textbooks on system design, "
+#| "going back to the 80s.  At the same time, in the 80s, the &ldquo;Unix "
+#| "operating system&rdquo; was understood to include all the system "
+#| "programs, and Berkeley's version of Unix included even games. Since we "
+#| "intended GNU to be a Unix-like operating system, we use the term &ldquo;"
+#| "operating system&rdquo; in the same way."
 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.  "
-"The use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is "
-"found in a number of textbooks on system design, going back to the 80s.  At "
-"the same time, in the 80s, the &ldquo;Unix operating system&rdquo; was "
+"to mean &ldquo;kernel.&rdquo; Both uses of the term go back many years.  The "
+"use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is found "
+"in a number of textbooks on system design, going back to the 80s.  At the "
+"same time, in the 80s, the &ldquo;Unix operating system&rdquo; was "
 "understood to include all the system programs, and Berkeley's version of "
 "Unix included even games. Since we intended GNU to be a Unix-like operating "
 "system, we use the term &ldquo;operating system&rdquo; in the same way."
@@ -1291,11 +1485,28 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
+# | Most of the time when people speak of the &ldquo;Linux operating
+# | system&rdquo; they are using &ldquo;operating system&rdquo; in the same
+# | sense we use: they mean the whole collection of programs.  If that's what
+# | you are referring to, please call it [-&ldquo;GNU/Linux&rdquo;.-]
+# | {+&ldquo;GNU/Linux.&rdquo;+} If you mean just the kernel, then
+# | &ldquo;Linux&rdquo; is the right name for it, but please say
+# | &ldquo;kernel&rdquo; also to avoid ambiguity about which body of software
+# | you mean.
+#, fuzzy
+#| 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 "
+#| "sense we use: they mean the whole collection of programs.  If that's what "
+#| "you are referring to, please call it &ldquo;GNU/Linux&rdquo;.  If you "
+#| "mean just the kernel, then &ldquo;Linux&rdquo; is the right name for it, "
+#| "but please say &ldquo;kernel&rdquo; also to avoid ambiguity about which "
+#| "body of software you mean."
 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 "
 "sense we use: they mean the whole collection of programs.  If that's what "
-"you are referring to, please call it &ldquo;GNU/Linux&rdquo;.  If you mean "
+"you are referring to, please call it &ldquo;GNU/Linux.&rdquo; If you mean "
 "just the kernel, then &ldquo;Linux&rdquo; is the right name for it, but "
 "please say &ldquo;kernel&rdquo; also to avoid ambiguity about which body of "
 "software you mean."
@@ -1309,10 +1520,20 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
+# | If you prefer to use some other term such as &ldquo;system
+# | distribution&rdquo; for the entire collection of programs, instead of
+# | &ldquo;operating [-system&rdquo;,-] {+system,&rdquo;+} that's fine.  Then
+# | you would talk about GNU/Linux system distributions.
+#, fuzzy
+#| msgid ""
+#| "If you prefer to use some other term such as &ldquo;system "
+#| "distribution&rdquo; for the entire collection of programs, instead of "
+#| "&ldquo;operating system&rdquo;, that's fine.  Then you would talk about "
+#| "GNU/Linux system distributions."
 msgid ""
 "If you prefer to use some other term such as &ldquo;system "
 "distribution&rdquo; for the entire collection of programs, instead of &ldquo;"
-"operating system&rdquo;, that's fine.  Then you would talk about GNU/Linux "
+"operating system,&rdquo; that's fine.  Then you would talk about GNU/Linux "
 "system distributions."
 msgstr ""
 "Si prefiere emplear alguna otra denominación como «distribución de 
sistema» "
@@ -1418,12 +1639,26 @@
 "reference-id\">(<a href=\"#nokernel\">#nokernel</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | The people who argue that way for calling the system &ldquo;Linux&rdquo;
+# | are using a double standard.  An operating system requires compilers,
+# | editors, window systems, libraries, and much [-more &mdash; hundreds-]
+# | {+more&mdash;hundreds+} of programs, even to match what BSD systems
+# | included in 1983.  Since Torvalds didn't develop any of those, how can the
+# | system be &ldquo;Linux&rdquo;?
+#, fuzzy
+#| 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, window systems, libraries, and much more &mdash; hundreds of "
+#| "programs, even to match what BSD systems included in 1983.  Since "
+#| "Torvalds didn't develop any of those, how can the system be &ldquo;"
+#| "Linux&rdquo;?"
 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, "
-"window systems, libraries, and much more &mdash; hundreds of programs, even "
-"to match what BSD systems included in 1983.  Since Torvalds didn't develop "
-"any of those, how can the system be &ldquo;Linux&rdquo;?"
+"window systems, libraries, and much more&mdash;hundreds of programs, even to "
+"match what BSD systems included in 1983.  Since Torvalds didn't develop any "
+"of those, how can the system be &ldquo;Linux&rdquo;?"
 msgstr ""
 "Quienes razonan así para llamar al sistema «Linux» están aplicando una 
doble "
 "moral. Un sistema operativo requiere compiladores, editores, sistemas de "
@@ -1461,9 +1696,18 @@
 "\"#notinstallable\">#notinstallable</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | Many <a href=\"/distros/distros.html\"> packaged and installable versions
+# | of GNU</a> are available.  None of them is called simply
+# | [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} but GNU is what they
+# | basically are.
+#, fuzzy
+#| 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."
 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</a> are available.  None of them is called simply &ldquo;GNU,&rdquo; but "
 "GNU is what they basically are."
 msgstr ""
 "Existen muchas <a href=\"/distros/distros.html\">versiones de GNU "
@@ -1516,9 +1760,17 @@
 "Esto implica volver a empaquetar una parte considerable del sistema GNU."
 
 #. type: Content of: <div><dl><dd><p>
+# | We never took the last step of packaging GNU under the name
+# | [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} but that doesn't alter what
+# | kind of thing GNU is.  GNU is an operating system.
+#, fuzzy
+#| 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."
 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 "
+"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 ""
 "Nunca dimos el último paso, que sería empaquetar GNU bajo el nombre 
«GNU», "
@@ -1537,13 +1789,28 @@
 
 # type: Content of: <dl><dd>
 #. type: Content of: <div><dl><dd>
+# | That practice seems to be very rare&mdash;we can't find any examples other
+# | than the misuse of the name [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+} Normally an operating system is developed as a
+# | single unified project, and the developers choose a name for the system as
+# | a whole.  The kernel usually does not have a name of its
+# | own&mdash;instead, people say &ldquo;the kernel of such-and-such&rdquo; or
+# | &ldquo;the such-and-such [-kernel&rdquo;.-] {+kernel.&rdquo;+}
+#, fuzzy
+#| 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 system is developed as a single unified project, and the "
+#| "developers choose a name for the system as a whole.  The kernel usually "
+#| "does not have a name of its own&mdash;instead, people say &ldquo;the "
+#| "kernel of such-and-such&rdquo; or &ldquo;the such-and-such kernel&rdquo;."
 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 "
+"than the misuse of the name &ldquo;Linux.&rdquo; Normally an operating "
 "system is developed as a single unified project, and the developers choose a "
 "name for the system as a whole.  The kernel usually does not have a name of "
 "its own&mdash;instead, people say &ldquo;the kernel of such-and-such&rdquo; "
-"or &ldquo;the such-and-such kernel&rdquo;."
+"or &ldquo;the such-and-such kernel.&rdquo;"
 msgstr ""
 "Esa práctica no parece ser muy habitual, no encontramos otro ejemplo que no "
 "sea el mal uso del nombre «Linux». Normalmente un sistema operativo se "
@@ -1604,9 +1871,18 @@
 
 # type: Content of: <dl><dd>
 #. type: Content of: <div><dl><dd>
+# | For a while we tried the name [-&ldquo;LiGNUx&rdquo;,-]
+# | {+&ldquo;LiGNUx,&rdquo;+} which combines the words &ldquo;GNU&rdquo; and
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} The reaction was very
+# | bad.  People accept &ldquo;GNU/Linux&rdquo; much better.
+#, fuzzy
+#| 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."
 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.  "
+"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 ""
 "Durante un tiempo probamos con el nombre «LiGNUx», que combina las palabras 
"
@@ -1615,8 +1891,16 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
+# | The shortest legitimate name for this system is [-&ldquo;GNU&rdquo;,-]
+# | {+&ldquo;GNU,&rdquo;+} but we call it &ldquo;GNU/Linux&rdquo; <a
+# | href=\"#justgnu\"> for the reasons given below</a>.
+#, fuzzy
+#| 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>."
 msgid ""
-"The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but we "
+"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 ""
@@ -1666,8 +1950,16 @@
 "href=\"#long2\">#long2</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | It only takes a second to say or type [-&ldquo;GNU/&rdquo;.-]
+# | {+&ldquo;GNU/.&rdquo;+} If you appreciate the system that we developed,
+# | can't you take one second to recognize our work?
+#, fuzzy
+#| 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?"
 msgid ""
-"It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you appreciate "
+"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 ""
@@ -1780,10 +2072,21 @@
 
 # type: Content of: <dl><dd><ul><li>
 #. type: Content of: <div><dl><dd><ul><li>
+# | Since many people know of the system as [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} if we say &ldquo;GNU&rdquo; they may simply not
+# | recognize we're talking about the same system.  If we say
+# | [-&ldquo;GNU/Linux&rdquo;,-] {+&ldquo;GNU/Linux,&rdquo;+} they can make a
+# | connection to what they have heard about.
+#, fuzzy
+#| 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 system.  If we say &ldquo;GNU/Linux&rdquo;, they can make a "
+#| "connection to what they have heard about."
 msgid ""
-"Since many people know of the system as &ldquo;Linux&rdquo;, if we say "
+"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 "
-"system.  If we say &ldquo;GNU/Linux&rdquo;, they can make a connection to "
+"system.  If we say &ldquo;GNU/Linux,&rdquo; they can make a connection to "
 "what they have heard about."
 msgstr ""
 "Dado que mucha gente conoce el sistema como «Linux», si decimos «GNU» 
pueden "
@@ -1792,10 +2095,23 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <div><dl><dt>
+# | 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;.-]
+# | {+&ldquo;GNU/Linux.&rdquo;+} Is it wrong if I use &ldquo;GNU&rdquo;
+# | without [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} to save the fee?
+# | <span class=\"anchor-reference-id\">(<a
+# | href=\"#trademarkfee\">#trademarkfee</a>)</span>
+#, fuzzy
+#| 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 wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to save "
+#| "the fee? <span class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
+#| "\">#trademarkfee</a>)</span>"
 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 "
-"wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to save the "
+"product, and that would also apply if I say &ldquo;GNU/Linux.&rdquo; Is it "
+"wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux,&rdquo; to save the "
 "fee? <span class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
 "\">#trademarkfee</a>)</span>"
 msgstr ""
@@ -1817,9 +2133,17 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
+# | So if you want to refer to the system simply as [-&ldquo;GNU&rdquo;,-]
+# | {+&ldquo;GNU,&rdquo;+} to avoid paying the fee for calling it
+# | [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} we won't criticize you.
+#, fuzzy
+#| 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."
 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."
+"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 ""
 "De modo que si para evitar el pago de regalías por llamarlo «Linux» quiere 
"
 "referirse al sistema simplemente como «GNU», no le censuraremos."
@@ -1884,12 +2208,25 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
+# | Different threshold levels would lead to different choices of name for the
+# | system.  But one name that cannot result from concerns of fairness and
+# | giving credit, not for any possible threshold level, is
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} It can't be fair to give
+# | all the credit to one secondary contribution (Linux) while omitting the
+# | principal contribution (GNU).
+#, fuzzy
+#| 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 giving credit, not for any possible threshold level, is &ldquo;"
+#| "Linux&rdquo;.  It can't be fair to give all the credit to one secondary "
+#| "contribution (Linux) while omitting the principal contribution (GNU)."
 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 "
-"giving credit, not for any possible threshold level, is &ldquo;"
-"Linux&rdquo;.  It can't be fair to give all the credit to one secondary "
-"contribution (Linux) while omitting the principal contribution (GNU)."
+"giving credit, not for any possible threshold level, is &ldquo;Linux.&rdquo; "
+"It can't be fair to give all the credit to one secondary contribution "
+"(Linux) while omitting the principal contribution (GNU)."
 msgstr ""
 "Diferentes grados en los límites llevarían a elecciones distintas del 
nombre "
 "para el sistema. Pero un nombre que no puede ser el resultado de la "
@@ -1910,11 +2247,23 @@
 "class=\"anchor-reference-id\">(<a href=\"#others\">#others</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | 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;,-]
+# | {+&ldquo;GNU/systemd/Linux,&rdquo;+} there is nothing wrong with doing so.
+#, fuzzy
+#| 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).  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."
 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).  "
 "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."
+"system &ldquo;GNU/systemd/Linux,&rdquo; there is nothing wrong with doing so."
 msgstr ""
 "systemd es un componente muy importante, pero no tan importante como el "
 "núcleo (Linux), ni tan importante como la base del sistema en conjunto "
@@ -1970,11 +2319,21 @@
 
 # type: Content of: <dl><dd>
 #. type: Content of: <div><dl><dd>
+# | 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 the same argument would apply even more strongly to calling it
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+}
+#, fuzzy
+#| 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 the same argument would apply even more strongly to calling it &ldquo;"
+#| "Linux&rdquo;."
 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 "
-"the same argument would apply even more strongly to calling it &ldquo;"
-"Linux&rdquo;."
+"the same argument would apply even more strongly to calling it &ldquo;Linux."
+"&rdquo;"
 msgstr ""
 "En 2008 vimos que los paquetes de GNU constituían el 15% del repositorio "
 "principal («<cite>main</cite>») de la distribución gNewSense GNU/Linux. "
@@ -2045,9 +2404,21 @@
 
 # type: Content of: <dl><dd>
 #. type: Content of: <div><dl><dd>
+# | Following the rules of English, in the construction &ldquo;GNU
+# | Linux&rdquo; the word &ldquo;GNU&rdquo; modifies [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+} This can mean either &ldquo;GNU's version of
+# | Linux&rdquo; or &ldquo;Linux, which is a GNU package.&rdquo; Neither of
+# | those meanings fits the situation at hand.
+#, fuzzy
+#| 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 either &ldquo;GNU's version of Linux&rdquo; or &ldquo;"
+#| "Linux, which is a GNU package.&rdquo; Neither of those meanings fits the "
+#| "situation at hand."
 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 "
+"the word &ldquo;GNU&rdquo; modifies &ldquo;Linux.&rdquo; This can mean "
 "either &ldquo;GNU's version of Linux&rdquo; or &ldquo;Linux, which is a GNU "
 "package.&rdquo; Neither of those meanings fits the situation at hand."
 msgstr ""
@@ -2071,11 +2442,27 @@
 
 # type: Content of: <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=\"https://directory.fsf.org/wiki/Linux-libre\";>separate version of
+# | Linux</a>, since the &ldquo;standard&rdquo; version contains nonfree
+# | firmware [-&ldquo;blobs&rdquo;.-] {+&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=\"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."
 msgid ""
 "We're not talking about a distinct GNU version of Linux, the kernel.  The "
 "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 "
+"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."
@@ -2089,11 +2476,24 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
+# | 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 &ldquo;combination.&rdquo; (Think of
+# | [-&ldquo;Input/Output&rdquo;.)-] {+&ldquo;Input/Output.&rdquo;)+}  This
+# | system is the combination of GNU and Linux; hence,
+# | [-&ldquo;GNU/Linux&rdquo;.-] {+&ldquo;GNU/Linux.&rdquo;+}
+#, fuzzy
+#| 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 &ldquo;combination.&rdquo; (Think of &ldquo;Input/Output&rdquo;.)  "
+#| "This system is the combination of GNU and Linux; hence, &ldquo;GNU/"
+#| "Linux&rdquo;."
 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 "
-"&ldquo;combination.&rdquo; (Think of &ldquo;Input/Output&rdquo;.)  This "
-"system is the combination of GNU and Linux; hence, &ldquo;GNU/Linux&rdquo;."
+"&ldquo;combination.&rdquo; (Think of &ldquo;Input/Output.&rdquo;)  This "
+"system is the combination of GNU and Linux; hence, &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "Hablamos de una versión de GNU, el sistema operativo, que se distingue por "
 "tener como núcleo a Linux. Una barra se adecúa a esta situación, pues "
@@ -2102,11 +2502,22 @@
 
 # type: Content of: <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: "
-"&ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes say &ldquo;GNU con "
-"Linux&rdquo;."
+# | There are other ways to express [-&ldquo;combination&rdquo;.-]
+# | {+&ldquo;combination.&rdquo;+} If you think that a plus-sign is clearer,
+# | please use that.  In French, a hyphen is clear:
+# | [-&ldquo;GNU-Linux&rdquo;.-] {+&ldquo;GNU-Linux.&rdquo;+} In Spanish, we
+# | sometimes say &ldquo;GNU con [-Linux&rdquo;.-] {+Linux.&rdquo;+}
+#, fuzzy
+#| 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: &ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes say &ldquo;GNU "
+#| "con Linux&rdquo;."
+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: "
+"&ldquo;GNU-Linux.&rdquo; In Spanish, we sometimes say &ldquo;GNU con Linux."
+"&rdquo;"
 msgstr ""
 "Existen otras maneras de expresar «combinación». Si cree que un signo de "
 "suma es más claro, úselo. En francés, el guión lo expresa con claridad: 
«GNU-"
@@ -2143,9 +2554,19 @@
 
 # type: Content of: <dl><dd>
 #. type: Content of: <div><dl><dd><p>
+# | Following the rules of English, in the construction &ldquo;GNU
+# | Emacs&rdquo; the word &ldquo;GNU&rdquo; modifies [-&ldquo;Emacs&rdquo;.-]
+# | {+&ldquo;Emacs.&rdquo;+} That is the right way to describe a program
+# | called Emacs which is a GNU package.
+#, fuzzy
+#| 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."
 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 "
+"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 ""
 "Según las reglas del inglés, en la construcción «GNU Emacs» la palabra 
«GNU» "
@@ -2194,8 +2615,17 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
+# | However, if you prefer to call the system [-&ldquo;Linux/GNU&rdquo;,-]
+# | {+&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.
+#, fuzzy
+#| 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."
 msgid ""
-"However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a "
+"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 ""
@@ -2205,8 +2635,19 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <div><dl><dt>
+# | My distro's developers call it &ldquo;Foobar [-Linux&rdquo;,-]
+# | {+Linux,&rdquo;+} but that doesn't say anything about what the system
+# | consists of.  Why shouldn't they call it whatever they like? <span
+# | class=\"anchor-reference-id\">(<a
+# | href=\"#distronames0\">#distronames0</a>)</span>
+#, fuzzy
+#| 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 whatever they like? <span class=\"anchor-reference-id\">(<a "
+#| "href=\"#distronames0\">#distronames0</a>)</span>"
 msgid ""
-"My distro's developers call it &ldquo;Foobar Linux&rdquo;, but that doesn't "
+"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 "
 "whatever they like? <span class=\"anchor-reference-id\">(<a href="
 "\"#distronames0\">#distronames0</a>)</span>"
@@ -2271,11 +2712,22 @@
 "\"anchor-reference-id\">(<a href=\"#distronames1\">#distronames1</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | When they spread misinformation by changing &ldquo;GNU&rdquo; to
+# | [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} and call their version
+# | of it &ldquo;Foobar [-Linux&rdquo;,-] {+Linux,&rdquo;+} it's proper for
+# | you to correct the misinformation by calling it &ldquo;Foobar
+# | [-GNU/Linux&rdquo;.-] {+GNU/Linux.&rdquo;+}
+#, fuzzy
+#| 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 proper for you to correct the misinformation by calling it &ldquo;"
+#| "Foobar GNU/Linux&rdquo;."
 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 "
+"Linux,&rdquo; and call their version of it &ldquo;Foobar Linux,&rdquo; it's "
 "proper for you to correct the misinformation by calling it &ldquo;Foobar GNU/"
-"Linux&rdquo;."
+"Linux.&rdquo;"
 msgstr ""
 "Si ellos, al cambiar «GNU» por «Linux» y llamar a su versión de GNU 
«XYZ "
 "Linux», difunden ideas erróneas, es pertinente que usted corrija ese error 
y "
@@ -2315,12 +2767,24 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | 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;.-] {+&ldquo;GNU/Linux.&rdquo;+}
+#, fuzzy
+#| 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 "
+#| "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;."
 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 "
 "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;."
+"&ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "No podemos hacer que lo hagan correctamente, pero no somos de los que se "
 "rinden ante las dificultades. Puede que usted no tenga tanta influencia como "
@@ -2343,16 +2807,35 @@
 
 # type: Content of: <dl><dd>
 #. type: Content of: <div><dl><dd>
+# | 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;.-] {+&ldquo;Linux.&rdquo;+} Many &ldquo;Linux&rdquo;
+# | User Groups make it part of 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 nonfree applications and drivers),
+# | or making the system more popular even at the cost of freedom.
+#, fuzzy
+#| msgid ""
+#| "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 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 nonfree "
+#| "applications and drivers), or making the system more popular even at the "
+#| "cost of freedom."
 msgid ""
 "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 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 nonfree "
-"applications and drivers), or making the system more popular even at the "
-"cost of freedom."
+"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 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 nonfree applications "
+"and drivers), or making the system more popular even at the cost of freedom."
 msgstr ""
 "La práctica generalizada de agregar software que no es libre al sistema GNU/"
 "Linux es un gran problema para nuestra comunidad. Transmite a los usuarios "
@@ -2388,6 +2871,23 @@
 
 # type: Content of: <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 nonfree
+# | software as perverted, adulterated versions of GNU, instead of thinking
+# | they are proper and appropriate &ldquo;versions of [-Linux&rdquo;.-]
+# | {+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 "
+#| "nonfree 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> "
@@ -2395,7 +2895,7 @@
 "specifically for the sake of the users' freedom.  With this understanding, "
 "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;."
+"proper and appropriate &ldquo;versions of Linux.&rdquo;"
 msgstr ""
 "El modo de hacer que esos usuarios vean una relación con la libertad es "
 "exactamente el opuesto: informarles de que todas esas versiones del sistema "
@@ -2498,11 +2998,22 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
+# | If we were to take an existing version of GNU/Linux and relabel it as
+# | [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} that would be somewhat like
+# | making a version of the GNU system and labeling it
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} That wasn't right, and
+# | we don't want to act like that.
+#, fuzzy
+#| 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 and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and "
+#| "we don't want to act like that."
 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 "
-"and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and we don't want "
-"to act like that."
+"GNU,&rdquo; that would be somewhat like making a version of the GNU system "
+"and labeling it &ldquo;Linux.&rdquo; That wasn't right, and we don't want to "
+"act like that."
 msgstr ""
 "Si tomáramos una versión ya existente de GNU/Linux y la renombráramos como 
"
 "«GNU», eso sería como hacer una versión del sistema GNU y darle el nombre 
de "
@@ -2539,11 +3050,29 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | with the GNU Project because he was a &ldquo;Linux [-user&rdquo;.-]
+# | {+user.&rdquo;+} That came as a shock, because the people who ported GNU
+# | packages to other systems had generally wanted to work with us to get
+# | their changes installed.  Yet these people, developing a system that was
+# | primarily based on GNU, were the first (and still practically the only)
+# | group that was unwilling to work with us.
+#, fuzzy
+#| 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 "
+#| "with the GNU Project because he was a &ldquo;Linux user&rdquo;.  That "
+#| "came as a shock, because the people who ported GNU packages to other "
+#| "systems had generally wanted to work with us to get their changes "
+#| "installed.  Yet these people, developing a system that was primarily "
+#| "based on GNU, were the first (and still practically the only) group that "
+#| "was unwilling to work with us."
 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 "
-"with the GNU Project because he was a &ldquo;Linux user&rdquo;.  That came "
-"as a shock, because the people who ported GNU packages to other systems had "
+"with the GNU Project because he was a &ldquo;Linux user.&rdquo; That came as "
+"a shock, because the people who ported GNU packages to other systems had "
 "generally wanted to work with us to get their changes installed.  Yet these "
 "people, developing a system that was primarily based on GNU, were the first "
 "(and still practically the only) group that was unwilling to work with us."
@@ -2559,9 +3088,22 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
+# | It was this experience that first showed us that people were calling a
+# | version of the GNU system [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} and that this confusion was obstructing our work.
+# |  Asking you to call the system &ldquo;GNU/Linux&rdquo; is our response to
+# | that problem, and to the other problems caused by the &ldquo;Linux&rdquo;
+# | misnomer.
+#, fuzzy
+#| 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 obstructing our work.  Asking you to call the system &ldquo;GNU/"
+#| "Linux&rdquo; is our response to that problem, and to the other problems "
+#| "caused by the &ldquo;Linux&rdquo; misnomer."
 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 "
+"version of the GNU system &ldquo;Linux,&rdquo; and that this confusion was "
 "obstructing our work.  Asking you to call the system &ldquo;GNU/Linux&rdquo; "
 "is our response to that problem, and to the other problems caused by the "
 "&ldquo;Linux&rdquo; misnomer."
@@ -2606,10 +3148,18 @@
 
 # type: Content of: <dl><dd>
 #. type: Content of: <div><dl><dd>
+# | We never refer to individual programs as
+# | [-&ldquo;GNU/<i>name</i>&rdquo;.-] {+&ldquo;GNU/<i>name</i>.&rdquo;+} When
+# | a program is a GNU package, we may call it &ldquo;GNU
+# | [-<i>name</i>&rdquo;.-] {+<i>name</i>.&rdquo;+}
+#, fuzzy
+#| 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;."
 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;."
+"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 ""
 "Nunca nos referimos a programas individuales como «GNU/[nombre]». Cuando un 
"
 "programa es un paquete de GNU, podemos llamarlo «GNU [nombre]»."
@@ -2732,10 +3282,24 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
+# | 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. 
+# | The name [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} which stands for
+# | &ldquo;GNU's Not [-Unix&rdquo;,-] {+Unix,&rdquo;+} is a humorous way of
+# | giving credit to Unix for this, following a hacker tradition of recursive
+# | acronyms that started in the 70s.
+#, fuzzy
+#| 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.  The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not "
+#| "Unix&rdquo;, is a humorous way of giving credit to Unix for this, "
+#| "following a hacker tradition of recursive acronyms that started in the "
+#| "70s."
 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.  "
-"The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not Unix&rdquo;, "
+"The name &ldquo;GNU,&rdquo; which stands for &ldquo;GNU's Not Unix,&rdquo; "
 "is a humorous way of giving credit to Unix for this, following a hacker "
 "tradition of recursive acronyms that started in the 70s."
 msgstr ""
@@ -2747,11 +3311,28 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
+# | The first such recursive acronym was TINT, &ldquo;TINT Is Not
+# | [-TECO&rdquo;.-] {+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;,-] {+TECO,&rdquo;+} he
+# | thought of a clever amusing name.  (That's what hacking means: <a
+# | href=\"https://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=\"https://stallman.org/articles/on-hacking.html\";>playful "
+#| "cleverness</a>.)"
 msgid ""
-"The first such recursive acronym was TINT, &ldquo;TINT Is Not TECO&rdquo;.  "
+"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 "
+"like &ldquo;<em>somethingorother</em> TECO,&rdquo; he thought of a clever "
 "amusing name.  (That's what hacking means: <a href=\"https://stallman.org/";
 "articles/on-hacking.html\">playful cleverness</a>.)"
 msgstr ""
@@ -2764,13 +3345,28 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | was similar to some existing program (let's imagine its name was
+# | &ldquo;Klever&rdquo;), you could give it a recursive acronym name, such as
+# | &ldquo;MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same
+# | spirit we called our replacement for Unix &ldquo;GNU's Not
+# | [-Unix&rdquo;.-] {+Unix.&rdquo;+}
+#, fuzzy
+#| 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 was similar to some existing program (let's imagine its name was "
+#| "&ldquo;Klever&rdquo;), you could give it a recursive acronym name, such "
+#| "as &ldquo;MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same "
+#| "spirit we called our replacement for Unix &ldquo;GNU's Not Unix&rdquo;."
 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 "
 "was similar to some existing program (let's imagine its name was &ldquo;"
 "Klever&rdquo;), you could give it a recursive acronym name, such as &ldquo;"
 "MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same spirit we "
-"called our replacement for Unix &ldquo;GNU's Not Unix&rdquo;."
+"called our replacement for Unix &ldquo;GNU's Not Unix.&rdquo;"
 msgstr ""
 "A otros hackers nos gustó tanto ese nombre que imitamos su forma. Se "
 "convirtió en una tradición que cuando uno escribía un programa desde cero "
@@ -2782,13 +3378,28 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
+# | 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 in a system 99% copied from Unix.  AT&amp;T actually threatened to
+# | sue anyone giving AT&amp;T credit in that way.  This is why each of the
+# | various modified versions of Unix (all proprietary, like Unix) had a
+# | completely different name that didn't include [-&ldquo;Unix&rdquo;.-]
+# | {+&ldquo;Unix.&rdquo;+}
+#, fuzzy
+#| 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 in a system 99% copied from Unix.  AT&amp;T actually threatened "
+#| "to sue anyone giving AT&amp;T credit in that way.  This is why each of "
+#| "the various modified versions of Unix (all proprietary, like Unix) had a "
+#| "completely different name that didn't include &ldquo;Unix&rdquo;."
 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 "
 "in a system 99% copied from Unix.  AT&amp;T actually threatened to sue "
 "anyone giving AT&amp;T credit in that way.  This is why each of the various "
 "modified versions of Unix (all proprietary, like Unix) had a completely "
-"different name that didn't include &ldquo;Unix&rdquo;."
+"different name that didn't include &ldquo;Unix.&rdquo;"
 msgstr ""
 "Históricamente, AT&amp;T, que desarrolló Unix, no quería que nadie le "
 "reconociera su trabajo incluyendo «Unix» en el nombre de sistemas 
similares, "
@@ -2869,9 +3480,22 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
+# | There is a version of GNU which uses the kernel from NetBSD.  Its
+# | developers call it &ldquo;Debian [-GNU/NetBSD&rdquo;,-]
+# | {+GNU/NetBSD,&rdquo;+} but &ldquo;GNU/kernelofNetBSD&rdquo; would be more
+# | accurate, since NetBSD is an entire system, not just the kernel.  This is
+# | not a BSD system, since most of the system is the same as the GNU/Linux
+# | system.
+#, fuzzy
+#| 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/"
+#| "kernelofNetBSD&rdquo; would be more accurate, since NetBSD is an entire "
+#| "system, not just the kernel.  This is not a BSD system, since most of the "
+#| "system is the same as the GNU/Linux system."
 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/"
+"call it &ldquo;Debian GNU/NetBSD,&rdquo; but &ldquo;GNU/"
 "kernelofNetBSD&rdquo; would be more accurate, since NetBSD is an entire "
 "system, not just the kernel.  This is not a BSD system, since most of the "
 "system is the same as the GNU/Linux system."
@@ -2895,8 +3519,21 @@
 
 # type: Content of: <dl><dd>
 #. type: Content of: <div><dl><dd><p>
+# | Not in the same sense that we mean by [-&ldquo;GNU/Linux&rdquo;.-]
+# | {+&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.
+#, fuzzy
+#| 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 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."
 msgid ""
-"Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of "
+"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 "
@@ -3008,8 +3645,19 @@
 "código en común. De hecho, lo único que tienen en común es Linux."
 
 #. type: Content of: <div><dl><dd><p>
+# | If you call the whole GNU/Linux system [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} you will find it necessary to say things like,
+# | &ldquo;Android contains Linux, but it isn't Linux, because it doesn't have
+# | the usual Linux [sic] libraries and utilities [meaning the GNU
+# | system].&rdquo;
+#, fuzzy
+#| 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 Linux, because it doesn't have the usual Linux [sic] libraries and "
+#| "utilities [meaning the GNU system].&rdquo;"
 msgid ""
-"If you call the whole GNU/Linux system &ldquo;Linux&rdquo;, you will find it "
+"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 "
 "Linux, because it doesn't have the usual Linux [sic] libraries and utilities "
 "[meaning the GNU system].&rdquo;"
@@ -3053,9 +3701,19 @@
 "quiere decir."
 
 #. type: Content of: <div><dl><dd><p>
+# | The public will find it very strange to speak of using Android as
+# | &ldquo;using [-Linux&rdquo;.-] {+Linux.&rdquo;+} It's like having a
+# | conversation, then saying you were conversing with the person's intestines
+# | or the person's circulatory system.
+#, fuzzy
+#| 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."
 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 "
+"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 ""
 "La gente encontrará muy extraño que alguien se refiera a utilizar Android "
@@ -3064,23 +3722,52 @@
 "persona en cuestión."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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;.-] {+&ldquo;Linux.&rdquo;+}
+#, fuzzy
+#| 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;."
 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;."
+"of the whole system as &ldquo;Linux.&rdquo;"
 msgstr ""
 "Ciertamente, la gente comprenderá la expresión «utilizar Linux», cuando 
en "
 "realidad se trata de GNU/Linux, debido al malentendido habitual: pensar en "
 "que el sistema en conjunto es «Linux»."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | contain Linux is irrelevant to using them, just as the fact that a car and
+# | a bicycle both have a structure of metal is irrelevant to using those two.
+# |  If you wish to talk about using cars and bikes, you wouldn't speak of
+# | &ldquo;riding metal [-objects&rdquo; &mdash; not-]
+# | {+objects&rdquo;&mdash;not+} unless you're playing games with the reader. 
+# | You would say, &ldquo;using cars and bikes.&rdquo; Likewise, the clear way
+# | to talk about using GNU/Linux and Android is to say &ldquo;using GNU/Linux
+# | and Android.&rdquo;
+#, fuzzy
+#| 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 "
+#| "contain Linux is irrelevant to using them, just as the fact that a car "
+#| "and a bicycle both have a structure of metal is irrelevant to using those "
+#| "two.  If you wish to talk about using cars and bikes, you wouldn't speak "
+#| "of &ldquo;riding metal objects&rdquo; &mdash; not unless you're playing "
+#| "games with the reader.  You would say, &ldquo;using cars and bikes."
+#| "&rdquo; Likewise, the clear way to talk about using GNU/Linux and Android "
+#| "is to say &ldquo;using GNU/Linux and Android.&rdquo;"
 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 "
 "contain Linux is irrelevant to using them, just as the fact that a car and a "
 "bicycle both have a structure of metal is irrelevant to using those two.  If "
 "you wish to talk about using cars and bikes, you wouldn't speak of &ldquo;"
-"riding metal objects&rdquo; &mdash; not unless you're playing games with the "
+"riding metal objects&rdquo;&mdash;not unless you're playing games with the "
 "reader.  You would say, &ldquo;using cars and bikes.&rdquo; Likewise, the "
 "clear way to talk about using GNU/Linux and Android is to say &ldquo;using "
 "GNU/Linux and Android.&rdquo;"
@@ -3180,11 +3867,22 @@
 
 # type: Content of: <dl><dd>
 #. type: Content of: <div><dl><dd><p>
+# | 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;.-] {+&ldquo;GNU.&rdquo;+} When we talk
+# | about the whole system, the name &ldquo;GNU/Linux&rdquo; gives him a share
+# | of the credit.
+#, fuzzy
+#| 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 "
+#| "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."
 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 "
-"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."
+"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."
 msgstr ""
 "Sería incorrecto, de modo que no lo hacemos. Obra de Torvalds es Linux, el "
 "núcleo; nos cuidamos de atribuir ese trabajo al Proyecto GNU o de "
@@ -3202,12 +3900,51 @@
 
 # type: Content of: <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=\"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>."
+# | He recognized this at the beginning.  The {+<a
+# | 
href=\"https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\";>+}
+# | earliest Linux release [-notes said, <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>.-] {+notes</a> said:+}
+#, fuzzy
+#| msgid ""
+#| "He recognized this at the beginning.  The earliest Linux release notes "
+#| "said, <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>."
+msgid ""
+"He recognized this at the beginning.  The <a href=\"https://ftp.funet.fi/pub/";
+"linux/historical/kernel/old-versions/RELNOTES-0.01\"> earliest Linux release "
+"notes</a> said:"
+msgstr ""
+"Así lo reconoció al principio. La primera nota de publicación decía, <a 
href="
+"\"https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
+"RELNOTES-0.01\">«La mayoría de las herramientas utilizadas con Linux son "
+"software de GNU y están bajo el copyleft de GNU. Estas herramientas no 
están "
+"en la distribución. Para más información, pregúnteme a mí (o a 
GNU)»</a> "
+"(texto en inglés)."
+
+# type: Content of: <dl><dd><p>
+#. type: Content of: <div><dl><dd><blockquote><p>
+# | [-He recognized this at the beginning.  The earliest Linux release notes
+# | said, <a
+# | 
href=\"https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\";>
+# | &ldquo;Most-]{+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>.-] {+info.+}
+#, fuzzy
+#| msgid ""
+#| "He recognized this at the beginning.  The earliest Linux release notes "
+#| "said, <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>."
+msgid ""
+"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."
 msgstr ""
 "Así lo reconoció al principio. La primera nota de publicación decía, <a 
href="
 "\"https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
@@ -3264,11 +4001,26 @@
 
 # type: Content of: <dl><dd>
 #. type: Content of: <div><dl><dd><p>
+# | 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;,-]
+# | {+&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.
+#, fuzzy
+#| 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;: 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."
 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;: "
 "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 "
+"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."
 msgstr ""
@@ -3291,13 +4043,32 @@
 
 # type: Content of: <dl><dd>
 #. type: Content of: <div><dl><dd><p>
+# | 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;,-] {+&ldquo;GNU/Linux,&rdquo;+} you will help
+# | others learn the system's true history, origin, and reason for being.  You
+# | can't correct the misnomer 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;,-] {+&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.
+#, fuzzy
+#| 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;GNU/Linux&rdquo;, you will help others learn the system's true "
+#| "history, origin, and reason for being.  You can't correct the misnomer "
+#| "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."
 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;"
-"GNU/Linux&rdquo;, you will help others learn the system's true history, "
+"GNU/Linux,&rdquo; you will help others learn the system's true history, "
 "origin, and reason for being.  You can't correct the misnomer 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 "
+"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."
 msgstr ""
@@ -3324,10 +4095,20 @@
 
 # type: Content of: <dl><dd>
 #. type: Content of: <div><dl><dd>
+# | 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;,-]
+# | {+&ldquo;GNU/Linux,&rdquo;+} and uses your time inefficiently.
+#, fuzzy
+#| 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."
 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."
+"the system &ldquo;GNU/Linux,&rdquo; and uses your time inefficiently."
 msgstr ""
 "Si nos ayuda explicándoselo a otros de esa forma, apreciamos su esfuerzo, "
 "pero no es el mejor método. No es tan eficaz como llamar al sistema «GNU/"
@@ -3335,12 +4116,28 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
+# | 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, and they may learn a correct picture of the system's origin. 
+# | But they are unlikely to repeat the explanation to others whenever they
+# | talk about the system.  They will probably just call it
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} Without particularly
+# | intending to, they will help spread the incorrect picture.
+#, fuzzy
+#| 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, and they may learn a correct picture of the system's origin.  "
+#| "But they are unlikely to repeat the explanation to others whenever they "
+#| "talk about the system.  They will probably just call it &ldquo;"
+#| "Linux&rdquo;.  Without particularly intending to, they will help spread "
+#| "the incorrect picture."
 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, "
 "and they may learn a correct picture of the system's origin.  But they are "
 "unlikely to repeat the explanation to others whenever they talk about the "
-"system.  They will probably just call it &ldquo;Linux&rdquo;.  Without "
+"system.  They will probably just call it &ldquo;Linux.&rdquo; Without "
 "particularly intending to, they will help spread the incorrect picture."
 msgstr ""
 "No es efectivo porque es posible que el mensaje no cale, y seguramente no se "
@@ -3490,9 +4287,16 @@
 
 # type: Content of: <dl><dd>
 #. type: Content of: <div><dl><dd><p>
+# | It would be wrong to force them, and we don't try.  We call the system
+# | [-&ldquo;GNU/Linux&rdquo;,-] {+&ldquo;GNU/Linux,&rdquo;+} and we ask you
+# | to do it too.
+#, fuzzy
+#| 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."
 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."
+"&ldquo;GNU/Linux,&rdquo; and we ask you to do it too."
 msgstr ""
 "Obligarles sería un error, y no es lo que pretendemos. Llamamos al sistema "
 "«GNU/Linux» y simplemente le pedimos a usted que haga lo mismo."
@@ -3584,9 +4388,19 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <div><dl><dt>
+# | Since you failed to put something in the GNU GPL to require people to call
+# | the system [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} you deserve what
+# | happened; why are you complaining now? <span
+# | class=\"anchor-reference-id\">(<a href=\"#deserve\">#deserve</a>)</span>
+#, fuzzy
+#| 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 "
+#| "complaining now? <span class=\"anchor-reference-id\">(<a href=\"#deserve"
+#| "\">#deserve</a>)</span>"
 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 "
+"the system &ldquo;GNU,&rdquo; you deserve what happened; why are you "
 "complaining now? <span class=\"anchor-reference-id\">(<a href=\"#deserve"
 "\">#deserve</a>)</span>"
 msgstr ""
@@ -3647,8 +4461,17 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <div><dl><dt>
+# | Since many people call it [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} doesn't that make it right? <span
+# | class=\"anchor-reference-id\">(<a
+# | href=\"#somanyright\">#somanyright</a>)</span>
+#, fuzzy
+#| 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>"
 msgid ""
-"Since many people call it &ldquo;Linux&rdquo;, doesn't that make it right? "
+"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 ""
@@ -3673,9 +4496,20 @@
 "\">#knownname</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | Users are not incapable of learning.  Since &ldquo;GNU/Linux&rdquo;
+# | includes [-&ldquo;Linux&rdquo;,-] {+&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.
+#, fuzzy
+#| 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 add &ldquo;(often erroneously referred to as &lsquo;"
+#| "Linux&rsquo;)&rdquo; once in a while, they will all understand."
 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 "
+"&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."
 msgstr ""

Index: po/gnu-linux-faq.fr.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.fr.po,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -b -r1.129 -r1.130
--- po/gnu-linux-faq.fr.po      12 Sep 2021 17:22:25 -0000      1.129
+++ po/gnu-linux-faq.fr.po      2 Nov 2021 14:41:51 -0000       1.130
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-linux-faq.html\n"
-"POT-Creation-Date: 2021-08-31 10:27+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2021-09-12 19:21+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-11-02 14:27+0000\n"
 "Plural-Forms: \n"
 "X-Generator: Gtranslator 2.91.5\n"
 
@@ -33,10 +34,19 @@
 msgid "by Richard Stallman"
 msgstr "par Richard Stallman"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+# | When people see that we use and recommend the name GNU/Linux for a system
+# | that many others call just [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} they ask many questions.  Here are common
+# | questions, and our answers.
+#, fuzzy
+#| 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."
 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.  "
+"that many others call just &ldquo;Linux,&rdquo; they ask many questions.  "
 "Here are common questions, and our answers."
 msgstr ""
 "Quand les gens voient que nous utilisons et recommandons le nom GNU/Linux "
@@ -261,11 +271,22 @@
 "« GNU » ?</a>"
 
 #. type: Content of: <div><div><ul><li>
+# | <a href=\"#trademarkfee\">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;.-] {+&ldquo;GNU/Linux.&rdquo;+} Is it
+# | wrong if I use &ldquo;GNU&rdquo; without [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} to save the fee?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#trademarkfee\">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 wrong if I use &ldquo;GNU&rdquo; without "
+#| "&ldquo;Linux&rdquo;, to save the fee?</a>"
 msgid ""
 "<a href=\"#trademarkfee\">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 wrong if I use &ldquo;GNU&rdquo; without "
-"&ldquo;Linux&rdquo;, to save the fee?</a>"
+"&ldquo;GNU/Linux.&rdquo; Is it wrong if I use &ldquo;GNU&rdquo; without "
+"&ldquo;Linux,&rdquo; to save the fee?</a>"
 msgstr ""
 "<a href=\"#trademarkfee\">Il me faudrait payer une taxe si j'utilisais "
 "« Linux » dans le nom d'un produit, et ce serait aussi le cas si 
j'utilisais "
@@ -354,10 +375,19 @@
 "<a href=\"#whyorder\">Pourquoi « GNU/Linux » plutôt que « Linux/GNU 
» ?</a>"
 
 #. type: Content of: <div><div><ul><li>
-msgid ""
-"<a href=\"#distronames0\">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 whatever they like?</a>"
+# | <a href=\"#distronames0\">My distro's developers call it &ldquo;Foobar
+# | [-Linux&rdquo;,-] {+Linux,&rdquo;+} but that doesn't say anything about
+# | what the system consists of.  Why shouldn't they call it whatever they
+# | like?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#distronames0\">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 whatever they like?</a>"
+msgid ""
+"<a href=\"#distronames0\">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 whatever they like?</a>"
 msgstr ""
 "<a href=\"#distronames0\">Les développeurs de ma distribution l'appellent "
 "« Toto Linux », mais cela ne dit rien sur ce qui compose le système. "
@@ -614,9 +644,18 @@
 "GPL pour obliger les gens à appeler le système « GNU » ?</a>"
 
 #. type: Content of: <div><div><ul><li>
+# | <a href=\"#deserve\">Since you failed to put something in the GNU GPL to
+# | require people to call the system [-&ldquo;GNU&rdquo;,-]
+# | {+&ldquo;GNU,&rdquo;+} you deserve what happened; why are you complaining
+# | now?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#deserve\">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 complaining now?</a>"
 msgid ""
 "<a href=\"#deserve\">Since you failed to put something in the GNU GPL to "
-"require people to call the system &ldquo;GNU&rdquo;, you deserve what "
+"require people to call the system &ldquo;GNU,&rdquo; you deserve what "
 "happened; why are you complaining now?</a>"
 msgstr ""
 "<a href=\"#deserve\">Puisque vous n'avez pas réussi à mettre quelque chose "
@@ -633,8 +672,15 @@
 "contredire ce que tant de gens croient ?</a>"
 
 #. type: Content of: <div><div><ul><li>
+# | <a href=\"#somanyright\">Since many people call it
+# | [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} doesn't that make it
+# | right?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#somanyright\">Since many people call it &ldquo;Linux&rdquo;, "
+#| "doesn't that make it right?</a>"
 msgid ""
-"<a href=\"#somanyright\">Since many people call it &ldquo;Linux&rdquo;, "
+"<a href=\"#somanyright\">Since many people call it &ldquo;Linux,&rdquo; "
 "doesn't that make it right?</a>"
 msgstr ""
 "<a href=\"#somanyright\">Puisque tant de gens l'appellent « Linux », cela 
ne "
@@ -806,6 +852,24 @@
 "bonne longueur d'avance."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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 it must be right.  The name &ldquo;Linux&rdquo; also spreads a
+# | false picture of the system's origin, because people tend to suppose that
+# | the system's history was such as to fit that name.  For instance, they
+# | often believe its development was started by Linus Torvalds in 1991.  This
+# | false picture tends to reinforce the idea that the system should be called
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+}
+#, fuzzy
+#| 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 it must be right.  The name &ldquo;Linux&rdquo; also spreads a "
+#| "false picture of the system's origin, because people tend to suppose that "
+#| "the system's history was such as to fit that name.  For instance, they "
+#| "often believe its development was started by Linus Torvalds in 1991.  "
+#| "This false picture tends to reinforce the idea that the system should be "
+#| "called &ldquo;Linux&rdquo;."
 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 "
@@ -813,7 +877,7 @@
 "of the system's origin, because people tend to suppose that the system's "
 "history was such as to fit that name.  For instance, they often believe its "
 "development was started by Linus Torvalds in 1991.  This false picture tends "
-"to reinforce the idea that the system should be called &ldquo;Linux&rdquo;."
+"to reinforce the idea that the system should be called &ldquo;Linux.&rdquo;"
 msgstr ""
 "La plupart des gens qui appellent le système « Linux » n'ont jamais 
entendu "
 "expliquer pourquoi ce n'est pas correct. Ils ont vu d'autres personnes "
@@ -841,22 +905,46 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#always\">#always</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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;,-] {+&ldquo;Linux,&rdquo;+} the name its developer
+# | chose.
+#, fuzzy
+#| 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."
 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."
+"you're referring specifically to the kernel, you should call it &ldquo;Linux,"
+"&rdquo; the name its developer chose."
 msgstr ""
 "Pas toujours, seulement quand vous parlez du système en entier. Quand vous "
 "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><dl><dd><p>
+# | When people call the whole system [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} as a consequence they call the whole system by
+# | the same name as the kernel.  This causes many kinds of confusion, because
+# | only experts can tell whether a statement is about the kernel or the whole
+# | system.  By calling the whole system [-&ldquo;GNU/Linux&rdquo;,-]
+# | {+&ldquo;GNU/Linux,&rdquo;+} and calling the kernel
+# | [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} you avoid the ambiguity.
+#, fuzzy
+#| 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 kinds of confusion, because only experts can tell whether a "
+#| "statement is about the kernel or the whole system.  By calling the whole "
+#| "system &ldquo;GNU/Linux&rdquo;, and calling the kernel &ldquo;"
+#| "Linux&rdquo;, you avoid the ambiguity."
 msgid ""
-"When people call the whole system &ldquo;Linux&rdquo;, as a consequence they "
+"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 "
 "kinds of confusion, because only experts can tell whether a statement is "
 "about the kernel or the whole system.  By calling the whole system &ldquo;"
-"GNU/Linux&rdquo;, and calling the kernel &ldquo;Linux&rdquo;, you avoid the "
+"GNU/Linux,&rdquo; and calling the kernel &ldquo;Linux,&rdquo; you avoid the "
 "ambiguity."
 msgstr ""
 "Appeler le système entier « Linux » revient à donner au système entier 
le "
@@ -928,8 +1016,17 @@
 "\">#divide</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | When we ask people to say [-&ldquo;GNU/Linux&rdquo;,-]
+# | {+&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.
+#, fuzzy
+#| 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."
 msgid ""
-"When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing "
+"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 ""
@@ -987,10 +1084,34 @@
 "perd de vue l'éthique du logiciel libre</a>."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | freedom are more likely to call the system [-&ldquo;GNU/Linux&rdquo;,-]
+# | {+&ldquo;GNU/Linux,&rdquo;+} and people who learn that the system is
+# | &ldquo;GNU/Linux&rdquo; are more likely to pay attention to our
+# | philosophical arguments for freedom and community (which is why the choice
+# | of name for the system makes a real difference for society).  However, the
+# | disagreement would probably exist even if everyone knew the system's real
+# | origin and its proper name, because the issue is a real one.  It can only
+# | go away if we who value freedom either persuade everyone (which won't be
+# | easy) or are defeated entirely (let's hope not).
+#, fuzzy
+#| 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 freedom are more likely to call the system &ldquo;GNU/"
+#| "Linux&rdquo;, and people who learn that the system is &ldquo;GNU/"
+#| "Linux&rdquo; are more likely to pay attention to our philosophical "
+#| "arguments for freedom and community (which is why the choice of name for "
+#| "the system makes a real difference for society).  However, the "
+#| "disagreement would probably exist even if everyone knew the system's real "
+#| "origin and its proper name, because the issue is a real one.  It can only "
+#| "go away if we who value freedom either persuade everyone (which won't be "
+#| "easy) or are defeated entirely (let's hope not)."
 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 "
-"freedom are more likely to call the system &ldquo;GNU/Linux&rdquo;, and "
+"freedom are more likely to call the system &ldquo;GNU/Linux,&rdquo; and "
 "people who learn that the system is &ldquo;GNU/Linux&rdquo; are more likely "
 "to pay attention to our philosophical arguments for freedom and community "
 "(which is why the choice of name for the system makes a real difference for "
@@ -1049,10 +1170,23 @@
 "span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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
+# | system do not mention the name [-&ldquo;GNU&rdquo;,-]
+# | {+&ldquo;GNU,&rdquo;+} or the ideals that GNU stands for.  <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never
+# | Heard of GNU</a> explains further.
+#, fuzzy
+#| 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 system do not mention the name &ldquo;GNU&rdquo;, or the ideals that "
+#| "GNU stands for.  <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU "
+#| "Users Who Have Never Heard of GNU</a> explains further."
 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 "
-"system do not mention the name &ldquo;GNU&rdquo;, or the ideals that GNU "
+"system do not mention the name &ldquo;GNU,&rdquo; or the ideals that GNU "
 "stands for.  <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users "
 "Who Have Never Heard of GNU</a> explains further."
 msgstr ""
@@ -1064,11 +1198,22 @@
 "des explications complémentaires à ce sujet."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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 GNU is.  For instance, many think it is a collection of [-<a
+# | href=\"#tools\">&ldquo;tools&rdquo;</a>,-] {+&ldquo;<a
+# | href=\"#tools\">tools</a>,&rdquo;+} or a project to develop tools.
+#, fuzzy
+#| 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 GNU is.  For instance, many think it is a collection of <a "
+#| "href=\"#tools\">&ldquo;tools&rdquo;</a>, or a project to develop tools."
 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 "
-"GNU is.  For instance, many think it is a collection of <a href=\"#tools"
-"\">&ldquo;tools&rdquo;</a>, or a project to develop tools."
+"GNU is.  For instance, many think it is a collection of &ldquo;<a href="
+"\"#tools\">tools</a>,&rdquo; or a project to develop tools."
 msgstr ""
 "Les personnes qui disent ceci sont probablement des geeks pensant aux autres "
 "geeks qu'ils connaissent. Les geeks ont pour la plupart entendu parler de "
@@ -1102,11 +1247,23 @@
 "\"#everyoneknows2\">#everyoneknows2</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | 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;,-] {+&ldquo;Linux,&rdquo;+} that it was started by
+# | Linus Torvalds, and that it was intended to be &ldquo;open
+# | [-source&rdquo;.-] {+source.&rdquo;+} If you don't tell them, who will?
+#, fuzzy
+#| 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;"
+#| "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?"
 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;"
-"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?"
+"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?"
 msgstr ""
 "Si les mots que vous utilisez ne reflètent pas votre connaissance, vous "
 "n'apprenez rien aux autres. La plupart des gens qui ont entendu parler du "
@@ -1164,14 +1321,31 @@
 "\">#tools</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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
+# | that GNU is the name of a collection of programs&mdash;often they say
+# | &ldquo;programming [-tools&rdquo;,-] {+tools,&rdquo;+} since some of our
+# | programming tools became popular on their own.  The idea that
+# | &ldquo;GNU&rdquo; is the name of an operating system is hard to fit into a
+# | conceptual framework in which that operating system is labeled
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+}
+#, fuzzy
+#| 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 "
+#| "that GNU is the name of a collection of programs&mdash;often they say "
+#| "&ldquo;programming tools&rdquo;, since some of our programming tools "
+#| "became popular on their own.  The idea that &ldquo;GNU&rdquo; is the name "
+#| "of an operating system is hard to fit into a conceptual framework in "
+#| "which that operating system is labeled &ldquo;Linux&rdquo;."
 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 "
 "that GNU is the name of a collection of programs&mdash;often they say &ldquo;"
-"programming tools&rdquo;, since some of our programming tools became popular "
+"programming tools,&rdquo; since some of our programming tools became popular "
 "on their own.  The idea that &ldquo;GNU&rdquo; is the name of an operating "
 "system is hard to fit into a conceptual framework in which that operating "
-"system is labeled &ldquo;Linux&rdquo;."
+"system is labeled &ldquo;Linux.&rdquo;"
 msgstr ""
 "Les personnes qui pensent que Linux est un système d'exploitation complet, "
 "si tant est qu'ils aient entendu parler de GNU, ont souvent une idée fausse "
@@ -1242,12 +1416,32 @@
 "programmes."
 
 #. type: Content of: <div><dl><dd><p>
+# | To confuse matters, some people use the term &ldquo;operating
+# | system&rdquo; to mean [-&ldquo;kernel&rdquo;.-] {+&ldquo;kernel.&rdquo;+}
+# | Both uses of the term go back many years.  The use of &ldquo;operating
+# | system&rdquo; to mean &ldquo;kernel&rdquo; is found in a number of
+# | textbooks on system design, going back to the 80s.  At the same time, in
+# | the 80s, the &ldquo;Unix operating system&rdquo; was understood to include
+# | all the system programs, and Berkeley's version of Unix included even
+# | games. Since we intended GNU to be a Unix-like operating system, we use
+# | the term &ldquo;operating system&rdquo; in the same way.
+#, fuzzy
+#| 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.  The use of &ldquo;operating system&rdquo; to mean "
+#| "&ldquo;kernel&rdquo; is found in a number of textbooks on system design, "
+#| "going back to the 80s.  At the same time, in the 80s, the &ldquo;Unix "
+#| "operating system&rdquo; was understood to include all the system "
+#| "programs, and Berkeley's version of Unix included even games. Since we "
+#| "intended GNU to be a Unix-like operating system, we use the term &ldquo;"
+#| "operating system&rdquo; in the same way."
 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.  "
-"The use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is "
-"found in a number of textbooks on system design, going back to the 80s.  At "
-"the same time, in the 80s, the &ldquo;Unix operating system&rdquo; was "
+"to mean &ldquo;kernel.&rdquo; Both uses of the term go back many years.  The "
+"use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is found "
+"in a number of textbooks on system design, going back to the 80s.  At the "
+"same time, in the 80s, the &ldquo;Unix operating system&rdquo; was "
 "understood to include all the system programs, and Berkeley's version of "
 "Unix included even games. Since we intended GNU to be a Unix-like operating "
 "system, we use the term &ldquo;operating system&rdquo; in the same way."
@@ -1264,11 +1458,28 @@
 "d'exploitation » de la même manière."
 
 #. type: Content of: <div><dl><dd><p>
+# | Most of the time when people speak of the &ldquo;Linux operating
+# | system&rdquo; they are using &ldquo;operating system&rdquo; in the same
+# | sense we use: they mean the whole collection of programs.  If that's what
+# | you are referring to, please call it [-&ldquo;GNU/Linux&rdquo;.-]
+# | {+&ldquo;GNU/Linux.&rdquo;+} If you mean just the kernel, then
+# | &ldquo;Linux&rdquo; is the right name for it, but please say
+# | &ldquo;kernel&rdquo; also to avoid ambiguity about which body of software
+# | you mean.
+#, fuzzy
+#| 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 "
+#| "sense we use: they mean the whole collection of programs.  If that's what "
+#| "you are referring to, please call it &ldquo;GNU/Linux&rdquo;.  If you "
+#| "mean just the kernel, then &ldquo;Linux&rdquo; is the right name for it, "
+#| "but please say &ldquo;kernel&rdquo; also to avoid ambiguity about which "
+#| "body of software you mean."
 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 "
 "sense we use: they mean the whole collection of programs.  If that's what "
-"you are referring to, please call it &ldquo;GNU/Linux&rdquo;.  If you mean "
+"you are referring to, please call it &ldquo;GNU/Linux.&rdquo; If you mean "
 "just the kernel, then &ldquo;Linux&rdquo; is the right name for it, but "
 "please say &ldquo;kernel&rdquo; also to avoid ambiguity about which body of "
 "software you mean."
@@ -1282,10 +1493,20 @@
 "logiciel dont vous parlez."
 
 #. type: Content of: <div><dl><dd><p>
+# | If you prefer to use some other term such as &ldquo;system
+# | distribution&rdquo; for the entire collection of programs, instead of
+# | &ldquo;operating [-system&rdquo;,-] {+system,&rdquo;+} that's fine.  Then
+# | you would talk about GNU/Linux system distributions.
+#, fuzzy
+#| msgid ""
+#| "If you prefer to use some other term such as &ldquo;system "
+#| "distribution&rdquo; for the entire collection of programs, instead of "
+#| "&ldquo;operating system&rdquo;, that's fine.  Then you would talk about "
+#| "GNU/Linux system distributions."
 msgid ""
 "If you prefer to use some other term such as &ldquo;system "
 "distribution&rdquo; for the entire collection of programs, instead of &ldquo;"
-"operating system&rdquo;, that's fine.  Then you would talk about GNU/Linux "
+"operating system,&rdquo; that's fine.  Then you would talk about GNU/Linux "
 "system distributions."
 msgstr ""
 "Si vous préférez utiliser un autre terme comme « distribution de 
système » "
@@ -1383,12 +1604,26 @@
 "\"anchor-reference-id\">(<a href=\"#nokernel\">#nokernel</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | The people who argue that way for calling the system &ldquo;Linux&rdquo;
+# | are using a double standard.  An operating system requires compilers,
+# | editors, window systems, libraries, and much [-more &mdash; hundreds-]
+# | {+more&mdash;hundreds+} of programs, even to match what BSD systems
+# | included in 1983.  Since Torvalds didn't develop any of those, how can the
+# | system be &ldquo;Linux&rdquo;?
+#, fuzzy
+#| 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, window systems, libraries, and much more &mdash; hundreds of "
+#| "programs, even to match what BSD systems included in 1983.  Since "
+#| "Torvalds didn't develop any of those, how can the system be &ldquo;"
+#| "Linux&rdquo;?"
 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, "
-"window systems, libraries, and much more &mdash; hundreds of programs, even "
-"to match what BSD systems included in 1983.  Since Torvalds didn't develop "
-"any of those, how can the system be &ldquo;Linux&rdquo;?"
+"window systems, libraries, and much more&mdash;hundreds of programs, even to "
+"match what BSD systems included in 1983.  Since Torvalds didn't develop any "
+"of those, how can the system be &ldquo;Linux&rdquo;?"
 msgstr ""
 "Les personnes qui donnent ces arguments pour appeler le système « Linux 
» "
 "font deux poids deux mesures. Un système d'exploitation a besoin de "
@@ -1427,9 +1662,18 @@
 "span>"
 
 #. type: Content of: <div><dl><dd>
+# | Many <a href=\"/distros/distros.html\"> packaged and installable versions
+# | of GNU</a> are available.  None of them is called simply
+# | [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} but GNU is what they
+# | basically are.
+#, fuzzy
+#| 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."
 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</a> are available.  None of them is called simply &ldquo;GNU,&rdquo; but "
 "GNU is what they basically are."
 msgstr ""
 "De nombreuses <a href=\"/distros/distros.html\">versions installables de "
@@ -1483,9 +1727,17 @@
 "système GNU."
 
 #. type: Content of: <div><dl><dd><p>
+# | We never took the last step of packaging GNU under the name
+# | [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} but that doesn't alter what
+# | kind of thing GNU is.  GNU is an operating system.
+#, fuzzy
+#| 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."
 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 "
+"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 ""
 "Nous n'avons jamais franchi l'ultime étape consistant à empaqueter GNU sous 
"
@@ -1503,13 +1755,28 @@
 "reference-id\">(<a href=\"#afterkernel\">#afterkernel</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | That practice seems to be very rare&mdash;we can't find any examples other
+# | than the misuse of the name [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+} Normally an operating system is developed as a
+# | single unified project, and the developers choose a name for the system as
+# | a whole.  The kernel usually does not have a name of its
+# | own&mdash;instead, people say &ldquo;the kernel of such-and-such&rdquo; or
+# | &ldquo;the such-and-such [-kernel&rdquo;.-] {+kernel.&rdquo;+}
+#, fuzzy
+#| 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 system is developed as a single unified project, and the "
+#| "developers choose a name for the system as a whole.  The kernel usually "
+#| "does not have a name of its own&mdash;instead, people say &ldquo;the "
+#| "kernel of such-and-such&rdquo; or &ldquo;the such-and-such kernel&rdquo;."
 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 "
+"than the misuse of the name &ldquo;Linux.&rdquo; Normally an operating "
 "system is developed as a single unified project, and the developers choose a "
 "name for the system as a whole.  The kernel usually does not have a name of "
 "its own&mdash;instead, people say &ldquo;the kernel of such-and-such&rdquo; "
-"or &ldquo;the such-and-such kernel&rdquo;."
+"or &ldquo;the such-and-such kernel.&rdquo;"
 msgstr ""
 "Cette pratique semble très rare : nous n'avons pas trouvé d'autre exemple "
 "que la mauvaise utilisation du nom « Linux ». Normalement un système "
@@ -1566,9 +1833,18 @@
 "\"#long\">#long</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | For a while we tried the name [-&ldquo;LiGNUx&rdquo;,-]
+# | {+&ldquo;LiGNUx,&rdquo;+} which combines the words &ldquo;GNU&rdquo; and
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} The reaction was very
+# | bad.  People accept &ldquo;GNU/Linux&rdquo; much better.
+#, fuzzy
+#| 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."
 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.  "
+"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 ""
 "Pendant quelque temps, nous avons essayé le nom « LiGNUx » qui combine 
les "
@@ -1576,8 +1852,16 @@
 "acceptent beaucoup mieux « GNU/Linux »."
 
 #. type: Content of: <div><dl><dd><p>
+# | The shortest legitimate name for this system is [-&ldquo;GNU&rdquo;,-]
+# | {+&ldquo;GNU,&rdquo;+} but we call it &ldquo;GNU/Linux&rdquo; <a
+# | href=\"#justgnu\"> for the reasons given below</a>.
+#, fuzzy
+#| 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>."
 msgid ""
-"The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but we "
+"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 ""
@@ -1625,8 +1909,16 @@
 "\"#long2\">#long2</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | It only takes a second to say or type [-&ldquo;GNU/&rdquo;.-]
+# | {+&ldquo;GNU/.&rdquo;+} If you appreciate the system that we developed,
+# | can't you take one second to recognize our work?
+#, fuzzy
+#| 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?"
 msgid ""
-"It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you appreciate "
+"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 ""
@@ -1736,10 +2028,21 @@
 "système."
 
 #. type: Content of: <div><dl><dd><ul><li>
+# | Since many people know of the system as [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} if we say &ldquo;GNU&rdquo; they may simply not
+# | recognize we're talking about the same system.  If we say
+# | [-&ldquo;GNU/Linux&rdquo;,-] {+&ldquo;GNU/Linux,&rdquo;+} they can make a
+# | connection to what they have heard about.
+#, fuzzy
+#| 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 system.  If we say &ldquo;GNU/Linux&rdquo;, they can make a "
+#| "connection to what they have heard about."
 msgid ""
-"Since many people know of the system as &ldquo;Linux&rdquo;, if we say "
+"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 "
-"system.  If we say &ldquo;GNU/Linux&rdquo;, they can make a connection to "
+"system.  If we say &ldquo;GNU/Linux,&rdquo; they can make a connection to "
 "what they have heard about."
 msgstr ""
 "Puisque de nombreuses personnes connaissent le système sous le nom "
@@ -1748,10 +2051,23 @@
 "ils peuvent faire la relation avec ce dont ils ont entendu parler."
 
 #. type: Content of: <div><dl><dt>
+# | 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;.-]
+# | {+&ldquo;GNU/Linux.&rdquo;+} Is it wrong if I use &ldquo;GNU&rdquo;
+# | without [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} to save the fee?
+# | <span class=\"anchor-reference-id\">(<a
+# | href=\"#trademarkfee\">#trademarkfee</a>)</span>
+#, fuzzy
+#| 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 wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to save "
+#| "the fee? <span class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
+#| "\">#trademarkfee</a>)</span>"
 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 "
-"wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to save the "
+"product, and that would also apply if I say &ldquo;GNU/Linux.&rdquo; Is it "
+"wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux,&rdquo; to save the "
 "fee? <span class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
 "\">#trademarkfee</a>)</span>"
 msgstr ""
@@ -1773,9 +2089,17 @@
 "privilège de le faire."
 
 #. type: Content of: <div><dl><dd><p>
+# | So if you want to refer to the system simply as [-&ldquo;GNU&rdquo;,-]
+# | {+&ldquo;GNU,&rdquo;+} to avoid paying the fee for calling it
+# | [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} we won't criticize you.
+#, fuzzy
+#| 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."
 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."
+"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 ""
 "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 »."
@@ -1836,12 +2160,25 @@
 "n'émettrons pas de critique."
 
 #. type: Content of: <div><dl><dd><p>
+# | Different threshold levels would lead to different choices of name for the
+# | system.  But one name that cannot result from concerns of fairness and
+# | giving credit, not for any possible threshold level, is
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} It can't be fair to give
+# | all the credit to one secondary contribution (Linux) while omitting the
+# | principal contribution (GNU).
+#, fuzzy
+#| 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 giving credit, not for any possible threshold level, is &ldquo;"
+#| "Linux&rdquo;.  It can't be fair to give all the credit to one secondary "
+#| "contribution (Linux) while omitting the principal contribution (GNU)."
 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 "
-"giving credit, not for any possible threshold level, is &ldquo;"
-"Linux&rdquo;.  It can't be fair to give all the credit to one secondary "
-"contribution (Linux) while omitting the principal contribution (GNU)."
+"giving credit, not for any possible threshold level, is &ldquo;Linux.&rdquo; "
+"It can't be fair to give all the credit to one secondary contribution "
+"(Linux) while omitting the principal contribution (GNU)."
 msgstr ""
 "Des limites différentes mèneront à des noms différents pour le système. 
Mais "
 "« Linux » est un nom qui ne peut résulter de considérations d'équité 
et de "
@@ -1860,11 +2197,23 @@
 "class=\"anchor-reference-id\">(<a href=\"#others\">#others</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | 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;,-]
+# | {+&ldquo;GNU/systemd/Linux,&rdquo;+} there is nothing wrong with doing so.
+#, fuzzy
+#| 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).  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."
 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).  "
 "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."
+"system &ldquo;GNU/systemd/Linux,&rdquo; there is nothing wrong with doing so."
 msgstr ""
 "systemd est assez important, mais pas aussi important que le noyau (Linux), "
 "ni aussi important que la base du système dans son ensemble (GNU). "
@@ -1915,11 +2264,21 @@
 "\">#allsmall</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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 the same argument would apply even more strongly to calling it
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+}
+#, fuzzy
+#| 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 the same argument would apply even more strongly to calling it &ldquo;"
+#| "Linux&rdquo;."
 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 "
-"the same argument would apply even more strongly to calling it &ldquo;"
-"Linux&rdquo;."
+"the same argument would apply even more strongly to calling it &ldquo;Linux."
+"&rdquo;"
 msgstr ""
 "En 2008, nous avons observé que les paquets GNU représentaient 15 % du "
 "répertoire « principal » <i>[main]</i> de la distribution GNU/Linux "
@@ -1984,9 +2343,21 @@
 "\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | Following the rules of English, in the construction &ldquo;GNU
+# | Linux&rdquo; the word &ldquo;GNU&rdquo; modifies [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+} This can mean either &ldquo;GNU's version of
+# | Linux&rdquo; or &ldquo;Linux, which is a GNU package.&rdquo; Neither of
+# | those meanings fits the situation at hand.
+#, fuzzy
+#| 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 either &ldquo;GNU's version of Linux&rdquo; or &ldquo;"
+#| "Linux, which is a GNU package.&rdquo; Neither of those meanings fits the "
+#| "situation at hand."
 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 "
+"the word &ldquo;GNU&rdquo; modifies &ldquo;Linux.&rdquo; This can mean "
 "either &ldquo;GNU's version of Linux&rdquo; or &ldquo;Linux, which is a GNU "
 "package.&rdquo; Neither of those meanings fits the situation at hand."
 msgstr ""
@@ -2008,11 +2379,27 @@
 "Donc le sens « Linux, qui est un paquet GNU » est faux."
 
 #. 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=\"https://directory.fsf.org/wiki/Linux-libre\";>separate version of
+# | Linux</a>, since the &ldquo;standard&rdquo; version contains nonfree
+# | firmware [-&ldquo;blobs&rdquo;.-] {+&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=\"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."
 msgid ""
 "We're not talking about a distinct GNU version of Linux, the kernel.  The "
 "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 "
+"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."
@@ -2026,11 +2413,24 @@
 "prêterait trop à confusion."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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 &ldquo;combination.&rdquo; (Think of
+# | [-&ldquo;Input/Output&rdquo;.)-] {+&ldquo;Input/Output.&rdquo;)+}  This
+# | system is the combination of GNU and Linux; hence,
+# | [-&ldquo;GNU/Linux&rdquo;.-] {+&ldquo;GNU/Linux.&rdquo;+}
+#, fuzzy
+#| 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 &ldquo;combination.&rdquo; (Think of &ldquo;Input/Output&rdquo;.)  "
+#| "This system is the combination of GNU and Linux; hence, &ldquo;GNU/"
+#| "Linux&rdquo;."
 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 "
-"&ldquo;combination.&rdquo; (Think of &ldquo;Input/Output&rdquo;.)  This "
-"system is the combination of GNU and Linux; hence, &ldquo;GNU/Linux&rdquo;."
+"&ldquo;combination.&rdquo; (Think of &ldquo;Input/Output.&rdquo;)  This "
+"system is the combination of GNU and Linux; hence, &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "Nous parlons ici d'une version de GNU, le système d'exploitation, 
distinguée "
 "par le fait d'avoir Linux comme noyau. Une barre de fraction correspond bien "
@@ -2039,11 +2439,22 @@
 "« GNU/Linux »."
 
 #. 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: "
-"&ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes say &ldquo;GNU con "
-"Linux&rdquo;."
+# | There are other ways to express [-&ldquo;combination&rdquo;.-]
+# | {+&ldquo;combination.&rdquo;+} If you think that a plus-sign is clearer,
+# | please use that.  In French, a hyphen is clear:
+# | [-&ldquo;GNU-Linux&rdquo;.-] {+&ldquo;GNU-Linux.&rdquo;+} In Spanish, we
+# | sometimes say &ldquo;GNU con [-Linux&rdquo;.-] {+Linux.&rdquo;+}
+#, fuzzy
+#| 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: &ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes say &ldquo;GNU "
+#| "con Linux&rdquo;."
+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: "
+"&ldquo;GNU-Linux.&rdquo; In Spanish, we sometimes say &ldquo;GNU con Linux."
+"&rdquo;"
 msgstr ""
 "Il y a d'autres moyens d'exprimer cette combinaison. Si vous pensez qu'un "
 "signe plus est plus clair, utilisez-le. En français, un tiret est clair : "
@@ -2077,9 +2488,19 @@
 "\"anchor-reference-id\">(<a href=\"#whynoslash\">#whynoslash</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | Following the rules of English, in the construction &ldquo;GNU
+# | Emacs&rdquo; the word &ldquo;GNU&rdquo; modifies [-&ldquo;Emacs&rdquo;.-]
+# | {+&ldquo;Emacs.&rdquo;+} That is the right way to describe a program
+# | called Emacs which is a GNU package.
+#, fuzzy
+#| 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."
 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 "
+"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 ""
 "En bon anglais, dans la construction « GNU Emacs » le mot « GNU » 
modifie "
@@ -2126,8 +2547,17 @@
 "élevés."
 
 #. type: Content of: <div><dl><dd><p>
+# | However, if you prefer to call the system [-&ldquo;Linux/GNU&rdquo;,-]
+# | {+&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.
+#, fuzzy
+#| 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."
 msgid ""
-"However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a "
+"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 ""
@@ -2136,8 +2566,19 @@
 "complètement GNU et donner l'impression que le système entier est Linux."
 
 #. type: Content of: <div><dl><dt>
+# | My distro's developers call it &ldquo;Foobar [-Linux&rdquo;,-]
+# | {+Linux,&rdquo;+} but that doesn't say anything about what the system
+# | consists of.  Why shouldn't they call it whatever they like? <span
+# | class=\"anchor-reference-id\">(<a
+# | href=\"#distronames0\">#distronames0</a>)</span>
+#, fuzzy
+#| 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 whatever they like? <span class=\"anchor-reference-id\">(<a "
+#| "href=\"#distronames0\">#distronames0</a>)</span>"
 msgid ""
-"My distro's developers call it &ldquo;Foobar Linux&rdquo;, but that doesn't "
+"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 "
 "whatever they like? <span class=\"anchor-reference-id\">(<a href="
 "\"#distronames0\">#distronames0</a>)</span>"
@@ -2201,11 +2642,22 @@
 "\"anchor-reference-id\">(<a href=\"#distronames1\">#distronames1</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | When they spread misinformation by changing &ldquo;GNU&rdquo; to
+# | [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} and call their version
+# | of it &ldquo;Foobar [-Linux&rdquo;,-] {+Linux,&rdquo;+} it's proper for
+# | you to correct the misinformation by calling it &ldquo;Foobar
+# | [-GNU/Linux&rdquo;.-] {+GNU/Linux.&rdquo;+}
+#, fuzzy
+#| 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 proper for you to correct the misinformation by calling it &ldquo;"
+#| "Foobar GNU/Linux&rdquo;."
 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 "
+"Linux,&rdquo; and call their version of it &ldquo;Foobar Linux,&rdquo; it's "
 "proper for you to correct the misinformation by calling it &ldquo;Foobar GNU/"
-"Linux&rdquo;."
+"Linux.&rdquo;"
 msgstr ""
 "Quand ils répandent la désinformation en changeant « GNU » en « 
Linux » et "
 "appellent leur version du système « Toto Linux », il convient de 
rétablir la "
@@ -2243,12 +2695,24 @@
 "non."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | 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;.-] {+&ldquo;GNU/Linux.&rdquo;+}
+#, fuzzy
+#| 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 "
+#| "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;."
 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 "
 "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;."
+"&ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "Nous ne pouvons pas les faire changer, mais nous ne sommes pas du genre à "
 "abandonner simplement parce que le chemin n'est pas facile. Vous ne disposez "
@@ -2269,16 +2733,35 @@
 "\">#reserve</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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;.-] {+&ldquo;Linux.&rdquo;+} Many &ldquo;Linux&rdquo;
+# | User Groups make it part of 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 nonfree applications and drivers),
+# | or making the system more popular even at the cost of freedom.
+#, fuzzy
+#| msgid ""
+#| "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 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 nonfree "
+#| "applications and drivers), or making the system more popular even at the "
+#| "cost of freedom."
 msgid ""
 "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 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 nonfree "
-"applications and drivers), or making the system more popular even at the "
-"cost of freedom."
+"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 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 nonfree applications "
+"and drivers), or making the system more popular even at the cost of freedom."
 msgstr ""
 "La pratique couramment admise d'ajouter des logiciels non libres au système "
 "GNU/Linux est un problème majeur pour notre communauté. Cela enseigne aux "
@@ -2311,6 +2794,23 @@
 "ces systèmes étaient d'abord GNU."
 
 #. 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 nonfree
+# | software as perverted, adulterated versions of GNU, instead of thinking
+# | they are proper and appropriate &ldquo;versions of [-Linux&rdquo;.-]
+# | {+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 "
+#| "nonfree 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> "
@@ -2318,7 +2818,7 @@
 "specifically for the sake of the users' freedom.  With this understanding, "
 "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;."
+"proper and appropriate &ldquo;versions of Linux.&rdquo;"
 msgstr ""
 "Le moyen d'amener ces utilisateurs à faire le lien avec la liberté est "
 "exactement l'opposé : il faut les informer que toutes ces versions du "
@@ -2416,11 +2916,22 @@
 "recul)."
 
 #. type: Content of: <div><dl><dd><p>
+# | If we were to take an existing version of GNU/Linux and relabel it as
+# | [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} that would be somewhat like
+# | making a version of the GNU system and labeling it
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} That wasn't right, and
+# | we don't want to act like that.
+#, fuzzy
+#| 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 and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and "
+#| "we don't want to act like that."
 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 "
-"and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and we don't want "
-"to act like that."
+"GNU,&rdquo; that would be somewhat like making a version of the GNU system "
+"and labeling it &ldquo;Linux.&rdquo; That wasn't right, and we don't want to "
+"act like that."
 msgstr ""
 "Si nous voulions prendre une version existante de GNU/Linux et la "
 "réétiqueter « GNU », ce serait un peu comme de prendre une version du "
@@ -2457,11 +2968,29 @@
 "nécessaire de les nettoyer pour l'installation."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | with the GNU Project because he was a &ldquo;Linux [-user&rdquo;.-]
+# | {+user.&rdquo;+} That came as a shock, because the people who ported GNU
+# | packages to other systems had generally wanted to work with us to get
+# | their changes installed.  Yet these people, developing a system that was
+# | primarily based on GNU, were the first (and still practically the only)
+# | group that was unwilling to work with us.
+#, fuzzy
+#| 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 "
+#| "with the GNU Project because he was a &ldquo;Linux user&rdquo;.  That "
+#| "came as a shock, because the people who ported GNU packages to other "
+#| "systems had generally wanted to work with us to get their changes "
+#| "installed.  Yet these people, developing a system that was primarily "
+#| "based on GNU, were the first (and still practically the only) group that "
+#| "was unwilling to work with us."
 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 "
-"with the GNU Project because he was a &ldquo;Linux user&rdquo;.  That came "
-"as a shock, because the people who ported GNU packages to other systems had "
+"with the GNU Project because he was a &ldquo;Linux user.&rdquo; That came as "
+"a shock, because the people who ported GNU packages to other systems had "
 "generally wanted to work with us to get their changes installed.  Yet these "
 "people, developing a system that was primarily based on GNU, were the first "
 "(and still practically the only) group that was unwilling to work with us."
@@ -2476,9 +3005,22 @@
 "refusait de travailler avec nous, et c'est toujours pratiquement le seul."
 
 #. type: Content of: <div><dl><dd><p>
+# | It was this experience that first showed us that people were calling a
+# | version of the GNU system [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} and that this confusion was obstructing our work.
+# |  Asking you to call the system &ldquo;GNU/Linux&rdquo; is our response to
+# | that problem, and to the other problems caused by the &ldquo;Linux&rdquo;
+# | misnomer.
+#, fuzzy
+#| 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 obstructing our work.  Asking you to call the system &ldquo;GNU/"
+#| "Linux&rdquo; is our response to that problem, and to the other problems "
+#| "caused by the &ldquo;Linux&rdquo; misnomer."
 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 "
+"version of the GNU system &ldquo;Linux,&rdquo; and that this confusion was "
 "obstructing our work.  Asking you to call the system &ldquo;GNU/Linux&rdquo; "
 "is our response to that problem, and to the other problems caused by the "
 "&ldquo;Linux&rdquo; misnomer."
@@ -2520,10 +3062,18 @@
 "a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | We never refer to individual programs as
+# | [-&ldquo;GNU/<i>name</i>&rdquo;.-] {+&ldquo;GNU/<i>name</i>.&rdquo;+} When
+# | a program is a GNU package, we may call it &ldquo;GNU
+# | [-<i>name</i>&rdquo;.-] {+<i>name</i>.&rdquo;+}
+#, fuzzy
+#| 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;."
 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;."
+"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 ""
 "Nous ne faisons jamais référence à des programmes individuels en tant que "
 "« GNU/[nom] ». Quand un programme est un paquet GNU, nous l'appelons "
@@ -2641,10 +3191,24 @@
 "programme d'Unix, ni même une portion de programme : tout a dû être 
réécrit."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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. 
+# | The name [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} which stands for
+# | &ldquo;GNU's Not [-Unix&rdquo;,-] {+Unix,&rdquo;+} is a humorous way of
+# | giving credit to Unix for this, following a hacker tradition of recursive
+# | acronyms that started in the 70s.
+#, fuzzy
+#| 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.  The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not "
+#| "Unix&rdquo;, is a humorous way of giving credit to Unix for this, "
+#| "following a hacker tradition of recursive acronyms that started in the "
+#| "70s."
 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.  "
-"The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not Unix&rdquo;, "
+"The name &ldquo;GNU,&rdquo; which stands for &ldquo;GNU's Not Unix,&rdquo; "
 "is a humorous way of giving credit to Unix for this, following a hacker "
 "tradition of recursive acronyms that started in the 70s."
 msgstr ""
@@ -2656,11 +3220,28 @@
 "les années 70."
 
 #. type: Content of: <div><dl><dd><p>
+# | The first such recursive acronym was TINT, &ldquo;TINT Is Not
+# | [-TECO&rdquo;.-] {+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;,-] {+TECO,&rdquo;+} he
+# | thought of a clever amusing name.  (That's what hacking means: <a
+# | href=\"https://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=\"https://stallman.org/articles/on-hacking.html\";>playful "
+#| "cleverness</a>.)"
 msgid ""
-"The first such recursive acronym was TINT, &ldquo;TINT Is Not TECO&rdquo;.  "
+"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 "
+"like &ldquo;<em>somethingorother</em> TECO,&rdquo; he thought of a clever "
 "amusing name.  (That's what hacking means: <a href=\"https://stallman.org/";
 "articles/on-hacking.html\">playful cleverness</a>.)"
 msgstr ""
@@ -2673,13 +3254,28 @@
 "articles/on-hacking.html\">intelligence ludique</a>)."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | was similar to some existing program (let's imagine its name was
+# | &ldquo;Klever&rdquo;), you could give it a recursive acronym name, such as
+# | &ldquo;MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same
+# | spirit we called our replacement for Unix &ldquo;GNU's Not
+# | [-Unix&rdquo;.-] {+Unix.&rdquo;+}
+#, fuzzy
+#| 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 was similar to some existing program (let's imagine its name was "
+#| "&ldquo;Klever&rdquo;), you could give it a recursive acronym name, such "
+#| "as &ldquo;MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same "
+#| "spirit we called our replacement for Unix &ldquo;GNU's Not Unix&rdquo;."
 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 "
 "was similar to some existing program (let's imagine its name was &ldquo;"
 "Klever&rdquo;), you could give it a recursive acronym name, such as &ldquo;"
 "MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same spirit we "
-"called our replacement for Unix &ldquo;GNU's Not Unix&rdquo;."
+"called our replacement for Unix &ldquo;GNU's Not Unix.&rdquo;"
 msgstr ""
 "D'autres hackers ont tellement aimé ce nom qu'ils ont imité cette approche. 
"
 "Cela devint une tradition, quand vous écriviez à partir de zéro un 
programme "
@@ -2689,13 +3285,28 @@
 "em> notre substitut à Unix."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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 in a system 99% copied from Unix.  AT&amp;T actually threatened to
+# | sue anyone giving AT&amp;T credit in that way.  This is why each of the
+# | various modified versions of Unix (all proprietary, like Unix) had a
+# | completely different name that didn't include [-&ldquo;Unix&rdquo;.-]
+# | {+&ldquo;Unix.&rdquo;+}
+#, fuzzy
+#| 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 in a system 99% copied from Unix.  AT&amp;T actually threatened "
+#| "to sue anyone giving AT&amp;T credit in that way.  This is why each of "
+#| "the various modified versions of Unix (all proprietary, like Unix) had a "
+#| "completely different name that didn't include &ldquo;Unix&rdquo;."
 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 "
 "in a system 99% copied from Unix.  AT&amp;T actually threatened to sue "
 "anyone giving AT&amp;T credit in that way.  This is why each of the various "
 "modified versions of Unix (all proprietary, like Unix) had a completely "
-"different name that didn't include &ldquo;Unix&rdquo;."
+"different name that didn't include &ldquo;Unix.&rdquo;"
 msgstr ""
 "Historiquement AT&amp;T, qui développait Unix, ne voulait pas qu'on lui "
 "donne crédit en mettant « Unix » dans le nom d'un système similaire, 
même "
@@ -2773,9 +3384,22 @@
 "raison pour laquelle le nom « GNU/Linux » est approprié."
 
 #. type: Content of: <div><dl><dd><p>
+# | There is a version of GNU which uses the kernel from NetBSD.  Its
+# | developers call it &ldquo;Debian [-GNU/NetBSD&rdquo;,-]
+# | {+GNU/NetBSD,&rdquo;+} but &ldquo;GNU/kernelofNetBSD&rdquo; would be more
+# | accurate, since NetBSD is an entire system, not just the kernel.  This is
+# | not a BSD system, since most of the system is the same as the GNU/Linux
+# | system.
+#, fuzzy
+#| 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/"
+#| "kernelofNetBSD&rdquo; would be more accurate, since NetBSD is an entire "
+#| "system, not just the kernel.  This is not a BSD system, since most of the "
+#| "system is the same as the GNU/Linux system."
 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/"
+"call it &ldquo;Debian GNU/NetBSD,&rdquo; but &ldquo;GNU/"
 "kernelofNetBSD&rdquo; would be more accurate, since NetBSD is an entire "
 "system, not just the kernel.  This is not a BSD system, since most of the "
 "system is the same as the GNU/Linux system."
@@ -2797,8 +3421,21 @@
 "(<a href=\"#othersys\">#othersys</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | Not in the same sense that we mean by [-&ldquo;GNU/Linux&rdquo;.-]
+# | {+&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.
+#, fuzzy
+#| 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 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."
 msgid ""
-"Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of "
+"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 "
@@ -2908,8 +3545,19 @@
 "est Linux."
 
 #. type: Content of: <div><dl><dd><p>
+# | If you call the whole GNU/Linux system [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} you will find it necessary to say things like,
+# | &ldquo;Android contains Linux, but it isn't Linux, because it doesn't have
+# | the usual Linux [sic] libraries and utilities [meaning the GNU
+# | system].&rdquo;
+#, fuzzy
+#| 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 Linux, because it doesn't have the usual Linux [sic] libraries and "
+#| "utilities [meaning the GNU system].&rdquo;"
 msgid ""
-"If you call the whole GNU/Linux system &ldquo;Linux&rdquo;, you will find it "
+"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 "
 "Linux, because it doesn't have the usual Linux [sic] libraries and utilities "
 "[meaning the GNU system].&rdquo;"
@@ -2952,9 +3600,19 @@
 "vous voulez dire."
 
 #. type: Content of: <div><dl><dd><p>
+# | The public will find it very strange to speak of using Android as
+# | &ldquo;using [-Linux&rdquo;.-] {+Linux.&rdquo;+} It's like having a
+# | conversation, then saying you were conversing with the person's intestines
+# | or the person's circulatory system.
+#, fuzzy
+#| 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."
 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 "
+"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 ""
 "Le public trouvera très étrange de se référer à l'utilisation d'Android 
en "
@@ -2963,23 +3621,52 @@
 "de la personne."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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;.-] {+&ldquo;Linux.&rdquo;+}
+#, fuzzy
+#| 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;."
 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;."
+"of the whole system as &ldquo;Linux.&rdquo;"
 msgstr ""
 "C'est vrai que, dans le cas de GNU/Linux, le public comprendra l'idée "
 "derrière « utiliser Linux » du fait de la méprise habituelle qui 
consiste à "
 "assimiler le système complet à « Linux »."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | contain Linux is irrelevant to using them, just as the fact that a car and
+# | a bicycle both have a structure of metal is irrelevant to using those two.
+# |  If you wish to talk about using cars and bikes, you wouldn't speak of
+# | &ldquo;riding metal [-objects&rdquo; &mdash; not-]
+# | {+objects&rdquo;&mdash;not+} unless you're playing games with the reader. 
+# | You would say, &ldquo;using cars and bikes.&rdquo; Likewise, the clear way
+# | to talk about using GNU/Linux and Android is to say &ldquo;using GNU/Linux
+# | and Android.&rdquo;
+#, fuzzy
+#| 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 "
+#| "contain Linux is irrelevant to using them, just as the fact that a car "
+#| "and a bicycle both have a structure of metal is irrelevant to using those "
+#| "two.  If you wish to talk about using cars and bikes, you wouldn't speak "
+#| "of &ldquo;riding metal objects&rdquo; &mdash; not unless you're playing "
+#| "games with the reader.  You would say, &ldquo;using cars and bikes."
+#| "&rdquo; Likewise, the clear way to talk about using GNU/Linux and Android "
+#| "is to say &ldquo;using GNU/Linux and Android.&rdquo;"
 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 "
 "contain Linux is irrelevant to using them, just as the fact that a car and a "
 "bicycle both have a structure of metal is irrelevant to using those two.  If "
 "you wish to talk about using cars and bikes, you wouldn't speak of &ldquo;"
-"riding metal objects&rdquo; &mdash; not unless you're playing games with the "
+"riding metal objects&rdquo;&mdash;not unless you're playing games with the "
 "reader.  You would say, &ldquo;using cars and bikes.&rdquo; Likewise, the "
 "clear way to talk about using GNU/Linux and Android is to say &ldquo;using "
 "GNU/Linux and Android.&rdquo;"
@@ -3076,11 +3763,22 @@
 "\"#claimlinux\">#claimlinux</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | 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;.-] {+&ldquo;GNU.&rdquo;+} When we talk
+# | about the whole system, the name &ldquo;GNU/Linux&rdquo; gives him a share
+# | of the credit.
+#, fuzzy
+#| 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 "
+#| "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."
 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 "
-"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."
+"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."
 msgstr ""
 "Ce serait une erreur, c'est pourquoi nous ne le faisons pas. Le travail de "
 "Torvalds est Linux, le noyau ; nous faisons attention à ne pas attribuer ce 
"
@@ -3096,12 +3794,50 @@
 "\"anchor-reference-id\">(<a href=\"#linusagreed\">#linusagreed</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
-msgid ""
-"He recognized this at the beginning.  The earliest Linux release notes said, "
-"<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>."
+# | He recognized this at the beginning.  The {+<a
+# | 
href=\"https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\";>+}
+# | earliest Linux release [-notes said, <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>.-] {+notes</a> said:+}
+#, fuzzy
+#| msgid ""
+#| "He recognized this at the beginning.  The earliest Linux release notes "
+#| "said, <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>."
+msgid ""
+"He recognized this at the beginning.  The <a href=\"https://ftp.funet.fi/pub/";
+"linux/historical/kernel/old-versions/RELNOTES-0.01\"> earliest Linux release "
+"notes</a> said:"
+msgstr ""
+"Il l'a reconnu dès le début. La première note de distribution de Linux 
dit : "
+"« <a href=\"https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
+"RELNOTES-0.01\">La plupart des outils utilisés avec Linux sont des logiciels 
"
+"GNU et sont sous le copyleft de GNU. Ces outils ne sont pas dans la "
+"distribution ; adressez-vous à moi (ou à GNU) pour toute information "
+"supplémentaire</a>. »"
+
+#. type: Content of: <div><dl><dd><blockquote><p>
+# | [-He recognized this at the beginning.  The earliest Linux release notes
+# | said, <a
+# | 
href=\"https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\";>
+# | &ldquo;Most-]{+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>.-] {+info.+}
+#, fuzzy
+#| msgid ""
+#| "He recognized this at the beginning.  The earliest Linux release notes "
+#| "said, <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>."
+msgid ""
+"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."
 msgstr ""
 "Il l'a reconnu dès le début. La première note de distribution de Linux 
dit : "
 "« <a href=\"https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
@@ -3154,11 +3890,26 @@
 "reference-id\">(<a href=\"#lost\">#lost</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | 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;,-]
+# | {+&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.
+#, fuzzy
+#| 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;: 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."
 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;: "
 "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 "
+"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."
 msgstr ""
@@ -3180,13 +3931,32 @@
 "(<a href=\"#whatgood\">#whatgood</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | 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;,-] {+&ldquo;GNU/Linux,&rdquo;+} you will help
+# | others learn the system's true history, origin, and reason for being.  You
+# | can't correct the misnomer 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;,-] {+&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.
+#, fuzzy
+#| 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;GNU/Linux&rdquo;, you will help others learn the system's true "
+#| "history, origin, and reason for being.  You can't correct the misnomer "
+#| "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."
 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;"
-"GNU/Linux&rdquo;, you will help others learn the system's true history, "
+"GNU/Linux,&rdquo; you will help others learn the system's true history, "
 "origin, and reason for being.  You can't correct the misnomer 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 "
+"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."
 msgstr ""
@@ -3211,10 +3981,20 @@
 "class=\"anchor-reference-id\">(<a href=\"#explain\">#explain</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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;,-]
+# | {+&ldquo;GNU/Linux,&rdquo;+} and uses your time inefficiently.
+#, fuzzy
+#| 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."
 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."
+"the system &ldquo;GNU/Linux,&rdquo; and uses your time inefficiently."
 msgstr ""
 "Si vous nous aidez en donnant ces explications aux autres, nous vous "
 "remercions de vos efforts, mais ce n'est pas la meilleure méthode. Ce n'est "
@@ -3222,12 +4002,28 @@
 "mauvais usage de votre temps."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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, and they may learn a correct picture of the system's origin. 
+# | But they are unlikely to repeat the explanation to others whenever they
+# | talk about the system.  They will probably just call it
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} Without particularly
+# | intending to, they will help spread the incorrect picture.
+#, fuzzy
+#| 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, and they may learn a correct picture of the system's origin.  "
+#| "But they are unlikely to repeat the explanation to others whenever they "
+#| "talk about the system.  They will probably just call it &ldquo;"
+#| "Linux&rdquo;.  Without particularly intending to, they will help spread "
+#| "the incorrect picture."
 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, "
 "and they may learn a correct picture of the system's origin.  But they are "
 "unlikely to repeat the explanation to others whenever they talk about the "
-"system.  They will probably just call it &ldquo;Linux&rdquo;.  Without "
+"system.  They will probably just call it &ldquo;Linux.&rdquo; Without "
 "particularly intending to, they will help spread the incorrect picture."
 msgstr ""
 "C'est inefficace, parce que le message peut ne pas passer et qu'il ne se "
@@ -3369,9 +4165,16 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#force\">#force</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | It would be wrong to force them, and we don't try.  We call the system
+# | [-&ldquo;GNU/Linux&rdquo;,-] {+&ldquo;GNU/Linux,&rdquo;+} and we ask you
+# | to do it too.
+#, fuzzy
+#| 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."
 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."
+"&ldquo;GNU/Linux,&rdquo; and we ask you to do it too."
 msgstr ""
 "Ce serait mal de les y forcer et nous n'essayons pas de le faire. Nous "
 "appelons le système « GNU/Linux » et vous demandons simplement de faire 
de "
@@ -3460,9 +4263,19 @@
 "l'expression « licence BSD » sans préciser de laquelle il s'agit."
 
 #. type: Content of: <div><dl><dt>
+# | Since you failed to put something in the GNU GPL to require people to call
+# | the system [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} you deserve what
+# | happened; why are you complaining now? <span
+# | class=\"anchor-reference-id\">(<a href=\"#deserve\">#deserve</a>)</span>
+#, fuzzy
+#| 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 "
+#| "complaining now? <span class=\"anchor-reference-id\">(<a href=\"#deserve"
+#| "\">#deserve</a>)</span>"
 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 "
+"the system &ldquo;GNU,&rdquo; you deserve what happened; why are you "
 "complaining now? <span class=\"anchor-reference-id\">(<a href=\"#deserve"
 "\">#deserve</a>)</span>"
 msgstr ""
@@ -3517,8 +4330,17 @@
 "acceptables."
 
 #. type: Content of: <div><dl><dt>
+# | Since many people call it [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} doesn't that make it right? <span
+# | class=\"anchor-reference-id\">(<a
+# | href=\"#somanyright\">#somanyright</a>)</span>
+#, fuzzy
+#| 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>"
 msgid ""
-"Since many people call it &ldquo;Linux&rdquo;, doesn't that make it right? "
+"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 ""
@@ -3541,9 +4363,20 @@
 "\">#knownname</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | Users are not incapable of learning.  Since &ldquo;GNU/Linux&rdquo;
+# | includes [-&ldquo;Linux&rdquo;,-] {+&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.
+#, fuzzy
+#| 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 add &ldquo;(often erroneously referred to as &lsquo;"
+#| "Linux&rsquo;)&rdquo; once in a while, they will all understand."
 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 "
+"&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."
 msgstr ""

Index: po/gnu-linux-faq.hr-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.hr-diff.html,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- po/gnu-linux-faq.hr-diff.html       31 Aug 2021 10:37:07 -0000      1.39
+++ po/gnu-linux-faq.hr-diff.html       2 Nov 2021 14:41:51 -0000       1.40
@@ -12,30 +12,35 @@
 <body><pre>
 &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;!-- This page is derived from /server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="gnulinux" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</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="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&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"&gt;by</em></ins></span> Richard <span 
class="removed"><del><strong>Stallman&lt;/h2&gt;
+&lt;address class="byline"&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;</em></ins></span>
 
-&lt;div class="announcement"&gt;
+&lt;div <span class="removed"><del><strong>class="announcement"&gt;
   &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 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&gt;</strong></del></span> <span 
class="inserted"><ins><em>class="introduction"&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.
+system that many others call just <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> they ask many 
questions.
 Here are common questions, and our answers.&lt;/p&gt;
+<span class="inserted"><ins><em>&lt;/div&gt;
 
-<span class="inserted"><ins><em>&lt;div class="toc"&gt;
+&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;
@@ -130,8 +135,8 @@
 
 &lt;li&gt;&lt;a <span class="removed"><del><strong>href="#trademarkfee" 
id="TOCtrademarkfee"&gt;I</strong></del></span> <span 
class="inserted"><ins><em>href="#trademarkfee"&gt;I</em></ins></span> 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
-    wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to
+    that would also apply if I say <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux.&rdquo;</em></ins></span>  Is 
it
+    wrong if I use &ldquo;GNU&rdquo; without <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> to
     save the fee?&lt;/a&gt;&lt;/li&gt;
 
 &lt;li&gt;&lt;a <span class="removed"><del><strong>href="#many" 
id="TOCmany"&gt;Many</strong></del></span> <span 
class="inserted"><ins><em>href="#many"&gt;Many</em></ins></span> other projects 
contributed to the
@@ -169,7 +174,7 @@
 rather than &ldquo;Linux/GNU&rdquo;?&lt;/a&gt;&lt;/li&gt;
 
 &lt;li&gt;&lt;a <span class="removed"><del><strong>href="#distronames" 
id="TOCdistronames"&gt;My</strong></del></span> <span 
class="inserted"><ins><em>href="#distronames0"&gt;My distro's developers call it
-    &ldquo;Foobar Linux&rdquo;, but that doesn't say anything about
+    &ldquo;Foobar Linux,&rdquo; but that doesn't say anything about
     what the system consists of.  Why shouldn't they call it whatever
     they like?&lt;/a&gt;&lt;/li&gt;
 
@@ -281,14 +286,16 @@
 
 &lt;li&gt;&lt;a <span class="removed"><del><strong>href="#deserve" 
id="TOCdeserve"&gt;Since</strong></del></span> <span 
class="inserted"><ins><em>href="#deserve"&gt;Since</em></ins></span> 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
+    <span class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span>
+    <span class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> you 
deserve what happened; why are you
     complaining now?&lt;/a&gt;&lt;/li&gt;
 
 &lt;li&gt;&lt;a <span class="removed"><del><strong>href="#contradict" 
id="TOCcontradict"&gt;Wouldn't</strong></del></span> <span 
class="inserted"><ins><em>href="#contradict"&gt;Wouldn't</em></ins></span> you 
be better off
     not contradicting what so many people believe?&lt;/a&gt;&lt;/li&gt;
 
 &lt;li&gt;&lt;a <span class="removed"><del><strong>href="#somanyright" 
id="TOCsomanyright"&gt;Since</strong></del></span> <span 
class="inserted"><ins><em>href="#somanyright"&gt;Since</em></ins></span> many 
people call it
-    &ldquo;Linux&rdquo;, doesn't that make it right?&lt;/a&gt;&lt;/li&gt;
+    <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span>
+    <span class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> 
doesn't that make it right?&lt;/a&gt;&lt;/li&gt;
 
 &lt;li&gt;&lt;a <span class="removed"><del><strong>href="#winning" 
id="TOCwinning"&gt;Many</strong></del></span> <span 
class="inserted"><ins><em>href="#knownname"&gt;Isn't it better to call the
     system by the name most users already know?&lt;/a&gt;&lt;/li&gt;
@@ -377,7 +384,7 @@
 the system's history was such as to fit that name.  For
 instance, they often believe its development was started by Linus
 Torvalds in 1991.  This false picture tends to reinforce the idea
-that the system should be called &ldquo;Linux&rdquo;.&lt;/p&gt;
+that the system should be called <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.&lt;/p&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;&lt;/p&gt;</em></ins></span>
 &lt;p&gt;
 Many of the questions in this file represent people's attempts to
 justify the name they are accustomed to using.&lt;/p&gt;
@@ -388,14 +395,16 @@
 &lt;dd&gt;
 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.
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> the 
name its developer chose.
 &lt;p&gt;
-When people call the whole system &ldquo;Linux&rdquo;, as a consequence
+When people call the whole system <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> as a 
consequence
 they call the whole system by the same name as the kernel.
 This causes many kinds of confusion, because only experts can tell
 whether a statement is about the kernel or the whole system.
-By calling the whole system &ldquo;GNU/Linux&rdquo;, and calling the kernel
-&ldquo;Linux&rdquo;, you avoid the ambiguity.&lt;/p&gt;
+By calling the whole 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> and 
calling the kernel
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> you 
avoid the ambiguity.&lt;/p&gt;
 &lt;/dd&gt;
 
 &lt;dt id="linuxalone"&gt;Would Linux have
@@ -425,7 +434,7 @@
     community if you did not divide people with this request? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#divide"&gt;#divide&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing people. 
 We
+When we ask people to say <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 
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.
 &lt;p&gt;
@@ -453,7 +462,8 @@
 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 freedom are more likely to call the system
-&ldquo;GNU/Linux&rdquo;, and people who learn that the system is 
&ldquo;GNU/Linux&rdquo; are
+<span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> and 
people who learn that the system is &ldquo;GNU/Linux&rdquo; are
 more likely to pay attention to our philosophical arguments for
 freedom and community (which is why the choice of name for the system
 makes a real difference for society).  However, the disagreement would
@@ -482,7 +492,7 @@
 
 &lt;dd&gt;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 system do not mention the name &ldquo;GNU&rdquo;, or the 
ideals
+articles about the system do not mention the name <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> or the ideals
 that GNU stands for.  &lt;a
 href="/gnu/gnu-users-never-heard-of-gnu.html"&gt;GNU Users Who Have Never
 Heard of GNU&lt;/a&gt; explains further.
@@ -490,7 +500,7 @@
 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 GNU is.  For instance, many think it is a collection
-of &lt;a href="#tools"&gt;&ldquo;tools&rdquo;&lt;/a&gt;, or a project to 
develop tools.&lt;/p&gt;
+of <span class="removed"><del><strong>&lt;a 
href="#tools"&gt;&ldquo;tools&rdquo;&lt;/a&gt;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;&lt;a 
href="#tools"&gt;tools&lt;/a&gt;,&rdquo;</em></ins></span> or a project to 
develop tools.&lt;/p&gt;
 &lt;p&gt;
 The wording of this question, which is typical, illustrates another
 common misconception.  To speak of &ldquo;GNU's role&rdquo; in developing
@@ -506,8 +516,9 @@
 <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
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> that it 
was started by Linus Torvalds, and that
+it was intended to be &ldquo;open <span 
class="removed"><del><strong>source&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>source.&rdquo;</em></ins></span>  If you don't tell
 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;
 
@@ -536,10 +547,10 @@
 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 that GNU is the name of a collection of programs&mdash;often they
-say &ldquo;programming tools&rdquo;, since some of our programming tools became
+say &ldquo;programming <span 
class="removed"><del><strong>tools&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>tools,&rdquo;</em></ins></span> since some of our 
programming tools became
 popular on their own.  The idea that &ldquo;GNU&rdquo; is the name of an 
operating
 system is hard to fit into a conceptual framework in which that
-operating system is labeled &ldquo;Linux&rdquo;.
+operating system is labeled <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>
 &lt;p&gt;
 The GNU Project was named after the GNU operating system&mdash;it's the project
 to develop the GNU system.  (See &lt;a
@@ -568,7 +579,7 @@
 programs.&lt;/p&gt;
 &lt;p&gt;
 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.  The
+mean <span 
class="removed"><del><strong>&ldquo;kernel&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;kernel.&rdquo;</em></ins></span>  Both uses of 
the term go back many years.  The
 use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is found in 
a number of
 textbooks on system design, going back to the 80s.  At the same time,
 in the 80s, the &ldquo;Unix operating system&rdquo; was understood to include 
all
@@ -579,12 +590,12 @@
 Most of the time when people speak of the &ldquo;Linux operating system&rdquo;
 they are using &ldquo;operating system&rdquo; in the same sense we use: they 
mean
 the whole collection of programs.  If that's what you are referring
-to, please call it &ldquo;GNU/Linux&rdquo;.  If you mean just the kernel, then
+to, please call it <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux.&rdquo;</em></ins></span>  If 
you mean just the kernel, then
 &ldquo;Linux&rdquo; is the right name for it, but please say 
&ldquo;kernel&rdquo; also to
 avoid ambiguity about which body of software you mean.&lt;/p&gt;
 &lt;p&gt;
 If you prefer to use some other term such as &ldquo;system distribution&rdquo; 
for
-the entire collection of programs, instead of &ldquo;operating system&rdquo;,
+the entire collection of programs, instead of &ldquo;operating <span 
class="removed"><del><strong>system&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>system,&rdquo;</em></ins></span>
 that's fine.  Then you would talk about GNU/Linux system
 distributions.&lt;/p&gt;
 &lt;/dd&gt;
@@ -636,8 +647,8 @@
 &lt;dd&gt;
 The people who argue that way for calling the system
 &ldquo;Linux&rdquo; are using a double standard.  An operating system
-requires compilers, editors, window systems, libraries, and much more
-&mdash; hundreds of programs, even to match what BSD systems included
+requires compilers, editors, window systems, libraries, and much
+more&mdash;hundreds of programs, even to match what BSD systems included
 in 1983.  Since Torvalds didn't develop any of those, how can the
 system be &ldquo;Linux&rdquo;?
 
@@ -658,7 +669,7 @@
 &lt;dd&gt;
 Many &lt;a href="/distros/distros.html"&gt; packaged and installable
 versions of GNU&lt;/a&gt; are available.  None of them is called simply
-&ldquo;GNU&rdquo;, but GNU is what they basically are.
+&ldquo;GNU,&rdquo; but GNU is what they basically are.
 
 &lt;p&gt;
 We expected to release the GNU system packaged for installation, but
@@ -685,7 +696,7 @@
 
 &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.
+&ldquo;GNU,&rdquo; but that doesn't alter what kind of thing GNU is.
 GNU is an operating system.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
@@ -695,11 +706,11 @@
 
 &lt;dd&gt;
 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 system 
is
+than the misuse of the name <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  Normally an 
operating system is
 developed as a single unified project, and the developers choose a
 name for the system as a whole.  The kernel usually does not have a
 name of its own&mdash;instead, people say &ldquo;the kernel of 
such-and-such&rdquo; or
-&ldquo;the such-and-such kernel&rdquo;.
+&ldquo;the such-and-such <span 
class="removed"><del><strong>kernel&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>kernel.&rdquo;</em></ins></span>
 &lt;p&gt;
 Because those two constructions are used synonymously, the expression
 &ldquo;the Linux kernel&rdquo; can easily be misunderstood as meaning 
&ldquo;the kernel
@@ -724,11 +735,11 @@
     How about recommending a shorter name? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#long"&gt;#long&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-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;
+For a while we tried the name <span 
class="removed"><del><strong>&ldquo;LiGNUx&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;LiGNUx,&rdquo;</em></ins></span> which 
combines the words &ldquo;GNU&rdquo;
+and <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  The reaction 
was very bad.  People accept &ldquo;GNU/Linux&rdquo;
 much better.
 &lt;p&gt;
-The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but
+The shortest legitimate name for this system is <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> but
 we call it &ldquo;GNU/Linux&rdquo; &lt;a href="#justgnu"&gt; for the reasons
 given below&lt;/a&gt;.&lt;/p&gt;
 &lt;/dd&gt;
@@ -753,7 +764,7 @@
     &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#long2"&gt;#long2&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-&lt;p&gt;It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you
+&lt;p&gt;It only takes a second to say or type <span 
class="removed"><del><strong>&ldquo;GNU/&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU/.&rdquo;</em></ins></span>  If you
 appreciate the system that we developed, can't you take one second
 to recognize our work?&lt;/p&gt;
 &lt;/dd&gt;
@@ -804,9 +815,9 @@
 honorably and openly, rather than by trying to cut him out of the
 credit for his contribution to the system.&lt;/li&gt;
 &lt;li&gt;
-Since many people know of the system as &ldquo;Linux&rdquo;, if we say 
&ldquo;GNU&rdquo; they
+Since many people know of the system as <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> if we say 
&ldquo;GNU&rdquo; they
 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
+say <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> they 
can make a connection to what they have heard
 about.&lt;/li&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>
@@ -814,16 +825,16 @@
 
 &lt;dt id="trademarkfee"&gt;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 wrong if I use 
&ldquo;GNU&rdquo;
-    without &ldquo;Linux&rdquo;, to save the fee? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#trademarkfee"&gt;#trademarkfee&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
+    would also apply if I say <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux.&rdquo;</em></ins></span>  Is 
it wrong if I use &ldquo;GNU&rdquo;
+    without <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> to save the 
fee? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#trademarkfee"&gt;#trademarkfee&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 &lt;dd&gt;
 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.
 &lt;p&gt;
-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.&lt;/p&gt;
+So if you want to refer to the system simply as <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> to avoid paying
+the fee for calling it <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> we won't 
criticize you.&lt;/p&gt;
 &lt;/dd&gt;
 
 &lt;dt id="many"&gt;Many other projects contributed to
@@ -853,7 +864,7 @@
 &lt;p&gt;
 Different threshold levels would lead to different choices of name for
 the system.  But one name that cannot result from concerns of fairness
-and giving credit, not for any possible threshold level, is 
&ldquo;Linux&rdquo;.
+and giving credit, not for any possible threshold level, is <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>
 It can't be fair to give all the credit to one secondary contribution
 (Linux) while omitting the principal contribution (GNU).&lt;/p&gt;
 &lt;/dd&gt;
@@ -867,7 +878,7 @@
 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
+by calling the system &ldquo;GNU/systemd/Linux,&rdquo; there is nothing
 wrong with doing so.&lt;/p&gt;
 &lt;/dd&gt;
 
@@ -892,7 +903,7 @@
 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 the same argument would apply even more
-strongly to calling it &ldquo;Linux&rdquo;.
+strongly to calling it <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>
 
 &lt;p&gt;
 GNU is a small fraction of the system nowadays, and Linux is an
@@ -929,7 +940,7 @@
 
 &lt;dd&gt;
 Following the rules of English, in the construction &ldquo;GNU Linux&rdquo; the
-word &ldquo;GNU&rdquo; modifies &ldquo;Linux&rdquo;.  This can mean either 
&ldquo;GNU's version of
+word &ldquo;GNU&rdquo; modifies <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  This can mean 
either &ldquo;GNU's version of
 Linux&rdquo; or &ldquo;Linux, which is a GNU package.&rdquo;  Neither of those 
meanings
 fits the situation at hand.
 &lt;p&gt;
@@ -942,23 +953,24 @@
 The free GNU/Linux distros do have
 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,
+firmware <span 
class="removed"><del><strong>&ldquo;blobs&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;blobs.&rdquo;</em></ins></span>  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;
 &lt;p&gt;
 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 &ldquo;combination.&rdquo; (Think of
-&ldquo;Input/Output&rdquo;.)  This system is the combination of GNU
-and Linux; hence, &ldquo;GNU/Linux&rdquo;.&lt;/p&gt;
+<span 
class="removed"><del><strong>&ldquo;Input/Output&rdquo;.)</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Input/Output.&rdquo;)</em></ins></span> 
 This system is the combination of GNU
+and Linux; hence, <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;
-There are other ways to express &ldquo;combination&rdquo;.  If you
+There are other ways to express <span 
class="removed"><del><strong>&ldquo;combination&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;combination.&rdquo;</em></ins></span>  
If you
 think that a plus-sign is clearer, please use that.  In French, a
-hyphen is clear: &ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes
-say &ldquo;GNU con Linux&rdquo;.&lt;/p&gt;
+hyphen is clear: <span 
class="removed"><del><strong>&ldquo;GNU-Linux&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU-Linux.&rdquo;</em></ins></span>  In 
Spanish, we sometimes
+say &ldquo;GNU con <span 
class="removed"><del><strong>Linux&rdquo;.&lt;/p&gt;</strong></del></span> 
<span class="inserted"><ins><em>Linux.&rdquo;&lt;/p&gt;
 &lt;/dd&gt;
 
-&lt;dt <span class="inserted"><ins><em>id="pronounce"&gt;How is the name 
&ldquo;GNU/Linux&rdquo;
+&lt;dt id="pronounce"&gt;How is the name &ldquo;GNU/Linux&rdquo;
 pronounced? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#pronounce"&gt;#pronounce&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 &lt;dd&gt;
 &lt;p&gt;
@@ -974,16 +986,16 @@
 &lt;dd&gt;
 &lt;p&gt;
 Following the rules of English, in the construction &ldquo;GNU
-Emacs&rdquo; the word &ldquo;GNU&rdquo; modifies &ldquo;Emacs&rdquo;.
+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.&lt;/p&gt;
 &lt;p&gt;
 &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.&lt;/p&gt;
+program, so &ldquo;GNU/Emacs&rdquo; is the wrong way to refer to 
it.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
-&lt;dt</em></ins></span> id="whyorder"&gt;Why &ldquo;GNU/Linux&rdquo; rather
+&lt;dt id="whyorder"&gt;Why &ldquo;GNU/Linux&rdquo; rather
 than &ldquo;Linux/GNU&rdquo;? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#whyorder"&gt;#whyorder&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
@@ -995,13 +1007,13 @@
 In addition, &ldquo;GNU/Linux&rdquo; fits the fact that Linux is the
 lowest level of the system and GNU fills technically higher 
levels.&lt;/p&gt;</em></ins></span>
 &lt;p&gt;
-However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a 
lot
+However, if you prefer to call the system <span 
class="removed"><del><strong>&ldquo;Linux/GNU&rdquo;,</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;Linux/GNU,&rdquo;</em></ins></span> 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.&lt;/p&gt;
 &lt;/dd&gt;
 
 &lt;dt <span class="inserted"><ins><em>id="distronames0"&gt;My distro's 
developers call it
-    &ldquo;Foobar Linux&rdquo;, but that doesn't say anything about
+    &ldquo;Foobar Linux,&rdquo; but that doesn't say anything about
     what the system consists of.  Why shouldn't they call it whatever
     they like? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#distronames0"&gt;#distronames0&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 &lt;dd&gt;
@@ -1032,11 +1044,11 @@
 <span class="removed"><del><strong>&lt;dd&gt;&lt;p&gt;If it's allowed for them 
to change</strong></del></span>
 
 <span class="inserted"><ins><em>&lt;dd&gt;&lt;p&gt;When they spread 
misinformation by changing</em></ins></span> &ldquo;GNU&rdquo;
-to <span class="inserted"><ins><em>&ldquo;Linux&rdquo;, and call their version 
of it</em></ins></span> &ldquo;Foobar
-Linux&rdquo;, it's <span 
class="removed"><del><strong>allowed</strong></del></span> <span 
class="inserted"><ins><em>proper</em></ins></span> for you to <span 
class="removed"><del><strong>change it back and
+to <span class="inserted"><ins><em>&ldquo;Linux,&rdquo; and call their version 
of it</em></ins></span> &ldquo;Foobar <span 
class="removed"><del><strong>Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>Linux,&rdquo;</em></ins></span> it's <span 
class="removed"><del><strong>allowed</strong></del></span> <span 
class="inserted"><ins><em>proper</em></ins></span> for you to <span 
class="removed"><del><strong>change it back and
 call the distro &ldquo;Foobar GNU/Linux&rdquo;.  It can't be more wrong
 to</strong></del></span> correct the <span 
class="removed"><del><strong>mistake than</strong></del></span> <span 
class="inserted"><ins><em>misinformation by
-calling</em></ins></span> it <span class="removed"><del><strong>was to make 
the mistake.&lt;/p&gt;&lt;/dd&gt;</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Foobar 
GNU/Linux&rdquo;.&lt;/p&gt;&lt;/dd&gt;</em></ins></span>
+calling</em></ins></span> it <span class="removed"><del><strong>was to make 
the mistake.&lt;/p&gt;&lt;/dd&gt;</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Foobar 
GNU/Linux.&rdquo;&lt;/p&gt;&lt;/dd&gt;</em></ins></span>
 
 &lt;dt id="companies"&gt;Wouldn't it be more
     effective to ask companies such as Mandrake, Red Hat and IBM to
@@ -1057,7 +1069,7 @@
 just because the road isn't easy.  You may not have as much 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;.&lt;/p&gt;
+more profit calling it <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;/dd&gt;
 
 &lt;dt id="reserve"&gt;Wouldn't it be better to
@@ -1068,7 +1080,7 @@
 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 <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
+of <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  Many 
&ldquo;Linux&rdquo; User Groups make it part of their mission to
 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 <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span>
@@ -1091,7 +1103,8 @@
 With this understanding, they can start to recognize the distributions
 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;
+<span 
class="removed"><del><strong>Linux&rdquo;.&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>Linux.&rdquo;&lt;/p&gt;</em></ins></span>
 &lt;p&gt;
 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
@@ -1131,8 +1144,9 @@
 GNU Hurd to work, we might have done that.  (Alas, that is hindsight.)
 &lt;p&gt;
 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
-and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and we don't
+<span class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> that 
would be somewhat like making a version of the GNU system
+and labeling it <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  That wasn't 
right, and we don't
 want to act like that.&lt;/p&gt;
 &lt;/dd&gt;
 
@@ -1151,7 +1165,7 @@
 &lt;p&gt;
 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 with the GNU Project because he was a &ldquo;Linux user&rdquo;.
+about working with the GNU Project because he was a &ldquo;Linux <span 
class="removed"><del><strong>user&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>user.&rdquo;</em></ins></span>
 That came as a shock, because the people who ported GNU packages to
 other systems had generally wanted to work with us to get their
 changes installed.  Yet these people, developing a system that was
@@ -1159,7 +1173,7 @@
 only) group that was unwilling to work with us.&lt;/p&gt;
 &lt;p&gt;
 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
+version of the GNU system <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> and that this 
confusion was
 obstructing our work.  Asking you to call the system &ldquo;GNU/Linux&rdquo; is
 our response to that problem, and to the other problems caused by the
 &ldquo;Linux&rdquo; misnomer.&lt;/p&gt;
@@ -1178,8 +1192,8 @@
     convention be applied to all programs that are GPL'ed? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#allgpled"&gt;#allgpled&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-We never refer to individual programs as 
&ldquo;GNU/&lt;i&gt;name&lt;/i&gt;&rdquo;.  When a program
-is a GNU package, we may call it &ldquo;GNU &lt;i&gt;name&lt;/i&gt;&rdquo;.
+We never refer to individual programs as <span 
class="removed"><del><strong>&ldquo;GNU/&lt;i&gt;name&lt;/i&gt;&rdquo;.</strong></del></span>
 <span 
class="inserted"><ins><em>&ldquo;GNU/&lt;i&gt;name&lt;/i&gt;.&rdquo;</em></ins></span>
  When a program
+is a GNU package, we may call it &ldquo;GNU <span 
class="removed"><del><strong>&lt;i&gt;name&lt;/i&gt;&rdquo;.</strong></del></span>
 <span 
class="inserted"><ins><em>&lt;i&gt;name&lt;/i&gt;.&rdquo;</em></ins></span>
 &lt;p&gt;
 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
@@ -1232,15 +1246,17 @@
 &lt;p&gt;
 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.  The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not
-Unix&rdquo;, is a humorous way of giving credit to Unix for this,
+Unix.  The name <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> which stands for 
&ldquo;GNU's Not
+<span class="removed"><del><strong>Unix&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>Unix,&rdquo;</em></ins></span> is a humorous 
way of giving credit to Unix for this,
 following a hacker tradition of recursive acronyms that started in the
 70s.&lt;/p&gt;
 &lt;p&gt;
 The first such recursive acronym was TINT, &ldquo;TINT Is Not
-TECO&rdquo;.  The author of TINT wrote another implementation of TECO
+<span class="removed"><del><strong>TECO&rdquo;.</strong></del></span>
+<span class="inserted"><ins><em>TECO.&rdquo;</em></ins></span>  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;&lt;em&gt;somethingorother&lt;/em&gt; 
TECO&rdquo;, he
+calling it by a dull name like &ldquo;&lt;em&gt;somethingorother&lt;/em&gt; 
<span class="removed"><del><strong>TECO&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>TECO,&rdquo;</em></ins></span> he
 thought of a clever amusing name.  (That's what hacking
 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;
@@ -1250,7 +1266,7 @@
 program that was similar to some existing program (let's imagine its
 name was &ldquo;Klever&rdquo;), you could give it a recursive acronym name, 
such
 as &ldquo;MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo;  In this same 
spirit we called our
-replacement for Unix &ldquo;GNU's Not Unix&rdquo;.&lt;/p&gt;
+replacement for Unix &ldquo;GNU's Not <span 
class="removed"><del><strong>Unix&rdquo;.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>Unix.&rdquo;&lt;/p&gt;</em></ins></span>
 &lt;p&gt;
 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
@@ -1258,7 +1274,8 @@
 threatened to sue anyone giving AT&amp;T credit in that way.  This is
 why each of the various modified versions of Unix (all proprietary,
 like Unix) had a completely different name that didn't include
-&ldquo;Unix&rdquo;.&lt;/p&gt;
+<span 
class="removed"><del><strong>&ldquo;Unix&rdquo;.&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Unix.&rdquo;&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="bsd"&gt;Should we say &ldquo;GNU/BSD&rdquo;
@@ -1289,7 +1306,7 @@
 why the name &ldquo;GNU/Linux&rdquo; is appropriate for it.&lt;/p&gt;
 &lt;p&gt;
 There is a version of GNU which uses the kernel from NetBSD.  Its
-developers call it &ldquo;Debian GNU/NetBSD&rdquo;, but 
&ldquo;GNU/kernelofNetBSD&rdquo;
+developers call it &ldquo;Debian <span 
class="removed"><del><strong>GNU/NetBSD&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>GNU/NetBSD,&rdquo;</em></ins></span> but 
&ldquo;GNU/kernelofNetBSD&rdquo;
 would be more accurate, since NetBSD is an entire system, not just
 the kernel.  This is not a BSD system, since most of the system
 is the same as the GNU/Linux system.&lt;/p&gt;
@@ -1300,7 +1317,7 @@
 
 &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
+Not in the same sense that we mean by <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux.&rdquo;</em></ins></span>  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,
@@ -1354,7 +1371,7 @@
 different system.</strong></del></span> <span class="inserted"><ins><em>thing 
they
 have in common is Linux.&lt;/p&gt;
 &lt;p&gt;</em></ins></span>
-If you call the whole <span 
class="inserted"><ins><em>GNU/Linux</em></ins></span> system 
&ldquo;Linux&rdquo;,
+If you call the whole <span 
class="inserted"><ins><em>GNU/Linux</em></ins></span> system <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span>
 you will find it necessary to say things like, &ldquo;Android contains
 Linux, but it isn't Linux, because it doesn't have the usual Linux
 [sic] libraries and utilities [meaning the GNU <span 
class="removed"><del><strong>system].&rdquo;</strong></del></span> <span 
class="inserted"><ins><em>system].&rdquo;&lt;/p&gt;
@@ -1373,22 +1390,22 @@
 people will not understand the intended meaning.
 &lt;p&gt;
 The public will find it very strange to speak of using Android as
-&ldquo;using Linux&rdquo;.  It's like having a conversation, then
+&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.&lt;/p&gt;
 &lt;p&gt;
 The public &lt;em&gt;will&lt;/em&gt; 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;.&lt;/p&gt;
+&ldquo;Linux.&rdquo;&lt;/p&gt;
 &lt;p&gt;
 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 contain Linux is irrelevant to using them, just as the
 fact that a car and a bicycle both have a structure of metal is
 irrelevant to using those two.  If you wish to talk about using cars
-and bikes, you wouldn't speak of &ldquo;riding metal objects&rdquo;
-&mdash; not unless you're playing games with the reader.  You would
+and bikes, you wouldn't speak of &ldquo;riding metal objects&rdquo;&mdash;not
+unless you're playing games with the reader.  You would
 say, &ldquo;using cars and bikes.&rdquo; Likewise, the clear way to
 talk about using GNU/Linux and Android is to say &ldquo;using
 GNU/Linux and Android.&rdquo;&lt;/p&gt;
@@ -1435,7 +1452,7 @@
 <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
+or label it as <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU.&rdquo;</em></ins></span>  When we talk 
about the whole
 system, the name &ldquo;GNU/Linux&rdquo; gives him a share of the
 <span class="removed"><del><strong>credit.</strong></del></span>
 <span class="inserted"><ins><em>credit.&lt;/p&gt;</em></ins></span>
@@ -1446,16 +1463,20 @@
     agree that Linux is just the kernel? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#linusagreed"&gt;#linusagreed&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-&lt;p&gt;He recognized this at the beginning.  The earliest Linux release notes
+&lt;p&gt;He recognized this at the beginning.  The <span 
class="inserted"><ins><em>&lt;a
+href="https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;</em></ins></span>
+earliest Linux release <span class="removed"><del><strong>notes
 said, &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>
-&ldquo;Most of the tools used with linux are GNU software and are under the
+href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;
+&ldquo;Most</strong></del></span> <span 
class="inserted"><ins><em>notes&lt;/a&gt; said:&lt;/p&gt;
+&lt;blockquote&gt;&lt;p&gt;
+Most</em></ins></span> 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;
+for more <span 
class="removed"><del><strong>info&rdquo;&lt;/a&gt;.&lt;/p&gt;</strong></del></span>
 <span class="inserted"><ins><em>info.
+&lt;/p&gt;&lt;/blockquote&gt;
 &lt;/dd&gt;
 
-&lt;dt <span class="inserted"><ins><em>id="finishhurd"&gt;Why not finish the 
GNU Hurd kernel, release the GNU system
+&lt;dt id="finishhurd"&gt;Why not finish the GNU Hurd kernel, release the GNU 
system
     as a whole, and forget the question of what to call GNU/Linux?
     &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#finishhurd"&gt;#finishhurd&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
@@ -1468,10 +1489,10 @@
 wrong with Linux as a kernel is its inclusion of firmware
 &ldquo;blobs&rdquo;; the best fix for that problem
 is &lt;a href="https://www.fsf.org/campaigns/priority-projects"&gt; developing
-free replacement for the blobs&lt;/a&gt;.&lt;/p&gt;
+free replacement for the blobs&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
-&lt;dt</em></ins></span> id="lost"&gt;The battle is already lost&mdash;society
+&lt;dt id="lost"&gt;The battle is already lost&mdash;society
     has made its decision and we can't change it, so why even think about
     it? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#lost"&gt;#lost&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
@@ -1480,7 +1501,7 @@
 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
+name to use.  You can't make others say <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> but
 you can decide to call the system &ldquo;GNU/Linux&rdquo;
 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;
@@ -1493,10 +1514,10 @@
 <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
+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> you 
will help others learn the system's true
 history, origin, and reason for being.  You can't correct the misnomer
 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
+only a few hundred people see you use the term <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> you 
will
 have educated a substantial number of people with very little work.
 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;
@@ -1508,14 +1529,15 @@
 &lt;dd&gt;
 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.
+calling 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> and 
uses your time inefficiently.
 &lt;p&gt;
 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, and they may learn a correct picture of the system's
 origin.  But they are unlikely to repeat the explanation to others
 whenever they talk about the system.  They will probably just call it
-&ldquo;Linux&rdquo;.  Without particularly intending to, they will help spread 
the
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  
Without particularly intending to, they will help spread the
 incorrect picture.&lt;/p&gt;
 &lt;p&gt;
 It is inefficient because it takes a lot more time.  Saying and
@@ -1581,7 +1603,8 @@
 &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 <span 
class="removed"><del><strong>too.</strong></del></span> <span 
class="inserted"><ins><em>too.&lt;/p&gt;</em></ins></span>
+<span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> 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
@@ -1625,7 +1648,7 @@
 &lt;/dd&gt;
 
 &lt;dt id="deserve"&gt;Since you failed to put
-    something in the GNU GPL to require people to call the system 
&ldquo;GNU&rdquo;,
+    something in the GNU GPL to require people to call the system <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span>
     you deserve what happened; why are you complaining now? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#deserve"&gt;#deserve&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
@@ -1651,7 +1674,7 @@
 &lt;/dd&gt;
 
 &lt;dt id="somanyright"&gt;Since many people call
-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;
+it <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> 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;
 <span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
@@ -1664,7 +1687,7 @@
 &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
+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.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
@@ -1748,7 +1771,7 @@
 
 <span class="inserted"><ins><em>&lt;p 
class="unprintable"&gt;Updated:</em></ins></span>
 &lt;!-- timestamp start --&gt;
-$Date: 2021/08/31 10:37:07 $
+$Date: 2021/11/02 14:41:51 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: po/gnu-linux-faq.hr.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.hr.po,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- po/gnu-linux-faq.hr.po      31 Aug 2021 10:37:07 -0000      1.45
+++ po/gnu-linux-faq.hr.po      2 Nov 2021 14:41:51 -0000       1.46
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-linux-faq.html\n"
-"POT-Creation-Date: 2021-08-31 10:27+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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"
@@ -35,10 +35,19 @@
 msgid "by Richard Stallman"
 msgstr "Richard Stallman"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+# | When people see that we use and recommend the name GNU/Linux for a system
+# | that many others call just [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} they ask many questions.  Here are common
+# | questions, and our answers.
+#, fuzzy
+#| 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."
 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.  "
+"that many others call just &ldquo;Linux,&rdquo; they ask many questions.  "
 "Here are common questions, and our answers."
 msgstr ""
 "Kada ljudi primijete da mi koristimo i preporučamo naziv GNU/Linux za sustav 
"
@@ -245,11 +254,22 @@
 "pogrešno nazivati sustav samo &ldquo;GNU&rdquo;?</a>"
 
 #. type: Content of: <div><div><ul><li>
+# | <a href=\"#trademarkfee\">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;.-] {+&ldquo;GNU/Linux.&rdquo;+} Is it
+# | wrong if I use &ldquo;GNU&rdquo; without [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} to save the fee?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#trademarkfee\">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 wrong if I use &ldquo;GNU&rdquo; without "
+#| "&ldquo;Linux&rdquo;, to save the fee?</a>"
 msgid ""
 "<a href=\"#trademarkfee\">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 wrong if I use &ldquo;GNU&rdquo; without "
-"&ldquo;Linux&rdquo;, to save the fee?</a>"
+"&ldquo;GNU/Linux.&rdquo; Is it wrong if I use &ldquo;GNU&rdquo; without "
+"&ldquo;Linux,&rdquo; to save the fee?</a>"
 msgstr ""
 "<a href=\"#trademarkfee\">Ukoliko želim koristiti naziv &ldquo;Linux&rdquo; "
 "u nazivu proizvoda, moram platiti naknadu. Odnosi li se to i na naziv &ldquo;"
@@ -357,11 +377,22 @@
 "GNU&rdquo;?</a>"
 
 #. type: Content of: <div><div><ul><li>
+# | <a [-href=\"#distronames\">My distro is called-]
+# | {+href=\"#distronames0\">My distro's developers call it+} &ldquo;Foobar
+# | [-Linux&rdquo;; doesn't-] {+Linux,&rdquo; but+} that [-show it's really
+# | Linux?</a>-] {+doesn't say anything about what the system consists of. 
+# | Why shouldn't they call it whatever they like?</a>+}
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#distronames\">My distro is called &ldquo;Foobar Linux&rdquo;; "
+#| "doesn't that show it's really Linux?</a>"
 msgid ""
-"<a href=\"#distronames0\">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 whatever they like?</a>"
+"<a href=\"#distronames0\">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 whatever they like?</a>"
 msgstr ""
+"<a href=\"#distronames\">Moja distribucija se zove &ldquo;Foobar "
+"Linux&rdquo;; ne pokazuje li to da je uistinu Linux?</a>"
 
 #. type: Content of: <div><div><ul><li>
 msgid ""
@@ -614,9 +645,18 @@
 "ljudi bili primorani zvati sustav &ldquo;GNU&rdquo;?</a>"
 
 #. type: Content of: <div><div><ul><li>
+# | <a href=\"#deserve\">Since you failed to put something in the GNU GPL to
+# | require people to call the system [-&ldquo;GNU&rdquo;,-]
+# | {+&ldquo;GNU,&rdquo;+} you deserve what happened; why are you complaining
+# | now?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#deserve\">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 complaining now?</a>"
 msgid ""
 "<a href=\"#deserve\">Since you failed to put something in the GNU GPL to "
-"require people to call the system &ldquo;GNU&rdquo;, you deserve what "
+"require people to call the system &ldquo;GNU,&rdquo; you deserve what "
 "happened; why are you complaining now?</a>"
 msgstr ""
 "<a href=\"#deserve\">S obzirom na to da niste uspjeli dodati nešto u GNU GPL 
"
@@ -632,8 +672,15 @@
 "većina ljudi vjeruje?</a>"
 
 #. type: Content of: <div><div><ul><li>
+# | <a href=\"#somanyright\">Since many people call it
+# | [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} doesn't that make it
+# | right?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#somanyright\">Since many people call it &ldquo;Linux&rdquo;, "
+#| "doesn't that make it right?</a>"
 msgid ""
-"<a href=\"#somanyright\">Since many people call it &ldquo;Linux&rdquo;, "
+"<a href=\"#somanyright\">Since many people call it &ldquo;Linux,&rdquo; "
 "doesn't that make it right?</a>"
 msgstr ""
 "<a href=\"#somanyright\">Kako većina ljudi koristi naziv &ldquo;"
@@ -811,6 +858,24 @@
 "veliku prednost."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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 it must be right.  The name &ldquo;Linux&rdquo; also spreads a
+# | false picture of the system's origin, because people tend to suppose that
+# | the system's history was such as to fit that name.  For instance, they
+# | often believe its development was started by Linus Torvalds in 1991.  This
+# | false picture tends to reinforce the idea that the system should be called
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+}
+#, fuzzy
+#| 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 it must be right.  The name &ldquo;Linux&rdquo; also spreads a "
+#| "false picture of the system's origin, because people tend to suppose that "
+#| "the system's history was such as to fit that name.  For instance, they "
+#| "often believe its development was started by Linus Torvalds in 1991.  "
+#| "This false picture tends to reinforce the idea that the system should be "
+#| "called &ldquo;Linux&rdquo;."
 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 "
@@ -818,7 +883,7 @@
 "of the system's origin, because people tend to suppose that the system's "
 "history was such as to fit that name.  For instance, they often believe its "
 "development was started by Linus Torvalds in 1991.  This false picture tends "
-"to reinforce the idea that the system should be called &ldquo;Linux&rdquo;."
+"to reinforce the idea that the system should be called &ldquo;Linux.&rdquo;"
 msgstr ""
 "Mnogi koji sustav zovu &ldquo;Linux&rdquo; nisu nikada čuli zašto to nije "
 "ispravan naziv. Vidjeli su da ga većina koristi i zaključili da je to 
točno. "
@@ -844,22 +909,46 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#always\">#always</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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;,-] {+&ldquo;Linux,&rdquo;+} the name its developer
+# | chose.
+#, fuzzy
+#| 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."
 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."
+"you're referring specifically to the kernel, you should call it &ldquo;Linux,"
+"&rdquo; the name its developer chose."
 msgstr ""
 "Ne uvijek&mdash;samo kada govorite o cjelokupnom sustavu. Kada govorite "
 "specifično o jezgri, trebate ju zvati &ldquo;Linux&rdquo; što je naziv koji 
"
 "je razvijatelj odabrao."
 
 #. type: Content of: <div><dl><dd><p>
+# | When people call the whole system [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} as a consequence they call the whole system by
+# | the same name as the kernel.  This causes many kinds of confusion, because
+# | only experts can tell whether a statement is about the kernel or the whole
+# | system.  By calling the whole system [-&ldquo;GNU/Linux&rdquo;,-]
+# | {+&ldquo;GNU/Linux,&rdquo;+} and calling the kernel
+# | [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} you avoid the ambiguity.
+#, fuzzy
+#| 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 kinds of confusion, because only experts can tell whether a "
+#| "statement is about the kernel or the whole system.  By calling the whole "
+#| "system &ldquo;GNU/Linux&rdquo;, and calling the kernel &ldquo;"
+#| "Linux&rdquo;, you avoid the ambiguity."
 msgid ""
-"When people call the whole system &ldquo;Linux&rdquo;, as a consequence they "
+"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 "
 "kinds of confusion, because only experts can tell whether a statement is "
 "about the kernel or the whole system.  By calling the whole system &ldquo;"
-"GNU/Linux&rdquo;, and calling the kernel &ldquo;Linux&rdquo;, you avoid the "
+"GNU/Linux,&rdquo; and calling the kernel &ldquo;Linux,&rdquo; you avoid the "
 "ambiguity."
 msgstr ""
 "Kada ljudi cijeli sustav nazivaju &ldquo;Linux&rdquo;, zapravo cijeli sustav "
@@ -928,8 +1017,17 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#divide\">#divide</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | When we ask people to say [-&ldquo;GNU/Linux&rdquo;,-]
+# | {+&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.
+#, fuzzy
+#| 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."
 msgid ""
-"When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing "
+"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 ""
@@ -984,10 +1082,34 @@
 "softvera</a>."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | freedom are more likely to call the system [-&ldquo;GNU/Linux&rdquo;,-]
+# | {+&ldquo;GNU/Linux,&rdquo;+} and people who learn that the system is
+# | &ldquo;GNU/Linux&rdquo; are more likely to pay attention to our
+# | philosophical arguments for freedom and community (which is why the choice
+# | of name for the system makes a real difference for society).  However, the
+# | disagreement would probably exist even if everyone knew the system's real
+# | origin and its proper name, because the issue is a real one.  It can only
+# | go away if we who value freedom either persuade everyone (which won't be
+# | easy) or are defeated entirely (let's hope not).
+#, fuzzy
+#| 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 freedom are more likely to call the system &ldquo;GNU/"
+#| "Linux&rdquo;, and people who learn that the system is &ldquo;GNU/"
+#| "Linux&rdquo; are more likely to pay attention to our philosophical "
+#| "arguments for freedom and community (which is why the choice of name for "
+#| "the system makes a real difference for society).  However, the "
+#| "disagreement would probably exist even if everyone knew the system's real "
+#| "origin and its proper name, because the issue is a real one.  It can only "
+#| "go away if we who value freedom either persuade everyone (which won't be "
+#| "easy) or are defeated entirely (let's hope not)."
 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 "
-"freedom are more likely to call the system &ldquo;GNU/Linux&rdquo;, and "
+"freedom are more likely to call the system &ldquo;GNU/Linux,&rdquo; and "
 "people who learn that the system is &ldquo;GNU/Linux&rdquo; are more likely "
 "to pay attention to our philosophical arguments for freedom and community "
 "(which is why the choice of name for the system makes a real difference for "
@@ -1042,10 +1164,23 @@
 "\"#everyoneknows\">#everyoneknows</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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
+# | system do not mention the name [-&ldquo;GNU&rdquo;,-]
+# | {+&ldquo;GNU,&rdquo;+} or the ideals that GNU stands for.  <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never
+# | Heard of GNU</a> explains further.
+#, fuzzy
+#| 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 system do not mention the name &ldquo;GNU&rdquo;, or the ideals that "
+#| "GNU stands for.  <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU "
+#| "Users Who Have Never Heard of GNU</a> explains further."
 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 "
-"system do not mention the name &ldquo;GNU&rdquo;, or the ideals that GNU "
+"system do not mention the name &ldquo;GNU,&rdquo; or the ideals that GNU "
 "stands for.  <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users "
 "Who Have Never Heard of GNU</a> explains further."
 msgstr ""
@@ -1056,11 +1191,22 @@
 "\">GNU korisnici koji nisu nikada čuli za GNU</a>"
 
 #. type: Content of: <div><dl><dd><p>
+# | 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 GNU is.  For instance, many think it is a collection of [-<a
+# | href=\"#tools\">&ldquo;tools&rdquo;</a>,-] {+&ldquo;<a
+# | href=\"#tools\">tools</a>,&rdquo;+} or a project to develop tools.
+#, fuzzy
+#| 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 GNU is.  For instance, many think it is a collection of <a "
+#| "href=\"#tools\">&ldquo;tools&rdquo;</a>, or a project to develop tools."
 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 "
-"GNU is.  For instance, many think it is a collection of <a href=\"#tools"
-"\">&ldquo;tools&rdquo;</a>, or a project to develop tools."
+"GNU is.  For instance, many think it is a collection of &ldquo;<a href="
+"\"#tools\">tools</a>,&rdquo; or a project to develop tools."
 msgstr ""
 "Ljudi koji to tvrde su većinom &ldquo;kompjuterski štreberi&rdquo; (KŠ, u "
 "pozitivnom smislu) koji imaju na umu samo KÅ -e koje sami poznaju. KÅ -i 
često "
@@ -1092,11 +1238,23 @@
 "\"#everyoneknows2\">#everyoneknows2</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | 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;,-] {+&ldquo;Linux,&rdquo;+} that it was started by
+# | Linus Torvalds, and that it was intended to be &ldquo;open
+# | [-source&rdquo;.-] {+source.&rdquo;+} If you don't tell them, who will?
+#, fuzzy
+#| 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;"
+#| "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?"
 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;"
-"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?"
+"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?"
 msgstr ""
 "Ukoliko vaše riječi ne pokazuju vaše znanje, ne možete poučavati druge. "
 "Mnogi koji su čuli za sustav GNU/Linux smatraju da je to &ldquo;"
@@ -1153,14 +1311,31 @@
 "\"anchor-reference-id\">(<a href=\"#tools\">#tools</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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
+# | that GNU is the name of a collection of programs&mdash;often they say
+# | &ldquo;programming [-tools&rdquo;,-] {+tools,&rdquo;+} since some of our
+# | programming tools became popular on their own.  The idea that
+# | &ldquo;GNU&rdquo; is the name of an operating system is hard to fit into a
+# | conceptual framework in which that operating system is labeled
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+}
+#, fuzzy
+#| 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 "
+#| "that GNU is the name of a collection of programs&mdash;often they say "
+#| "&ldquo;programming tools&rdquo;, since some of our programming tools "
+#| "became popular on their own.  The idea that &ldquo;GNU&rdquo; is the name "
+#| "of an operating system is hard to fit into a conceptual framework in "
+#| "which that operating system is labeled &ldquo;Linux&rdquo;."
 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 "
 "that GNU is the name of a collection of programs&mdash;often they say &ldquo;"
-"programming tools&rdquo;, since some of our programming tools became popular "
+"programming tools,&rdquo; since some of our programming tools became popular "
 "on their own.  The idea that &ldquo;GNU&rdquo; is the name of an operating "
 "system is hard to fit into a conceptual framework in which that operating "
-"system is labeled &ldquo;Linux&rdquo;."
+"system is labeled &ldquo;Linux.&rdquo;"
 msgstr ""
 "Ljudi koji smatraju da je Linux cjelovit operativni sustav, a kada čuju za "
 "GNU, dobiju pogrešnu ideju o tome što GNU jest. Možda misle da je GNU 
naziv "
@@ -1223,12 +1398,32 @@
 "brine o pokretanju i zaustavljanju drugih programa."
 
 #. type: Content of: <div><dl><dd><p>
+# | To confuse matters, some people use the term &ldquo;operating
+# | system&rdquo; to mean [-&ldquo;kernel&rdquo;.-] {+&ldquo;kernel.&rdquo;+}
+# | Both uses of the term go back many years.  The use of &ldquo;operating
+# | system&rdquo; to mean &ldquo;kernel&rdquo; is found in a number of
+# | textbooks on system design, going back to the 80s.  At the same time, in
+# | the 80s, the &ldquo;Unix operating system&rdquo; was understood to include
+# | all the system programs, and Berkeley's version of Unix included even
+# | games. Since we intended GNU to be a Unix-like operating system, we use
+# | the term &ldquo;operating system&rdquo; in the same way.
+#, fuzzy
+#| 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.  The use of &ldquo;operating system&rdquo; to mean "
+#| "&ldquo;kernel&rdquo; is found in a number of textbooks on system design, "
+#| "going back to the 80s.  At the same time, in the 80s, the &ldquo;Unix "
+#| "operating system&rdquo; was understood to include all the system "
+#| "programs, and Berkeley's version of Unix included even games. Since we "
+#| "intended GNU to be a Unix-like operating system, we use the term &ldquo;"
+#| "operating system&rdquo; in the same way."
 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.  "
-"The use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is "
-"found in a number of textbooks on system design, going back to the 80s.  At "
-"the same time, in the 80s, the &ldquo;Unix operating system&rdquo; was "
+"to mean &ldquo;kernel.&rdquo; Both uses of the term go back many years.  The "
+"use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is found "
+"in a number of textbooks on system design, going back to the 80s.  At the "
+"same time, in the 80s, the &ldquo;Unix operating system&rdquo; was "
 "understood to include all the system programs, and Berkeley's version of "
 "Unix included even games. Since we intended GNU to be a Unix-like operating "
 "system, we use the term &ldquo;operating system&rdquo; in the same way."
@@ -1244,11 +1439,28 @@
 "sustav na jednak način.&rdquo;"
 
 #. type: Content of: <div><dl><dd><p>
+# | Most of the time when people speak of the &ldquo;Linux operating
+# | system&rdquo; they are using &ldquo;operating system&rdquo; in the same
+# | sense we use: they mean the whole collection of programs.  If that's what
+# | you are referring to, please call it [-&ldquo;GNU/Linux&rdquo;.-]
+# | {+&ldquo;GNU/Linux.&rdquo;+} If you mean just the kernel, then
+# | &ldquo;Linux&rdquo; is the right name for it, but please say
+# | &ldquo;kernel&rdquo; also to avoid ambiguity about which body of software
+# | you mean.
+#, fuzzy
+#| 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 "
+#| "sense we use: they mean the whole collection of programs.  If that's what "
+#| "you are referring to, please call it &ldquo;GNU/Linux&rdquo;.  If you "
+#| "mean just the kernel, then &ldquo;Linux&rdquo; is the right name for it, "
+#| "but please say &ldquo;kernel&rdquo; also to avoid ambiguity about which "
+#| "body of software you mean."
 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 "
 "sense we use: they mean the whole collection of programs.  If that's what "
-"you are referring to, please call it &ldquo;GNU/Linux&rdquo;.  If you mean "
+"you are referring to, please call it &ldquo;GNU/Linux.&rdquo; If you mean "
 "just the kernel, then &ldquo;Linux&rdquo; is the right name for it, but "
 "please say &ldquo;kernel&rdquo; also to avoid ambiguity about which body of "
 "software you mean."
@@ -1261,10 +1473,20 @@
 "izbjegle dvoznačnosti."
 
 #. type: Content of: <div><dl><dd><p>
+# | If you prefer to use some other term such as &ldquo;system
+# | distribution&rdquo; for the entire collection of programs, instead of
+# | &ldquo;operating [-system&rdquo;,-] {+system,&rdquo;+} that's fine.  Then
+# | you would talk about GNU/Linux system distributions.
+#, fuzzy
+#| msgid ""
+#| "If you prefer to use some other term such as &ldquo;system "
+#| "distribution&rdquo; for the entire collection of programs, instead of "
+#| "&ldquo;operating system&rdquo;, that's fine.  Then you would talk about "
+#| "GNU/Linux system distributions."
 msgid ""
 "If you prefer to use some other term such as &ldquo;system "
 "distribution&rdquo; for the entire collection of programs, instead of &ldquo;"
-"operating system&rdquo;, that's fine.  Then you would talk about GNU/Linux "
+"operating system,&rdquo; that's fine.  Then you would talk about GNU/Linux "
 "system distributions."
 msgstr ""
 "Ako preferirate koristiti neki drugi termin kao npr. &ldquo;sistemska "
@@ -1369,9 +1591,9 @@
 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, "
-"window systems, libraries, and much more &mdash; hundreds of programs, even "
-"to match what BSD systems included in 1983.  Since Torvalds didn't develop "
-"any of those, how can the system be &ldquo;Linux&rdquo;?"
+"window systems, libraries, and much more&mdash;hundreds of programs, even to "
+"match what BSD systems included in 1983.  Since Torvalds didn't develop any "
+"of those, how can the system be &ldquo;Linux&rdquo;?"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><p>
@@ -1397,7 +1619,7 @@
 #. 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</a> are available.  None of them is called simply &ldquo;GNU,&rdquo; but "
 "GNU is what they basically are."
 msgstr ""
 
@@ -1430,8 +1652,8 @@
 
 #. 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 "
+"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 ""
 
@@ -1446,13 +1668,28 @@
 "\"#afterkernel\">#afterkernel</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | That practice seems to be very rare&mdash;we can't find any examples other
+# | than the misuse of the name [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+} Normally an operating system is developed as a
+# | single unified project, and the developers choose a name for the system as
+# | a whole.  The kernel usually does not have a name of its
+# | own&mdash;instead, people say &ldquo;the kernel of such-and-such&rdquo; or
+# | &ldquo;the such-and-such [-kernel&rdquo;.-] {+kernel.&rdquo;+}
+#, fuzzy
+#| 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 system is developed as a single unified project, and the "
+#| "developers choose a name for the system as a whole.  The kernel usually "
+#| "does not have a name of its own&mdash;instead, people say &ldquo;the "
+#| "kernel of such-and-such&rdquo; or &ldquo;the such-and-such kernel&rdquo;."
 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 "
+"than the misuse of the name &ldquo;Linux.&rdquo; Normally an operating "
 "system is developed as a single unified project, and the developers choose a "
 "name for the system as a whole.  The kernel usually does not have a name of "
 "its own&mdash;instead, people say &ldquo;the kernel of such-and-such&rdquo; "
-"or &ldquo;the such-and-such kernel&rdquo;."
+"or &ldquo;the such-and-such kernel.&rdquo;"
 msgstr ""
 "Takva praksa je rijetka, nema puno primjera osim pogrešne upotrebe naziva "
 "&ldquo;Linux&rdquo;. Obično, operativni sustav se razvija kao jedinstven "
@@ -1500,9 +1737,18 @@
 "\">#long</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | For a while we tried the name [-&ldquo;LiGNUx&rdquo;,-]
+# | {+&ldquo;LiGNUx,&rdquo;+} which combines the words &ldquo;GNU&rdquo; and
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} The reaction was very
+# | bad.  People accept &ldquo;GNU/Linux&rdquo; much better.
+#, fuzzy
+#| 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."
 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.  "
+"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 ""
 "Određeno vrijeme smo koristili ime&ldquo;LiGNUx&rdquo;, kombinaciju riječi "
@@ -1510,8 +1756,16 @@
 "loša, naziv &ldquo;GNU/Linux&rdquo; je mnogo bolje prihvaćen."
 
 #. type: Content of: <div><dl><dd><p>
+# | The shortest legitimate name for this system is [-&ldquo;GNU&rdquo;,-]
+# | {+&ldquo;GNU,&rdquo;+} but we call it &ldquo;GNU/Linux&rdquo; <a
+# | href=\"#justgnu\"> for the reasons given below</a>.
+#, fuzzy
+#| 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>."
 msgid ""
-"The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but we "
+"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 ""
@@ -1551,8 +1805,16 @@
 "(<a href=\"#long2\">#long2</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | It only takes a second to say or type [-&ldquo;GNU/&rdquo;.-]
+# | {+&ldquo;GNU/.&rdquo;+} If you appreciate the system that we developed,
+# | can't you take one second to recognize our work?
+#, fuzzy
+#| 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?"
 msgid ""
-"It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you appreciate "
+"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 ""
@@ -1657,10 +1919,21 @@
 "doprinosa sustavu."
 
 #. type: Content of: <div><dl><dd><ul><li>
+# | Since many people know of the system as [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} if we say &ldquo;GNU&rdquo; they may simply not
+# | recognize we're talking about the same system.  If we say
+# | [-&ldquo;GNU/Linux&rdquo;,-] {+&ldquo;GNU/Linux,&rdquo;+} they can make a
+# | connection to what they have heard about.
+#, fuzzy
+#| 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 system.  If we say &ldquo;GNU/Linux&rdquo;, they can make a "
+#| "connection to what they have heard about."
 msgid ""
-"Since many people know of the system as &ldquo;Linux&rdquo;, if we say "
+"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 "
-"system.  If we say &ldquo;GNU/Linux&rdquo;, they can make a connection to "
+"system.  If we say &ldquo;GNU/Linux,&rdquo; they can make a connection to "
 "what they have heard about."
 msgstr ""
 "Kako je mnogo ljudi upoznato sa sustavom kao &ldquo;Linuxom&rdquo;, ako samo "
@@ -1669,10 +1942,23 @@
 "onime što su čuli."
 
 #. type: Content of: <div><dl><dt>
+# | 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;.-]
+# | {+&ldquo;GNU/Linux.&rdquo;+} Is it wrong if I use &ldquo;GNU&rdquo;
+# | without [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} to save the fee?
+# | <span class=\"anchor-reference-id\">(<a
+# | href=\"#trademarkfee\">#trademarkfee</a>)</span>
+#, fuzzy
+#| 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 wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to save "
+#| "the fee? <span class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
+#| "\">#trademarkfee</a>)</span>"
 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 "
-"wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to save the "
+"product, and that would also apply if I say &ldquo;GNU/Linux.&rdquo; Is it "
+"wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux,&rdquo; to save the "
 "fee? <span class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
 "\">#trademarkfee</a>)</span>"
 msgstr ""
@@ -1693,9 +1979,17 @@
 "nikakve obveze plaćati tu privilegiju."
 
 #. type: Content of: <div><dl><dd><p>
+# | So if you want to refer to the system simply as [-&ldquo;GNU&rdquo;,-]
+# | {+&ldquo;GNU,&rdquo;+} to avoid paying the fee for calling it
+# | [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} we won't criticize you.
+#, fuzzy
+#| 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."
 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."
+"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 ""
 "Stoga ako želite nazvati sistem jednostavno &ldquo;GNU&rdquo; radi "
 "izbjegavanja plaćanja naknade zbog korištenja naziva &ldquo;Linux&rdquo;, "
@@ -1753,12 +2047,25 @@
 "želite, bez prigovora"
 
 #. type: Content of: <div><dl><dd><p>
+# | Different threshold levels would lead to different choices of name for the
+# | system.  But one name that cannot result from concerns of fairness and
+# | giving credit, not for any possible threshold level, is
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} It can't be fair to give
+# | all the credit to one secondary contribution (Linux) while omitting the
+# | principal contribution (GNU).
+#, fuzzy
+#| 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 giving credit, not for any possible threshold level, is &ldquo;"
+#| "Linux&rdquo;.  It can't be fair to give all the credit to one secondary "
+#| "contribution (Linux) while omitting the principal contribution (GNU)."
 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 "
-"giving credit, not for any possible threshold level, is &ldquo;"
-"Linux&rdquo;.  It can't be fair to give all the credit to one secondary "
-"contribution (Linux) while omitting the principal contribution (GNU)."
+"giving credit, not for any possible threshold level, is &ldquo;Linux.&rdquo; "
+"It can't be fair to give all the credit to one secondary contribution "
+"(Linux) while omitting the principal contribution (GNU)."
 msgstr ""
 "Različite granice bi dovele do izbora različitih imena sustava. Međutim, 
ni "
 "jedna granica ne bi smjela uključivati isključivo naziv Linux, a bez naziva 
"
@@ -1791,7 +2098,7 @@
 "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."
+"system &ldquo;GNU/systemd/Linux,&rdquo; there is nothing wrong with doing so."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
@@ -1835,11 +2142,21 @@
 "class=\"anchor-reference-id\">(<a href=\"#allsmall\">#allsmall</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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 the same argument would apply even more strongly to calling it
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+}
+#, fuzzy
+#| 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 the same argument would apply even more strongly to calling it &ldquo;"
+#| "Linux&rdquo;."
 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 "
-"the same argument would apply even more strongly to calling it &ldquo;"
-"Linux&rdquo;."
+"the same argument would apply even more strongly to calling it &ldquo;Linux."
+"&rdquo;"
 msgstr ""
 "2008. godine, paketi GNU su sačinjavali 15% &ldquo;glavnih&rdquo; "
 "repozitorija distribucije GNU/Linuxa imena gNewSense. Linux je sačinjavao do 
"
@@ -1899,9 +2216,21 @@
 "class=\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | Following the rules of English, in the construction &ldquo;GNU
+# | Linux&rdquo; the word &ldquo;GNU&rdquo; modifies [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+} This can mean either &ldquo;GNU's version of
+# | Linux&rdquo; or &ldquo;Linux, which is a GNU package.&rdquo; Neither of
+# | those meanings fits the situation at hand.
+#, fuzzy
+#| 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 either &ldquo;GNU's version of Linux&rdquo; or &ldquo;"
+#| "Linux, which is a GNU package.&rdquo; Neither of those meanings fits the "
+#| "situation at hand."
 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 "
+"the word &ldquo;GNU&rdquo; modifies &ldquo;Linux.&rdquo; This can mean "
 "either &ldquo;GNU's version of Linux&rdquo; or &ldquo;Linux, which is a GNU "
 "package.&rdquo; Neither of those meanings fits the situation at hand."
 msgstr ""
@@ -1929,9 +2258,10 @@
 # | [-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.
+# | non[---]free firmware [-&ldquo;blobs&rdquo;.-] {+&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 "
@@ -1945,7 +2275,7 @@
 "We're not talking about a distinct GNU version of Linux, the kernel.  The "
 "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 "
+"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."
@@ -1957,11 +2287,24 @@
 "bi se nazvati GNU Linux ali mi ne želimo takav naziv jer bi bio zbunjujući."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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 &ldquo;combination.&rdquo; (Think of
+# | [-&ldquo;Input/Output&rdquo;.)-] {+&ldquo;Input/Output.&rdquo;)+}  This
+# | system is the combination of GNU and Linux; hence,
+# | [-&ldquo;GNU/Linux&rdquo;.-] {+&ldquo;GNU/Linux.&rdquo;+}
+#, fuzzy
+#| 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 &ldquo;combination.&rdquo; (Think of &ldquo;Input/Output&rdquo;.)  "
+#| "This system is the combination of GNU and Linux; hence, &ldquo;GNU/"
+#| "Linux&rdquo;."
 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 "
-"&ldquo;combination.&rdquo; (Think of &ldquo;Input/Output&rdquo;.)  This "
-"system is the combination of GNU and Linux; hence, &ldquo;GNU/Linux&rdquo;."
+"&ldquo;combination.&rdquo; (Think of &ldquo;Input/Output.&rdquo;)  This "
+"system is the combination of GNU and Linux; hence, &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "Ovdje je riječ o verziji GNU-a, operativnog sustava, koji je specifičan po "
 "tome Å¡to ima Linux kao jezgru. Kosa crtica pristaje situaciji jer "
@@ -1969,11 +2312,22 @@
 "GNU/Linux&rdquo;."
 
 #. 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: "
-"&ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes say &ldquo;GNU con "
-"Linux&rdquo;."
+# | There are other ways to express [-&ldquo;combination&rdquo;.-]
+# | {+&ldquo;combination.&rdquo;+} If you think that a plus-sign is clearer,
+# | please use that.  In French, a hyphen is clear:
+# | [-&ldquo;GNU-Linux&rdquo;.-] {+&ldquo;GNU-Linux.&rdquo;+} In Spanish, we
+# | sometimes say &ldquo;GNU con [-Linux&rdquo;.-] {+Linux.&rdquo;+}
+#, fuzzy
+#| 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: &ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes say &ldquo;GNU "
+#| "con Linux&rdquo;."
+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: "
+"&ldquo;GNU-Linux.&rdquo; In Spanish, we sometimes say &ldquo;GNU con Linux."
+"&rdquo;"
 msgstr ""
 "Postoje i drugi načini da se izrazi ta kombinacija. Ako smatrate da je znak "
 "+ prikladniji, upotrijebite to. Na francuskom jeziku, koristi se crtica: "
@@ -2026,7 +2380,7 @@
 # | 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
-# | Linux&rdquo; or &ldquo;Linux,-] {+&ldquo;Emacs&rdquo;.  That is the right
+# | Linux&rdquo; or &ldquo;Linux,-] {+&ldquo;Emacs.&rdquo; That is the right
 # | way to describe a program called Emacs+} which is a GNU [-package.&rdquo;
 # | Neither of those meanings fits the situation at hand.-] {+package.+}
 #, fuzzy
@@ -2038,7 +2392,7 @@
 #| "situation at hand."
 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 "
+"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 ""
 "U skladu sa pravilima engleskog jezika, u konstrukciji &ldquo;GNU "
@@ -2079,8 +2433,17 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dd><p>
+# | However, if you prefer to call the system [-&ldquo;Linux/GNU&rdquo;,-]
+# | {+&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.
+#, fuzzy
+#| 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."
 msgid ""
-"However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a "
+"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 ""
@@ -2089,12 +2452,27 @@
 "potpunosti i time se kompletni sustav naizgled čini kao Linux."
 
 #. type: Content of: <div><dl><dt>
+# | My [-distro is called-] {+distro's developers call it+} &ldquo;Foobar
+# | [-Linux&rdquo;; doesn't-] {+Linux,&rdquo; but+} that [-show it's really
+# | Linux?-] {+doesn't say anything about what the system consists of.  Why
+# | shouldn't they call it whatever they like?+} <span
+# | class=\"anchor-reference-id\">(<a
+# | [-href=\"#distronames\">#distronames</a>)</span>-]
+# | {+href=\"#distronames0\">#distronames0</a>)</span>+}
+#, fuzzy
+#| 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>"
 msgid ""
-"My distro's developers call it &ldquo;Foobar Linux&rdquo;, but that doesn't "
+"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 "
 "whatever they like? <span class=\"anchor-reference-id\">(<a href="
 "\"#distronames0\">#distronames0</a>)</span>"
 msgstr ""
+"Moja distribucija se zove &ldquo;Foobar Linux&rdquo;; ne pokazuje li to da "
+"je uistinu Linux? <span class=\"anchor-reference-id\">(<a href=\"#distronames"
+"\">#distronames</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
 msgid ""
@@ -2147,12 +2525,12 @@
 
 #. 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+}
-# | for you to [-change it back and call the distro &ldquo;Foobar
-# | 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;.+}
+# | changing+} &ldquo;GNU&rdquo; to {+&ldquo;Linux,&rdquo; and call their
+# | version of it+} &ldquo;Foobar [-Linux&rdquo;,-] {+Linux,&rdquo;+} it's
+# | [-allowed-] {+proper+} for you to [-change it back and call the distro
+# | &ldquo;Foobar 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;+}
 #, fuzzy
 #| msgid ""
 #| "If it's allowed for them to change &ldquo;GNU&rdquo; to &ldquo;Foobar "
@@ -2161,9 +2539,9 @@
 #| "mistake than it was to make the mistake."
 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 "
+"Linux,&rdquo; and call their version of it &ldquo;Foobar Linux,&rdquo; it's "
 "proper for you to correct the misinformation by calling it &ldquo;Foobar GNU/"
-"Linux&rdquo;."
+"Linux.&rdquo;"
 msgstr ""
 "Ako je njima dopušteno izmijeniti &ldquo;GNU&rdquo; u &ldquo;Foobar "
 "Linux&rdquo;, onda je i vama dopušteno izmijeniti naziv i nazvati "
@@ -2201,12 +2579,24 @@
 "&rdquo; Drugim riječima, nije ih briga što je ispravno."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | 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;.-] {+&ldquo;GNU/Linux.&rdquo;+}
+#, fuzzy
+#| 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 "
+#| "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;."
 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 "
 "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;."
+"&ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "Ne možemo ih natjerati da postupe ispravno, ali mi nismo tip koji odustaje "
 "lako jer je put težak. Vi možda nemate takav utjecaj koji imaju IBM ili Red 
"
@@ -2229,12 +2619,12 @@
 # | 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.
+# | [-&ldquo;Linux&rdquo;.-] {+&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 "
@@ -2249,13 +2639,12 @@
 msgid ""
 "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 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 nonfree "
-"applications and drivers), or making the system more popular even at the "
-"cost of freedom."
+"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 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 nonfree applications "
+"and drivers), or making the system more popular even at the cost of freedom."
 msgstr ""
 "Raširena praksa dodavanja ne-slobodnog softvera sustavima GNU/Linux "
 "predstavlja velik problem za našu zajednicu. Takva praksa \"uči\" korisnike 
"
@@ -2291,7 +2680,8 @@
 # | 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;.
+# | they are proper and appropriate &ldquo;versions of [-Linux&rdquo;.-]
+# | {+Linux.&rdquo;+}
 #, fuzzy
 #| msgid ""
 #| "The way to lead these users to see a connection with freedom is exactly "
@@ -2308,7 +2698,7 @@
 "specifically for the sake of the users' freedom.  With this understanding, "
 "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;."
+"proper and appropriate &ldquo;versions of Linux.&rdquo;"
 msgstr ""
 "Način da korisnici uoče poveznicu sa slobodom jest upravo suprotan: "
 "informirati korisnike da svi ti sustavi  <em>jesu</em> verzije GNU-a, da se "
@@ -2407,11 +2797,22 @@
 "proradi, možda bismo to i učinili."
 
 #. type: Content of: <div><dl><dd><p>
+# | If we were to take an existing version of GNU/Linux and relabel it as
+# | [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} that would be somewhat like
+# | making a version of the GNU system and labeling it
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} That wasn't right, and
+# | we don't want to act like that.
+#, fuzzy
+#| 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 and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and "
+#| "we don't want to act like that."
 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 "
-"and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and we don't want "
-"to act like that."
+"GNU,&rdquo; that would be somewhat like making a version of the GNU system "
+"and labeling it &ldquo;Linux.&rdquo; That wasn't right, and we don't want to "
+"act like that."
 msgstr ""
 "Da uzmemo postojeću verziju GNU/Linuxa i preimenujemo ju u &ldquo;GNU&rdquo; 
"
 "to bi bilo nešto slično kao kada bismo napravili verziju GNU sustava i "
@@ -2445,11 +2846,29 @@
 "trebalo ih je \"pročistiti\" za instalaciju."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | with the GNU Project because he was a &ldquo;Linux [-user&rdquo;.-]
+# | {+user.&rdquo;+} That came as a shock, because the people who ported GNU
+# | packages to other systems had generally wanted to work with us to get
+# | their changes installed.  Yet these people, developing a system that was
+# | primarily based on GNU, were the first (and still practically the only)
+# | group that was unwilling to work with us.
+#, fuzzy
+#| 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 "
+#| "with the GNU Project because he was a &ldquo;Linux user&rdquo;.  That "
+#| "came as a shock, because the people who ported GNU packages to other "
+#| "systems had generally wanted to work with us to get their changes "
+#| "installed.  Yet these people, developing a system that was primarily "
+#| "based on GNU, were the first (and still practically the only) group that "
+#| "was unwilling to work with us."
 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 "
-"with the GNU Project because he was a &ldquo;Linux user&rdquo;.  That came "
-"as a shock, because the people who ported GNU packages to other systems had "
+"with the GNU Project because he was a &ldquo;Linux user.&rdquo; That came as "
+"a shock, because the people who ported GNU packages to other systems had "
 "generally wanted to work with us to get their changes installed.  Yet these "
 "people, developing a system that was primarily based on GNU, were the first "
 "(and still practically the only) group that was unwilling to work with us."
@@ -2462,9 +2881,22 @@
 "primarno baziran na GNU-u, su bili prvi koji nisu bili voljni raditi s nama."
 
 #. type: Content of: <div><dl><dd><p>
+# | It was this experience that first showed us that people were calling a
+# | version of the GNU system [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} and that this confusion was obstructing our work.
+# |  Asking you to call the system &ldquo;GNU/Linux&rdquo; is our response to
+# | that problem, and to the other problems caused by the &ldquo;Linux&rdquo;
+# | misnomer.
+#, fuzzy
+#| 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 obstructing our work.  Asking you to call the system &ldquo;GNU/"
+#| "Linux&rdquo; is our response to that problem, and to the other problems "
+#| "caused by the &ldquo;Linux&rdquo; misnomer."
 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 "
+"version of the GNU system &ldquo;Linux,&rdquo; and that this confusion was "
 "obstructing our work.  Asking you to call the system &ldquo;GNU/Linux&rdquo; "
 "is our response to that problem, and to the other problems caused by the "
 "&ldquo;Linux&rdquo; misnomer."
@@ -2504,10 +2936,18 @@
 "\"#allgpled\">#allgpled</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | We never refer to individual programs as
+# | [-&ldquo;GNU/<i>name</i>&rdquo;.-] {+&ldquo;GNU/<i>name</i>.&rdquo;+} When
+# | a program is a GNU package, we may call it &ldquo;GNU
+# | [-<i>name</i>&rdquo;.-] {+<i>name</i>.&rdquo;+}
+#, fuzzy
+#| 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;."
 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;."
+"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 ""
 "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;."
@@ -2619,10 +3059,24 @@
 "dijelove, sve je moralo biti pisano iznova."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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. 
+# | The name [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} which stands for
+# | &ldquo;GNU's Not [-Unix&rdquo;,-] {+Unix,&rdquo;+} is a humorous way of
+# | giving credit to Unix for this, following a hacker tradition of recursive
+# | acronyms that started in the 70s.
+#, fuzzy
+#| 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.  The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not "
+#| "Unix&rdquo;, is a humorous way of giving credit to Unix for this, "
+#| "following a hacker tradition of recursive acronyms that started in the "
+#| "70s."
 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.  "
-"The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not Unix&rdquo;, "
+"The name &ldquo;GNU,&rdquo; which stands for &ldquo;GNU's Not Unix,&rdquo; "
 "is a humorous way of giving credit to Unix for this, following a hacker "
 "tradition of recursive acronyms that started in the 70s."
 msgstr ""
@@ -2633,11 +3087,12 @@
 "rekurzivnih akronima iz sedamdesetih."
 
 #. 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
+# | The first such recursive acronym was TINT, &ldquo;TINT Is Not
+# | [-TECO&rdquo;.-] {+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;,-] {+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
@@ -2650,10 +3105,10 @@
 #| "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 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 "
+"like &ldquo;<em>somethingorother</em> TECO,&rdquo; he thought of a clever "
 "amusing name.  (That's what hacking means: <a href=\"https://stallman.org/";
 "articles/on-hacking.html\">playful cleverness</a>.)"
 msgstr ""
@@ -2665,13 +3120,28 @@
 "html\">zaigrana pamet</a>.)"
 
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | was similar to some existing program (let's imagine its name was
+# | &ldquo;Klever&rdquo;), you could give it a recursive acronym name, such as
+# | &ldquo;MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same
+# | spirit we called our replacement for Unix &ldquo;GNU's Not
+# | [-Unix&rdquo;.-] {+Unix.&rdquo;+}
+#, fuzzy
+#| 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 was similar to some existing program (let's imagine its name was "
+#| "&ldquo;Klever&rdquo;), you could give it a recursive acronym name, such "
+#| "as &ldquo;MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same "
+#| "spirit we called our replacement for Unix &ldquo;GNU's Not Unix&rdquo;."
 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 "
 "was similar to some existing program (let's imagine its name was &ldquo;"
 "Klever&rdquo;), you could give it a recursive acronym name, such as &ldquo;"
 "MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same spirit we "
-"called our replacement for Unix &ldquo;GNU's Not Unix&rdquo;."
+"called our replacement for Unix &ldquo;GNU's Not Unix.&rdquo;"
 msgstr ""
 "Drugim hakerima se toliko svidjelo to ime da su počeli kopirati pristup u "
 "nazivima. Postala je tradicija - kada ste pisali program od nule, a taj "
@@ -2681,13 +3151,28 @@
 "Koristeći ovaj pristup, nazvali smo naš unixoid &ldquo;GNU's Not 
Unix&rdquo;."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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 in a system 99% copied from Unix.  AT&amp;T actually threatened to
+# | sue anyone giving AT&amp;T credit in that way.  This is why each of the
+# | various modified versions of Unix (all proprietary, like Unix) had a
+# | completely different name that didn't include [-&ldquo;Unix&rdquo;.-]
+# | {+&ldquo;Unix.&rdquo;+}
+#, fuzzy
+#| 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 in a system 99% copied from Unix.  AT&amp;T actually threatened "
+#| "to sue anyone giving AT&amp;T credit in that way.  This is why each of "
+#| "the various modified versions of Unix (all proprietary, like Unix) had a "
+#| "completely different name that didn't include &ldquo;Unix&rdquo;."
 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 "
 "in a system 99% copied from Unix.  AT&amp;T actually threatened to sue "
 "anyone giving AT&amp;T credit in that way.  This is why each of the various "
 "modified versions of Unix (all proprietary, like Unix) had a completely "
-"different name that didn't include &ldquo;Unix&rdquo;."
+"different name that didn't include &ldquo;Unix.&rdquo;"
 msgstr ""
 "Ranije, AT&amp;T (tvrtka koja je razvila Unix) nije željela da se naziv "
 "&ldquo;Unix&rdquo; spominje u nazivu sličnog sustava, čak niti u sustavu "
@@ -2768,9 +3253,22 @@
 "Linux&rdquo; ispravan."
 
 #. type: Content of: <div><dl><dd><p>
+# | There is a version of GNU which uses the kernel from NetBSD.  Its
+# | developers call it &ldquo;Debian [-GNU/NetBSD&rdquo;,-]
+# | {+GNU/NetBSD,&rdquo;+} but &ldquo;GNU/kernelofNetBSD&rdquo; would be more
+# | accurate, since NetBSD is an entire system, not just the kernel.  This is
+# | not a BSD system, since most of the system is the same as the GNU/Linux
+# | system.
+#, fuzzy
+#| 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/"
+#| "kernelofNetBSD&rdquo; would be more accurate, since NetBSD is an entire "
+#| "system, not just the kernel.  This is not a BSD system, since most of the "
+#| "system is the same as the GNU/Linux system."
 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/"
+"call it &ldquo;Debian GNU/NetBSD,&rdquo; but &ldquo;GNU/"
 "kernelofNetBSD&rdquo; would be more accurate, since NetBSD is an entire "
 "system, not just the kernel.  This is not a BSD system, since most of the "
 "system is the same as the GNU/Linux system."
@@ -2791,8 +3289,21 @@
 "\">#othersys</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | Not in the same sense that we mean by [-&ldquo;GNU/Linux&rdquo;.-]
+# | {+&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.
+#, fuzzy
+#| 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 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."
 msgid ""
-"Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of "
+"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 "
@@ -2920,7 +3431,7 @@
 
 #. type: Content of: <div><dl><dd><p>
 msgid ""
-"If you call the whole GNU/Linux system &ldquo;Linux&rdquo;, you will find it "
+"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 "
 "Linux, because it doesn't have the usual Linux [sic] libraries and utilities "
 "[meaning the GNU system].&rdquo;"
@@ -2951,7 +3462,7 @@
 #. 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 "
+"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 ""
 
@@ -2959,7 +3470,7 @@
 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;."
+"of the whole system as &ldquo;Linux.&rdquo;"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><p>
@@ -2969,7 +3480,7 @@
 "contain Linux is irrelevant to using them, just as the fact that a car and a "
 "bicycle both have a structure of metal is irrelevant to using those two.  If "
 "you wish to talk about using cars and bikes, you wouldn't speak of &ldquo;"
-"riding metal objects&rdquo; &mdash; not unless you're playing games with the "
+"riding metal objects&rdquo;&mdash;not unless you're playing games with the "
 "reader.  You would say, &ldquo;using cars and bikes.&rdquo; Likewise, the "
 "clear way to talk about using GNU/Linux and Android is to say &ldquo;using "
 "GNU/Linux and Android.&rdquo;"
@@ -3068,11 +3579,22 @@
 "\"anchor-reference-id\">(<a href=\"#claimlinux\">#claimlinux</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | 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;.-] {+&ldquo;GNU.&rdquo;+} When we talk
+# | about the whole system, the name &ldquo;GNU/Linux&rdquo; gives him a share
+# | of the credit.
+#, fuzzy
+#| 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 "
+#| "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."
 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 "
-"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."
+"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."
 msgstr ""
 "To bi bilo pogrešno, stoga to ni ne radimo. Torvaldsovo djelo je Linux, "
 "jezgra, i pazimo da ga ne pripisujemo Projektu GNU i ne označavamo kao  "
@@ -3088,12 +3610,13 @@
 "\"anchor-reference-id\">(<a href=\"#linusagreed\">#linusagreed</a>)</span>"
 
 #. 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\">
+# | He recognized this at the beginning.  The {+<a
+# | 
href=\"https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\";>+}
+# | 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>.
+# |  for more info&rdquo;</a>.-] {+notes</a> said:+}
 #, fuzzy
 #| msgid ""
 #| "He recognized this at the beginning.  The earliest Linux release notes "
@@ -3102,11 +3625,34 @@
 #| "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=\"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>."
+"He recognized this at the beginning.  The <a href=\"https://ftp.funet.fi/pub/";
+"linux/historical/kernel/old-versions/RELNOTES-0.01\"> earliest Linux release "
+"notes</a> said:"
+msgstr ""
+"Na početku je on ovo i ustvrdio. Najranije obavijesti uz izdanje kažu, <a "
+"href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
+"RELNOTES-0.01\"> &ldquo;Većina alata korištenih s linuxom su GNU-ov softver 
"
+"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><dl><dd><blockquote><p>
+# | [-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-]{+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>.-] {+info.+}
+#, 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 ""
+"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."
 msgstr ""
 "Na početku je on ovo i ustvrdio. Najranije obavijesti uz izdanje kažu, <a "
 "href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
@@ -3147,11 +3693,26 @@
 "\">(<a href=\"#lost\">#lost</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | 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;,-]
+# | {+&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.
+#, fuzzy
+#| 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;: 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."
 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;: "
 "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 "
+"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."
 msgstr ""
@@ -3172,13 +3733,32 @@
 "href=\"#whatgood\">#whatgood</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | 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;,-] {+&ldquo;GNU/Linux,&rdquo;+} you will help
+# | others learn the system's true history, origin, and reason for being.  You
+# | can't correct the misnomer 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;,-] {+&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.
+#, fuzzy
+#| 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;GNU/Linux&rdquo;, you will help others learn the system's true "
+#| "history, origin, and reason for being.  You can't correct the misnomer "
+#| "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."
 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;"
-"GNU/Linux&rdquo;, you will help others learn the system's true history, "
+"GNU/Linux,&rdquo; you will help others learn the system's true history, "
 "origin, and reason for being.  You can't correct the misnomer 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 "
+"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."
 msgstr ""
@@ -3201,22 +3781,48 @@
 "\">(<a href=\"#explain\">#explain</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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;,-]
+# | {+&ldquo;GNU/Linux,&rdquo;+} and uses your time inefficiently.
+#, fuzzy
+#| 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."
 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."
+"the system &ldquo;GNU/Linux,&rdquo; and uses your time inefficiently."
 msgstr ""
 "Ako nam pomažete na takav način, objašnjavajući drugima, cijenimo vaš 
trud, "
 "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><dl><dd><p>
+# | 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, and they may learn a correct picture of the system's origin. 
+# | But they are unlikely to repeat the explanation to others whenever they
+# | talk about the system.  They will probably just call it
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} Without particularly
+# | intending to, they will help spread the incorrect picture.
+#, fuzzy
+#| 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, and they may learn a correct picture of the system's origin.  "
+#| "But they are unlikely to repeat the explanation to others whenever they "
+#| "talk about the system.  They will probably just call it &ldquo;"
+#| "Linux&rdquo;.  Without particularly intending to, they will help spread "
+#| "the incorrect picture."
 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, "
 "and they may learn a correct picture of the system's origin.  But they are "
 "unlikely to repeat the explanation to others whenever they talk about the "
-"system.  They will probably just call it &ldquo;Linux&rdquo;.  Without "
+"system.  They will probably just call it &ldquo;Linux.&rdquo; Without "
 "particularly intending to, they will help spread the incorrect picture."
 msgstr ""
 "Nije efektna jer se neće \"uhvatiti\" niti će propagirati. Neki od ljudi "
@@ -3347,9 +3953,16 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#force\">#force</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | It would be wrong to force them, and we don't try.  We call the system
+# | [-&ldquo;GNU/Linux&rdquo;,-] {+&ldquo;GNU/Linux,&rdquo;+} and we ask you
+# | to do it too.
+#, fuzzy
+#| 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."
 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."
+"&ldquo;GNU/Linux,&rdquo; and we ask you to do it too."
 msgstr ""
 "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."
@@ -3451,9 +4064,19 @@
 "BSD&rdquo; a da ne naznačite o kojoj se radi."
 
 #. type: Content of: <div><dl><dt>
+# | Since you failed to put something in the GNU GPL to require people to call
+# | the system [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} you deserve what
+# | happened; why are you complaining now? <span
+# | class=\"anchor-reference-id\">(<a href=\"#deserve\">#deserve</a>)</span>
+#, fuzzy
+#| 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 "
+#| "complaining now? <span class=\"anchor-reference-id\">(<a href=\"#deserve"
+#| "\">#deserve</a>)</span>"
 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 "
+"the system &ldquo;GNU,&rdquo; you deserve what happened; why are you "
 "complaining now? <span class=\"anchor-reference-id\">(<a href=\"#deserve"
 "\">#deserve</a>)</span>"
 msgstr ""
@@ -3506,8 +4129,17 @@
 "prihvatljiv."
 
 #. type: Content of: <div><dl><dt>
+# | Since many people call it [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} doesn't that make it right? <span
+# | class=\"anchor-reference-id\">(<a
+# | href=\"#somanyright\">#somanyright</a>)</span>
+#, fuzzy
+#| 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>"
 msgid ""
-"Since many people call it &ldquo;Linux&rdquo;, doesn't that make it right? "
+"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 ""
@@ -3529,7 +4161,7 @@
 #. 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 "
+"&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."
 msgstr ""

Index: po/gnu-linux-faq.it-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.it-diff.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- po/gnu-linux-faq.it-diff.html       31 Aug 2021 10:37:07 -0000      1.9
+++ po/gnu-linux-faq.it-diff.html       2 Nov 2021 14:41:51 -0000       1.10
@@ -12,30 +12,35 @@
 <body><pre>
 &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;!-- This page is derived from /server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="gnulinux" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</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="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&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"&gt;by</em></ins></span> Richard <span 
class="removed"><del><strong>Stallman&lt;/h2&gt;
+&lt;address class="byline"&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;</em></ins></span>
 
-&lt;div class="announcement"&gt;
+&lt;div <span class="removed"><del><strong>class="announcement"&gt;
   &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 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&gt;</strong></del></span> <span 
class="inserted"><ins><em>class="introduction"&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.
+system that many others call just <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> they ask many 
questions.
 Here are common questions, and our answers.&lt;/p&gt;
+<span class="inserted"><ins><em>&lt;/div&gt;
 
-<span class="inserted"><ins><em>&lt;div class="toc"&gt;
+&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;
@@ -130,8 +135,8 @@
 
 &lt;li&gt;&lt;a href="#trademarkfee"&gt;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
-    wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to
+    that would also apply if I say <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux.&rdquo;</em></ins></span>  Is 
it
+    wrong if I use &ldquo;GNU&rdquo; without <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> to
     save the fee?&lt;/a&gt;&lt;/li&gt;
 
 &lt;li&gt;&lt;a href="#many"&gt;Many other projects contributed to the
@@ -169,7 +174,7 @@
 rather than &ldquo;Linux/GNU&rdquo;?&lt;/a&gt;&lt;/li&gt;
 
 &lt;li&gt;&lt;a href="#distronames0"&gt;My distro's developers call it
-    &ldquo;Foobar Linux&rdquo;, but that doesn't say anything about
+    &ldquo;Foobar <span 
class="removed"><del><strong>Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>Linux,&rdquo;</em></ins></span> but that doesn't say 
anything about
     what the system consists of.  Why shouldn't they call it whatever
     they like?&lt;/a&gt;&lt;/li&gt;
 
@@ -281,14 +286,16 @@
 
 &lt;li&gt;&lt;a href="#deserve"&gt;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
+    <span class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span>
+    <span class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> you 
deserve what happened; why are you
     complaining now?&lt;/a&gt;&lt;/li&gt;
 
 &lt;li&gt;&lt;a href="#contradict"&gt;Wouldn't you be better off
     not contradicting what so many people believe?&lt;/a&gt;&lt;/li&gt;
 
 &lt;li&gt;&lt;a href="#somanyright"&gt;Since many people call it
-    &ldquo;Linux&rdquo;, doesn't that make it right?&lt;/a&gt;&lt;/li&gt;
+    <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span>
+    <span class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> 
doesn't that make it right?&lt;/a&gt;&lt;/li&gt;
 
 &lt;li&gt;&lt;a href="#knownname"&gt;Isn't it better to call the
     system by the name most users already know?&lt;/a&gt;&lt;/li&gt;
@@ -380,7 +387,7 @@
 the system's history was such as to fit that name.  For
 instance, they often believe its development was started by Linus
 Torvalds in 1991.  This false picture tends to reinforce the idea
-that the system should be called &ldquo;Linux&rdquo;.&lt;/p&gt;
+that the system should be called <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.&lt;/p&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;&lt;/p&gt;</em></ins></span>
 &lt;p&gt;
 Many of the questions in this file represent people's attempts to
 justify the name they are accustomed to using.&lt;/p&gt;
@@ -391,14 +398,16 @@
 &lt;dd&gt;
 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.
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> the 
name its developer chose.
 &lt;p&gt;
-When people call the whole system &ldquo;Linux&rdquo;, as a consequence
+When people call the whole system <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> as a 
consequence
 they call the whole system by the same name as the kernel.
 This causes many kinds of confusion, because only experts can tell
 whether a statement is about the kernel or the whole system.
-By calling the whole system &ldquo;GNU/Linux&rdquo;, and calling the kernel
-&ldquo;Linux&rdquo;, you avoid the ambiguity.&lt;/p&gt;
+By calling the whole 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> and 
calling the kernel
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> you 
avoid the ambiguity.&lt;/p&gt;
 &lt;/dd&gt;
 
 &lt;dt id="linuxalone"&gt;Would Linux have
@@ -428,7 +437,7 @@
     community if you did not divide people with this request? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#divide"&gt;#divide&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing people. 
 We
+When we ask people to say <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 
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.
 &lt;p&gt;
@@ -456,7 +465,8 @@
 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 freedom are more likely to call the system
-&ldquo;GNU/Linux&rdquo;, and people who learn that the system is 
&ldquo;GNU/Linux&rdquo; are
+<span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> and 
people who learn that the system is &ldquo;GNU/Linux&rdquo; are
 more likely to pay attention to our philosophical arguments for
 freedom and community (which is why the choice of name for the system
 makes a real difference for society).  However, the disagreement would
@@ -484,7 +494,7 @@
 
 &lt;dd&gt;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 system do not mention the name &ldquo;GNU&rdquo;, or the 
ideals
+articles about the system do not mention the name <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> or the ideals
 that GNU stands for.  &lt;a
 href="/gnu/gnu-users-never-heard-of-gnu.html"&gt;GNU Users Who Have Never
 Heard of GNU&lt;/a&gt; explains further.
@@ -492,7 +502,7 @@
 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 GNU is.  For instance, many think it is a collection
-of &lt;a href="#tools"&gt;&ldquo;tools&rdquo;&lt;/a&gt;, or a project to 
develop tools.&lt;/p&gt;
+of <span class="removed"><del><strong>&lt;a 
href="#tools"&gt;&ldquo;tools&rdquo;&lt;/a&gt;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;&lt;a 
href="#tools"&gt;tools&lt;/a&gt;,&rdquo;</em></ins></span> or a project to 
develop tools.&lt;/p&gt;
 &lt;p&gt;
 The wording of this question, which is typical, illustrates another
 common misconception.  To speak of &ldquo;GNU's role&rdquo; in developing
@@ -508,8 +518,9 @@
 <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
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> that it 
was started by Linus Torvalds, and that
+it was intended to be &ldquo;open <span 
class="removed"><del><strong>source&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>source.&rdquo;</em></ins></span>  If you don't tell
 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;
 
@@ -538,10 +549,10 @@
 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 that GNU is the name of a collection of programs&mdash;often they
-say &ldquo;programming tools&rdquo;, since some of our programming tools became
+say &ldquo;programming <span 
class="removed"><del><strong>tools&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>tools,&rdquo;</em></ins></span> since some of our 
programming tools became
 popular on their own.  The idea that &ldquo;GNU&rdquo; is the name of an 
operating
 system is hard to fit into a conceptual framework in which that
-operating system is labeled &ldquo;Linux&rdquo;.
+operating system is labeled <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>
 &lt;p&gt;
 The GNU Project was named after the GNU operating system&mdash;it's the project
 to develop the GNU system.  (See &lt;a
@@ -570,7 +581,7 @@
 programs.&lt;/p&gt;
 &lt;p&gt;
 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.  The
+mean <span 
class="removed"><del><strong>&ldquo;kernel&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;kernel.&rdquo;</em></ins></span>  Both uses of 
the term go back many years.  The
 use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is found in 
a number of
 textbooks on system design, going back to the 80s.  At the same time,
 in the 80s, the &ldquo;Unix operating system&rdquo; was understood to include 
all
@@ -581,12 +592,12 @@
 Most of the time when people speak of the &ldquo;Linux operating system&rdquo;
 they are using &ldquo;operating system&rdquo; in the same sense we use: they 
mean
 the whole collection of programs.  If that's what you are referring
-to, please call it &ldquo;GNU/Linux&rdquo;.  If you mean just the kernel, then
+to, please call it <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux.&rdquo;</em></ins></span>  If 
you mean just the kernel, then
 &ldquo;Linux&rdquo; is the right name for it, but please say 
&ldquo;kernel&rdquo; also to
 avoid ambiguity about which body of software you mean.&lt;/p&gt;
 &lt;p&gt;
 If you prefer to use some other term such as &ldquo;system distribution&rdquo; 
for
-the entire collection of programs, instead of &ldquo;operating system&rdquo;,
+the entire collection of programs, instead of &ldquo;operating <span 
class="removed"><del><strong>system&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>system,&rdquo;</em></ins></span>
 that's fine.  Then you would talk about GNU/Linux system
 distributions.&lt;/p&gt;
 &lt;/dd&gt;
@@ -638,8 +649,8 @@
 &lt;dd&gt;
 The people who argue that way for calling the system
 &ldquo;Linux&rdquo; are using a double standard.  An operating system
-requires compilers, editors, window systems, libraries, and much more
-&mdash; hundreds of programs, even to match what BSD systems included
+requires compilers, editors, window systems, libraries, and much
+more&mdash;hundreds of programs, even to match what BSD systems included
 in 1983.  Since Torvalds didn't develop any of those, how can the
 system be &ldquo;Linux&rdquo;?
 
@@ -660,7 +671,8 @@
 &lt;dd&gt;
 Many &lt;a href="/distros/distros.html"&gt; packaged and installable
 versions of GNU&lt;/a&gt; are available.  None of them is called simply
-&ldquo;GNU&rdquo;, but GNU is what they basically are.
+<span class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> but GNU 
is what they basically are.
 
 &lt;p&gt;
 We expected to release the GNU system packaged for installation, but
@@ -687,7 +699,8 @@
 
 &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.
+<span class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> but that 
doesn't alter what kind of thing GNU is.
 GNU is an operating system.&lt;/p&gt;
 &lt;/dd&gt;
 
@@ -697,11 +710,11 @@
 
 &lt;dd&gt;
 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 system 
is
+than the misuse of the name <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  Normally an 
operating system is
 developed as a single unified project, and the developers choose a
 name for the system as a whole.  The kernel usually does not have a
 name of its own&mdash;instead, people say &ldquo;the kernel of 
such-and-such&rdquo; or
-&ldquo;the such-and-such kernel&rdquo;.
+&ldquo;the such-and-such <span 
class="removed"><del><strong>kernel&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>kernel.&rdquo;</em></ins></span>
 &lt;p&gt;
 Because those two constructions are used synonymously, the expression
 &ldquo;the Linux kernel&rdquo; can easily be misunderstood as meaning 
&ldquo;the kernel
@@ -726,11 +739,11 @@
     How about recommending a shorter name? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#long"&gt;#long&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-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;
+For a while we tried the name <span 
class="removed"><del><strong>&ldquo;LiGNUx&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;LiGNUx,&rdquo;</em></ins></span> which 
combines the words &ldquo;GNU&rdquo;
+and <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  The reaction 
was very bad.  People accept &ldquo;GNU/Linux&rdquo;
 much better.
 &lt;p&gt;
-The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but
+The shortest legitimate name for this system is <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> but
 we call it &ldquo;GNU/Linux&rdquo; &lt;a href="#justgnu"&gt; for the reasons
 given below&lt;/a&gt;.&lt;/p&gt;
 &lt;/dd&gt;
@@ -755,7 +768,7 @@
     &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#long2"&gt;#long2&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-&lt;p&gt;It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you
+&lt;p&gt;It only takes a second to say or type <span 
class="removed"><del><strong>&ldquo;GNU/&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU/.&rdquo;</em></ins></span>  If you
 appreciate the system that we developed, can't you take one second
 to recognize our work?&lt;/p&gt;
 &lt;/dd&gt;
@@ -806,9 +819,9 @@
 honorably and openly, rather than by trying to cut him out of the
 credit for his contribution to the system.&lt;/li&gt;
 &lt;li&gt;
-Since many people know of the system as &ldquo;Linux&rdquo;, if we say 
&ldquo;GNU&rdquo; they
+Since many people know of the system as <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> if we say 
&ldquo;GNU&rdquo; they
 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
+say <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> they 
can make a connection to what they have heard
 about.&lt;/li&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>
@@ -816,16 +829,16 @@
 
 &lt;dt id="trademarkfee"&gt;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 wrong if I use 
&ldquo;GNU&rdquo;
-    without &ldquo;Linux&rdquo;, to save the fee? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#trademarkfee"&gt;#trademarkfee&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
+    would also apply if I say <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux.&rdquo;</em></ins></span>  Is 
it wrong if I use &ldquo;GNU&rdquo;
+    without <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> to save the 
fee? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#trademarkfee"&gt;#trademarkfee&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 &lt;dd&gt;
 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.
 &lt;p&gt;
-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.&lt;/p&gt;
+So if you want to refer to the system simply as <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> to avoid paying
+the fee for calling it <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> we won't 
criticize you.&lt;/p&gt;
 &lt;/dd&gt;
 
 &lt;dt id="many"&gt;Many other projects contributed to
@@ -855,7 +868,7 @@
 &lt;p&gt;
 Different threshold levels would lead to different choices of name for
 the system.  But one name that cannot result from concerns of fairness
-and giving credit, not for any possible threshold level, is 
&ldquo;Linux&rdquo;.
+and giving credit, not for any possible threshold level, is <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>
 It can't be fair to give all the credit to one secondary contribution
 (Linux) while omitting the principal contribution (GNU).&lt;/p&gt;
 &lt;/dd&gt;
@@ -869,7 +882,7 @@
 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
+by calling the system &ldquo;GNU/systemd/Linux,&rdquo; there is nothing
 wrong with doing so.&lt;/p&gt;
 &lt;/dd&gt;
 
@@ -894,7 +907,7 @@
 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 the same argument would apply even more
-strongly to calling it &ldquo;Linux&rdquo;.
+strongly to calling it <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>
 
 &lt;p&gt;
 GNU is a small fraction of the system nowadays, and Linux is an
@@ -931,7 +944,7 @@
 
 &lt;dd&gt;
 Following the rules of English, in the construction &ldquo;GNU Linux&rdquo; the
-word &ldquo;GNU&rdquo; modifies &ldquo;Linux&rdquo;.  This can mean either 
&ldquo;GNU's version of
+word &ldquo;GNU&rdquo; modifies <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  This can mean 
either &ldquo;GNU's version of
 Linux&rdquo; or &ldquo;Linux, which is a GNU package.&rdquo;  Neither of those 
meanings
 fits the situation at hand.
 &lt;p&gt;
@@ -944,23 +957,24 @@
 The free GNU/Linux distros do have
 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,
+firmware <span 
class="removed"><del><strong>&ldquo;blobs&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;blobs.&rdquo;</em></ins></span>  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;
 &lt;p&gt;
 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 &ldquo;combination.&rdquo; (Think of
-&ldquo;Input/Output&rdquo;.)  This system is the combination of GNU
-and Linux; hence, &ldquo;GNU/Linux&rdquo;.&lt;/p&gt;
+<span 
class="removed"><del><strong>&ldquo;Input/Output&rdquo;.)</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Input/Output.&rdquo;)</em></ins></span> 
 This system is the combination of GNU
+and Linux; hence, <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;
-There are other ways to express &ldquo;combination&rdquo;.  If you
+There are other ways to express <span 
class="removed"><del><strong>&ldquo;combination&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;combination.&rdquo;</em></ins></span>  
If you
 think that a plus-sign is clearer, please use that.  In French, a
-hyphen is clear: &ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes
-say &ldquo;GNU con Linux&rdquo;.&lt;/p&gt;
+hyphen is clear: <span 
class="removed"><del><strong>&ldquo;GNU-Linux&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU-Linux.&rdquo;</em></ins></span>  In 
Spanish, we sometimes
+say &ldquo;GNU con <span 
class="removed"><del><strong>Linux&rdquo;.&lt;/p&gt;</strong></del></span> 
<span class="inserted"><ins><em>Linux.&rdquo;&lt;/p&gt;
 &lt;/dd&gt;
 
-&lt;dt <span class="inserted"><ins><em>id="pronounce"&gt;How is the name 
&ldquo;GNU/Linux&rdquo;
+&lt;dt id="pronounce"&gt;How is the name &ldquo;GNU/Linux&rdquo;
 pronounced? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#pronounce"&gt;#pronounce&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 &lt;dd&gt;
 &lt;p&gt;
@@ -976,16 +990,16 @@
 &lt;dd&gt;
 &lt;p&gt;
 Following the rules of English, in the construction &ldquo;GNU
-Emacs&rdquo; the word &ldquo;GNU&rdquo; modifies &ldquo;Emacs&rdquo;.
+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.&lt;/p&gt;
 &lt;p&gt;
 &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.&lt;/p&gt;
+program, so &ldquo;GNU/Emacs&rdquo; is the wrong way to refer to 
it.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
-&lt;dt</em></ins></span> id="whyorder"&gt;Why &ldquo;GNU/Linux&rdquo; rather
+&lt;dt id="whyorder"&gt;Why &ldquo;GNU/Linux&rdquo; rather
 than &ldquo;Linux/GNU&rdquo;? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#whyorder"&gt;#whyorder&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
@@ -997,13 +1011,13 @@
 In addition, &ldquo;GNU/Linux&rdquo; fits the fact that Linux is the
 lowest level of the system and GNU fills technically higher levels.&lt;/p&gt;
 &lt;p&gt;
-However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a 
lot
+However, if you prefer to call the system <span 
class="removed"><del><strong>&ldquo;Linux/GNU&rdquo;,</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;Linux/GNU,&rdquo;</em></ins></span> 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.&lt;/p&gt;
 &lt;/dd&gt;
 
 &lt;dt id="distronames0"&gt;My distro's developers call it
-    &ldquo;Foobar Linux&rdquo;, but that doesn't say anything about
+    &ldquo;Foobar <span 
class="removed"><del><strong>Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>Linux,&rdquo;</em></ins></span> but that doesn't say 
anything about
     what the system consists of.  Why shouldn't they call it whatever
     they like? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#distronames0"&gt;#distronames0&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 &lt;dd&gt;
@@ -1032,9 +1046,10 @@
     anything but &ldquo;Foobar Linux&rdquo;? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#distronames1"&gt;#distronames1&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;&lt;p&gt;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 proper for you to correct the misinformation by
-calling it &ldquo;Foobar GNU/Linux&rdquo;.&lt;/p&gt;&lt;/dd&gt;
+to <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> and call their 
version of it &ldquo;Foobar
+<span class="removed"><del><strong>Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>Linux,&rdquo;</em></ins></span> it's proper 
for you to correct the misinformation by
+calling it &ldquo;Foobar <span 
class="removed"><del><strong>GNU/Linux&rdquo;.&lt;/p&gt;&lt;/dd&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>GNU/Linux.&rdquo;&lt;/p&gt;&lt;/dd&gt;</em></ins></span>
 
 &lt;dt id="companies"&gt;Wouldn't it be more
     effective to ask companies such as Mandrake, Red Hat and IBM to
@@ -1055,7 +1070,7 @@
 just because the road isn't easy.  You may not have as much 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;.&lt;/p&gt;
+more profit calling it <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;/dd&gt;
 
 &lt;dt id="reserve"&gt;Wouldn't it be better to
@@ -1066,7 +1081,7 @@
 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 <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
+of <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  Many 
&ldquo;Linux&rdquo; User Groups make it part of their mission to
 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 <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span>
@@ -1089,7 +1104,8 @@
 With this understanding, they can start to recognize the distributions
 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;
+<span 
class="removed"><del><strong>Linux&rdquo;.&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>Linux.&rdquo;&lt;/p&gt;</em></ins></span>
 &lt;p&gt;
 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
@@ -1129,8 +1145,9 @@
 GNU Hurd to work, we might have done that.  (Alas, that is hindsight.)
 &lt;p&gt;
 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
-and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and we don't
+<span class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> that 
would be somewhat like making a version of the GNU system
+and labeling it <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  That wasn't 
right, and we don't
 want to act like that.&lt;/p&gt;
 &lt;/dd&gt;
 
@@ -1149,7 +1166,7 @@
 &lt;p&gt;
 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 with the GNU Project because he was a &ldquo;Linux user&rdquo;.
+about working with the GNU Project because he was a &ldquo;Linux <span 
class="removed"><del><strong>user&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>user.&rdquo;</em></ins></span>
 That came as a shock, because the people who ported GNU packages to
 other systems had generally wanted to work with us to get their
 changes installed.  Yet these people, developing a system that was
@@ -1157,7 +1174,7 @@
 only) group that was unwilling to work with us.&lt;/p&gt;
 &lt;p&gt;
 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
+version of the GNU system <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> and that this 
confusion was
 obstructing our work.  Asking you to call the system &ldquo;GNU/Linux&rdquo; is
 our response to that problem, and to the other problems caused by the
 &ldquo;Linux&rdquo; misnomer.&lt;/p&gt;
@@ -1176,8 +1193,8 @@
     convention be applied to all programs that are GPL'ed? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#allgpled"&gt;#allgpled&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-We never refer to individual programs as 
&ldquo;GNU/&lt;i&gt;name&lt;/i&gt;&rdquo;.  When a program
-is a GNU package, we may call it &ldquo;GNU &lt;i&gt;name&lt;/i&gt;&rdquo;.
+We never refer to individual programs as <span 
class="removed"><del><strong>&ldquo;GNU/&lt;i&gt;name&lt;/i&gt;&rdquo;.</strong></del></span>
 <span 
class="inserted"><ins><em>&ldquo;GNU/&lt;i&gt;name&lt;/i&gt;.&rdquo;</em></ins></span>
  When a program
+is a GNU package, we may call it &ldquo;GNU <span 
class="removed"><del><strong>&lt;i&gt;name&lt;/i&gt;&rdquo;.</strong></del></span>
 <span 
class="inserted"><ins><em>&lt;i&gt;name&lt;/i&gt;.&rdquo;</em></ins></span>
 &lt;p&gt;
 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
@@ -1230,15 +1247,17 @@
 &lt;p&gt;
 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.  The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not
-Unix&rdquo;, is a humorous way of giving credit to Unix for this,
+Unix.  The name <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> which stands for 
&ldquo;GNU's Not
+<span class="removed"><del><strong>Unix&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>Unix,&rdquo;</em></ins></span> is a humorous 
way of giving credit to Unix for this,
 following a hacker tradition of recursive acronyms that started in the
 70s.&lt;/p&gt;
 &lt;p&gt;
 The first such recursive acronym was TINT, &ldquo;TINT Is Not
-TECO&rdquo;.  The author of TINT wrote another implementation of TECO
+<span class="removed"><del><strong>TECO&rdquo;.</strong></del></span>
+<span class="inserted"><ins><em>TECO.&rdquo;</em></ins></span>  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;&lt;em&gt;somethingorother&lt;/em&gt; 
TECO&rdquo;, he
+calling it by a dull name like &ldquo;&lt;em&gt;somethingorother&lt;/em&gt; 
<span class="removed"><del><strong>TECO&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>TECO,&rdquo;</em></ins></span> he
 thought of a clever amusing name.  (That's what hacking
 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;
@@ -1248,7 +1267,7 @@
 program that was similar to some existing program (let's imagine its
 name was &ldquo;Klever&rdquo;), you could give it a recursive acronym name, 
such
 as &ldquo;MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo;  In this same 
spirit we called our
-replacement for Unix &ldquo;GNU's Not Unix&rdquo;.&lt;/p&gt;
+replacement for Unix &ldquo;GNU's Not <span 
class="removed"><del><strong>Unix&rdquo;.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>Unix.&rdquo;&lt;/p&gt;</em></ins></span>
 &lt;p&gt;
 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
@@ -1256,7 +1275,8 @@
 threatened to sue anyone giving AT&amp;T credit in that way.  This is
 why each of the various modified versions of Unix (all proprietary,
 like Unix) had a completely different name that didn't include
-&ldquo;Unix&rdquo;.&lt;/p&gt;
+<span 
class="removed"><del><strong>&ldquo;Unix&rdquo;.&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Unix.&rdquo;&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="bsd"&gt;Should we say &ldquo;GNU/BSD&rdquo;
@@ -1287,7 +1307,7 @@
 why the name &ldquo;GNU/Linux&rdquo; is appropriate for it.&lt;/p&gt;
 &lt;p&gt;
 There is a version of GNU which uses the kernel from NetBSD.  Its
-developers call it &ldquo;Debian GNU/NetBSD&rdquo;, but 
&ldquo;GNU/kernelofNetBSD&rdquo;
+developers call it &ldquo;Debian <span 
class="removed"><del><strong>GNU/NetBSD&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>GNU/NetBSD,&rdquo;</em></ins></span> but 
&ldquo;GNU/kernelofNetBSD&rdquo;
 would be more accurate, since NetBSD is an entire system, not just
 the kernel.  This is not a BSD system, since most of the system
 is the same as the GNU/Linux system.&lt;/p&gt;
@@ -1298,7 +1318,7 @@
 
 &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
+Not in the same sense that we mean by <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux.&rdquo;</em></ins></span>  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,
@@ -1349,7 +1369,7 @@
 the two have very little code in common.  In fact, the only thing they
 have in common is Linux.&lt;/p&gt;
 &lt;p&gt;
-If you call the whole GNU/Linux system &ldquo;Linux&rdquo;,
+If you call the whole GNU/Linux system <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span>
 you will find it necessary to say things like, &ldquo;Android contains
 Linux, but it isn't Linux, because it doesn't have the usual Linux
 [sic] libraries and utilities [meaning the GNU system].&rdquo;&lt;/p&gt;
@@ -1368,22 +1388,24 @@
 people will not understand the intended meaning.
 &lt;p&gt;
 The public will find it very strange to speak of using Android as
-&ldquo;using Linux&rdquo;.  It's like having a conversation, then
+&ldquo;using <span 
class="removed"><del><strong>Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>Linux.&rdquo;</em></ins></span>  It's like having a 
conversation, then
 saying you were conversing with the person's intestines or the
 person's circulatory system.&lt;/p&gt;
 &lt;p&gt;
 The public &lt;em&gt;will&lt;/em&gt; 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;.&lt;/p&gt;
+<span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.&lt;/p&gt;</strong></del></span>
+<span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;&lt;/p&gt;</em></ins></span>
 &lt;p&gt;
 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 contain Linux is irrelevant to using them, just as the
 fact that a car and a bicycle both have a structure of metal is
 irrelevant to using those two.  If you wish to talk about using cars
-and bikes, you wouldn't speak of &ldquo;riding metal objects&rdquo;
-&mdash; not unless you're playing games with the reader.  You would
+and bikes, you wouldn't speak of &ldquo;riding metal <span 
class="removed"><del><strong>objects&rdquo;
+&mdash; not</strong></del></span> <span 
class="inserted"><ins><em>objects&rdquo;&mdash;not</em></ins></span>
+unless you're playing games with the reader.  You would
 say, &ldquo;using cars and bikes.&rdquo; Likewise, the clear way to
 talk about using GNU/Linux and Android is to say &ldquo;using
 GNU/Linux and Android.&rdquo;&lt;/p&gt;
@@ -1430,7 +1452,7 @@
 <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
+or label it as <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU.&rdquo;</em></ins></span>  When we talk 
about the whole
 system, the name &ldquo;GNU/Linux&rdquo; gives him a share of the
 <span class="removed"><del><strong>credit.</strong></del></span>
 <span class="inserted"><ins><em>credit.&lt;/p&gt;</em></ins></span>
@@ -1441,13 +1463,17 @@
     agree that Linux is just the kernel? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#linusagreed"&gt;#linusagreed&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-&lt;p&gt;He recognized this at the beginning.  The earliest Linux release notes
+&lt;p&gt;He recognized this at the beginning.  The <span 
class="inserted"><ins><em>&lt;a
+href="https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;</em></ins></span>
+earliest Linux release <span class="removed"><del><strong>notes
 said, &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>
-&ldquo;Most of the tools used with linux are GNU software and are under the
+href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;
+&ldquo;Most</strong></del></span> <span 
class="inserted"><ins><em>notes&lt;/a&gt; said:&lt;/p&gt;
+&lt;blockquote&gt;&lt;p&gt;
+Most</em></ins></span> 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;
+for more <span 
class="removed"><del><strong>info&rdquo;&lt;/a&gt;.&lt;/p&gt;</strong></del></span>
 <span class="inserted"><ins><em>info.
+&lt;/p&gt;&lt;/blockquote&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="finishhurd"&gt;Why not finish the GNU Hurd kernel, release the GNU 
system
@@ -1475,7 +1501,7 @@
 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
+name to use.  You can't make others say <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> but
 you can decide to call the system &ldquo;GNU/Linux&rdquo;
 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;
@@ -1488,10 +1514,10 @@
 <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
+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> you 
will help others learn the system's true
 history, origin, and reason for being.  You can't correct the misnomer
 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
+only a few hundred people see you use the term <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> you 
will
 have educated a substantial number of people with very little work.
 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;
@@ -1503,14 +1529,15 @@
 &lt;dd&gt;
 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.
+calling 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> and 
uses your time inefficiently.
 &lt;p&gt;
 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, and they may learn a correct picture of the system's
 origin.  But they are unlikely to repeat the explanation to others
 whenever they talk about the system.  They will probably just call it
-&ldquo;Linux&rdquo;.  Without particularly intending to, they will help spread 
the
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  
Without particularly intending to, they will help spread the
 incorrect picture.&lt;/p&gt;
 &lt;p&gt;
 It is inefficient because it takes a lot more time.  Saying and
@@ -1576,7 +1603,8 @@
 &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 <span 
class="removed"><del><strong>too.</strong></del></span> <span 
class="inserted"><ins><em>too.&lt;/p&gt;</em></ins></span>
+<span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> 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
@@ -1620,7 +1648,7 @@
 &lt;/dd&gt;
 
 &lt;dt id="deserve"&gt;Since you failed to put
-    something in the GNU GPL to require people to call the system 
&ldquo;GNU&rdquo;,
+    something in the GNU GPL to require people to call the system <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span>
     you deserve what happened; why are you complaining now? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#deserve"&gt;#deserve&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
@@ -1646,7 +1674,7 @@
 &lt;/dd&gt;
 
 &lt;dt id="somanyright"&gt;Since many people call
-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;
+it <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> 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;
 <span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
@@ -1659,7 +1687,7 @@
 &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
+includes <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> 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 <span 
class="removed"><del><strong>understand.</strong></del></span> <span 
class="inserted"><ins><em>understand.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
@@ -1740,7 +1768,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/08/31 10:37:07 $
+$Date: 2021/11/02 14:41:51 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: po/gnu-linux-faq.it.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.it.po,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- po/gnu-linux-faq.it.po      31 Aug 2021 10:37:07 -0000      1.56
+++ po/gnu-linux-faq.it.po      2 Nov 2021 14:41:51 -0000       1.57
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-linux-faq.html\n"
-"POT-Creation-Date: 2021-08-31 10:27+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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"
@@ -34,10 +34,19 @@
 msgid "by Richard Stallman"
 msgstr "di Richard Stallman"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+# | When people see that we use and recommend the name GNU/Linux for a system
+# | that many others call just [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} they ask many questions.  Here are common
+# | questions, and our answers.
+#, fuzzy
+#| 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."
 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.  "
+"that many others call just &ldquo;Linux,&rdquo; they ask many questions.  "
 "Here are common questions, and our answers."
 msgstr ""
 "Quando la gente scopre che noi usiamo e raccomandiamo il nome GNU/Linux per "
@@ -250,11 +259,22 @@
 "sbagliato chiamare il sistema semplicemente &ldquo;GNU&rdquo;?</a>"
 
 #. type: Content of: <div><div><ul><li>
+# | <a href=\"#trademarkfee\">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;.-] {+&ldquo;GNU/Linux.&rdquo;+} Is it
+# | wrong if I use &ldquo;GNU&rdquo; without [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} to save the fee?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#trademarkfee\">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 wrong if I use &ldquo;GNU&rdquo; without "
+#| "&ldquo;Linux&rdquo;, to save the fee?</a>"
 msgid ""
 "<a href=\"#trademarkfee\">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 wrong if I use &ldquo;GNU&rdquo; without "
-"&ldquo;Linux&rdquo;, to save the fee?</a>"
+"&ldquo;GNU/Linux.&rdquo; Is it wrong if I use &ldquo;GNU&rdquo; without "
+"&ldquo;Linux,&rdquo; to save the fee?</a>"
 msgstr ""
 "<a href=\"#trademarkfee\">Sarei costretto a pagare i diritti se usassi il "
 "nome &ldquo;Linux&rdquo; nel nome del mio prodotto e sarebbe lo stesso se "
@@ -363,10 +383,19 @@
 "Linux/GNU&rdquo;?</a>"
 
 #. type: Content of: <div><div><ul><li>
-msgid ""
-"<a href=\"#distronames0\">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 whatever they like?</a>"
+# | <a href=\"#distronames0\">My distro's developers call it &ldquo;Foobar
+# | [-Linux&rdquo;,-] {+Linux,&rdquo;+} but that doesn't say anything about
+# | what the system consists of.  Why shouldn't they call it whatever they
+# | like?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#distronames0\">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 whatever they like?</a>"
+msgid ""
+"<a href=\"#distronames0\">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 whatever they like?</a>"
 msgstr ""
 "<a href=\"#distronames\">La mia distribuzione si chiama &ldquo;... "
 "Linux&rdquo;; ma questo non dà informazioni sul contenuto del sistema. "
@@ -620,9 +649,18 @@
 "per richiedere alla gente di chiamare il sistema &ldquo;GNU&rdquo;?</a>"
 
 #. type: Content of: <div><div><ul><li>
+# | <a href=\"#deserve\">Since you failed to put something in the GNU GPL to
+# | require people to call the system [-&ldquo;GNU&rdquo;,-]
+# | {+&ldquo;GNU,&rdquo;+} you deserve what happened; why are you complaining
+# | now?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#deserve\">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 complaining now?</a>"
 msgid ""
 "<a href=\"#deserve\">Since you failed to put something in the GNU GPL to "
-"require people to call the system &ldquo;GNU&rdquo;, you deserve what "
+"require people to call the system &ldquo;GNU,&rdquo; you deserve what "
 "happened; why are you complaining now?</a>"
 msgstr ""
 "<a href=\"#deserve\">Non avete voluto mettere nulla nella GNU GPL per "
@@ -638,8 +676,15 @@
 "quello che tanta gente crede?</a>"
 
 #. type: Content of: <div><div><ul><li>
+# | <a href=\"#somanyright\">Since many people call it
+# | [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} doesn't that make it
+# | right?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#somanyright\">Since many people call it &ldquo;Linux&rdquo;, "
+#| "doesn't that make it right?</a>"
 msgid ""
-"<a href=\"#somanyright\">Since many people call it &ldquo;Linux&rdquo;, "
+"<a href=\"#somanyright\">Since many people call it &ldquo;Linux,&rdquo; "
 "doesn't that make it right?</a>"
 msgstr ""
 "<a href=\"#somanyright\">Tanta gente lo chiama &ldquo;Linux&rdquo;, non è "
@@ -823,6 +868,24 @@
 "di correggerla ma era già troppo tardi, la confusione aveva già preso 
piede."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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 it must be right.  The name &ldquo;Linux&rdquo; also spreads a
+# | false picture of the system's origin, because people tend to suppose that
+# | the system's history was such as to fit that name.  For instance, they
+# | often believe its development was started by Linus Torvalds in 1991.  This
+# | false picture tends to reinforce the idea that the system should be called
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+}
+#, fuzzy
+#| 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 it must be right.  The name &ldquo;Linux&rdquo; also spreads a "
+#| "false picture of the system's origin, because people tend to suppose that "
+#| "the system's history was such as to fit that name.  For instance, they "
+#| "often believe its development was started by Linus Torvalds in 1991.  "
+#| "This false picture tends to reinforce the idea that the system should be "
+#| "called &ldquo;Linux&rdquo;."
 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 "
@@ -830,7 +893,7 @@
 "of the system's origin, because people tend to suppose that the system's "
 "history was such as to fit that name.  For instance, they often believe its "
 "development was started by Linus Torvalds in 1991.  This false picture tends "
-"to reinforce the idea that the system should be called &ldquo;Linux&rdquo;."
+"to reinforce the idea that the system should be called &ldquo;Linux.&rdquo;"
 msgstr ""
 "La maggior parte di coloro che chiamano il sistema &ldquo;Linux&rdquo; non "
 "sono al corrente del perché il loro è un errore. Hanno sentito loro "
@@ -860,22 +923,46 @@
 "\">#always</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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;,-] {+&ldquo;Linux,&rdquo;+} the name its developer
+# | chose.
+#, fuzzy
+#| 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."
 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."
+"you're referring specifically to the kernel, you should call it &ldquo;Linux,"
+"&rdquo; the name its developer chose."
 msgstr ""
 "Non sempre - solo quando parlate dell'intero sistema. Quando fate "
 "riferimento specificamente al kernel, dovreste chiamarlo &ldquo;"
 "Linux&rdquo;, il nome ad esso assegnato dal suo sviluppatore."
 
 #. type: Content of: <div><dl><dd><p>
+# | When people call the whole system [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} as a consequence they call the whole system by
+# | the same name as the kernel.  This causes many kinds of confusion, because
+# | only experts can tell whether a statement is about the kernel or the whole
+# | system.  By calling the whole system [-&ldquo;GNU/Linux&rdquo;,-]
+# | {+&ldquo;GNU/Linux,&rdquo;+} and calling the kernel
+# | [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} you avoid the ambiguity.
+#, fuzzy
+#| 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 kinds of confusion, because only experts can tell whether a "
+#| "statement is about the kernel or the whole system.  By calling the whole "
+#| "system &ldquo;GNU/Linux&rdquo;, and calling the kernel &ldquo;"
+#| "Linux&rdquo;, you avoid the ambiguity."
 msgid ""
-"When people call the whole system &ldquo;Linux&rdquo;, as a consequence they "
+"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 "
 "kinds of confusion, because only experts can tell whether a statement is "
 "about the kernel or the whole system.  By calling the whole system &ldquo;"
-"GNU/Linux&rdquo;, and calling the kernel &ldquo;Linux&rdquo;, you avoid the "
+"GNU/Linux,&rdquo; and calling the kernel &ldquo;Linux,&rdquo; you avoid the "
 "ambiguity."
 msgstr ""
 "Quando la gente chiama l'intero sistema &ldquo;Linux&rdquo;, come "
@@ -945,8 +1032,17 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#divide\">#divide</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | When we ask people to say [-&ldquo;GNU/Linux&rdquo;,-]
+# | {+&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.
+#, fuzzy
+#| 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."
 msgid ""
-"When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing "
+"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 ""
@@ -1004,10 +1100,34 @@
 "Source” manca l'obiettivo del Software Libero</a>."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | freedom are more likely to call the system [-&ldquo;GNU/Linux&rdquo;,-]
+# | {+&ldquo;GNU/Linux,&rdquo;+} and people who learn that the system is
+# | &ldquo;GNU/Linux&rdquo; are more likely to pay attention to our
+# | philosophical arguments for freedom and community (which is why the choice
+# | of name for the system makes a real difference for society).  However, the
+# | disagreement would probably exist even if everyone knew the system's real
+# | origin and its proper name, because the issue is a real one.  It can only
+# | go away if we who value freedom either persuade everyone (which won't be
+# | easy) or are defeated entirely (let's hope not).
+#, fuzzy
+#| 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 freedom are more likely to call the system &ldquo;GNU/"
+#| "Linux&rdquo;, and people who learn that the system is &ldquo;GNU/"
+#| "Linux&rdquo; are more likely to pay attention to our philosophical "
+#| "arguments for freedom and community (which is why the choice of name for "
+#| "the system makes a real difference for society).  However, the "
+#| "disagreement would probably exist even if everyone knew the system's real "
+#| "origin and its proper name, because the issue is a real one.  It can only "
+#| "go away if we who value freedom either persuade everyone (which won't be "
+#| "easy) or are defeated entirely (let's hope not)."
 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 "
-"freedom are more likely to call the system &ldquo;GNU/Linux&rdquo;, and "
+"freedom are more likely to call the system &ldquo;GNU/Linux,&rdquo; and "
 "people who learn that the system is &ldquo;GNU/Linux&rdquo; are more likely "
 "to pay attention to our philosophical arguments for freedom and community "
 "(which is why the choice of name for the system makes a real difference for "
@@ -1065,10 +1185,23 @@
 "span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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
+# | system do not mention the name [-&ldquo;GNU&rdquo;,-]
+# | {+&ldquo;GNU,&rdquo;+} or the ideals that GNU stands for.  <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never
+# | Heard of GNU</a> explains further.
+#, fuzzy
+#| 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 system do not mention the name &ldquo;GNU&rdquo;, or the ideals that "
+#| "GNU stands for.  <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU "
+#| "Users Who Have Never Heard of GNU</a> explains further."
 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 "
-"system do not mention the name &ldquo;GNU&rdquo;, or the ideals that GNU "
+"system do not mention the name &ldquo;GNU,&rdquo; or the ideals that GNU "
 "stands for.  <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users "
 "Who Have Never Heard of GNU</a> explains further."
 msgstr ""
@@ -1080,11 +1213,22 @@
 "argomento in profondità."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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 GNU is.  For instance, many think it is a collection of [-<a
+# | href=\"#tools\">&ldquo;tools&rdquo;</a>,-] {+&ldquo;<a
+# | href=\"#tools\">tools</a>,&rdquo;+} or a project to develop tools.
+#, fuzzy
+#| 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 GNU is.  For instance, many think it is a collection of <a "
+#| "href=\"#tools\">&ldquo;tools&rdquo;</a>, or a project to develop tools."
 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 "
-"GNU is.  For instance, many think it is a collection of <a href=\"#tools"
-"\">&ldquo;tools&rdquo;</a>, or a project to develop tools."
+"GNU is.  For instance, many think it is a collection of &ldquo;<a href="
+"\"#tools\">tools</a>,&rdquo; or a project to develop tools."
 msgstr ""
 "Le persone che dicono questo sono spesso nerd che provano ad imitare i nerd "
 "di loro conoscenza. I nerd di solito conoscono GNU, ma molti hanno un'idea "
@@ -1117,11 +1261,23 @@
 "\"#everyoneknows2\">#everyoneknows2</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | 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;,-] {+&ldquo;Linux,&rdquo;+} that it was started by
+# | Linus Torvalds, and that it was intended to be &ldquo;open
+# | [-source&rdquo;.-] {+source.&rdquo;+} If you don't tell them, who will?
+#, fuzzy
+#| 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;"
+#| "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?"
 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;"
-"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?"
+"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?"
 msgstr ""
 "Se le vostre parole non riflettono la vostra conoscenza, non insegnatele "
 "agli altri. La maggior parte di coloro che hanno sentito parlare del sistema "
@@ -1180,14 +1336,31 @@
 "class=\"anchor-reference-id\">(<a href=\"#tools\">#tools</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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
+# | that GNU is the name of a collection of programs&mdash;often they say
+# | &ldquo;programming [-tools&rdquo;,-] {+tools,&rdquo;+} since some of our
+# | programming tools became popular on their own.  The idea that
+# | &ldquo;GNU&rdquo; is the name of an operating system is hard to fit into a
+# | conceptual framework in which that operating system is labeled
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+}
+#, fuzzy
+#| 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 "
+#| "that GNU is the name of a collection of programs&mdash;often they say "
+#| "&ldquo;programming tools&rdquo;, since some of our programming tools "
+#| "became popular on their own.  The idea that &ldquo;GNU&rdquo; is the name "
+#| "of an operating system is hard to fit into a conceptual framework in "
+#| "which that operating system is labeled &ldquo;Linux&rdquo;."
 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 "
 "that GNU is the name of a collection of programs&mdash;often they say &ldquo;"
-"programming tools&rdquo;, since some of our programming tools became popular "
+"programming tools,&rdquo; since some of our programming tools became popular "
 "on their own.  The idea that &ldquo;GNU&rdquo; is the name of an operating "
 "system is hard to fit into a conceptual framework in which that operating "
-"system is labeled &ldquo;Linux&rdquo;."
+"system is labeled &ldquo;Linux.&rdquo;"
 msgstr ""
 "Coloro che pensano che Linux sia un intero sistema operativo, ammesso che "
 "abbiano sentito parlare di GNU, spesso si fanno un'idea sbagliata di GNU. "
@@ -1254,12 +1427,32 @@
 "degli altri programmi."
 
 #. type: Content of: <div><dl><dd><p>
+# | To confuse matters, some people use the term &ldquo;operating
+# | system&rdquo; to mean [-&ldquo;kernel&rdquo;.-] {+&ldquo;kernel.&rdquo;+}
+# | Both uses of the term go back many years.  The use of &ldquo;operating
+# | system&rdquo; to mean &ldquo;kernel&rdquo; is found in a number of
+# | textbooks on system design, going back to the 80s.  At the same time, in
+# | the 80s, the &ldquo;Unix operating system&rdquo; was understood to include
+# | all the system programs, and Berkeley's version of Unix included even
+# | games. Since we intended GNU to be a Unix-like operating system, we use
+# | the term &ldquo;operating system&rdquo; in the same way.
+#, fuzzy
+#| 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.  The use of &ldquo;operating system&rdquo; to mean "
+#| "&ldquo;kernel&rdquo; is found in a number of textbooks on system design, "
+#| "going back to the 80s.  At the same time, in the 80s, the &ldquo;Unix "
+#| "operating system&rdquo; was understood to include all the system "
+#| "programs, and Berkeley's version of Unix included even games. Since we "
+#| "intended GNU to be a Unix-like operating system, we use the term &ldquo;"
+#| "operating system&rdquo; in the same way."
 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.  "
-"The use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is "
-"found in a number of textbooks on system design, going back to the 80s.  At "
-"the same time, in the 80s, the &ldquo;Unix operating system&rdquo; was "
+"to mean &ldquo;kernel.&rdquo; Both uses of the term go back many years.  The "
+"use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is found "
+"in a number of textbooks on system design, going back to the 80s.  At the "
+"same time, in the 80s, the &ldquo;Unix operating system&rdquo; was "
 "understood to include all the system programs, and Berkeley's version of "
 "Unix included even games. Since we intended GNU to be a Unix-like operating "
 "system, we use the term &ldquo;operating system&rdquo; in the same way."
@@ -1276,11 +1469,28 @@
 "operativo&rdquo; intendiamo la stessa cosa."
 
 #. type: Content of: <div><dl><dd><p>
+# | Most of the time when people speak of the &ldquo;Linux operating
+# | system&rdquo; they are using &ldquo;operating system&rdquo; in the same
+# | sense we use: they mean the whole collection of programs.  If that's what
+# | you are referring to, please call it [-&ldquo;GNU/Linux&rdquo;.-]
+# | {+&ldquo;GNU/Linux.&rdquo;+} If you mean just the kernel, then
+# | &ldquo;Linux&rdquo; is the right name for it, but please say
+# | &ldquo;kernel&rdquo; also to avoid ambiguity about which body of software
+# | you mean.
+#, fuzzy
+#| 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 "
+#| "sense we use: they mean the whole collection of programs.  If that's what "
+#| "you are referring to, please call it &ldquo;GNU/Linux&rdquo;.  If you "
+#| "mean just the kernel, then &ldquo;Linux&rdquo; is the right name for it, "
+#| "but please say &ldquo;kernel&rdquo; also to avoid ambiguity about which "
+#| "body of software you mean."
 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 "
 "sense we use: they mean the whole collection of programs.  If that's what "
-"you are referring to, please call it &ldquo;GNU/Linux&rdquo;.  If you mean "
+"you are referring to, please call it &ldquo;GNU/Linux.&rdquo; If you mean "
 "just the kernel, then &ldquo;Linux&rdquo; is the right name for it, but "
 "please say &ldquo;kernel&rdquo; also to avoid ambiguity about which body of "
 "software you mean."
@@ -1294,10 +1504,20 @@
 "software discusso."
 
 #. type: Content of: <div><dl><dd><p>
+# | If you prefer to use some other term such as &ldquo;system
+# | distribution&rdquo; for the entire collection of programs, instead of
+# | &ldquo;operating [-system&rdquo;,-] {+system,&rdquo;+} that's fine.  Then
+# | you would talk about GNU/Linux system distributions.
+#, fuzzy
+#| msgid ""
+#| "If you prefer to use some other term such as &ldquo;system "
+#| "distribution&rdquo; for the entire collection of programs, instead of "
+#| "&ldquo;operating system&rdquo;, that's fine.  Then you would talk about "
+#| "GNU/Linux system distributions."
 msgid ""
 "If you prefer to use some other term such as &ldquo;system "
 "distribution&rdquo; for the entire collection of programs, instead of &ldquo;"
-"operating system&rdquo;, that's fine.  Then you would talk about GNU/Linux "
+"operating system,&rdquo; that's fine.  Then you would talk about GNU/Linux "
 "system distributions."
 msgstr ""
 "Se preferite usare un altro termine come &ldquo;distribuzione di "
@@ -1408,9 +1628,9 @@
 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, "
-"window systems, libraries, and much more &mdash; hundreds of programs, even "
-"to match what BSD systems included in 1983.  Since Torvalds didn't develop "
-"any of those, how can the system be &ldquo;Linux&rdquo;?"
+"window systems, libraries, and much more&mdash;hundreds of programs, even to "
+"match what BSD systems included in 1983.  Since Torvalds didn't develop any "
+"of those, how can the system be &ldquo;Linux&rdquo;?"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><p>
@@ -1437,9 +1657,18 @@
 "\">(<a href=\"#notinstallable\">#notinstallable</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | Many <a href=\"/distros/distros.html\"> packaged and installable versions
+# | of GNU</a> are available.  None of them is called simply
+# | [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} but GNU is what they
+# | basically are.
+#, fuzzy
+#| 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."
 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</a> are available.  None of them is called simply &ldquo;GNU,&rdquo; but "
 "GNU is what they basically are."
 msgstr ""
 "Sono disponibili molte <a href=\"/distros/distros.html\">versioni "
@@ -1492,9 +1721,17 @@
 "gran parte del sistema GNU."
 
 #. type: Content of: <div><dl><dd><p>
+# | We never took the last step of packaging GNU under the name
+# | [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} but that doesn't alter what
+# | kind of thing GNU is.  GNU is an operating system.
+#, fuzzy
+#| 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."
 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 "
+"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 ""
 "Non abbiamo mai fatto il grande passo di rilasciare GNU sotto il nome di "
@@ -1512,13 +1749,28 @@
 "reference-id\">(<a href=\"#afterkernel\">#afterkernel</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | That practice seems to be very rare&mdash;we can't find any examples other
+# | than the misuse of the name [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+} Normally an operating system is developed as a
+# | single unified project, and the developers choose a name for the system as
+# | a whole.  The kernel usually does not have a name of its
+# | own&mdash;instead, people say &ldquo;the kernel of such-and-such&rdquo; or
+# | &ldquo;the such-and-such [-kernel&rdquo;.-] {+kernel.&rdquo;+}
+#, fuzzy
+#| 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 system is developed as a single unified project, and the "
+#| "developers choose a name for the system as a whole.  The kernel usually "
+#| "does not have a name of its own&mdash;instead, people say &ldquo;the "
+#| "kernel of such-and-such&rdquo; or &ldquo;the such-and-such kernel&rdquo;."
 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 "
+"than the misuse of the name &ldquo;Linux.&rdquo; Normally an operating "
 "system is developed as a single unified project, and the developers choose a "
 "name for the system as a whole.  The kernel usually does not have a name of "
 "its own&mdash;instead, people say &ldquo;the kernel of such-and-such&rdquo; "
-"or &ldquo;the such-and-such kernel&rdquo;."
+"or &ldquo;the such-and-such kernel.&rdquo;"
 msgstr ""
 "Questa pratica sembra molto rara - non siamo riusciti a trovare altri esempi "
 "al di fuori dell'erroneo utilizzo del nome &ldquo;Linux&rdquo;. Normalmente "
@@ -1575,9 +1827,18 @@
 "\"#long\">#long</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | For a while we tried the name [-&ldquo;LiGNUx&rdquo;,-]
+# | {+&ldquo;LiGNUx,&rdquo;+} which combines the words &ldquo;GNU&rdquo; and
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} The reaction was very
+# | bad.  People accept &ldquo;GNU/Linux&rdquo; much better.
+#, fuzzy
+#| 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."
 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.  "
+"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 ""
 "Per un po' abbiamo provato ad usare il nome &ldquo;LiGNUx&rdquo;, neologismo "
@@ -1586,8 +1847,16 @@
 "trova &ldquo;GNU/Linux&rdquo; più tollerabile."
 
 #. type: Content of: <div><dl><dd><p>
+# | The shortest legitimate name for this system is [-&ldquo;GNU&rdquo;,-]
+# | {+&ldquo;GNU,&rdquo;+} but we call it &ldquo;GNU/Linux&rdquo; <a
+# | href=\"#justgnu\"> for the reasons given below</a>.
+#, fuzzy
+#| 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>."
 msgid ""
-"The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but we "
+"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 ""
@@ -1636,8 +1905,16 @@
 "href=\"#long2\">#long2</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | It only takes a second to say or type [-&ldquo;GNU/&rdquo;.-]
+# | {+&ldquo;GNU/.&rdquo;+} If you appreciate the system that we developed,
+# | can't you take one second to recognize our work?
+#, fuzzy
+#| 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?"
 msgid ""
-"It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you appreciate "
+"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 ""
@@ -1749,10 +2026,21 @@
 "meritato per i suoi contributi al sistema."
 
 #. type: Content of: <div><dl><dd><ul><li>
+# | Since many people know of the system as [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} if we say &ldquo;GNU&rdquo; they may simply not
+# | recognize we're talking about the same system.  If we say
+# | [-&ldquo;GNU/Linux&rdquo;,-] {+&ldquo;GNU/Linux,&rdquo;+} they can make a
+# | connection to what they have heard about.
+#, fuzzy
+#| 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 system.  If we say &ldquo;GNU/Linux&rdquo;, they can make a "
+#| "connection to what they have heard about."
 msgid ""
-"Since many people know of the system as &ldquo;Linux&rdquo;, if we say "
+"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 "
-"system.  If we say &ldquo;GNU/Linux&rdquo;, they can make a connection to "
+"system.  If we say &ldquo;GNU/Linux,&rdquo; they can make a connection to "
 "what they have heard about."
 msgstr ""
 "Visto che la maggior parte della gente conosce il sistema come &ldquo;"
@@ -1761,10 +2049,23 @@
 "Linux&rdquo;, essa può fare un collegamento a quello che già conosce."
 
 #. type: Content of: <div><dl><dt>
+# | 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;.-]
+# | {+&ldquo;GNU/Linux.&rdquo;+} Is it wrong if I use &ldquo;GNU&rdquo;
+# | without [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} to save the fee?
+# | <span class=\"anchor-reference-id\">(<a
+# | href=\"#trademarkfee\">#trademarkfee</a>)</span>
+#, fuzzy
+#| 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 wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to save "
+#| "the fee? <span class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
+#| "\">#trademarkfee</a>)</span>"
 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 "
-"wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to save the "
+"product, and that would also apply if I say &ldquo;GNU/Linux.&rdquo; Is it "
+"wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux,&rdquo; to save the "
 "fee? <span class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
 "\">#trademarkfee</a>)</span>"
 msgstr ""
@@ -1785,9 +2086,17 @@
 "credito ma non siete costretti a pagare per questo privilegio."
 
 #. type: Content of: <div><dl><dd><p>
+# | So if you want to refer to the system simply as [-&ldquo;GNU&rdquo;,-]
+# | {+&ldquo;GNU,&rdquo;+} to avoid paying the fee for calling it
+# | [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} we won't criticize you.
+#, fuzzy
+#| 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."
 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."
+"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 ""
 "Se voleste fare riferimento al sistema semplicemente come &ldquo;GNU&rdquo; "
 "per evitare di pagare l'imposta presente sul marchio &ldquo;Linux&rdquo;, "
@@ -1848,12 +2157,25 @@
 "noi ad opporci."
 
 #. type: Content of: <div><dl><dd><p>
+# | Different threshold levels would lead to different choices of name for the
+# | system.  But one name that cannot result from concerns of fairness and
+# | giving credit, not for any possible threshold level, is
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} It can't be fair to give
+# | all the credit to one secondary contribution (Linux) while omitting the
+# | principal contribution (GNU).
+#, fuzzy
+#| 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 giving credit, not for any possible threshold level, is &ldquo;"
+#| "Linux&rdquo;.  It can't be fair to give all the credit to one secondary "
+#| "contribution (Linux) while omitting the principal contribution (GNU)."
 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 "
-"giving credit, not for any possible threshold level, is &ldquo;"
-"Linux&rdquo;.  It can't be fair to give all the credit to one secondary "
-"contribution (Linux) while omitting the principal contribution (GNU)."
+"giving credit, not for any possible threshold level, is &ldquo;Linux.&rdquo; "
+"It can't be fair to give all the credit to one secondary contribution "
+"(Linux) while omitting the principal contribution (GNU)."
 msgstr ""
 "Limiti diversi porterebbero a nomi diversi per il sistema. Un nome che non è 
"
 "però mai giusto sotto alcun limite e prospettiva è &ldquo;Linux&rdquo;. Non 
"
@@ -1888,7 +2210,7 @@
 "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."
+"system &ldquo;GNU/systemd/Linux,&rdquo; there is nothing wrong with doing so."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
@@ -1934,11 +2256,21 @@
 "class=\"anchor-reference-id\">(<a href=\"#allsmall\">#allsmall</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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 the same argument would apply even more strongly to calling it
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+}
+#, fuzzy
+#| 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 the same argument would apply even more strongly to calling it &ldquo;"
+#| "Linux&rdquo;."
 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 "
-"the same argument would apply even more strongly to calling it &ldquo;"
-"Linux&rdquo;."
+"the same argument would apply even more strongly to calling it &ldquo;Linux."
+"&rdquo;"
 msgstr ""
 "Nel 2008, abbiamo verificato che i pacchetti GNU costituivano il 15% "
 "dell'archivio &ldquo;main&rdquo; della distrubuzione gNewSense GNU/Linux. "
@@ -2004,9 +2336,21 @@
 "span>"
 
 #. type: Content of: <div><dl><dd>
+# | Following the rules of English, in the construction &ldquo;GNU
+# | Linux&rdquo; the word &ldquo;GNU&rdquo; modifies [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+} This can mean either &ldquo;GNU's version of
+# | Linux&rdquo; or &ldquo;Linux, which is a GNU package.&rdquo; Neither of
+# | those meanings fits the situation at hand.
+#, fuzzy
+#| 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 either &ldquo;GNU's version of Linux&rdquo; or &ldquo;"
+#| "Linux, which is a GNU package.&rdquo; Neither of those meanings fits the "
+#| "situation at hand."
 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 "
+"the word &ldquo;GNU&rdquo; modifies &ldquo;Linux.&rdquo; This can mean "
 "either &ldquo;GNU's version of Linux&rdquo; or &ldquo;Linux, which is a GNU "
 "package.&rdquo; Neither of those meanings fits the situation at hand."
 msgstr ""
@@ -2033,9 +2377,10 @@
 # | [-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.
+# | non[---]free firmware [-&ldquo;blobs&rdquo;.-] {+&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 "
@@ -2049,7 +2394,7 @@
 "We're not talking about a distinct GNU version of Linux, the kernel.  The "
 "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 "
+"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."
@@ -2063,11 +2408,24 @@
 "ulteriori confusioni."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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 &ldquo;combination.&rdquo; (Think of
+# | [-&ldquo;Input/Output&rdquo;.)-] {+&ldquo;Input/Output.&rdquo;)+}  This
+# | system is the combination of GNU and Linux; hence,
+# | [-&ldquo;GNU/Linux&rdquo;.-] {+&ldquo;GNU/Linux.&rdquo;+}
+#, fuzzy
+#| 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 &ldquo;combination.&rdquo; (Think of &ldquo;Input/Output&rdquo;.)  "
+#| "This system is the combination of GNU and Linux; hence, &ldquo;GNU/"
+#| "Linux&rdquo;."
 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 "
-"&ldquo;combination.&rdquo; (Think of &ldquo;Input/Output&rdquo;.)  This "
-"system is the combination of GNU and Linux; hence, &ldquo;GNU/Linux&rdquo;."
+"&ldquo;combination.&rdquo; (Think of &ldquo;Input/Output.&rdquo;)  This "
+"system is the combination of GNU and Linux; hence, &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "Stiamo parlando di una versione di GNU, il sistema operativo, che si "
 "distingue per l'aver adottato Linux come kernel. Una barra si addice alla "
@@ -2076,11 +2434,22 @@
 "quindi, &ldquo;GNU/Linux&rdquo;."
 
 #. 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: "
-"&ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes say &ldquo;GNU con "
-"Linux&rdquo;."
+# | There are other ways to express [-&ldquo;combination&rdquo;.-]
+# | {+&ldquo;combination.&rdquo;+} If you think that a plus-sign is clearer,
+# | please use that.  In French, a hyphen is clear:
+# | [-&ldquo;GNU-Linux&rdquo;.-] {+&ldquo;GNU-Linux.&rdquo;+} In Spanish, we
+# | sometimes say &ldquo;GNU con [-Linux&rdquo;.-] {+Linux.&rdquo;+}
+#, fuzzy
+#| 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: &ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes say &ldquo;GNU "
+#| "con Linux&rdquo;."
+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: "
+"&ldquo;GNU-Linux.&rdquo; In Spanish, we sometimes say &ldquo;GNU con Linux."
+"&rdquo;"
 msgstr ""
 "Ci sono altri modi per esprimere una &ldquo;combinazione&rdquo;. Se credete "
 "che un simbolo di somma sia più chiaro, prego usare quello. In francese, un "
@@ -2134,7 +2503,7 @@
 # | 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
-# | Linux&rdquo; or &ldquo;Linux,-] {+&ldquo;Emacs&rdquo;.  That is the right
+# | Linux&rdquo; or &ldquo;Linux,-] {+&ldquo;Emacs.&rdquo; That is the right
 # | way to describe a program called Emacs+} which is a GNU [-package.&rdquo;
 # | Neither of those meanings fits the situation at hand.-] {+package.+}
 #, fuzzy
@@ -2146,7 +2515,7 @@
 #| "situation at hand."
 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 "
+"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 ""
 "Secondo le regole dell'inglese, nel costrutto &ldquo;GNU Linux&rdquo; la "
@@ -2190,8 +2559,17 @@
 "dal punto di vista dell'architettura del sistema."
 
 #. type: Content of: <div><dl><dd><p>
+# | However, if you prefer to call the system [-&ldquo;Linux/GNU&rdquo;,-]
+# | {+&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.
+#, fuzzy
+#| 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."
 msgid ""
-"However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a "
+"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 ""
@@ -2200,8 +2578,19 @@
 "del tutto e dare a Linux credito per l'intero sistema."
 
 #. type: Content of: <div><dl><dt>
+# | My distro's developers call it &ldquo;Foobar [-Linux&rdquo;,-]
+# | {+Linux,&rdquo;+} but that doesn't say anything about what the system
+# | consists of.  Why shouldn't they call it whatever they like? <span
+# | class=\"anchor-reference-id\">(<a
+# | href=\"#distronames0\">#distronames0</a>)</span>
+#, fuzzy
+#| 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 whatever they like? <span class=\"anchor-reference-id\">(<a "
+#| "href=\"#distronames0\">#distronames0</a>)</span>"
 msgid ""
-"My distro's developers call it &ldquo;Foobar Linux&rdquo;, but that doesn't "
+"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 "
 "whatever they like? <span class=\"anchor-reference-id\">(<a href="
 "\"#distronames0\">#distronames0</a>)</span>"
@@ -2267,11 +2656,22 @@
 "\"#distronames1\">#distronames1</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | When they spread misinformation by changing &ldquo;GNU&rdquo; to
+# | [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} and call their version
+# | of it &ldquo;Foobar [-Linux&rdquo;,-] {+Linux,&rdquo;+} it's proper for
+# | you to correct the misinformation by calling it &ldquo;Foobar
+# | [-GNU/Linux&rdquo;.-] {+GNU/Linux.&rdquo;+}
+#, fuzzy
+#| 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 proper for you to correct the misinformation by calling it &ldquo;"
+#| "Foobar GNU/Linux&rdquo;."
 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 "
+"Linux,&rdquo; and call their version of it &ldquo;Foobar Linux,&rdquo; it's "
 "proper for you to correct the misinformation by calling it &ldquo;Foobar GNU/"
-"Linux&rdquo;."
+"Linux.&rdquo;"
 msgstr ""
 "Quando fanno cattiva informazione modificando il nome &ldquo;GNU&rdquo; in "
 "&ldquo;Linux&rdquo;, e chiamano la loro versione &ldquo;Qualcosa "
@@ -2311,12 +2711,24 @@
 "quale forma fosse corretta."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | 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;.-] {+&ldquo;GNU/Linux.&rdquo;+}
+#, fuzzy
+#| 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 "
+#| "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;."
 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 "
 "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;."
+"&ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "Non possiamo forzarli a fare ciò che è giusto, ma non siamo tra quei tipi "
 "che si arrendono solo perché la strada non è in discesa. Non avrete molta "
@@ -2340,12 +2752,12 @@
 # | 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.
+# | [-&ldquo;Linux&rdquo;.-] {+&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 "
@@ -2360,13 +2772,12 @@
 msgid ""
 "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 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 nonfree "
-"applications and drivers), or making the system more popular even at the "
-"cost of freedom."
+"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 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 nonfree applications "
+"and drivers), or making the system more popular even at the cost of freedom."
 msgstr ""
 "La pratica diffusa di aggiungere software non libero al sistema GNU/Linux è "
 "un problema enorme per la nostra comunità. Insegna ai nostri utenti che il "
@@ -2403,7 +2814,8 @@
 # | 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;.
+# | they are proper and appropriate &ldquo;versions of [-Linux&rdquo;.-]
+# | {+Linux.&rdquo;+}
 #, fuzzy
 #| msgid ""
 #| "The way to lead these users to see a connection with freedom is exactly "
@@ -2420,7 +2832,7 @@
 "specifically for the sake of the users' freedom.  With this understanding, "
 "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;."
+"proper and appropriate &ldquo;versions of Linux.&rdquo;"
 msgstr ""
 "Il modo per mostrare a questi utenti il legame con la libertà è quello "
 "contrario: informarli che quelle versioni del sistema <em>sono</em> versioni "
@@ -2522,11 +2934,22 @@
 "parlare con il senno di poi)."
 
 #. type: Content of: <div><dl><dd><p>
+# | If we were to take an existing version of GNU/Linux and relabel it as
+# | [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} that would be somewhat like
+# | making a version of the GNU system and labeling it
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} That wasn't right, and
+# | we don't want to act like that.
+#, fuzzy
+#| 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 and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and "
+#| "we don't want to act like that."
 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 "
-"and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and we don't want "
-"to act like that."
+"GNU,&rdquo; that would be somewhat like making a version of the GNU system "
+"and labeling it &ldquo;Linux.&rdquo; That wasn't right, and we don't want to "
+"act like that."
 msgstr ""
 "Se prendessimo una versione esistente di GNU/Linux e la etichettassimo come "
 "&ldquo;GNU&rdquo;, sarebbe un po' come creare una versione del sistema GNU e "
@@ -2563,11 +2986,29 @@
 "dell'installazione."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | with the GNU Project because he was a &ldquo;Linux [-user&rdquo;.-]
+# | {+user.&rdquo;+} That came as a shock, because the people who ported GNU
+# | packages to other systems had generally wanted to work with us to get
+# | their changes installed.  Yet these people, developing a system that was
+# | primarily based on GNU, were the first (and still practically the only)
+# | group that was unwilling to work with us.
+#, fuzzy
+#| 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 "
+#| "with the GNU Project because he was a &ldquo;Linux user&rdquo;.  That "
+#| "came as a shock, because the people who ported GNU packages to other "
+#| "systems had generally wanted to work with us to get their changes "
+#| "installed.  Yet these people, developing a system that was primarily "
+#| "based on GNU, were the first (and still practically the only) group that "
+#| "was unwilling to work with us."
 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 "
-"with the GNU Project because he was a &ldquo;Linux user&rdquo;.  That came "
-"as a shock, because the people who ported GNU packages to other systems had "
+"with the GNU Project because he was a &ldquo;Linux user.&rdquo; That came as "
+"a shock, because the people who ported GNU packages to other systems had "
 "generally wanted to work with us to get their changes installed.  Yet these "
 "people, developing a system that was primarily based on GNU, were the first "
 "(and still practically the only) group that was unwilling to work with us."
@@ -2582,9 +3023,22 @@
 "con noi."
 
 #. type: Content of: <div><dl><dd><p>
+# | It was this experience that first showed us that people were calling a
+# | version of the GNU system [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} and that this confusion was obstructing our work.
+# |  Asking you to call the system &ldquo;GNU/Linux&rdquo; is our response to
+# | that problem, and to the other problems caused by the &ldquo;Linux&rdquo;
+# | misnomer.
+#, fuzzy
+#| 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 obstructing our work.  Asking you to call the system &ldquo;GNU/"
+#| "Linux&rdquo; is our response to that problem, and to the other problems "
+#| "caused by the &ldquo;Linux&rdquo; misnomer."
 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 "
+"version of the GNU system &ldquo;Linux,&rdquo; and that this confusion was "
 "obstructing our work.  Asking you to call the system &ldquo;GNU/Linux&rdquo; "
 "is our response to that problem, and to the other problems caused by the "
 "&ldquo;Linux&rdquo; misnomer."
@@ -2625,10 +3079,18 @@
 "\"#allgpled\">#allgpled</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | We never refer to individual programs as
+# | [-&ldquo;GNU/<i>name</i>&rdquo;.-] {+&ldquo;GNU/<i>name</i>.&rdquo;+} When
+# | a program is a GNU package, we may call it &ldquo;GNU
+# | [-<i>name</i>&rdquo;.-] {+<i>name</i>.&rdquo;+}
+#, fuzzy
+#| 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;."
 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;."
+"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 ""
 "Non facciamo mai riferimento ai programmi individuali come &ldquo;GNU/"
 "<i>nome</i>&rdquo;. Quando un programma è parte di GNU, potremmo chiamarlo "
@@ -2741,10 +3203,24 @@
 "capo."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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. 
+# | The name [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} which stands for
+# | &ldquo;GNU's Not [-Unix&rdquo;,-] {+Unix,&rdquo;+} is a humorous way of
+# | giving credit to Unix for this, following a hacker tradition of recursive
+# | acronyms that started in the 70s.
+#, fuzzy
+#| 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.  The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not "
+#| "Unix&rdquo;, is a humorous way of giving credit to Unix for this, "
+#| "following a hacker tradition of recursive acronyms that started in the "
+#| "70s."
 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.  "
-"The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not Unix&rdquo;, "
+"The name &ldquo;GNU,&rdquo; which stands for &ldquo;GNU's Not Unix,&rdquo; "
 "is a humorous way of giving credit to Unix for this, following a hacker "
 "tradition of recursive acronyms that started in the 70s."
 msgstr ""
@@ -2756,11 +3232,12 @@
 "tradizione degli acronimi ricorsivi iniziata negli anni 70."
 
 #. 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
+# | The first such recursive acronym was TINT, &ldquo;TINT Is Not
+# | [-TECO&rdquo;.-] {+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;,-] {+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
@@ -2773,10 +3250,10 @@
 #| "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 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 "
+"like &ldquo;<em>somethingorother</em> TECO,&rdquo; he thought of a clever "
 "amusing name.  (That's what hacking means: <a href=\"https://stallman.org/";
 "articles/on-hacking.html\">playful cleverness</a>.)"
 msgstr ""
@@ -2789,13 +3266,28 @@
 "scherzosa</a>."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | was similar to some existing program (let's imagine its name was
+# | &ldquo;Klever&rdquo;), you could give it a recursive acronym name, such as
+# | &ldquo;MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same
+# | spirit we called our replacement for Unix &ldquo;GNU's Not
+# | [-Unix&rdquo;.-] {+Unix.&rdquo;+}
+#, fuzzy
+#| 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 was similar to some existing program (let's imagine its name was "
+#| "&ldquo;Klever&rdquo;), you could give it a recursive acronym name, such "
+#| "as &ldquo;MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same "
+#| "spirit we called our replacement for Unix &ldquo;GNU's Not Unix&rdquo;."
 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 "
 "was similar to some existing program (let's imagine its name was &ldquo;"
 "Klever&rdquo;), you could give it a recursive acronym name, such as &ldquo;"
 "MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same spirit we "
-"called our replacement for Unix &ldquo;GNU's Not Unix&rdquo;."
+"called our replacement for Unix &ldquo;GNU's Not Unix.&rdquo;"
 msgstr ""
 "Agli altri hacker questo approccio piacque a tal punto da imitarlo e divenne "
 "quindi una tradizione dare ai cloni di programmi pre-esistenti (per esempio "
@@ -2804,13 +3296,28 @@
 "il nostro sostituto per Unix &ldquo;GNU's Not Unix&rdquo;."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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 in a system 99% copied from Unix.  AT&amp;T actually threatened to
+# | sue anyone giving AT&amp;T credit in that way.  This is why each of the
+# | various modified versions of Unix (all proprietary, like Unix) had a
+# | completely different name that didn't include [-&ldquo;Unix&rdquo;.-]
+# | {+&ldquo;Unix.&rdquo;+}
+#, fuzzy
+#| 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 in a system 99% copied from Unix.  AT&amp;T actually threatened "
+#| "to sue anyone giving AT&amp;T credit in that way.  This is why each of "
+#| "the various modified versions of Unix (all proprietary, like Unix) had a "
+#| "completely different name that didn't include &ldquo;Unix&rdquo;."
 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 "
 "in a system 99% copied from Unix.  AT&amp;T actually threatened to sue "
 "anyone giving AT&amp;T credit in that way.  This is why each of the various "
 "modified versions of Unix (all proprietary, like Unix) had a completely "
-"different name that didn't include &ldquo;Unix&rdquo;."
+"different name that didn't include &ldquo;Unix.&rdquo;"
 msgstr ""
 "Storicamente, AT&amp;T, gli autori di Unix, non volevano essere citati in "
 "alcuna maniera nei nomi di progetti simili, nemmeno quando questi copiavano "
@@ -2893,9 +3400,22 @@
 "&ldquo;GNU/Linux&rdquo; è per esso appropriato."
 
 #. type: Content of: <div><dl><dd><p>
+# | There is a version of GNU which uses the kernel from NetBSD.  Its
+# | developers call it &ldquo;Debian [-GNU/NetBSD&rdquo;,-]
+# | {+GNU/NetBSD,&rdquo;+} but &ldquo;GNU/kernelofNetBSD&rdquo; would be more
+# | accurate, since NetBSD is an entire system, not just the kernel.  This is
+# | not a BSD system, since most of the system is the same as the GNU/Linux
+# | system.
+#, fuzzy
+#| 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/"
+#| "kernelofNetBSD&rdquo; would be more accurate, since NetBSD is an entire "
+#| "system, not just the kernel.  This is not a BSD system, since most of the "
+#| "system is the same as the GNU/Linux system."
 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/"
+"call it &ldquo;Debian GNU/NetBSD,&rdquo; but &ldquo;GNU/"
 "kernelofNetBSD&rdquo; would be more accurate, since NetBSD is an entire "
 "system, not just the kernel.  This is not a BSD system, since most of the "
 "system is the same as the GNU/Linux system."
@@ -2917,8 +3437,21 @@
 "\"#othersys\">#othersys</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | Not in the same sense that we mean by [-&ldquo;GNU/Linux&rdquo;.-]
+# | {+&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.
+#, fuzzy
+#| 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 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."
 msgid ""
-"Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of "
+"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 "
@@ -3028,8 +3561,19 @@
 "Linux."
 
 #. type: Content of: <div><dl><dd><p>
+# | If you call the whole GNU/Linux system [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} you will find it necessary to say things like,
+# | &ldquo;Android contains Linux, but it isn't Linux, because it doesn't have
+# | the usual Linux [sic] libraries and utilities [meaning the GNU
+# | system].&rdquo;
+#, fuzzy
+#| 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 Linux, because it doesn't have the usual Linux [sic] libraries and "
+#| "utilities [meaning the GNU system].&rdquo;"
 msgid ""
-"If you call the whole GNU/Linux system &ldquo;Linux&rdquo;, you will find it "
+"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 "
 "Linux, because it doesn't have the usual Linux [sic] libraries and utilities "
 "[meaning the GNU system].&rdquo;"
@@ -3072,9 +3616,19 @@
 "si vuole parlare."
 
 #. type: Content of: <div><dl><dd><p>
+# | The public will find it very strange to speak of using Android as
+# | &ldquo;using [-Linux&rdquo;.-] {+Linux.&rdquo;+} It's like having a
+# | conversation, then saying you were conversing with the person's intestines
+# | or the person's circulatory system.
+#, fuzzy
+#| 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."
 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 "
+"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 ""
 "Il pubblico troverà molto strano che si parli dell'uso di Android dicendo "
@@ -3082,23 +3636,52 @@
 "l'intestino o con il sistema venoso dell'interlocutore."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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;.-] {+&ldquo;Linux.&rdquo;+}
+#, fuzzy
+#| 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;."
 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;."
+"of the whole system as &ldquo;Linux.&rdquo;"
 msgstr ""
 "Il pubblico invece <em>capirà</em> l'idea di \"usare Linux\" quando di parla 
"
 "dell'uso di GNU/Linux, a causa del comune abuso di linguaggio in cui si "
 "chiama \"Linux\" l'intero sistema."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | contain Linux is irrelevant to using them, just as the fact that a car and
+# | a bicycle both have a structure of metal is irrelevant to using those two.
+# |  If you wish to talk about using cars and bikes, you wouldn't speak of
+# | &ldquo;riding metal [-objects&rdquo; &mdash; not-]
+# | {+objects&rdquo;&mdash;not+} unless you're playing games with the reader. 
+# | You would say, &ldquo;using cars and bikes.&rdquo; Likewise, the clear way
+# | to talk about using GNU/Linux and Android is to say &ldquo;using GNU/Linux
+# | and Android.&rdquo;
+#, fuzzy
+#| 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 "
+#| "contain Linux is irrelevant to using them, just as the fact that a car "
+#| "and a bicycle both have a structure of metal is irrelevant to using those "
+#| "two.  If you wish to talk about using cars and bikes, you wouldn't speak "
+#| "of &ldquo;riding metal objects&rdquo; &mdash; not unless you're playing "
+#| "games with the reader.  You would say, &ldquo;using cars and bikes."
+#| "&rdquo; Likewise, the clear way to talk about using GNU/Linux and Android "
+#| "is to say &ldquo;using GNU/Linux and Android.&rdquo;"
 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 "
 "contain Linux is irrelevant to using them, just as the fact that a car and a "
 "bicycle both have a structure of metal is irrelevant to using those two.  If "
 "you wish to talk about using cars and bikes, you wouldn't speak of &ldquo;"
-"riding metal objects&rdquo; &mdash; not unless you're playing games with the "
+"riding metal objects&rdquo;&mdash;not unless you're playing games with the "
 "reader.  You would say, &ldquo;using cars and bikes.&rdquo; Likewise, the "
 "clear way to talk about using GNU/Linux and Android is to say &ldquo;using "
 "GNU/Linux and Android.&rdquo;"
@@ -3209,11 +3792,22 @@
 "</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | 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;.-] {+&ldquo;GNU.&rdquo;+} When we talk
+# | about the whole system, the name &ldquo;GNU/Linux&rdquo; gives him a share
+# | of the credit.
+#, fuzzy
+#| 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 "
+#| "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."
 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 "
-"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."
+"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."
 msgstr ""
 "Sarebbe sbagliato ed infatti non lo facciamo. Il lavoro di Torvalds è Linux, 
"
 "il kernel; facciamo attenzione a non attribuire quel lavoro al Progetto GNU "
@@ -3230,12 +3824,39 @@
 "span>"
 
 #. 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\">
+# | He recognized this at the beginning.  The {+<a
+# | 
href=\"https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\";>+}
+# | 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>.
+# |  for more info&rdquo;</a>.-] {+notes</a> said:+}
+#, 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 <a href=\"https://ftp.funet.fi/pub/";
+"linux/historical/kernel/old-versions/RELNOTES-0.01\"> earliest Linux release "
+"notes</a> said:"
+msgstr ""
+"Lo ha riconosciuto fin dall'inizio. Citando le prime note di rilascio di "
+"Linux, <a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-";
+"versions/RELNOTES-0.01\"> &ldquo;La maggior parte delle utilità usate con "
+"Linux sono software GNU rilasciato sotto il copyleft di GNU. Queste utilità "
+"non fanno parte della distribuzione - contattate me (o GNU) per ulteriori "
+"informazioni&rdquo;</a>."
+
+#. type: Content of: <div><dl><dd><blockquote><p>
+# | [-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-]{+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>.-] {+info.+}
 #, fuzzy
 #| msgid ""
 #| "He recognized this at the beginning.  The earliest Linux release notes "
@@ -3244,11 +3865,9 @@
 #| "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=\"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>."
+"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."
 msgstr ""
 "Lo ha riconosciuto fin dall'inizio. Citando le prime note di rilascio di "
 "Linux, <a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-";
@@ -3314,11 +3933,26 @@
 "reference-id\">(<a href=\"#lost\">#lost</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | 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;,-]
+# | {+&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.
+#, fuzzy
+#| 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;: 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."
 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;: "
 "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 "
+"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."
 msgstr ""
@@ -3340,13 +3974,32 @@
 "\">(<a href=\"#whatgood\">#whatgood</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | 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;,-] {+&ldquo;GNU/Linux,&rdquo;+} you will help
+# | others learn the system's true history, origin, and reason for being.  You
+# | can't correct the misnomer 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;,-] {+&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.
+#, fuzzy
+#| 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;GNU/Linux&rdquo;, you will help others learn the system's true "
+#| "history, origin, and reason for being.  You can't correct the misnomer "
+#| "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."
 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;"
-"GNU/Linux&rdquo;, you will help others learn the system's true history, "
+"GNU/Linux,&rdquo; you will help others learn the system's true history, "
 "origin, and reason for being.  You can't correct the misnomer 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 "
+"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."
 msgstr ""
@@ -3370,22 +4023,48 @@
 "\"anchor-reference-id\">(<a href=\"#explain\">#explain</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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;,-]
+# | {+&ldquo;GNU/Linux,&rdquo;+} and uses your time inefficiently.
+#, fuzzy
+#| 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."
 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."
+"the system &ldquo;GNU/Linux,&rdquo; and uses your time inefficiently."
 msgstr ""
 "Se ci aiutaste a presentare il sistema in quel modo, apprezzeremmo i vostri "
 "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><dl><dd><p>
+# | 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, and they may learn a correct picture of the system's origin. 
+# | But they are unlikely to repeat the explanation to others whenever they
+# | talk about the system.  They will probably just call it
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} Without particularly
+# | intending to, they will help spread the incorrect picture.
+#, fuzzy
+#| 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, and they may learn a correct picture of the system's origin.  "
+#| "But they are unlikely to repeat the explanation to others whenever they "
+#| "talk about the system.  They will probably just call it &ldquo;"
+#| "Linux&rdquo;.  Without particularly intending to, they will help spread "
+#| "the incorrect picture."
 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, "
 "and they may learn a correct picture of the system's origin.  But they are "
 "unlikely to repeat the explanation to others whenever they talk about the "
-"system.  They will probably just call it &ldquo;Linux&rdquo;.  Without "
+"system.  They will probably just call it &ldquo;Linux.&rdquo; Without "
 "particularly intending to, they will help spread the incorrect picture."
 msgstr ""
 "Non è efficace perché potrebbe non essere compreso, e di sicuro non verrà "
@@ -3523,9 +4202,16 @@
 "\">#force</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | It would be wrong to force them, and we don't try.  We call the system
+# | [-&ldquo;GNU/Linux&rdquo;,-] {+&ldquo;GNU/Linux,&rdquo;+} and we ask you
+# | to do it too.
+#, fuzzy
+#| 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."
 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."
+"&ldquo;GNU/Linux,&rdquo; and we ask you to do it too."
 msgstr ""
 "Sarebbe sbagliato forzare chiunque ed infatti non lo facciamo. Noi chiamiamo "
 "il sistema &ldquo;GNU/Linux&rdquo; e non facciamo altro che chiedervi di "
@@ -3633,9 +4319,19 @@
 "specificare quale."
 
 #. type: Content of: <div><dl><dt>
+# | Since you failed to put something in the GNU GPL to require people to call
+# | the system [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} you deserve what
+# | happened; why are you complaining now? <span
+# | class=\"anchor-reference-id\">(<a href=\"#deserve\">#deserve</a>)</span>
+#, fuzzy
+#| 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 "
+#| "complaining now? <span class=\"anchor-reference-id\">(<a href=\"#deserve"
+#| "\">#deserve</a>)</span>"
 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 "
+"the system &ldquo;GNU,&rdquo; you deserve what happened; why are you "
 "complaining now? <span class=\"anchor-reference-id\">(<a href=\"#deserve"
 "\">#deserve</a>)</span>"
 msgstr ""
@@ -3690,8 +4386,17 @@
 "il software proprietario fosse legittimo ed accettabile."
 
 #. type: Content of: <div><dl><dt>
+# | Since many people call it [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} doesn't that make it right? <span
+# | class=\"anchor-reference-id\">(<a
+# | href=\"#somanyright\">#somanyright</a>)</span>
+#, fuzzy
+#| 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>"
 msgid ""
-"Since many people call it &ldquo;Linux&rdquo;, doesn't that make it right? "
+"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 ""
@@ -3714,9 +4419,20 @@
 "\">(<a href=\"#knownname\">#knownname</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | Users are not incapable of learning.  Since &ldquo;GNU/Linux&rdquo;
+# | includes [-&ldquo;Linux&rdquo;,-] {+&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.
+#, fuzzy
+#| 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 add &ldquo;(often erroneously referred to as &lsquo;"
+#| "Linux&rsquo;)&rdquo; once in a while, they will all understand."
 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 "
+"&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."
 msgstr ""

Index: po/gnu-linux-faq.ja.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.ja.po,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -b -r1.100 -r1.101
--- po/gnu-linux-faq.ja.po      1 Oct 2021 06:08:27 -0000       1.100
+++ po/gnu-linux-faq.ja.po      2 Nov 2021 14:41:51 -0000       1.101
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-linux-faq.html\n"
-"POT-Creation-Date: 2021-08-31 10:27+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2021-10-01 14:36+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-11-02 14:27+0000\n"
 
 #. type: Content of: <title>
 msgid "GNU/Linux FAQ - GNU Project - Free Software Foundation"
@@ -29,10 +30,15 @@
 msgid "by Richard Stallman"
 msgstr "リチャード・ストールマン著"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| 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."
 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.  "
+"that many others call just &ldquo;Linux,&rdquo; they ask many questions.  "
 "Here are common questions, and our answers."
 msgstr ""
 "ほかの多くのみんなが&ldquo;Linux&rdquo;と単に呼ぶシステム
にわたしたちがGNU/"
@@ -253,11 +259,17 @@
 "ぶことは間違いではないですよね?</a>"
 
 #. type: Content of: <div><div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#trademarkfee\">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 wrong if I use &ldquo;GNU&rdquo; without "
+#| "&ldquo;Linux&rdquo;, to save the fee?</a>"
 msgid ""
 "<a href=\"#trademarkfee\">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 wrong if I use &ldquo;GNU&rdquo; without "
-"&ldquo;Linux&rdquo;, to save the fee?</a>"
+"&ldquo;GNU/Linux.&rdquo; Is it wrong if I use &ldquo;GNU&rdquo; without "
+"&ldquo;Linux,&rdquo; to save the fee?</a>"
 msgstr ""
 "<a 
href=\"#trademarkfee\">&ldquo;Linux&rdquo;を製品の名前に使うのに使用料を払"
 
"わなければならないかもしれません。&ldquo;GNU/Linux&rdquo;と言うときにもこれは"
@@ -345,10 +357,15 @@
 "GNU&rdquo;ではなくて?</a>"
 
 #. type: Content of: <div><div><ul><li>
-msgid ""
-"<a href=\"#distronames0\">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 whatever they like?</a>"
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#distronames0\">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 whatever they like?</a>"
+msgid ""
+"<a href=\"#distronames0\">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 whatever they like?</a>"
 msgstr ""
 "<a href=\"#distronames0\">わたしのディストロの開発者
はそれを&ldquo;Foobar "
 "Linux&rdquo;と呼びますが、それはシステム
が何で構成されているかについて何も述"
@@ -601,9 +618,14 @@
 "GNU&rdquo;と呼ぶように要求するべきではないですか?</a>"
 
 #. type: Content of: <div><div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#deserve\">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 complaining now?</a>"
 msgid ""
 "<a href=\"#deserve\">Since you failed to put something in the GNU GPL to "
-"require people to call the system &ldquo;GNU&rdquo;, you deserve what "
+"require people to call the system &ldquo;GNU,&rdquo; you deserve what "
 "happened; why are you complaining now?</a>"
 msgstr ""
 "<a href=\"#deserve\">GNU GPLに人々にシステム
を&ldquo;GNU&rdquo;と呼ぶようにと"
@@ -619,8 +641,12 @@
 "よくないでしょうか?</a>"
 
 #. type: Content of: <div><div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#somanyright\">Since many people call it &ldquo;Linux&rdquo;, "
+#| "doesn't that make it right?</a>"
 msgid ""
-"<a href=\"#somanyright\">Since many people call it &ldquo;Linux&rdquo;, "
+"<a href=\"#somanyright\">Since many people call it &ldquo;Linux,&rdquo; "
 "doesn't that make it right?</a>"
 msgstr ""
 "<a 
href=\"#somanyright\">多くの人がそれを&ldquo;Linux&rdquo;と言っています。"
@@ -789,6 +815,16 @@
 "有利なスタートをしていたのです。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 it must be right.  The name &ldquo;Linux&rdquo; also spreads a "
+#| "false picture of the system's origin, because people tend to suppose that "
+#| "the system's history was such as to fit that name.  For instance, they "
+#| "often believe its development was started by Linus Torvalds in 1991.  "
+#| "This false picture tends to reinforce the idea that the system should be "
+#| "called &ldquo;Linux&rdquo;."
 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 "
@@ -796,7 +832,7 @@
 "of the system's origin, because people tend to suppose that the system's "
 "history was such as to fit that name.  For instance, they often believe its "
 "development was started by Linus Torvalds in 1991.  This false picture tends "
-"to reinforce the idea that the system should be called &ldquo;Linux&rdquo;."
+"to reinforce the idea that the system should be called &ldquo;Linux.&rdquo;"
 msgstr ""
 "システムを&ldquo;Linux&rdquo;と呼ぶほとんどの人々
は、それが正しくない理由につ"
 "いてなにも聞いたことがありません。ほかの人々
がその名前を使うのを見て、正しい"
@@ -824,22 +860,35 @@
 "span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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."
 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."
+"you're referring specifically to the kernel, you should call it &ldquo;Linux,"
+"&rdquo; the name its developer chose."
 msgstr ""
 "いつもではありません。全体のシステム
について語るときだけです。カーネルについ"
 "て特に指すときには、その開発者が選んだ
名前で&ldquo;Linux&rdquo;と呼ぶべきで"
 "す。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 kinds of confusion, because only experts can tell whether a "
+#| "statement is about the kernel or the whole system.  By calling the whole "
+#| "system &ldquo;GNU/Linux&rdquo;, and calling the kernel &ldquo;"
+#| "Linux&rdquo;, you avoid the ambiguity."
 msgid ""
-"When people call the whole system &ldquo;Linux&rdquo;, as a consequence they "
+"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 "
 "kinds of confusion, because only experts can tell whether a statement is "
 "about the kernel or the whole system.  By calling the whole system &ldquo;"
-"GNU/Linux&rdquo;, and calling the kernel &ldquo;Linux&rdquo;, you avoid the "
+"GNU/Linux,&rdquo; and calling the kernel &ldquo;Linux,&rdquo; you avoid the "
 "ambiguity."
 msgstr ""
 "人々が全体のシステム
を&ldquo;Linux&rdquo;と呼ぶとき、結果として、カーネルと同"
@@ -909,8 +958,13 @@
 "a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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."
 msgid ""
-"When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing "
+"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 ""
@@ -965,10 +1019,23 @@
 "トウェアの的を外すのか</a>をご覧ください。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 freedom are more likely to call the system &ldquo;GNU/"
+#| "Linux&rdquo;, and people who learn that the system is &ldquo;GNU/"
+#| "Linux&rdquo; are more likely to pay attention to our philosophical "
+#| "arguments for freedom and community (which is why the choice of name for "
+#| "the system makes a real difference for society).  However, the "
+#| "disagreement would probably exist even if everyone knew the system's real "
+#| "origin and its proper name, because the issue is a real one.  It can only "
+#| "go away if we who value freedom either persuade everyone (which won't be "
+#| "easy) or are defeated entirely (let's hope not)."
 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 "
-"freedom are more likely to call the system &ldquo;GNU/Linux&rdquo;, and "
+"freedom are more likely to call the system &ldquo;GNU/Linux,&rdquo; and "
 "people who learn that the system is &ldquo;GNU/Linux&rdquo; are more likely "
 "to pay attention to our philosophical arguments for freedom and community "
 "(which is why the choice of name for the system makes a real difference for "
@@ -1023,10 +1090,17 @@
 "id\">(<a href=\"#everyoneknows\">#everyoneknows</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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 system do not mention the name &ldquo;GNU&rdquo;, or the ideals that "
+#| "GNU stands for.  <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU "
+#| "Users Who Have Never Heard of GNU</a> explains further."
 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 "
-"system do not mention the name &ldquo;GNU&rdquo;, or the ideals that GNU "
+"system do not mention the name &ldquo;GNU,&rdquo; or the ideals that GNU "
 "stands for.  <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users "
 "Who Have Never Heard of GNU</a> explains further."
 msgstr ""
@@ -1037,11 +1111,17 @@
 "がないGNUユーザ</a>で詳しく説明されています。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 GNU is.  For instance, many think it is a collection of <a "
+#| "href=\"#tools\">&ldquo;tools&rdquo;</a>, or a project to develop tools."
 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 "
-"GNU is.  For instance, many think it is a collection of <a href=\"#tools"
-"\">&ldquo;tools&rdquo;</a>, or a project to develop tools."
+"GNU is.  For instance, many think it is a collection of &ldquo;<a href="
+"\"#tools\">tools</a>,&rdquo; or a project to develop tools."
 msgstr ""
 "これを言うのはおそらく、知りあいのギークのことを念é 
­ã«ç½®ãã‚®ãƒ¼ã‚¯ã§ã—ょう。"
 
"ギークはGNUについてしばしば知ってますが、多くはGNUがなにであるかについて完å
…¨"
@@ -1074,11 +1154,18 @@
 "\"#everyoneknows2\">#everyoneknows2</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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;"
+#| "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?"
 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;"
-"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?"
+"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?"
 msgstr ""
 "もし、あなたの言葉があなたの知識を反映
しないのであれば、あなたはほかの人に教"
 "えることができないでしょう。GNU/Linuxシステム
について聞いたことがあるほとんど"
@@ -1137,14 +1224,23 @@
 "class=\"anchor-reference-id\">(<a href=\"#tools\">#tools</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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 "
+#| "that GNU is the name of a collection of programs&mdash;often they say "
+#| "&ldquo;programming tools&rdquo;, since some of our programming tools "
+#| "became popular on their own.  The idea that &ldquo;GNU&rdquo; is the name "
+#| "of an operating system is hard to fit into a conceptual framework in "
+#| "which that operating system is labeled &ldquo;Linux&rdquo;."
 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 "
 "that GNU is the name of a collection of programs&mdash;often they say &ldquo;"
-"programming tools&rdquo;, since some of our programming tools became popular "
+"programming tools,&rdquo; since some of our programming tools became popular "
 "on their own.  The idea that &ldquo;GNU&rdquo; is the name of an operating "
 "system is hard to fit into a conceptual framework in which that operating "
-"system is labeled &ldquo;Linux&rdquo;."
+"system is labeled &ldquo;Linux.&rdquo;"
 msgstr ""
 "Linuxを全体のオペレーティング・システムと考える人々
は、GNUについて聞いたこと"
 "があるå 
´åˆã€GNUがなんであるかについてまったく間違った考えをしばしば持っていま"
@@ -1209,12 +1305,23 @@
 "ラム
の実行を開始したり、止めたりすることを取り扱います。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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.  The use of &ldquo;operating system&rdquo; to mean "
+#| "&ldquo;kernel&rdquo; is found in a number of textbooks on system design, "
+#| "going back to the 80s.  At the same time, in the 80s, the &ldquo;Unix "
+#| "operating system&rdquo; was understood to include all the system "
+#| "programs, and Berkeley's version of Unix included even games. Since we "
+#| "intended GNU to be a Unix-like operating system, we use the term &ldquo;"
+#| "operating system&rdquo; in the same way."
 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.  "
-"The use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is "
-"found in a number of textbooks on system design, going back to the 80s.  At "
-"the same time, in the 80s, the &ldquo;Unix operating system&rdquo; was "
+"to mean &ldquo;kernel.&rdquo; Both uses of the term go back many years.  The "
+"use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is found "
+"in a number of textbooks on system design, going back to the 80s.  At the "
+"same time, in the 80s, the &ldquo;Unix operating system&rdquo; was "
 "understood to include all the system programs, and Berkeley's version of "
 "Unix included even games. Since we intended GNU to be a Unix-like operating "
 "system, we use the term &ldquo;operating system&rdquo; in the same way."
@@ -1229,11 +1336,20 @@
 "ティング・システム
」という用語を(Unixと)同じように使っています。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 "
+#| "sense we use: they mean the whole collection of programs.  If that's what "
+#| "you are referring to, please call it &ldquo;GNU/Linux&rdquo;.  If you "
+#| "mean just the kernel, then &ldquo;Linux&rdquo; is the right name for it, "
+#| "but please say &ldquo;kernel&rdquo; also to avoid ambiguity about which "
+#| "body of software you mean."
 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 "
 "sense we use: they mean the whole collection of programs.  If that's what "
-"you are referring to, please call it &ldquo;GNU/Linux&rdquo;.  If you mean "
+"you are referring to, please call it &ldquo;GNU/Linux.&rdquo; If you mean "
 "just the kernel, then &ldquo;Linux&rdquo; is the right name for it, but "
 "please say &ldquo;kernel&rdquo; also to avoid ambiguity about which body of "
 "software you mean."
@@ -1246,10 +1362,16 @@
 "れを意味しているか曖昧さを回避するようにしてくだ
さい。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "If you prefer to use some other term such as &ldquo;system "
+#| "distribution&rdquo; for the entire collection of programs, instead of "
+#| "&ldquo;operating system&rdquo;, that's fine.  Then you would talk about "
+#| "GNU/Linux system distributions."
 msgid ""
 "If you prefer to use some other term such as &ldquo;system "
 "distribution&rdquo; for the entire collection of programs, instead of &ldquo;"
-"operating system&rdquo;, that's fine.  Then you would talk about GNU/Linux "
+"operating system,&rdquo; that's fine.  Then you would talk about GNU/Linux "
 "system distributions."
 msgstr ""
 "プログラムのコレクションå…
¨ä½“を示すのに、「オペレーティング・システム」の代わ"
@@ -1344,12 +1466,20 @@
 "span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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, window systems, libraries, and much more &mdash; hundreds of "
+#| "programs, even to match what BSD systems included in 1983.  Since "
+#| "Torvalds didn't develop any of those, how can the system be &ldquo;"
+#| "Linux&rdquo;?"
 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, "
-"window systems, libraries, and much more &mdash; hundreds of programs, even "
-"to match what BSD systems included in 1983.  Since Torvalds didn't develop "
-"any of those, how can the system be &ldquo;Linux&rdquo;?"
+"window systems, libraries, and much more&mdash;hundreds of programs, even to "
+"match what BSD systems included in 1983.  Since Torvalds didn't develop any "
+"of those, how can the system be &ldquo;Linux&rdquo;?"
 msgstr ""
 "このようにシステム
を&ldquo;Linux&rdquo;を呼ぶことについて論じる人々はダブルス"
 "タンダードを用いています。オペレーティング・システム
はコンパイラ、エディタ、"
@@ -1388,9 +1518,14 @@
 "span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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."
 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</a> are available.  None of them is called simply &ldquo;GNU,&rdquo; but "
 "GNU is what they basically are."
 msgstr ""
 "たくさんの<a 
href=\"/distros/distros.html\">パッケージされてインストール可能"
@@ -1442,9 +1577,14 @@
 "して、これにはGNUシステム
の主要な部分を再パッケージすることが含まれます。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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."
 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 "
+"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 ""
 "わたしたちは&ldquo;GNU&rdquo;の名のå…
ƒã«&ldquo;GNU&rdquo;をパッケージする最終"
@@ -1462,13 +1602,21 @@
 "\"anchor-reference-id\">(<a href=\"#afterkernel\">#afterkernel</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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 system is developed as a single unified project, and the "
+#| "developers choose a name for the system as a whole.  The kernel usually "
+#| "does not have a name of its own&mdash;instead, people say &ldquo;the "
+#| "kernel of such-and-such&rdquo; or &ldquo;the such-and-such kernel&rdquo;."
 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 "
+"than the misuse of the name &ldquo;Linux.&rdquo; Normally an operating "
 "system is developed as a single unified project, and the developers choose a "
 "name for the system as a whole.  The kernel usually does not have a name of "
 "its own&mdash;instead, people say &ldquo;the kernel of such-and-such&rdquo; "
-"or &ldquo;the such-and-such kernel&rdquo;."
+"or &ldquo;the such-and-such kernel.&rdquo;"
 msgstr ""
 "そのæ…
£ç¿’はとても希少です。&ldquo;Linux&rdquo;の名前の間違った使い方のほかに例"
 
"を見つけることができません。通常、オペレーティング・システãƒ
 ã¯å˜ä¸€ã®çµ±åˆã•ã‚Œ"
@@ -1523,9 +1671,14 @@
 "span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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."
 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.  "
+"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 ""
 
"いっとき、わたしたちは&ldquo;GNU&rdquo;と&ldquo;Linux&rdquo;&ldquo;の組み合わ"
@@ -1533,8 +1686,13 @@
 "&ldquo;GNU/Linux&rdquo;の方をより認めました。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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>."
 msgid ""
-"The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but we "
+"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 ""
@@ -1581,8 +1739,13 @@
 "\"#long2\">#long2</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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?"
 msgid ""
-"It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you appreciate "
+"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 ""
@@ -1688,10 +1851,16 @@
 "す。システム
に対するかれの貢献の謝辞から外すようにするのではなく。"
 
 #. type: Content of: <div><dl><dd><ul><li>
+#, fuzzy
+#| 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 system.  If we say &ldquo;GNU/Linux&rdquo;, they can make a "
+#| "connection to what they have heard about."
 msgid ""
-"Since many people know of the system as &ldquo;Linux&rdquo;, if we say "
+"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 "
-"system.  If we say &ldquo;GNU/Linux&rdquo;, they can make a connection to "
+"system.  If we say &ldquo;GNU/Linux,&rdquo; they can make a connection to "
 "what they have heard about."
 msgstr ""
 "たくさんの人々がそのシステム
を&ldquo;Linux&rdquo;として知っていますから、"
@@ -1700,10 +1869,17 @@
 "Linux&rdquo;と言うと、人々
は、聞いたことがあるものとつなげることができます。"
 
 #. type: Content of: <div><dl><dt>
+#, fuzzy
+#| 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 wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to save "
+#| "the fee? <span class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
+#| "\">#trademarkfee</a>)</span>"
 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 "
-"wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to save the "
+"product, and that would also apply if I say &ldquo;GNU/Linux.&rdquo; Is it "
+"wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux,&rdquo; to save the "
 "fee? <span class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
 "\">#trademarkfee</a>)</span>"
 msgstr ""
@@ -1725,9 +1901,14 @@
 "ん。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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."
 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."
+"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 ""
 
"ですから、&ldquo;Linux&rdquo;と呼ぶことの使用料を支払うのを避けるために、シス"
 "テムを単に&ldquo;GNU&rdquo;として参照したいå 
´åˆã€ã‚ãŸã—たちはあなたを批判しな"
@@ -1785,12 +1966,19 @@
 
"りませんから、どこに設定しても、わたしたちはそれに反論しません。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 giving credit, not for any possible threshold level, is &ldquo;"
+#| "Linux&rdquo;.  It can't be fair to give all the credit to one secondary "
+#| "contribution (Linux) while omitting the principal contribution (GNU)."
 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 "
-"giving credit, not for any possible threshold level, is &ldquo;"
-"Linux&rdquo;.  It can't be fair to give all the credit to one secondary "
-"contribution (Linux) while omitting the principal contribution (GNU)."
+"giving credit, not for any possible threshold level, is &ldquo;Linux.&rdquo; "
+"It can't be fair to give all the credit to one secondary contribution "
+"(Linux) while omitting the principal contribution (GNU)."
 msgstr ""
 "異なるしきい値のレベルは、システム
についての名前について異なる選択を導き出す"
 
"でしょう。しかし、ありうるどのしきい値のレベルでも、å
…¬æ­£ã•ã®æ‡¸å¿µã¨è¬æ„ã‚’示す"
@@ -1809,11 +1997,18 @@
 "(<a href=\"#others\">#others</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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).  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."
 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).  "
 "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."
+"system &ldquo;GNU/systemd/Linux,&rdquo; there is nothing wrong with doing so."
 msgstr ""
 
"systemdはたしかに重要なコンポーネントですが、カーネル(Linux)と同じように重要"
 "ではなく、全体のシステム
の基盤(GNU)と同じように重要でもありません。"
@@ -1862,11 +2057,17 @@
 "\">#allsmall</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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 the same argument would apply even more strongly to calling it &ldquo;"
+#| "Linux&rdquo;."
 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 "
-"the same argument would apply even more strongly to calling it &ldquo;"
-"Linux&rdquo;."
+"the same argument would apply even more strongly to calling it &ldquo;Linux."
+"&rdquo;"
 msgstr ""
 "2008年において、GNUのパッケージはgNewSense 
GNU/Linuxディストリビューションの"
 "&ldquo;main&rdquo;リポジトリにおいて、15%を占
めていました。Linuxは1.5%でし"
@@ -1931,9 +2132,16 @@
 "a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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 either &ldquo;GNU's version of Linux&rdquo; or &ldquo;"
+#| "Linux, which is a GNU package.&rdquo; Neither of those meanings fits the "
+#| "situation at hand."
 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 "
+"the word &ldquo;GNU&rdquo; modifies &ldquo;Linux.&rdquo; This can mean "
 "either &ldquo;GNU's version of Linux&rdquo; or &ldquo;Linux, which is a GNU "
 "package.&rdquo; Neither of those meanings fits the situation at hand."
 msgstr ""
@@ -1956,11 +2164,20 @@
 "ん。"
 
 #. 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=\"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."
 msgid ""
 "We're not talking about a distinct GNU version of Linux, the kernel.  The "
 "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 "
+"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."
@@ -1973,11 +2190,18 @@
 "に呼ぼうとはしません。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 &ldquo;combination.&rdquo; (Think of &ldquo;Input/Output&rdquo;.)  "
+#| "This system is the combination of GNU and Linux; hence, &ldquo;GNU/"
+#| "Linux&rdquo;."
 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 "
-"&ldquo;combination.&rdquo; (Think of &ldquo;Input/Output&rdquo;.)  This "
-"system is the combination of GNU and Linux; hence, &ldquo;GNU/Linux&rdquo;."
+"&ldquo;combination.&rdquo; (Think of &ldquo;Input/Output.&rdquo;)  This "
+"system is the combination of GNU and Linux; hence, &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 
"わたしたちが話しているのはGNUの版です。Linuxをカーネルとして持つことにより区"
 "別される、オペレーティング・システム
です。スラッシュはこの状況に適合します。"
@@ -1986,11 +2210,17 @@
 "Linux&rdquo;なのです。"
 
 #. 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: "
-"&ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes say &ldquo;GNU con "
-"Linux&rdquo;."
+#, fuzzy
+#| 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: &ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes say &ldquo;GNU "
+#| "con Linux&rdquo;."
+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: "
+"&ldquo;GNU-Linux.&rdquo; In Spanish, we sometimes say &ldquo;GNU con Linux."
+"&rdquo;"
 msgstr ""
 
"「組み合わせ」を表現するにはほかの方法もあります。プラスの記号がより明確ã
 ã¨"
 "考えるならば、それを使ってくだ
さい。フランス語ではハイフンで&ldquo;GNU-"
@@ -2026,9 +2256,15 @@
 "\">#whynoslash</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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."
 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 "
+"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 ""
 "英語のルールにしたがうと、&ldquo;GNU 
Emacs&rdquo;の構文では&ldquo;GNU&rdquo;"
@@ -2073,8 +2309,13 @@
 "位のレベルを埋めるという事実をよく表します。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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."
 msgid ""
-"However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a "
+"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 ""
@@ -2083,8 +2324,14 @@
 "るかのように扱う方法よりもだいぶ良いでしょう。"
 
 #. type: Content of: <div><dl><dt>
+#, fuzzy
+#| 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 whatever they like? <span class=\"anchor-reference-id\">(<a "
+#| "href=\"#distronames0\">#distronames0</a>)</span>"
 msgid ""
-"My distro's developers call it &ldquo;Foobar Linux&rdquo;, but that doesn't "
+"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 "
 "whatever they like? <span class=\"anchor-reference-id\">(<a href="
 "\"#distronames0\">#distronames0</a>)</span>"
@@ -2149,11 +2396,17 @@
 "\"anchor-reference-id\">(<a href=\"#distronames1\">#distronames1</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 proper for you to correct the misinformation by calling it &ldquo;"
+#| "Foobar GNU/Linux&rdquo;."
 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 "
+"Linux,&rdquo; and call their version of it &ldquo;Foobar Linux,&rdquo; it's "
 "proper for you to correct the misinformation by calling it &ldquo;Foobar GNU/"
-"Linux&rdquo;."
+"Linux.&rdquo;"
 msgstr ""
 "かれらが&ldquo;GNU&rdquo;を&ldquo;Foobar 
Linux&rdquo;と変えることによって間"
 "違った情報を広め、かれらのバージョンを&ldquo;Foobar 
Linux&rdquo;と呼ぶ際に"
@@ -2191,12 +2444,19 @@
 "は気にしないということです。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 "
+#| "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;."
 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 "
 "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;."
+"&ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 
"わたしたちはかれらを正しいことを行うようにさせることはできませんが、わたした"
 
"ちは、道が容易ならざるからといって、すぐにあきらめるような類の輩ではありませ"
@@ -2218,16 +2478,26 @@
 "a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| msgid ""
+#| "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 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 nonfree "
+#| "applications and drivers), or making the system more popular even at the "
+#| "cost of freedom."
 msgid ""
 "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 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 nonfree "
-"applications and drivers), or making the system more popular even at the "
-"cost of freedom."
+"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 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 nonfree applications "
+"and drivers), or making the system more popular even at the cost of freedom."
 msgstr ""
 "GNU/Linuxシステムに不自由なソフトウェアを加
える広く行われている慣習は、わたし"
 
"たちのコミュニティの重要な問題です。それは、不自由なソフトウェアは問題ではな"
@@ -2259,6 +2529,15 @@
 "するだけでしょう。"
 
 #. 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 "
+#| "nonfree 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> "
@@ -2266,7 +2545,7 @@
 "specifically for the sake of the users' freedom.  With this understanding, "
 "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;."
+"proper and appropriate &ldquo;versions of Linux.&rdquo;"
 msgstr ""
 "こういった利用者
を、自由との関連を知るように導く方法は、実に逆のものです。そ"
 "れらのシステムの版はGNUの版<em>であり</em>、利用者
の自由のためにまさに存在す"
@@ -2358,11 +2637,17 @@
 
"いたら、わたしたちはそうしたでしょう。(ああ、これはあと知恵です。)"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and "
+#| "we don't want to act like that."
 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 "
-"and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and we don't want "
-"to act like that."
+"GNU,&rdquo; that would be somewhat like making a version of the GNU system "
+"and labeling it &ldquo;Linux.&rdquo; That wasn't right, and we don't want to "
+"act like that."
 msgstr ""
 
"もし、すでに存在するGNU/Linuxの版を&ldquo;GNU&rdquo;として再ラベルするのであ"
 "れば、それは、GNUシステム
の版を&ldquo;Linux&rdquo;とラベルすることに似たこと"
@@ -2398,11 +2683,21 @@
 "た。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 "
+#| "with the GNU Project because he was a &ldquo;Linux user&rdquo;.  That "
+#| "came as a shock, because the people who ported GNU packages to other "
+#| "systems had generally wanted to work with us to get their changes "
+#| "installed.  Yet these people, developing a system that was primarily "
+#| "based on GNU, were the first (and still practically the only) group that "
+#| "was unwilling to work with us."
 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 "
-"with the GNU Project because he was a &ldquo;Linux user&rdquo;.  That came "
-"as a shock, because the people who ported GNU packages to other systems had "
+"with the GNU Project because he was a &ldquo;Linux user.&rdquo; That came as "
+"a shock, because the people who ported GNU packages to other systems had "
 "generally wanted to work with us to get their changes installed.  Yet these "
 "people, developing a system that was primarily based on GNU, were the first "
 "(and still practically the only) group that was unwilling to work with us."
@@ -2416,9 +2711,16 @@
 "の(で、現在も実際には唯一の)グループでした。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 obstructing our work.  Asking you to call the system &ldquo;GNU/"
+#| "Linux&rdquo; is our response to that problem, and to the other problems "
+#| "caused by the &ldquo;Linux&rdquo; misnomer."
 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 "
+"version of the GNU system &ldquo;Linux,&rdquo; and that this confusion was "
 "obstructing our work.  Asking you to call the system &ldquo;GNU/Linux&rdquo; "
 "is our response to that problem, and to the other problems caused by the "
 "&ldquo;Linux&rdquo; misnomer."
@@ -2457,10 +2759,14 @@
 "class=\"anchor-reference-id\">(<a href=\"#allgpled\">#allgpled</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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;."
 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;."
+"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 ""
 "&ldquo;GNU/<i>name</i>&rdquo;の形で個々のプログラムを参ç…
§ã™ã‚‹ã“とは決してあり"
 "ません。あるプログラム
がGNUパッケージの時、わたしたちはそれを&ldquo;GNU "
@@ -2575,10 +2881,18 @@
 "たのです。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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.  The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not "
+#| "Unix&rdquo;, is a humorous way of giving credit to Unix for this, "
+#| "following a hacker tradition of recursive acronyms that started in the "
+#| "70s."
 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.  "
-"The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not Unix&rdquo;, "
+"The name &ldquo;GNU,&rdquo; which stands for &ldquo;GNU's Not Unix,&rdquo; "
 "is a humorous way of giving credit to Unix for this, following a hacker "
 "tradition of recursive acronyms that started in the 70s."
 msgstr ""
@@ -2589,11 +2903,20 @@
 "います。"
 
 #. 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=\"https://stallman.org/articles/on-hacking.html\";>playful "
+#| "cleverness</a>.)"
 msgid ""
-"The first such recursive acronym was TINT, &ldquo;TINT Is Not TECO&rdquo;.  "
+"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 "
+"like &ldquo;<em>somethingorother</em> TECO,&rdquo; he thought of a clever "
 "amusing name.  (That's what hacking means: <a href=\"https://stallman.org/";
 "articles/on-hacking.html\">playful cleverness</a>.)"
 msgstr ""
@@ -2605,13 +2928,21 @@
 "</a>です。)"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 was similar to some existing program (let's imagine its name was "
+#| "&ldquo;Klever&rdquo;), you could give it a recursive acronym name, such "
+#| "as &ldquo;MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same "
+#| "spirit we called our replacement for Unix &ldquo;GNU's Not Unix&rdquo;."
 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 "
 "was similar to some existing program (let's imagine its name was &ldquo;"
 "Klever&rdquo;), you could give it a recursive acronym name, such as &ldquo;"
 "MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same spirit we "
-"called our replacement for Unix &ldquo;GNU's Not Unix&rdquo;."
+"called our replacement for Unix &ldquo;GNU's Not Unix.&rdquo;"
 msgstr ""
 
"ほかのハッカーがその名前をとても楽しみ、この方法を真似しました。すでに存在す"
 "るプログラム
(たとえばその名前を&ldquo;Klever&rdquo;としましょう)と同じような"
@@ -2621,13 +2952,21 @@
 "Unix&rdquo;と呼んだのです。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 in a system 99% copied from Unix.  AT&amp;T actually threatened "
+#| "to sue anyone giving AT&amp;T credit in that way.  This is why each of "
+#| "the various modified versions of Unix (all proprietary, like Unix) had a "
+#| "completely different name that didn't include &ldquo;Unix&rdquo;."
 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 "
 "in a system 99% copied from Unix.  AT&amp;T actually threatened to sue "
 "anyone giving AT&amp;T credit in that way.  This is why each of the various "
 "modified versions of Unix (all proprietary, like Unix) had a completely "
-"different name that didn't include &ldquo;Unix&rdquo;."
+"different name that didn't include &ldquo;Unix.&rdquo;"
 msgstr ""
 "歴史的に、Unixを開発したAT&amp;Tは、同様なシステム
の名前に&ldquo;Unix&rdquo;"
 
"を使って謝意を示すことを誰にも欲しませんでした。Unixから99%コピーされたシステ"
@@ -2700,9 +3039,16 @@
 "切である理由です。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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/"
+#| "kernelofNetBSD&rdquo; would be more accurate, since NetBSD is an entire "
+#| "system, not just the kernel.  This is not a BSD system, since most of the "
+#| "system is the same as the GNU/Linux system."
 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/"
+"call it &ldquo;Debian GNU/NetBSD,&rdquo; but &ldquo;GNU/"
 "kernelofNetBSD&rdquo; would be more accurate, since NetBSD is an entire "
 "system, not just the kernel.  This is not a BSD system, since most of the "
 "system is the same as the GNU/Linux system."
@@ -2724,8 +3070,15 @@
 "\">#othersys</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 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."
 msgid ""
-"Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of "
+"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 "
@@ -2831,8 +3184,14 @@
 "少ししかありません。実際、共通にあるのはLinuxだ
けです。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 Linux, because it doesn't have the usual Linux [sic] libraries and "
+#| "utilities [meaning the GNU system].&rdquo;"
 msgid ""
-"If you call the whole GNU/Linux system &ldquo;Linux&rdquo;, you will find it "
+"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 "
 "Linux, because it doesn't have the usual Linux [sic] libraries and utilities "
 "[meaning the GNU system].&rdquo;"
@@ -2875,9 +3234,15 @@
 "人々は意図した意味を理解し得ないでしょう。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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."
 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 "
+"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 ""
 "å…
¬è¡†ã¯Androidを使うことを&ldquo;Linuxを使う&rdquo;として話すことをとても奇異"
@@ -2885,23 +3250,39 @@
 "と会話していた、というようなものです。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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;."
 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;."
+"of the whole system as &ldquo;Linux.&rdquo;"
 msgstr ""
 "å…
¬è¡†ã¯ã€ãã‚ŒãŒæœ¬å½“はGNU/Linuxなのに、&ldquo;Linuxを使う&rdquo;という考えを、"
 "通常の誤解(&ldquo;Linux&rdquo;として全体のシステム
をとらえる)で理解<em>してし"
 "まう</em>でしょう。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 "
+#| "contain Linux is irrelevant to using them, just as the fact that a car "
+#| "and a bicycle both have a structure of metal is irrelevant to using those "
+#| "two.  If you wish to talk about using cars and bikes, you wouldn't speak "
+#| "of &ldquo;riding metal objects&rdquo; &mdash; not unless you're playing "
+#| "games with the reader.  You would say, &ldquo;using cars and bikes."
+#| "&rdquo; Likewise, the clear way to talk about using GNU/Linux and Android "
+#| "is to say &ldquo;using GNU/Linux and Android.&rdquo;"
 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 "
 "contain Linux is irrelevant to using them, just as the fact that a car and a "
 "bicycle both have a structure of metal is irrelevant to using those two.  If "
 "you wish to talk about using cars and bikes, you wouldn't speak of &ldquo;"
-"riding metal objects&rdquo; &mdash; not unless you're playing games with the "
+"riding metal objects&rdquo;&mdash;not unless you're playing games with the "
 "reader.  You would say, &ldquo;using cars and bikes.&rdquo; Likewise, the "
 "clear way to talk about using GNU/Linux and Android is to say &ldquo;using "
 "GNU/Linux and Android.&rdquo;"
@@ -2991,11 +3372,17 @@
 "</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 "
+#| "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."
 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 "
-"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."
+"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."
 msgstr ""
 
"それはまちがいでしょう。ですからわたしたちはそうしていません。トーバルズの仕"
 "事はカーネルLinuxで、その仕事をGNUプロジェクトのものだ
としたり、&ldquo;"
@@ -3013,12 +3400,36 @@
 "a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
-msgid ""
-"He recognized this at the beginning.  The earliest Linux release notes said, "
-"<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>."
+#, fuzzy
+#| msgid ""
+#| "He recognized this at the beginning.  The earliest Linux release notes "
+#| "said, <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>."
+msgid ""
+"He recognized this at the beginning.  The <a href=\"https://ftp.funet.fi/pub/";
+"linux/historical/kernel/old-versions/RELNOTES-0.01\"> earliest Linux release "
+"notes</a> said:"
+msgstr ""
+"彼は最初からこれを認識していました。もっとも古いLinuxのリリースノートでこう"
+"言っています:<a 
href=\"https://ftp.funet.fi/pub/linux/historical/kernel/old-";
+"versions/RELNOTES-0.01\"> 
「linuxと一緒につかうほとんどのツールはGNUソフト"
+"ウェアで、GNUコピーレフトの元です。これらのツールはé…
å¸ƒã«ã¯å…¥ã£ã¦ã„ませんの"
+"で、より多くの情報は僕(あるいはGNU)に頼んでくだ
さい。」</a>"
+
+#. type: Content of: <div><dl><dd><blockquote><p>
+#, fuzzy
+#| msgid ""
+#| "He recognized this at the beginning.  The earliest Linux release notes "
+#| "said, <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>."
+msgid ""
+"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."
 msgstr ""
 
"彼は最初からこれを認識していました。もっとも古いLinuxのリリースノートでこう"
 "言っています:<a 
href=\"https://ftp.funet.fi/pub/linux/historical/kernel/old-";
@@ -3069,11 +3480,19 @@
 "\"anchor-reference-id\">(<a href=\"#lost\">#lost</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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;: 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."
 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;: "
 "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 "
+"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."
 msgstr ""
@@ -3095,13 +3514,23 @@
 "\"anchor-reference-id\">(<a href=\"#whatgood\">#whatgood</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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;GNU/Linux&rdquo;, you will help others learn the system's true "
+#| "history, origin, and reason for being.  You can't correct the misnomer "
+#| "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."
 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;"
-"GNU/Linux&rdquo;, you will help others learn the system's true history, "
+"GNU/Linux,&rdquo; you will help others learn the system's true history, "
 "origin, and reason for being.  You can't correct the misnomer 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 "
+"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."
 msgstr ""
@@ -3125,10 +3554,16 @@
 "\"#explain\">#explain</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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."
 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."
+"the system &ldquo;GNU/Linux,&rdquo; and uses your time inefficiently."
 msgstr ""
 
"あなたがほかの人にその方法で説明することによってわたしたちを手伝うならば、わ"
 
"たしたちはあなたの努力に感謝しますが、それは最善の方法ではありません。このシ"
@@ -3136,12 +3571,21 @@
 "の時間を不効率に費やしてしまうでしょう。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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, and they may learn a correct picture of the system's origin.  "
+#| "But they are unlikely to repeat the explanation to others whenever they "
+#| "talk about the system.  They will probably just call it &ldquo;"
+#| "Linux&rdquo;.  Without particularly intending to, they will help spread "
+#| "the incorrect picture."
 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, "
 "and they may learn a correct picture of the system's origin.  But they are "
 "unlikely to repeat the explanation to others whenever they talk about the "
-"system.  They will probably just call it &ldquo;Linux&rdquo;.  Without "
+"system.  They will probably just call it &ldquo;Linux.&rdquo; Without "
 "particularly intending to, they will help spread the incorrect picture."
 msgstr ""
 "それはなかなか人々の意識にå…
¥ã£ã¦ã„かないので、効果的ではなく、確実に伝搬しな"
@@ -3278,9 +3722,13 @@
 "a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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."
 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."
+"&ldquo;GNU/Linux,&rdquo; and we ask you to do it too."
 msgstr ""
 
"強制することは間違っているでしょうし、わたしたちはそうしようとはしません。わ"
 "たしたちはシステム
を&ldquo;GNU/Linux&rdquo;と呼び、あなたもそうしましょうとお"
@@ -3366,9 +3814,15 @@
 "ンス」という用語を使わないでください。"
 
 #. type: Content of: <div><dl><dt>
+#, fuzzy
+#| 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 "
+#| "complaining now? <span class=\"anchor-reference-id\">(<a href=\"#deserve"
+#| "\">#deserve</a>)</span>"
 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 "
+"the system &ldquo;GNU,&rdquo; you deserve what happened; why are you "
 "complaining now? <span class=\"anchor-reference-id\">(<a href=\"#deserve"
 "\">#deserve</a>)</span>"
 msgstr ""
@@ -3423,8 +3877,13 @@
 "ステムを開発することができなかったでしょう。"
 
 #. type: Content of: <div><dl><dt>
+#, fuzzy
+#| 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>"
 msgid ""
-"Since many people call it &ldquo;Linux&rdquo;, doesn't that make it right? "
+"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 ""
@@ -3447,9 +3906,15 @@
 "span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 add &ldquo;(often erroneously referred to as &lsquo;"
+#| "Linux&rsquo;)&rdquo; once in a while, they will all understand."
 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 "
+"&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."
 msgstr ""

Index: po/gnu-linux-faq.ko-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.ko-diff.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- po/gnu-linux-faq.ko-diff.html       31 Aug 2021 10:37:07 -0000      1.23
+++ po/gnu-linux-faq.ko-diff.html       2 Nov 2021 14:41:51 -0000       1.24
@@ -12,30 +12,35 @@
 <body><pre>
 &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;!-- This page is derived from /server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="gnulinux" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</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="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&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"&gt;by</em></ins></span> Richard <span 
class="removed"><del><strong>Stallman&lt;/h2&gt;
+&lt;address class="byline"&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;</em></ins></span>
 
-&lt;div class="announcement"&gt;
+&lt;div <span class="removed"><del><strong>class="announcement"&gt;
   &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 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&gt;</strong></del></span> <span 
class="inserted"><ins><em>class="introduction"&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.
+system that many others call just <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> they ask many 
questions.
 Here are common questions, and our answers.&lt;/p&gt;
+<span class="inserted"><ins><em>&lt;/div&gt;
 
-<span class="inserted"><ins><em>&lt;div class="toc"&gt;
+&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;
@@ -130,8 +135,8 @@
 
 &lt;li&gt;&lt;a <span class="removed"><del><strong>href="#trademarkfee" 
id="TOCtrademarkfee"&gt;I</strong></del></span> <span 
class="inserted"><ins><em>href="#trademarkfee"&gt;I</em></ins></span> 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
-    wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to
+    that would also apply if I say <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux.&rdquo;</em></ins></span>  Is 
it
+    wrong if I use &ldquo;GNU&rdquo; without <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> to
     save the fee?&lt;/a&gt;&lt;/li&gt;
 
 &lt;li&gt;&lt;a <span class="removed"><del><strong>href="#many" 
id="TOCmany"&gt;Many</strong></del></span> <span 
class="inserted"><ins><em>href="#many"&gt;Many</em></ins></span> other projects 
contributed to the
@@ -169,7 +174,7 @@
 rather than &ldquo;Linux/GNU&rdquo;?&lt;/a&gt;&lt;/li&gt;
 
 &lt;li&gt;&lt;a <span class="removed"><del><strong>href="#distronames0" 
id="TOCdistronames0"&gt;My</strong></del></span> <span 
class="inserted"><ins><em>href="#distronames0"&gt;My</em></ins></span> distro's 
developers call it
-    &ldquo;Foobar Linux&rdquo;, but that doesn't say anything about
+    &ldquo;Foobar <span 
class="removed"><del><strong>Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>Linux,&rdquo;</em></ins></span> but that doesn't say 
anything about
     what the system consists of.  Why shouldn't they call it whatever
     they like?&lt;/a&gt;&lt;/li&gt;
 
@@ -281,14 +286,16 @@
 
 &lt;li&gt;&lt;a <span class="removed"><del><strong>href="#deserve" 
id="TOCdeserve"&gt;Since</strong></del></span> <span 
class="inserted"><ins><em>href="#deserve"&gt;Since</em></ins></span> 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
+    <span class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span>
+    <span class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> you 
deserve what happened; why are you
     complaining now?&lt;/a&gt;&lt;/li&gt;
 
 &lt;li&gt;&lt;a <span class="removed"><del><strong>href="#contradict" 
id="TOCcontradict"&gt;Wouldn't</strong></del></span> <span 
class="inserted"><ins><em>href="#contradict"&gt;Wouldn't</em></ins></span> you 
be better off
     not contradicting what so many people believe?&lt;/a&gt;&lt;/li&gt;
 
 &lt;li&gt;&lt;a <span class="removed"><del><strong>href="#somanyright" 
id="TOCsomanyright"&gt;Since</strong></del></span> <span 
class="inserted"><ins><em>href="#somanyright"&gt;Since</em></ins></span> many 
people call it
-    &ldquo;Linux&rdquo;, doesn't that make it right?&lt;/a&gt;&lt;/li&gt;
+    <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span>
+    <span class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> 
doesn't that make it right?&lt;/a&gt;&lt;/li&gt;
 
 &lt;li&gt;&lt;a <span class="removed"><del><strong>href="#knownname" 
id="TOCknownname"&gt;Isn't</strong></del></span> <span 
class="inserted"><ins><em>href="#knownname"&gt;Isn't</em></ins></span> it 
better to call the
     system by the name most users already know?&lt;/a&gt;&lt;/li&gt;
@@ -377,7 +384,7 @@
 the system's history was such as to fit that name.  For
 instance, they often believe its development was started by Linus
 Torvalds in 1991.  This false picture tends to reinforce the idea
-that the system should be called &ldquo;Linux&rdquo;.&lt;/p&gt;
+that the system should be called <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.&lt;/p&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;&lt;/p&gt;</em></ins></span>
 &lt;p&gt;
 Many of the questions in this file represent people's attempts to
 justify the name they are accustomed to using.&lt;/p&gt;
@@ -388,14 +395,16 @@
 &lt;dd&gt;
 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.
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> the 
name its developer chose.
 &lt;p&gt;
-When people call the whole system &ldquo;Linux&rdquo;, as a consequence
+When people call the whole system <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> as a 
consequence
 they call the whole system by the same name as the kernel.
 This causes many kinds of confusion, because only experts can tell
 whether a statement is about the kernel or the whole system.
-By calling the whole system &ldquo;GNU/Linux&rdquo;, and calling the kernel
-&ldquo;Linux&rdquo;, you avoid the ambiguity.&lt;/p&gt;
+By calling the whole 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> and 
calling the kernel
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> you 
avoid the ambiguity.&lt;/p&gt;
 &lt;/dd&gt;
 
 &lt;dt id="linuxalone"&gt;Would Linux have
@@ -425,7 +434,7 @@
     community if you did not divide people with this request? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#divide"&gt;#divide&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing people. 
 We
+When we ask people to say <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 
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.
 &lt;p&gt;
@@ -453,7 +462,8 @@
 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 freedom are more likely to call the system
-&ldquo;GNU/Linux&rdquo;, and people who learn that the system is 
&ldquo;GNU/Linux&rdquo; are
+<span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> and 
people who learn that the system is &ldquo;GNU/Linux&rdquo; are
 more likely to pay attention to our philosophical arguments for
 freedom and community (which is why the choice of name for the system
 makes a real difference for society).  However, the disagreement would
@@ -482,7 +492,7 @@
 
 &lt;dd&gt;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 system do not mention the name &ldquo;GNU&rdquo;, or the 
ideals
+articles about the system do not mention the name <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> or the ideals
 that GNU stands for.  &lt;a
 href="/gnu/gnu-users-never-heard-of-gnu.html"&gt;GNU Users Who Have Never
 Heard of GNU&lt;/a&gt; explains further.
@@ -490,7 +500,7 @@
 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 GNU is.  For instance, many think it is a collection
-of &lt;a href="#tools"&gt;&ldquo;tools&rdquo;&lt;/a&gt;, or a project to 
develop tools.&lt;/p&gt;
+of <span class="removed"><del><strong>&lt;a 
href="#tools"&gt;&ldquo;tools&rdquo;&lt;/a&gt;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;&lt;a 
href="#tools"&gt;tools&lt;/a&gt;,&rdquo;</em></ins></span> or a project to 
develop tools.&lt;/p&gt;
 &lt;p&gt;
 The wording of this question, which is typical, illustrates another
 common misconception.  To speak of &ldquo;GNU's role&rdquo; in developing
@@ -506,8 +516,9 @@
 <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
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> that it 
was started by Linus Torvalds, and that
+it was intended to be &ldquo;open <span 
class="removed"><del><strong>source&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>source.&rdquo;</em></ins></span>  If you don't tell
 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;
 
@@ -536,10 +547,10 @@
 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 that GNU is the name of a collection of programs&mdash;often they
-say &ldquo;programming tools&rdquo;, since some of our programming tools became
+say &ldquo;programming <span 
class="removed"><del><strong>tools&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>tools,&rdquo;</em></ins></span> since some of our 
programming tools became
 popular on their own.  The idea that &ldquo;GNU&rdquo; is the name of an 
operating
 system is hard to fit into a conceptual framework in which that
-operating system is labeled &ldquo;Linux&rdquo;.
+operating system is labeled <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>
 &lt;p&gt;
 The GNU Project was named after the GNU operating system&mdash;it's the project
 to develop the GNU system.  (See &lt;a
@@ -568,7 +579,7 @@
 programs.&lt;/p&gt;
 &lt;p&gt;
 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.  The
+mean <span 
class="removed"><del><strong>&ldquo;kernel&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;kernel.&rdquo;</em></ins></span>  Both uses of 
the term go back many years.  The
 use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is found in 
a number of
 textbooks on system design, going back to the 80s.  At the same time,
 in the 80s, the &ldquo;Unix operating system&rdquo; was understood to include 
all
@@ -579,12 +590,12 @@
 Most of the time when people speak of the &ldquo;Linux operating system&rdquo;
 they are using &ldquo;operating system&rdquo; in the same sense we use: they 
mean
 the whole collection of programs.  If that's what you are referring
-to, please call it &ldquo;GNU/Linux&rdquo;.  If you mean just the kernel, then
+to, please call it <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux.&rdquo;</em></ins></span>  If 
you mean just the kernel, then
 &ldquo;Linux&rdquo; is the right name for it, but please say 
&ldquo;kernel&rdquo; also to
 avoid ambiguity about which body of software you mean.&lt;/p&gt;
 &lt;p&gt;
 If you prefer to use some other term such as &ldquo;system distribution&rdquo; 
for
-the entire collection of programs, instead of &ldquo;operating system&rdquo;,
+the entire collection of programs, instead of &ldquo;operating <span 
class="removed"><del><strong>system&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>system,&rdquo;</em></ins></span>
 that's fine.  Then you would talk about GNU/Linux system
 distributions.&lt;/p&gt;
 &lt;/dd&gt;
@@ -636,8 +647,8 @@
 &lt;dd&gt;
 The people who argue that way for calling the system
 &ldquo;Linux&rdquo; are using a double standard.  An operating system
-requires compilers, editors, window systems, libraries, and much more
-&mdash; hundreds of programs, even to match what BSD systems included
+requires compilers, editors, window systems, libraries, and much
+more&mdash;hundreds of programs, even to match what BSD systems included
 in 1983.  Since Torvalds didn't develop any of those, how can the
 system be &ldquo;Linux&rdquo;?
 
@@ -658,7 +669,8 @@
 &lt;dd&gt;
 Many &lt;a href="/distros/distros.html"&gt; packaged and installable
 versions of GNU&lt;/a&gt; are available.  None of them is called simply
-&ldquo;GNU&rdquo;, but GNU is what they basically are.
+<span class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> but GNU 
is what they basically are.
 
 &lt;p&gt;
 We expected to release the GNU system packaged for installation, but
@@ -685,7 +697,8 @@
 
 &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.
+<span class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> but that 
doesn't alter what kind of thing GNU is.
 GNU is an operating system.&lt;/p&gt;
 &lt;/dd&gt;
 
@@ -695,11 +708,11 @@
 
 &lt;dd&gt;
 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 system 
is
+than the misuse of the name <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  Normally an 
operating system is
 developed as a single unified project, and the developers choose a
 name for the system as a whole.  The kernel usually does not have a
 name of its own&mdash;instead, people say &ldquo;the kernel of 
such-and-such&rdquo; or
-&ldquo;the such-and-such kernel&rdquo;.
+&ldquo;the such-and-such <span 
class="removed"><del><strong>kernel&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>kernel.&rdquo;</em></ins></span>
 &lt;p&gt;
 Because those two constructions are used synonymously, the expression
 &ldquo;the Linux kernel&rdquo; can easily be misunderstood as meaning 
&ldquo;the kernel
@@ -724,11 +737,11 @@
     How about recommending a shorter name? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#long"&gt;#long&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-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;
+For a while we tried the name <span 
class="removed"><del><strong>&ldquo;LiGNUx&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;LiGNUx,&rdquo;</em></ins></span> which 
combines the words &ldquo;GNU&rdquo;
+and <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  The reaction 
was very bad.  People accept &ldquo;GNU/Linux&rdquo;
 much better.
 &lt;p&gt;
-The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but
+The shortest legitimate name for this system is <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> but
 we call it &ldquo;GNU/Linux&rdquo; &lt;a href="#justgnu"&gt; for the reasons
 given below&lt;/a&gt;.&lt;/p&gt;
 &lt;/dd&gt;
@@ -753,7 +766,7 @@
     &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#long2"&gt;#long2&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-&lt;p&gt;It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you
+&lt;p&gt;It only takes a second to say or type <span 
class="removed"><del><strong>&ldquo;GNU/&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU/.&rdquo;</em></ins></span>  If you
 appreciate the system that we developed, can't you take one second
 to recognize our work?&lt;/p&gt;
 &lt;/dd&gt;
@@ -804,9 +817,9 @@
 honorably and openly, rather than by trying to cut him out of the
 credit for his contribution to the system.&lt;/li&gt;
 &lt;li&gt;
-Since many people know of the system as &ldquo;Linux&rdquo;, if we say 
&ldquo;GNU&rdquo; they
+Since many people know of the system as <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> if we say 
&ldquo;GNU&rdquo; they
 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
+say <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> they 
can make a connection to what they have heard
 about.&lt;/li&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>
@@ -814,16 +827,16 @@
 
 &lt;dt id="trademarkfee"&gt;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 wrong if I use 
&ldquo;GNU&rdquo;
-    without &ldquo;Linux&rdquo;, to save the fee? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#trademarkfee"&gt;#trademarkfee&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
+    would also apply if I say <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux.&rdquo;</em></ins></span>  Is 
it wrong if I use &ldquo;GNU&rdquo;
+    without <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> to save the 
fee? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#trademarkfee"&gt;#trademarkfee&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 &lt;dd&gt;
 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.
 &lt;p&gt;
-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.&lt;/p&gt;
+So if you want to refer to the system simply as <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> to avoid paying
+the fee for calling it <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> we won't 
criticize you.&lt;/p&gt;
 &lt;/dd&gt;
 
 &lt;dt id="many"&gt;Many other projects contributed to
@@ -853,7 +866,7 @@
 &lt;p&gt;
 Different threshold levels would lead to different choices of name for
 the system.  But one name that cannot result from concerns of fairness
-and giving credit, not for any possible threshold level, is 
&ldquo;Linux&rdquo;.
+and giving credit, not for any possible threshold level, is <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>
 It can't be fair to give all the credit to one secondary contribution
 (Linux) while omitting the principal contribution (GNU).&lt;/p&gt;
 &lt;/dd&gt;
@@ -867,7 +880,7 @@
 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
+by calling the system &ldquo;GNU/systemd/Linux,&rdquo; there is nothing
 wrong with doing so.&lt;/p&gt;
 &lt;/dd&gt;
 
@@ -892,7 +905,7 @@
 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 the same argument would apply even more
-strongly to calling it &ldquo;Linux&rdquo;.
+strongly to calling it <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>
 
 &lt;p&gt;
 GNU is a small fraction of the system nowadays, and Linux is an
@@ -929,7 +942,7 @@
 
 &lt;dd&gt;
 Following the rules of English, in the construction &ldquo;GNU Linux&rdquo; the
-word &ldquo;GNU&rdquo; modifies &ldquo;Linux&rdquo;.  This can mean either 
&ldquo;GNU's version of
+word &ldquo;GNU&rdquo; modifies <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  This can mean 
either &ldquo;GNU's version of
 Linux&rdquo; or &ldquo;Linux, which is a GNU package.&rdquo;  Neither of those 
meanings
 fits the situation at hand.
 &lt;p&gt;
@@ -942,23 +955,24 @@
 The free GNU/Linux distros do have
 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,
+firmware <span 
class="removed"><del><strong>&ldquo;blobs&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;blobs.&rdquo;</em></ins></span>  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;
 &lt;p&gt;
 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 &ldquo;combination.&rdquo; (Think of
-&ldquo;Input/Output&rdquo;.)  This system is the combination of GNU
-and Linux; hence, &ldquo;GNU/Linux&rdquo;.&lt;/p&gt;
+<span 
class="removed"><del><strong>&ldquo;Input/Output&rdquo;.)</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Input/Output.&rdquo;)</em></ins></span> 
 This system is the combination of GNU
+and Linux; hence, <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;
-There are other ways to express &ldquo;combination&rdquo;.  If you
+There are other ways to express <span 
class="removed"><del><strong>&ldquo;combination&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;combination.&rdquo;</em></ins></span>  
If you
 think that a plus-sign is clearer, please use that.  In French, a
-hyphen is clear: &ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes
-say &ldquo;GNU con Linux&rdquo;.&lt;/p&gt;
+hyphen is clear: <span 
class="removed"><del><strong>&ldquo;GNU-Linux&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU-Linux.&rdquo;</em></ins></span>  In 
Spanish, we sometimes
+say &ldquo;GNU con <span 
class="removed"><del><strong>Linux&rdquo;.&lt;/p&gt;</strong></del></span> 
<span class="inserted"><ins><em>Linux.&rdquo;&lt;/p&gt;
 &lt;/dd&gt;
 
-&lt;dt <span class="inserted"><ins><em>id="pronounce"&gt;How is the name 
&ldquo;GNU/Linux&rdquo;
+&lt;dt id="pronounce"&gt;How is the name &ldquo;GNU/Linux&rdquo;
 pronounced? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#pronounce"&gt;#pronounce&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 &lt;dd&gt;
 &lt;p&gt;
@@ -974,16 +988,16 @@
 &lt;dd&gt;
 &lt;p&gt;
 Following the rules of English, in the construction &ldquo;GNU
-Emacs&rdquo; the word &ldquo;GNU&rdquo; modifies &ldquo;Emacs&rdquo;.
+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.&lt;/p&gt;
 &lt;p&gt;
 &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.&lt;/p&gt;
+program, so &ldquo;GNU/Emacs&rdquo; is the wrong way to refer to 
it.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
-&lt;dt</em></ins></span> id="whyorder"&gt;Why &ldquo;GNU/Linux&rdquo; rather
+&lt;dt id="whyorder"&gt;Why &ldquo;GNU/Linux&rdquo; rather
 than &ldquo;Linux/GNU&rdquo;? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#whyorder"&gt;#whyorder&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
@@ -995,13 +1009,13 @@
 In addition, &ldquo;GNU/Linux&rdquo; fits the fact that Linux is the
 lowest level of the system and GNU fills technically higher 
levels.&lt;/p&gt;</em></ins></span>
 &lt;p&gt;
-However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a 
lot
+However, if you prefer to call the system <span 
class="removed"><del><strong>&ldquo;Linux/GNU&rdquo;,</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;Linux/GNU,&rdquo;</em></ins></span> 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.&lt;/p&gt;
 &lt;/dd&gt;
 
 &lt;dt id="distronames0"&gt;My distro's developers call it
-    &ldquo;Foobar Linux&rdquo;, but that doesn't say anything about
+    &ldquo;Foobar <span 
class="removed"><del><strong>Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>Linux,&rdquo;</em></ins></span> but that doesn't say 
anything about
     what the system consists of.  Why shouldn't they call it whatever
     they like? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#distronames0"&gt;#distronames0&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 &lt;dd&gt;
@@ -1032,11 +1046,11 @@
 <span class="removed"><del><strong>&lt;dd&gt;&lt;p&gt;If it's allowed for them 
to change</strong></del></span>
 
 <span class="inserted"><ins><em>&lt;dd&gt;&lt;p&gt;When they spread 
misinformation by changing</em></ins></span> &ldquo;GNU&rdquo;
-to <span class="inserted"><ins><em>&ldquo;Linux&rdquo;, and call their version 
of it</em></ins></span> &ldquo;Foobar
-Linux&rdquo;, it's <span 
class="removed"><del><strong>allowed</strong></del></span> <span 
class="inserted"><ins><em>proper</em></ins></span> for you to <span 
class="removed"><del><strong>change it back and
+to <span class="inserted"><ins><em>&ldquo;Linux,&rdquo; and call their version 
of it</em></ins></span> &ldquo;Foobar <span 
class="removed"><del><strong>Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>Linux,&rdquo;</em></ins></span> it's <span 
class="removed"><del><strong>allowed</strong></del></span> <span 
class="inserted"><ins><em>proper</em></ins></span> for you to <span 
class="removed"><del><strong>change it back and
 call</strong></del></span> <span class="inserted"><ins><em>correct the 
misinformation by
 calling</em></ins></span> it &ldquo;Foobar <span 
class="removed"><del><strong>GNU/Linux&rdquo;.  This is what you ought to do,
-to avoid their error.&lt;/p&gt;&lt;/dd&gt;</strong></del></span> <span 
class="inserted"><ins><em>GNU/Linux&rdquo;.&lt;/p&gt;&lt;/dd&gt;</em></ins></span>
+to avoid their error.&lt;/p&gt;&lt;/dd&gt;</strong></del></span> <span 
class="inserted"><ins><em>GNU/Linux.&rdquo;&lt;/p&gt;&lt;/dd&gt;</em></ins></span>
 
 &lt;dt id="companies"&gt;Wouldn't it be more
     effective to ask companies such as Mandrake, Red Hat and IBM to
@@ -1057,7 +1071,7 @@
 just because the road isn't easy.  You may not have as much 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;.&lt;/p&gt;
+more profit calling it <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;/dd&gt;
 
 &lt;dt id="reserve"&gt;Wouldn't it be better to
@@ -1068,7 +1082,7 @@
 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 <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
+of <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  Many 
&ldquo;Linux&rdquo; User Groups make it part of their mission to
 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 <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span>
@@ -1091,7 +1105,8 @@
 With this understanding, they can start to recognize the distributions
 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;
+<span 
class="removed"><del><strong>Linux&rdquo;.&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>Linux.&rdquo;&lt;/p&gt;</em></ins></span>
 &lt;p&gt;
 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
@@ -1131,8 +1146,9 @@
 GNU Hurd to work, we might have done that.  (Alas, that is hindsight.)
 &lt;p&gt;
 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
-and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and we don't
+<span class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> that 
would be somewhat like making a version of the GNU system
+and labeling it <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  That wasn't 
right, and we don't
 want to act like that.&lt;/p&gt;
 &lt;/dd&gt;
 
@@ -1151,7 +1167,7 @@
 &lt;p&gt;
 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 with the GNU Project because he was a &ldquo;Linux user&rdquo;.
+about working with the GNU Project because he was a &ldquo;Linux <span 
class="removed"><del><strong>user&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>user.&rdquo;</em></ins></span>
 That came as a shock, because the people who ported GNU packages to
 other systems had generally wanted to work with us to get their
 changes installed.  Yet these people, developing a system that was
@@ -1159,7 +1175,7 @@
 only) group that was unwilling to work with us.&lt;/p&gt;
 &lt;p&gt;
 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
+version of the GNU system <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> and that this 
confusion was
 obstructing our work.  Asking you to call the system &ldquo;GNU/Linux&rdquo; is
 our response to that problem, and to the other problems caused by the
 &ldquo;Linux&rdquo; misnomer.&lt;/p&gt;
@@ -1178,8 +1194,8 @@
     convention be applied to all programs that are GPL'ed? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#allgpled"&gt;#allgpled&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-We never refer to individual programs as 
&ldquo;GNU/&lt;i&gt;name&lt;/i&gt;&rdquo;.  When a program
-is a GNU package, we may call it &ldquo;GNU &lt;i&gt;name&lt;/i&gt;&rdquo;.
+We never refer to individual programs as <span 
class="removed"><del><strong>&ldquo;GNU/&lt;i&gt;name&lt;/i&gt;&rdquo;.</strong></del></span>
 <span 
class="inserted"><ins><em>&ldquo;GNU/&lt;i&gt;name&lt;/i&gt;.&rdquo;</em></ins></span>
  When a program
+is a GNU package, we may call it &ldquo;GNU <span 
class="removed"><del><strong>&lt;i&gt;name&lt;/i&gt;&rdquo;.</strong></del></span>
 <span 
class="inserted"><ins><em>&lt;i&gt;name&lt;/i&gt;.&rdquo;</em></ins></span>
 &lt;p&gt;
 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
@@ -1232,15 +1248,17 @@
 &lt;p&gt;
 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.  The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not
-Unix&rdquo;, is a humorous way of giving credit to Unix for this,
+Unix.  The name <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> which stands for 
&ldquo;GNU's Not
+<span class="removed"><del><strong>Unix&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>Unix,&rdquo;</em></ins></span> is a humorous 
way of giving credit to Unix for this,
 following a hacker tradition of recursive acronyms that started in the
 70s.&lt;/p&gt;
 &lt;p&gt;
 The first such recursive acronym was TINT, &ldquo;TINT Is Not
-TECO&rdquo;.  The author of TINT wrote another implementation of TECO
+<span class="removed"><del><strong>TECO&rdquo;.</strong></del></span>
+<span class="inserted"><ins><em>TECO.&rdquo;</em></ins></span>  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;&lt;em&gt;somethingorother&lt;/em&gt; 
TECO&rdquo;, he
+calling it by a dull name like &ldquo;&lt;em&gt;somethingorother&lt;/em&gt; 
<span class="removed"><del><strong>TECO&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>TECO,&rdquo;</em></ins></span> he
 thought of a clever amusing name.  (That's what hacking
 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;
@@ -1250,7 +1268,7 @@
 program that was similar to some existing program (let's imagine its
 name was &ldquo;Klever&rdquo;), you could give it a recursive acronym name, 
such
 as &ldquo;MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo;  In this same 
spirit we called our
-replacement for Unix &ldquo;GNU's Not Unix&rdquo;.&lt;/p&gt;
+replacement for Unix &ldquo;GNU's Not <span 
class="removed"><del><strong>Unix&rdquo;.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>Unix.&rdquo;&lt;/p&gt;</em></ins></span>
 &lt;p&gt;
 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
@@ -1258,7 +1276,8 @@
 threatened to sue anyone giving AT&amp;T credit in that way.  This is
 why each of the various modified versions of Unix (all proprietary,
 like Unix) had a completely different name that didn't include
-&ldquo;Unix&rdquo;.&lt;/p&gt;
+<span 
class="removed"><del><strong>&ldquo;Unix&rdquo;.&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Unix.&rdquo;&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="bsd"&gt;Should we say &ldquo;GNU/BSD&rdquo;
@@ -1289,7 +1308,7 @@
 why the name &ldquo;GNU/Linux&rdquo; is appropriate for it.&lt;/p&gt;
 &lt;p&gt;
 There is a version of GNU which uses the kernel from NetBSD.  Its
-developers call it &ldquo;Debian GNU/NetBSD&rdquo;, but 
&ldquo;GNU/kernelofNetBSD&rdquo;
+developers call it &ldquo;Debian <span 
class="removed"><del><strong>GNU/NetBSD&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>GNU/NetBSD,&rdquo;</em></ins></span> but 
&ldquo;GNU/kernelofNetBSD&rdquo;
 would be more accurate, since NetBSD is an entire system, not just
 the kernel.  This is not a BSD system, since most of the system
 is the same as the GNU/Linux system.&lt;/p&gt;
@@ -1300,7 +1319,7 @@
 
 &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
+Not in the same sense that we mean by <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux.&rdquo;</em></ins></span>  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,
@@ -1351,7 +1370,7 @@
 the two have very little code in common.  In fact, the only thing they
 have in common is Linux.&lt;/p&gt;
 &lt;p&gt;
-If you call the whole GNU/Linux system &ldquo;Linux&rdquo;,
+If you call the whole GNU/Linux system <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span>
 you will find it necessary to say things like, &ldquo;Android contains
 Linux, but it isn't Linux, because it doesn't have the usual Linux
 [sic] libraries and utilities [meaning the GNU system].&rdquo;&lt;/p&gt;
@@ -1372,7 +1391,7 @@
 people will</em></ins></span> not <span class="inserted"><ins><em>understand 
the intended meaning.
 &lt;p&gt;
 The public will find it very strange to speak of using Android as
-&ldquo;using Linux&rdquo;.  It's like having</em></ins></span> a <span 
class="removed"><del><strong>meaningful question because</strong></del></span> 
<span class="inserted"><ins><em>conversation, then
+&ldquo;using Linux.&rdquo;  It's like having</em></ins></span> a <span 
class="removed"><del><strong>meaningful question because</strong></del></span> 
<span class="inserted"><ins><em>conversation, then
 saying you were conversing with</em></ins></span> the <span 
class="removed"><del><strong>GNU
 system does not have precise boundaries.</strong></del></span> <span 
class="inserted"><ins><em>person's intestines or the
 person's circulatory system.&lt;/p&gt;</em></ins></span>
@@ -1382,7 +1401,7 @@
 Linux&rdquo; when it's really GNU/Linux,</em></ins></span> by <span 
class="removed"><del><strong>a community.  It includes far
 more than just</strong></del></span> <span class="inserted"><ins><em>way 
of</em></ins></span> the <span class="removed"><del><strong>GNU software 
packages (of which we have</strong></del></span> <span 
class="inserted"><ins><em>usual
 misunderstanding: thinking of the whole system as
-&ldquo;Linux&rdquo;.&lt;/p&gt;
+&ldquo;Linux.&rdquo;&lt;/p&gt;
 &lt;p&gt;
 Use of Android and use of GNU/Linux are totally different, as
 different as driving</em></ins></span> a <span 
class="removed"><del><strong>specific
@@ -1392,8 +1411,8 @@
 fact</em></ins></span> that <span class="removed"><del><strong>yields
 GNU/Linux.</strong></del></span> <span class="inserted"><ins><em>a car and a 
bicycle both have a structure of metal is
 irrelevant to using those two.</em></ins></span>  If you <span 
class="removed"><del><strong>use part</strong></del></span> <span 
class="inserted"><ins><em>wish to talk about using cars
-and bikes, you wouldn't speak</em></ins></span> of <span 
class="inserted"><ins><em>&ldquo;riding metal objects&rdquo;
-&mdash; not unless you're playing games with</em></ins></span> the <span 
class="removed"><del><strong>GNU system</strong></del></span> <span 
class="inserted"><ins><em>reader.  You would
+and bikes, you wouldn't speak</em></ins></span> of <span 
class="inserted"><ins><em>&ldquo;riding metal objects&rdquo;&mdash;not
+unless you're playing games with</em></ins></span> the <span 
class="removed"><del><strong>GNU system</strong></del></span> <span 
class="inserted"><ins><em>reader.  You would
 say, &ldquo;using cars</em></ins></span> and <span 
class="removed"><del><strong>omit part, there is
 no meaningful</strong></del></span> <span 
class="inserted"><ins><em>bikes.&rdquo; Likewise, the clear</em></ins></span> 
way to <span class="removed"><del><strong>say &ldquo;how much&rdquo; you 
used.&lt;/p&gt;
 &lt;p&gt;
@@ -1446,7 +1465,7 @@
 <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
+or label it as <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU.&rdquo;</em></ins></span>  When we talk 
about the whole
 system, the name &ldquo;GNU/Linux&rdquo; gives him a share of the
 <span class="removed"><del><strong>credit.</strong></del></span>
 <span class="inserted"><ins><em>credit.&lt;/p&gt;</em></ins></span>
@@ -1457,13 +1476,17 @@
     agree that Linux is just the kernel? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#linusagreed"&gt;#linusagreed&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-&lt;p&gt;He recognized this at the beginning.  The earliest Linux release notes
+&lt;p&gt;He recognized this at the beginning.  The <span 
class="inserted"><ins><em>&lt;a
+href="https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;</em></ins></span>
+earliest Linux release <span class="removed"><del><strong>notes
 said, &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>
-&ldquo;Most of the tools used with linux are GNU software and are under the
+href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;
+&ldquo;Most</strong></del></span> <span 
class="inserted"><ins><em>notes&lt;/a&gt; said:&lt;/p&gt;
+&lt;blockquote&gt;&lt;p&gt;
+Most</em></ins></span> 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;
+for more <span 
class="removed"><del><strong>info&rdquo;&lt;/a&gt;.&lt;/p&gt;</strong></del></span>
 <span class="inserted"><ins><em>info.
+&lt;/p&gt;&lt;/blockquote&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="finishhurd"&gt;Why not finish the GNU Hurd kernel, release the GNU 
system
@@ -1491,7 +1514,7 @@
 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
+name to use.  You can't make others say <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> but
 you can decide to call the system &ldquo;GNU/Linux&rdquo;
 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;
@@ -1504,10 +1527,10 @@
 <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
+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> you 
will help others learn the system's true
 history, origin, and reason for being.  You can't correct the misnomer
 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
+only a few hundred people see you use the term <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> you 
will
 have educated a substantial number of people with very little work.
 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;
@@ -1519,14 +1542,15 @@
 &lt;dd&gt;
 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.
+calling 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> and 
uses your time inefficiently.
 &lt;p&gt;
 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, and they may learn a correct picture of the system's
 origin.  But they are unlikely to repeat the explanation to others
 whenever they talk about the system.  They will probably just call it
-&ldquo;Linux&rdquo;.  Without particularly intending to, they will help spread 
the
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  
Without particularly intending to, they will help spread the
 incorrect picture.&lt;/p&gt;
 &lt;p&gt;
 It is inefficient because it takes a lot more time.  Saying and
@@ -1592,7 +1616,8 @@
 &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 <span 
class="removed"><del><strong>too.</strong></del></span> <span 
class="inserted"><ins><em>too.&lt;/p&gt;</em></ins></span>
+<span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> 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
@@ -1636,7 +1661,7 @@
 &lt;/dd&gt;
 
 &lt;dt id="deserve"&gt;Since you failed to put
-    something in the GNU GPL to require people to call the system 
&ldquo;GNU&rdquo;,
+    something in the GNU GPL to require people to call the system <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span>
     you deserve what happened; why are you complaining now? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#deserve"&gt;#deserve&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
@@ -1662,7 +1687,7 @@
 &lt;/dd&gt;
 
 &lt;dt id="somanyright"&gt;Since many people call
-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;
+it <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> 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;
 <span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
@@ -1675,7 +1700,7 @@
 &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
+includes <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> 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 <span 
class="removed"><del><strong>understand.</strong></del></span> <span 
class="inserted"><ins><em>understand.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
@@ -1756,7 +1781,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/08/31 10:37:07 $
+$Date: 2021/11/02 14:41:51 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: po/gnu-linux-faq.ko.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.ko.po,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- po/gnu-linux-faq.ko.po      31 Aug 2021 10:37:07 -0000      1.31
+++ po/gnu-linux-faq.ko.po      2 Nov 2021 14:41:51 -0000       1.32
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-linux-faq.html\n"
-"POT-Creation-Date: 2021-08-31 10:27+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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"
@@ -31,10 +31,19 @@
 msgid "by Richard Stallman"
 msgstr "리차드 스톨반이 작성한 GNU/Linux FAQ"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+# | When people see that we use and recommend the name GNU/Linux for a system
+# | that many others call just [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} they ask many questions.  Here are common
+# | questions, and our answers.
+#, fuzzy
+#| 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."
 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.  "
+"that many others call just &ldquo;Linux,&rdquo; they ask many questions.  "
 "Here are common questions, and our answers."
 msgstr ""
 "많은 이들이 단순히 &ldquo;Linux&rdquo;라 부르는 시스템을 
GNU/Linux라고 쓰고 "
@@ -256,11 +265,22 @@
 "나요?<a href=\"#justgnu\"></a>"
 
 #. type: Content of: <div><div><ul><li>
+# | <a href=\"#trademarkfee\">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;.-] {+&ldquo;GNU/Linux.&rdquo;+} Is it
+# | wrong if I use &ldquo;GNU&rdquo; without [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} to save the fee?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#trademarkfee\">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 wrong if I use &ldquo;GNU&rdquo; without "
+#| "&ldquo;Linux&rdquo;, to save the fee?</a>"
 msgid ""
 "<a href=\"#trademarkfee\">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 wrong if I use &ldquo;GNU&rdquo; without "
-"&ldquo;Linux&rdquo;, to save the fee?</a>"
+"&ldquo;GNU/Linux.&rdquo; Is it wrong if I use &ldquo;GNU&rdquo; without "
+"&ldquo;Linux,&rdquo; to save the fee?</a>"
 msgstr ""
 "<a href=\"#trademarkfee\">만약 &ldquo;Linux&rdquo; 이름의 제품을 
사용하게 된"
 "다면 비용을 지불해야 합니다. 이는 &ldquo;GNU/Linux&rdquo;에도 
적용되는 사안이"
@@ -367,10 +387,19 @@
 "Linux&rdquo;인가요?</a>"
 
 #. type: Content of: <div><div><ul><li>
-msgid ""
-"<a href=\"#distronames0\">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 whatever they like?</a>"
+# | <a href=\"#distronames0\">My distro's developers call it &ldquo;Foobar
+# | [-Linux&rdquo;,-] {+Linux,&rdquo;+} but that doesn't say anything about
+# | what the system consists of.  Why shouldn't they call it whatever they
+# | like?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#distronames0\">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 whatever they like?</a>"
+msgid ""
+"<a href=\"#distronames0\">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 whatever they like?</a>"
 msgstr ""
 "<a href=\"#distronames0\">내 배포판의 개발자들는 &ldquo;Foobar 
Linux&rdquo;라"
 "고 부릅니다. 하지만 이는 시스템이 어떻게 
구성되어있는지 말해주지 않습니다. "
@@ -629,9 +658,18 @@
 "구 사항을 적어 놓아야 하지 않나요?</a>"
 
 #. type: Content of: <div><div><ul><li>
+# | <a href=\"#deserve\">Since you failed to put something in the GNU GPL to
+# | require people to call the system [-&ldquo;GNU&rdquo;,-]
+# | {+&ldquo;GNU,&rdquo;+} you deserve what happened; why are you complaining
+# | now?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#deserve\">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 complaining now?</a>"
 msgid ""
 "<a href=\"#deserve\">Since you failed to put something in the GNU GPL to "
-"require people to call the system &ldquo;GNU&rdquo;, you deserve what "
+"require people to call the system &ldquo;GNU,&rdquo; you deserve what "
 "happened; why are you complaining now?</a>"
 msgstr ""
 "<a href=\"#deserve\">GNU GPL에 &ldquo;GNU&rdquo;라는 문구를 넣지 
못했기 때문"
@@ -646,8 +684,15 @@
 "지 않을까요?</a>"
 
 #. type: Content of: <div><div><ul><li>
+# | <a href=\"#somanyright\">Since many people call it
+# | [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} doesn't that make it
+# | right?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#somanyright\">Since many people call it &ldquo;Linux&rdquo;, "
+#| "doesn't that make it right?</a>"
 msgid ""
-"<a href=\"#somanyright\">Since many people call it &ldquo;Linux&rdquo;, "
+"<a href=\"#somanyright\">Since many people call it &ldquo;Linux,&rdquo; "
 "doesn't that make it right?</a>"
 msgstr ""
 "<a href=\"#somanyright\">많은 사람들이 &ldquo;Linux&rdquo;라고 
부르고 있기 때"
@@ -834,6 +879,24 @@
 "터 문제는 커지기 시작했습니다."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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 it must be right.  The name &ldquo;Linux&rdquo; also spreads a
+# | false picture of the system's origin, because people tend to suppose that
+# | the system's history was such as to fit that name.  For instance, they
+# | often believe its development was started by Linus Torvalds in 1991.  This
+# | false picture tends to reinforce the idea that the system should be called
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+}
+#, fuzzy
+#| 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 it must be right.  The name &ldquo;Linux&rdquo; also spreads a "
+#| "false picture of the system's origin, because people tend to suppose that "
+#| "the system's history was such as to fit that name.  For instance, they "
+#| "often believe its development was started by Linus Torvalds in 1991.  "
+#| "This false picture tends to reinforce the idea that the system should be "
+#| "called &ldquo;Linux&rdquo;."
 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 "
@@ -841,7 +904,7 @@
 "of the system's origin, because people tend to suppose that the system's "
 "history was such as to fit that name.  For instance, they often believe its "
 "development was started by Linus Torvalds in 1991.  This false picture tends "
-"to reinforce the idea that the system should be called &ldquo;Linux&rdquo;."
+"to reinforce the idea that the system should be called &ldquo;Linux.&rdquo;"
 msgstr ""
 "&ldquo;Linux&rdquo;라고 부르는 사람들은 대부분 왜 그것이 
옳지 않은 일인지 전"
 "혀 들어보지 못했습니다. 그들은 다른 사람들이 그 이름을 
쓰는 것을 보고 그것이 "
@@ -868,22 +931,46 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#always\">#always</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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;,-] {+&ldquo;Linux,&rdquo;+} the name its developer
+# | chose.
+#, fuzzy
+#| 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."
 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."
+"you're referring specifically to the kernel, you should call it &ldquo;Linux,"
+"&rdquo; the name its developer chose."
 msgstr ""
 "항상 그렇지는 않습니다. 전체 시스템에 대해 이야기할 
때만 GNU/Linux라고 부르"
 "면 됩니다. 커널만을 언급할 때는 커널 개발자가 고른 
이름인 &ldquo;Linux&rdquo;"
 "라고 불러야 합니다. "
 
 #. type: Content of: <div><dl><dd><p>
+# | When people call the whole system [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} as a consequence they call the whole system by
+# | the same name as the kernel.  This causes many kinds of confusion, because
+# | only experts can tell whether a statement is about the kernel or the whole
+# | system.  By calling the whole system [-&ldquo;GNU/Linux&rdquo;,-]
+# | {+&ldquo;GNU/Linux,&rdquo;+} and calling the kernel
+# | [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} you avoid the ambiguity.
+#, fuzzy
+#| 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 kinds of confusion, because only experts can tell whether a "
+#| "statement is about the kernel or the whole system.  By calling the whole "
+#| "system &ldquo;GNU/Linux&rdquo;, and calling the kernel &ldquo;"
+#| "Linux&rdquo;, you avoid the ambiguity."
 msgid ""
-"When people call the whole system &ldquo;Linux&rdquo;, as a consequence they "
+"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 "
 "kinds of confusion, because only experts can tell whether a statement is "
 "about the kernel or the whole system.  By calling the whole system &ldquo;"
-"GNU/Linux&rdquo;, and calling the kernel &ldquo;Linux&rdquo;, you avoid the "
+"GNU/Linux,&rdquo; and calling the kernel &ldquo;Linux,&rdquo; you avoid the "
 "ambiguity."
 msgstr ""
 "사람들이 전체 시스템을 &ldquo;Linux&rdquo;라고 부르면 
커널과 같은 이름으로 전"
@@ -950,8 +1037,17 @@
 "\"anchor-reference-id\">(<a href=\"#divide\">#divide</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | When we ask people to say [-&ldquo;GNU/Linux&rdquo;,-]
+# | {+&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.
+#, fuzzy
+#| 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."
 msgid ""
-"When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing "
+"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 ""
@@ -1005,10 +1101,34 @@
 "프트웨어가 오픈 소스보다 좋은가?</a>를 보세요."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | freedom are more likely to call the system [-&ldquo;GNU/Linux&rdquo;,-]
+# | {+&ldquo;GNU/Linux,&rdquo;+} and people who learn that the system is
+# | &ldquo;GNU/Linux&rdquo; are more likely to pay attention to our
+# | philosophical arguments for freedom and community (which is why the choice
+# | of name for the system makes a real difference for society).  However, the
+# | disagreement would probably exist even if everyone knew the system's real
+# | origin and its proper name, because the issue is a real one.  It can only
+# | go away if we who value freedom either persuade everyone (which won't be
+# | easy) or are defeated entirely (let's hope not).
+#, fuzzy
+#| 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 freedom are more likely to call the system &ldquo;GNU/"
+#| "Linux&rdquo;, and people who learn that the system is &ldquo;GNU/"
+#| "Linux&rdquo; are more likely to pay attention to our philosophical "
+#| "arguments for freedom and community (which is why the choice of name for "
+#| "the system makes a real difference for society).  However, the "
+#| "disagreement would probably exist even if everyone knew the system's real "
+#| "origin and its proper name, because the issue is a real one.  It can only "
+#| "go away if we who value freedom either persuade everyone (which won't be "
+#| "easy) or are defeated entirely (let's hope not)."
 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 "
-"freedom are more likely to call the system &ldquo;GNU/Linux&rdquo;, and "
+"freedom are more likely to call the system &ldquo;GNU/Linux,&rdquo; and "
 "people who learn that the system is &ldquo;GNU/Linux&rdquo; are more likely "
 "to pay attention to our philosophical arguments for freedom and community "
 "(which is why the choice of name for the system makes a real difference for "
@@ -1071,10 +1191,23 @@
 "\"#everyoneknows\">#everyoneknows</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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
+# | system do not mention the name [-&ldquo;GNU&rdquo;,-]
+# | {+&ldquo;GNU,&rdquo;+} or the ideals that GNU stands for.  <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never
+# | Heard of GNU</a> explains further.
+#, fuzzy
+#| 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 system do not mention the name &ldquo;GNU&rdquo;, or the ideals that "
+#| "GNU stands for.  <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU "
+#| "Users Who Have Never Heard of GNU</a> explains further."
 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 "
-"system do not mention the name &ldquo;GNU&rdquo;, or the ideals that GNU "
+"system do not mention the name &ldquo;GNU,&rdquo; or the ideals that GNU "
 "stands for.  <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users "
 "Who Have Never Heard of GNU</a> explains further."
 msgstr ""
@@ -1085,11 +1218,22 @@
 "는 사람들을 위한 문서</a>에서 더 자세한 것을 보실 수 
있습니다."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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 GNU is.  For instance, many think it is a collection of [-<a
+# | href=\"#tools\">&ldquo;tools&rdquo;</a>,-] {+&ldquo;<a
+# | href=\"#tools\">tools</a>,&rdquo;+} or a project to develop tools.
+#, fuzzy
+#| 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 GNU is.  For instance, many think it is a collection of <a "
+#| "href=\"#tools\">&ldquo;tools&rdquo;</a>, or a project to develop tools."
 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 "
-"GNU is.  For instance, many think it is a collection of <a href=\"#tools"
-"\">&ldquo;tools&rdquo;</a>, or a project to develop tools."
+"GNU is.  For instance, many think it is a collection of &ldquo;<a href="
+"\"#tools\">tools</a>,&rdquo; or a project to develop tools."
 msgstr ""
 "이런 말을 하는 사람들은 아마도 geek에 대해 생각하는 
geek들일 것입니다. Geek들"
 "은 GNU에 대해 알기도 합니다. 그러나 GNU가 무엇인지에 
대해 완전히 잘못된 개념"
@@ -1122,11 +1266,23 @@
 "a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | 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;,-] {+&ldquo;Linux,&rdquo;+} that it was started by
+# | Linus Torvalds, and that it was intended to be &ldquo;open
+# | [-source&rdquo;.-] {+source.&rdquo;+} If you don't tell them, who will?
+#, fuzzy
+#| 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;"
+#| "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?"
 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;"
-"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?"
+"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?"
 msgstr ""
 "만약 당신의 말들이 당신의 생각을 비추지 못한다면 당신
은 아무에게도 가르치지 "
 "못합니다. GNU/Linux를 들어봤던 대부분의 사람들은 이를 
Linus Torvalds로부터 시"
@@ -1183,14 +1339,31 @@
 "reference-id\">(<a href=\"#tools\">#tools</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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
+# | that GNU is the name of a collection of programs&mdash;often they say
+# | &ldquo;programming [-tools&rdquo;,-] {+tools,&rdquo;+} since some of our
+# | programming tools became popular on their own.  The idea that
+# | &ldquo;GNU&rdquo; is the name of an operating system is hard to fit into a
+# | conceptual framework in which that operating system is labeled
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+}
+#, fuzzy
+#| 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 "
+#| "that GNU is the name of a collection of programs&mdash;often they say "
+#| "&ldquo;programming tools&rdquo;, since some of our programming tools "
+#| "became popular on their own.  The idea that &ldquo;GNU&rdquo; is the name "
+#| "of an operating system is hard to fit into a conceptual framework in "
+#| "which that operating system is labeled &ldquo;Linux&rdquo;."
 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 "
 "that GNU is the name of a collection of programs&mdash;often they say &ldquo;"
-"programming tools&rdquo;, since some of our programming tools became popular "
+"programming tools,&rdquo; since some of our programming tools became popular "
 "on their own.  The idea that &ldquo;GNU&rdquo; is the name of an operating "
 "system is hard to fit into a conceptual framework in which that operating "
-"system is labeled &ldquo;Linux&rdquo;."
+"system is labeled &ldquo;Linux.&rdquo;"
 msgstr ""
 "Linux를 전체 운영체제로 생각하는 사람들이 GNU에 대해 
들으면 GNU가 무엇인지에 "
 "대해 잘못 생각할 때가 종종 있습니다. 그들은 GNU를 
프로그램(&ldquo;프로그래밍 "
@@ -1251,12 +1424,32 @@
 "램입니다. 커널은 또한 다른 프로그램을 시작하고 멈추게 
합니다."
 
 #. type: Content of: <div><dl><dd><p>
+# | To confuse matters, some people use the term &ldquo;operating
+# | system&rdquo; to mean [-&ldquo;kernel&rdquo;.-] {+&ldquo;kernel.&rdquo;+}
+# | Both uses of the term go back many years.  The use of &ldquo;operating
+# | system&rdquo; to mean &ldquo;kernel&rdquo; is found in a number of
+# | textbooks on system design, going back to the 80s.  At the same time, in
+# | the 80s, the &ldquo;Unix operating system&rdquo; was understood to include
+# | all the system programs, and Berkeley's version of Unix included even
+# | games. Since we intended GNU to be a Unix-like operating system, we use
+# | the term &ldquo;operating system&rdquo; in the same way.
+#, fuzzy
+#| 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.  The use of &ldquo;operating system&rdquo; to mean "
+#| "&ldquo;kernel&rdquo; is found in a number of textbooks on system design, "
+#| "going back to the 80s.  At the same time, in the 80s, the &ldquo;Unix "
+#| "operating system&rdquo; was understood to include all the system "
+#| "programs, and Berkeley's version of Unix included even games. Since we "
+#| "intended GNU to be a Unix-like operating system, we use the term &ldquo;"
+#| "operating system&rdquo; in the same way."
 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.  "
-"The use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is "
-"found in a number of textbooks on system design, going back to the 80s.  At "
-"the same time, in the 80s, the &ldquo;Unix operating system&rdquo; was "
+"to mean &ldquo;kernel.&rdquo; Both uses of the term go back many years.  The "
+"use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is found "
+"in a number of textbooks on system design, going back to the 80s.  At the "
+"same time, in the 80s, the &ldquo;Unix operating system&rdquo; was "
 "understood to include all the system programs, and Berkeley's version of "
 "Unix included even games. Since we intended GNU to be a Unix-like operating "
 "system, we use the term &ldquo;operating system&rdquo; in the same way."
@@ -1271,11 +1464,28 @@
 "니다."
 
 #. type: Content of: <div><dl><dd><p>
+# | Most of the time when people speak of the &ldquo;Linux operating
+# | system&rdquo; they are using &ldquo;operating system&rdquo; in the same
+# | sense we use: they mean the whole collection of programs.  If that's what
+# | you are referring to, please call it [-&ldquo;GNU/Linux&rdquo;.-]
+# | {+&ldquo;GNU/Linux.&rdquo;+} If you mean just the kernel, then
+# | &ldquo;Linux&rdquo; is the right name for it, but please say
+# | &ldquo;kernel&rdquo; also to avoid ambiguity about which body of software
+# | you mean.
+#, fuzzy
+#| 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 "
+#| "sense we use: they mean the whole collection of programs.  If that's what "
+#| "you are referring to, please call it &ldquo;GNU/Linux&rdquo;.  If you "
+#| "mean just the kernel, then &ldquo;Linux&rdquo; is the right name for it, "
+#| "but please say &ldquo;kernel&rdquo; also to avoid ambiguity about which "
+#| "body of software you mean."
 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 "
 "sense we use: they mean the whole collection of programs.  If that's what "
-"you are referring to, please call it &ldquo;GNU/Linux&rdquo;.  If you mean "
+"you are referring to, please call it &ldquo;GNU/Linux.&rdquo; If you mean "
 "just the kernel, then &ldquo;Linux&rdquo; is the right name for it, but "
 "please say &ldquo;kernel&rdquo; also to avoid ambiguity about which body of "
 "software you mean."
@@ -1288,10 +1498,20 @@
 "한 것인지 모호함을 피하기 위해 &ldquo;커널&rdquo;이라고 
말해주세요."
 
 #. type: Content of: <div><dl><dd><p>
+# | If you prefer to use some other term such as &ldquo;system
+# | distribution&rdquo; for the entire collection of programs, instead of
+# | &ldquo;operating [-system&rdquo;,-] {+system,&rdquo;+} that's fine.  Then
+# | you would talk about GNU/Linux system distributions.
+#, fuzzy
+#| msgid ""
+#| "If you prefer to use some other term such as &ldquo;system "
+#| "distribution&rdquo; for the entire collection of programs, instead of "
+#| "&ldquo;operating system&rdquo;, that's fine.  Then you would talk about "
+#| "GNU/Linux system distributions."
 msgid ""
 "If you prefer to use some other term such as &ldquo;system "
 "distribution&rdquo; for the entire collection of programs, instead of &ldquo;"
-"operating system&rdquo;, that's fine.  Then you would talk about GNU/Linux "
+"operating system,&rdquo; that's fine.  Then you would talk about GNU/Linux "
 "system distributions."
 msgstr ""
 "전체 프로그램 모음으로 &ldquo;운영체제&rdquo; 대신 
&ldquo;시스템 배포판"
@@ -1395,9 +1615,9 @@
 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, "
-"window systems, libraries, and much more &mdash; hundreds of programs, even "
-"to match what BSD systems included in 1983.  Since Torvalds didn't develop "
-"any of those, how can the system be &ldquo;Linux&rdquo;?"
+"window systems, libraries, and much more&mdash;hundreds of programs, even to "
+"match what BSD systems included in 1983.  Since Torvalds didn't develop any "
+"of those, how can the system be &ldquo;Linux&rdquo;?"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><p>
@@ -1424,9 +1644,18 @@
 "\">#notinstallable</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | Many <a href=\"/distros/distros.html\"> packaged and installable versions
+# | of GNU</a> are available.  None of them is called simply
+# | [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} but GNU is what they
+# | basically are.
+#, fuzzy
+#| 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."
 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</a> are available.  None of them is called simply &ldquo;GNU,&rdquo; but "
 "GNU is what they basically are."
 msgstr ""
 "많은<a href=\"/distros/distros.html\">패키지화된 설치가능한 GNU 
버전</a>들이 "
@@ -1474,9 +1703,17 @@
 "의 실질적인 부분을 리패키징하는 것을 포함합니다."
 
 #. type: Content of: <div><dl><dd><p>
+# | We never took the last step of packaging GNU under the name
+# | [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} but that doesn't alter what
+# | kind of thing GNU is.  GNU is an operating system.
+#, fuzzy
+#| 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."
 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 "
+"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 ""
 "우리는 절대 &ldquo;GNU&rdquo;의 이름 아래 GNU를 패키징하는 
지난 단계를 밟지 "
@@ -1494,13 +1731,28 @@
 "href=\"#afterkernel\">#afterkernel</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | That practice seems to be very rare&mdash;we can't find any examples other
+# | than the misuse of the name [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+} Normally an operating system is developed as a
+# | single unified project, and the developers choose a name for the system as
+# | a whole.  The kernel usually does not have a name of its
+# | own&mdash;instead, people say &ldquo;the kernel of such-and-such&rdquo; or
+# | &ldquo;the such-and-such [-kernel&rdquo;.-] {+kernel.&rdquo;+}
+#, fuzzy
+#| 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 system is developed as a single unified project, and the "
+#| "developers choose a name for the system as a whole.  The kernel usually "
+#| "does not have a name of its own&mdash;instead, people say &ldquo;the "
+#| "kernel of such-and-such&rdquo; or &ldquo;the such-and-such kernel&rdquo;."
 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 "
+"than the misuse of the name &ldquo;Linux.&rdquo; Normally an operating "
 "system is developed as a single unified project, and the developers choose a "
 "name for the system as a whole.  The kernel usually does not have a name of "
 "its own&mdash;instead, people say &ldquo;the kernel of such-and-such&rdquo; "
-"or &ldquo;the such-and-such kernel&rdquo;."
+"or &ldquo;the such-and-such kernel.&rdquo;"
 msgstr ""
 "그 관례는 매우 드뭅니다. 우리는 &ldquo;Linux&rdquo;라는 
이름을 잘못 쓰는 것"
 "만 봤습니다. 운영체제는 단일한 통합 프로젝트로 
개발되는 것이 일반적이고 개발"
@@ -1554,9 +1806,18 @@
 "span>"
 
 #. type: Content of: <div><dl><dd>
+# | For a while we tried the name [-&ldquo;LiGNUx&rdquo;,-]
+# | {+&ldquo;LiGNUx,&rdquo;+} which combines the words &ldquo;GNU&rdquo; and
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} The reaction was very
+# | bad.  People accept &ldquo;GNU/Linux&rdquo; much better.
+#, fuzzy
+#| 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."
 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.  "
+"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 ""
 "한동안 &ldquo;GNU&rdquo;와 &ldquo;Linux&rdquo;를 합친 
&ldquo;LiGNUx&rdquo;라"
@@ -1564,8 +1825,16 @@
 "Linux&rdquo;를 더 좋아했습니다."
 
 #. type: Content of: <div><dl><dd><p>
+# | The shortest legitimate name for this system is [-&ldquo;GNU&rdquo;,-]
+# | {+&ldquo;GNU,&rdquo;+} but we call it &ldquo;GNU/Linux&rdquo; <a
+# | href=\"#justgnu\"> for the reasons given below</a>.
+#, fuzzy
+#| 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>."
 msgid ""
-"The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but we "
+"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 ""
@@ -1616,8 +1885,16 @@
 "\"#long2\">#long2</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | It only takes a second to say or type [-&ldquo;GNU/&rdquo;.-]
+# | {+&ldquo;GNU/.&rdquo;+} If you appreciate the system that we developed,
+# | can't you take one second to recognize our work?
+#, fuzzy
+#| 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?"
 msgid ""
-"It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you appreciate "
+"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 ""
@@ -1726,10 +2003,21 @@
 "으로 다룰 것입니다."
 
 #. type: Content of: <div><dl><dd><ul><li>
+# | Since many people know of the system as [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} if we say &ldquo;GNU&rdquo; they may simply not
+# | recognize we're talking about the same system.  If we say
+# | [-&ldquo;GNU/Linux&rdquo;,-] {+&ldquo;GNU/Linux,&rdquo;+} they can make a
+# | connection to what they have heard about.
+#, fuzzy
+#| 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 system.  If we say &ldquo;GNU/Linux&rdquo;, they can make a "
+#| "connection to what they have heard about."
 msgid ""
-"Since many people know of the system as &ldquo;Linux&rdquo;, if we say "
+"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 "
-"system.  If we say &ldquo;GNU/Linux&rdquo;, they can make a connection to "
+"system.  If we say &ldquo;GNU/Linux,&rdquo; they can make a connection to "
 "what they have heard about."
 msgstr ""
 "많은 사람들이 &ldquo;Linux&rdquo;에 대해 알고 있기 때문에 
우리가 &ldquo;"
@@ -1738,10 +2026,23 @@
 "다."
 
 #. type: Content of: <div><dl><dt>
+# | 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;.-]
+# | {+&ldquo;GNU/Linux.&rdquo;+} Is it wrong if I use &ldquo;GNU&rdquo;
+# | without [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} to save the fee?
+# | <span class=\"anchor-reference-id\">(<a
+# | href=\"#trademarkfee\">#trademarkfee</a>)</span>
+#, fuzzy
+#| 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 wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to save "
+#| "the fee? <span class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
+#| "\">#trademarkfee</a>)</span>"
 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 "
-"wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to save the "
+"product, and that would also apply if I say &ldquo;GNU/Linux.&rdquo; Is it "
+"wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux,&rdquo; to save the "
 "fee? <span class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
 "\">#trademarkfee</a>)</span>"
 msgstr ""
@@ -1762,9 +2063,17 @@
 "만 하는 의무가 있는 것은 아닙니다."
 
 #. type: Content of: <div><dl><dd><p>
+# | So if you want to refer to the system simply as [-&ldquo;GNU&rdquo;,-]
+# | {+&ldquo;GNU,&rdquo;+} to avoid paying the fee for calling it
+# | [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} we won't criticize you.
+#, fuzzy
+#| 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."
 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."
+"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 ""
 "따라서 &ldquo;Linux&rdquo;라고 부르는 것에 대한 비용을 내지 
않으려고 그냥 "
 "&ldquo;GNU&rdquo;라 부르고 싶다면 우리는 비난하지 않을 것입
니다."
@@ -1820,12 +2129,25 @@
 "한계를 정할 적절한 곳이 없으므로 어떻게 정하든 우리는 
반박하지 않을 것입니다."
 
 #. type: Content of: <div><dl><dd><p>
+# | Different threshold levels would lead to different choices of name for the
+# | system.  But one name that cannot result from concerns of fairness and
+# | giving credit, not for any possible threshold level, is
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} It can't be fair to give
+# | all the credit to one secondary contribution (Linux) while omitting the
+# | principal contribution (GNU).
+#, fuzzy
+#| 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 giving credit, not for any possible threshold level, is &ldquo;"
+#| "Linux&rdquo;.  It can't be fair to give all the credit to one secondary "
+#| "contribution (Linux) while omitting the principal contribution (GNU)."
 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 "
-"giving credit, not for any possible threshold level, is &ldquo;"
-"Linux&rdquo;.  It can't be fair to give all the credit to one secondary "
-"contribution (Linux) while omitting the principal contribution (GNU)."
+"giving credit, not for any possible threshold level, is &ldquo;Linux.&rdquo; "
+"It can't be fair to give all the credit to one secondary contribution "
+"(Linux) while omitting the principal contribution (GNU)."
 msgstr ""
 "한계 수준이 서로 다르면 시스템 이름을 고르는 것도 
달라집니다. 형평성을 잃어버"
 "린 이름의 한 예가 바로 &ldquo;Linux&rdquo;입니다. 주요 
기여(GNU)를 빼고 부차"
@@ -1858,7 +2180,7 @@
 "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."
+"system &ldquo;GNU/systemd/Linux,&rdquo; there is nothing wrong with doing so."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
@@ -1902,11 +2224,21 @@
 "span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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 the same argument would apply even more strongly to calling it
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+}
+#, fuzzy
+#| 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 the same argument would apply even more strongly to calling it &ldquo;"
+#| "Linux&rdquo;."
 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 "
-"the same argument would apply even more strongly to calling it &ldquo;"
-"Linux&rdquo;."
+"the same argument would apply even more strongly to calling it &ldquo;Linux."
+"&rdquo;"
 msgstr ""
 "2008년에 우리는 GNU 패키지가 gNweSense GNU/Linux 배포판의 
&ldquo;Main&rdquo; "
 "Repository의 15%로 만들어졌다는 사실을 확인했습니다. 
Linux는 단지 1.5%로 확인"
@@ -1967,9 +2299,21 @@
 "class=\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | Following the rules of English, in the construction &ldquo;GNU
+# | Linux&rdquo; the word &ldquo;GNU&rdquo; modifies [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+} This can mean either &ldquo;GNU's version of
+# | Linux&rdquo; or &ldquo;Linux, which is a GNU package.&rdquo; Neither of
+# | those meanings fits the situation at hand.
+#, fuzzy
+#| 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 either &ldquo;GNU's version of Linux&rdquo; or &ldquo;"
+#| "Linux, which is a GNU package.&rdquo; Neither of those meanings fits the "
+#| "situation at hand."
 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 "
+"the word &ldquo;GNU&rdquo; modifies &ldquo;Linux.&rdquo; This can mean "
 "either &ldquo;GNU's version of Linux&rdquo; or &ldquo;Linux, which is a GNU "
 "package.&rdquo; Neither of those meanings fits the situation at hand."
 msgstr ""
@@ -1996,9 +2340,10 @@
 # | [-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.
+# | non[---]free firmware [-&ldquo;blobs&rdquo;.-] {+&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 "
@@ -2012,7 +2357,7 @@
 "We're not talking about a distinct GNU version of Linux, the kernel.  The "
 "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 "
+"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."
@@ -2024,11 +2369,24 @@
 "GNU 판&rdquo; 역시 맞지 않습니다."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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 &ldquo;combination.&rdquo; (Think of
+# | [-&ldquo;Input/Output&rdquo;.)-] {+&ldquo;Input/Output.&rdquo;)+}  This
+# | system is the combination of GNU and Linux; hence,
+# | [-&ldquo;GNU/Linux&rdquo;.-] {+&ldquo;GNU/Linux.&rdquo;+}
+#, fuzzy
+#| 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 &ldquo;combination.&rdquo; (Think of &ldquo;Input/Output&rdquo;.)  "
+#| "This system is the combination of GNU and Linux; hence, &ldquo;GNU/"
+#| "Linux&rdquo;."
 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 "
-"&ldquo;combination.&rdquo; (Think of &ldquo;Input/Output&rdquo;.)  This "
-"system is the combination of GNU and Linux; hence, &ldquo;GNU/Linux&rdquo;."
+"&ldquo;combination.&rdquo; (Think of &ldquo;Input/Output.&rdquo;)  This "
+"system is the combination of GNU and Linux; hence, &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "우리는 Linux를 커널로 쓰는 GNU 운영체제에 대해 이야기하고
 있습니다. 사선이 "
 "이 상황에 맞습니다. 사선은 &ldquo;결합&rdquo;을 의미하기 
때문입니다. (&ldquo;"
@@ -2036,11 +2394,22 @@
 "므로 &ldquo;GNU/Linux&rdquo;입니다."
 
 #. 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: "
-"&ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes say &ldquo;GNU con "
-"Linux&rdquo;."
+# | There are other ways to express [-&ldquo;combination&rdquo;.-]
+# | {+&ldquo;combination.&rdquo;+} If you think that a plus-sign is clearer,
+# | please use that.  In French, a hyphen is clear:
+# | [-&ldquo;GNU-Linux&rdquo;.-] {+&ldquo;GNU-Linux.&rdquo;+} In Spanish, we
+# | sometimes say &ldquo;GNU con [-Linux&rdquo;.-] {+Linux.&rdquo;+}
+#, fuzzy
+#| 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: &ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes say &ldquo;GNU "
+#| "con Linux&rdquo;."
+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: "
+"&ldquo;GNU-Linux.&rdquo; In Spanish, we sometimes say &ldquo;GNU con Linux."
+"&rdquo;"
 msgstr ""
 "&ldquo;결합&rdquo;을 표현하는 다른 방법도 있습니다. 더하기 
기호가 더 명확하다"
 "고 생각한다면 더하기 기호를 쓰세요. 프랑스어에서는 
대시를 써 &ldquo;GNU-"
@@ -2093,7 +2462,7 @@
 # | 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
-# | Linux&rdquo; or &ldquo;Linux,-] {+&ldquo;Emacs&rdquo;.  That is the right
+# | Linux&rdquo; or &ldquo;Linux,-] {+&ldquo;Emacs.&rdquo; That is the right
 # | way to describe a program called Emacs+} which is a GNU [-package.&rdquo;
 # | Neither of those meanings fits the situation at hand.-] {+package.+}
 #, fuzzy
@@ -2105,7 +2474,7 @@
 #| "situation at hand."
 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 "
+"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 ""
 "영어 규칙에 따라 &ldquo;GNU Linux&rdquo;라는 구문에서는 
&ldquo;GNU&rdquo;라"
@@ -2144,8 +2513,17 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dd><p>
+# | However, if you prefer to call the system [-&ldquo;Linux/GNU&rdquo;,-]
+# | {+&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.
+#, fuzzy
+#| 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."
 msgid ""
-"However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a "
+"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 ""
@@ -2153,8 +2531,19 @@
 "떼어 버리고 전체 시스템을 Linux만으로 부르는 것보다는 
훨씬 낫습니다."
 
 #. type: Content of: <div><dl><dt>
+# | My distro's developers call it &ldquo;Foobar [-Linux&rdquo;,-]
+# | {+Linux,&rdquo;+} but that doesn't say anything about what the system
+# | consists of.  Why shouldn't they call it whatever they like? <span
+# | class=\"anchor-reference-id\">(<a
+# | href=\"#distronames0\">#distronames0</a>)</span>
+#, fuzzy
+#| 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 whatever they like? <span class=\"anchor-reference-id\">(<a "
+#| "href=\"#distronames0\">#distronames0</a>)</span>"
 msgid ""
-"My distro's developers call it &ldquo;Foobar Linux&rdquo;, but that doesn't "
+"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 "
 "whatever they like? <span class=\"anchor-reference-id\">(<a href="
 "\"#distronames0\">#distronames0</a>)</span>"
@@ -2231,9 +2620,9 @@
 #. 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 "
+"Linux,&rdquo; and call their version of it &ldquo;Foobar Linux,&rdquo; it's "
 "proper for you to correct the misinformation by calling it &ldquo;Foobar GNU/"
-"Linux&rdquo;."
+"Linux.&rdquo;"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
@@ -2266,12 +2655,24 @@
 "습니다. 다시 말하면 그 회사는 뭐가 옳은지 신경쓰지 
않았습니다."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | 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;.-] {+&ldquo;GNU/Linux.&rdquo;+}
+#, fuzzy
+#| 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 "
+#| "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;."
 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 "
 "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;."
+"&ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "우리는 그 회사들을 바꿀 수 없지만 길이 어렵다고 
포기하지 않습니다. 여러분은 "
 "IBM이나 RedHat같은 회사에 비해서 영향력이 적을 것입니다. 
그러나 여러분은 여전"
@@ -2293,12 +2694,12 @@
 # | 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.
+# | [-&ldquo;Linux&rdquo;.-] {+&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 "
@@ -2313,13 +2714,12 @@
 msgid ""
 "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 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 nonfree "
-"applications and drivers), or making the system more popular even at the "
-"cost of freedom."
+"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 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 nonfree applications "
+"and drivers), or making the system more popular even at the cost of freedom."
 msgstr ""
 "GNU/Linux 시스템에 비자유 소프트웨어를 추가하는, 널리 
퍼진 관행이 자유 소프트"
 "웨어 커뮤니티에게는 주요한 문제입니다. 그로 인해 
사용자들이 비자유 소프트웨어"
@@ -2355,7 +2755,8 @@
 # | 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;.
+# | they are proper and appropriate &ldquo;versions of [-Linux&rdquo;.-]
+# | {+Linux.&rdquo;+}
 #, fuzzy
 #| msgid ""
 #| "The way to lead these users to see a connection with freedom is exactly "
@@ -2372,7 +2773,7 @@
 "specifically for the sake of the users' freedom.  With this understanding, "
 "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;."
+"proper and appropriate &ldquo;versions of Linux.&rdquo;"
 msgstr ""
 "이런 사용자들이 자유와의 관계를 보도록 이끄는 방법은 ì 
•í™•ížˆ ê·¸ 반대입니다. "
 "이 모든 시스템들이 GNU 판본이고 그것들이 특히 사용자의 
자유를 위해 존재하는 "
@@ -2470,11 +2871,22 @@
 "진짜 GNU 시스템을 발표할 준비가 됐기 때문입니다."
 
 #. type: Content of: <div><dl><dd><p>
+# | If we were to take an existing version of GNU/Linux and relabel it as
+# | [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} that would be somewhat like
+# | making a version of the GNU system and labeling it
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} That wasn't right, and
+# | we don't want to act like that.
+#, fuzzy
+#| 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 and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and "
+#| "we don't want to act like that."
 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 "
-"and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and we don't want "
-"to act like that."
+"GNU,&rdquo; that would be somewhat like making a version of the GNU system "
+"and labeling it &ldquo;Linux.&rdquo; That wasn't right, and we don't want to "
+"act like that."
 msgstr ""
 "우리가 기존 GNU/Linux 판본을 가져다 &ldquo;GNU&rdquo;라고 다시 
이름을 붙이려 "
 "하지 않는 또 다른 이유가 있습니다. 그 것은 GNU 시스템을 
가져다가 &ldquo;"
@@ -2508,11 +2920,29 @@
 "필요가 있었습니다."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | with the GNU Project because he was a &ldquo;Linux [-user&rdquo;.-]
+# | {+user.&rdquo;+} That came as a shock, because the people who ported GNU
+# | packages to other systems had generally wanted to work with us to get
+# | their changes installed.  Yet these people, developing a system that was
+# | primarily based on GNU, were the first (and still practically the only)
+# | group that was unwilling to work with us.
+#, fuzzy
+#| 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 "
+#| "with the GNU Project because he was a &ldquo;Linux user&rdquo;.  That "
+#| "came as a shock, because the people who ported GNU packages to other "
+#| "systems had generally wanted to work with us to get their changes "
+#| "installed.  Yet these people, developing a system that was primarily "
+#| "based on GNU, were the first (and still practically the only) group that "
+#| "was unwilling to work with us."
 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 "
-"with the GNU Project because he was a &ldquo;Linux user&rdquo;.  That came "
-"as a shock, because the people who ported GNU packages to other systems had "
+"with the GNU Project because he was a &ldquo;Linux user.&rdquo; That came as "
+"a shock, because the people who ported GNU packages to other systems had "
 "generally wanted to work with us to get their changes installed.  Yet these "
 "people, developing a system that was primarily based on GNU, were the first "
 "(and still practically the only) group that was unwilling to work with us."
@@ -2526,9 +2956,22 @@
 "않은 첫 번째(그리고 여전히 실제로 유일한) 
그룹이었습니다."
 
 #. type: Content of: <div><dl><dd><p>
+# | It was this experience that first showed us that people were calling a
+# | version of the GNU system [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} and that this confusion was obstructing our work.
+# |  Asking you to call the system &ldquo;GNU/Linux&rdquo; is our response to
+# | that problem, and to the other problems caused by the &ldquo;Linux&rdquo;
+# | misnomer.
+#, fuzzy
+#| 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 obstructing our work.  Asking you to call the system &ldquo;GNU/"
+#| "Linux&rdquo; is our response to that problem, and to the other problems "
+#| "caused by the &ldquo;Linux&rdquo; misnomer."
 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 "
+"version of the GNU system &ldquo;Linux,&rdquo; and that this confusion was "
 "obstructing our work.  Asking you to call the system &ldquo;GNU/Linux&rdquo; "
 "is our response to that problem, and to the other problems caused by the "
 "&ldquo;Linux&rdquo; misnomer."
@@ -2566,10 +3009,18 @@
 "reference-id\">(<a href=\"#allgpled\">#allgpled</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | We never refer to individual programs as
+# | [-&ldquo;GNU/<i>name</i>&rdquo;.-] {+&ldquo;GNU/<i>name</i>.&rdquo;+} When
+# | a program is a GNU package, we may call it &ldquo;GNU
+# | [-<i>name</i>&rdquo;.-] {+<i>name</i>.&rdquo;+}
+#, fuzzy
+#| 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;."
 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;."
+"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 ""
 "우리는 개별 프로그램을 &ldquo;GNU/<i>이름</i>&rdquo;으로 절대 
부르지 않습니"
 "다. 프로그램이 패키지라면 우리는 
&ldquo;GNU<i>이름</i>&rdquo;이라 부릅니다."
@@ -2678,10 +3129,24 @@
 "다. 모든 것을 전부 새롭게 만들어야 했습니다."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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. 
+# | The name [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} which stands for
+# | &ldquo;GNU's Not [-Unix&rdquo;,-] {+Unix,&rdquo;+} is a humorous way of
+# | giving credit to Unix for this, following a hacker tradition of recursive
+# | acronyms that started in the 70s.
+#, fuzzy
+#| 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.  The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not "
+#| "Unix&rdquo;, is a humorous way of giving credit to Unix for this, "
+#| "following a hacker tradition of recursive acronyms that started in the "
+#| "70s."
 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.  "
-"The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not Unix&rdquo;, "
+"The name &ldquo;GNU,&rdquo; which stands for &ldquo;GNU's Not Unix,&rdquo; "
 "is a humorous way of giving credit to Unix for this, following a hacker "
 "tradition of recursive acronyms that started in the 70s."
 msgstr ""
@@ -2691,11 +3156,12 @@
 "따라, 유닉스에 경의를 표하는 익살스러운 방법입니다."
 
 #. 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
+# | The first such recursive acronym was TINT, &ldquo;TINT Is Not
+# | [-TECO&rdquo;.-] {+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;,-] {+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
@@ -2708,10 +3174,10 @@
 #| "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 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 "
+"like &ldquo;<em>somethingorother</em> TECO,&rdquo; he thought of a clever "
 "amusing name.  (That's what hacking means: <a href=\"https://stallman.org/";
 "articles/on-hacking.html\">playful cleverness</a>.)"
 msgstr ""
@@ -2722,13 +3188,28 @@
 "\"http://stallman.org/articles/on-hacking.html\";>재치있는 기발함</a>입
니다.)"
 
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | was similar to some existing program (let's imagine its name was
+# | &ldquo;Klever&rdquo;), you could give it a recursive acronym name, such as
+# | &ldquo;MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same
+# | spirit we called our replacement for Unix &ldquo;GNU's Not
+# | [-Unix&rdquo;.-] {+Unix.&rdquo;+}
+#, fuzzy
+#| 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 was similar to some existing program (let's imagine its name was "
+#| "&ldquo;Klever&rdquo;), you could give it a recursive acronym name, such "
+#| "as &ldquo;MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same "
+#| "spirit we called our replacement for Unix &ldquo;GNU's Not Unix&rdquo;."
 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 "
 "was similar to some existing program (let's imagine its name was &ldquo;"
 "Klever&rdquo;), you could give it a recursive acronym name, such as &ldquo;"
 "MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same spirit we "
-"called our replacement for Unix &ldquo;GNU's Not Unix&rdquo;."
+"called our replacement for Unix &ldquo;GNU's Not Unix.&rdquo;"
 msgstr ""
 "다른 해커들이 그 이름을 즐기자 우리도 이와 같은 방식을 
흉내냈습니다. 이후, 기"
 "ì¡´ 프로그램과 비슷한 프로그램을 처음부터 다시 짤 때 ì 
„통이 됐습니다. (ê·¸ 이름"
@@ -2738,13 +3219,28 @@
 "렀습니다."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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 in a system 99% copied from Unix.  AT&amp;T actually threatened to
+# | sue anyone giving AT&amp;T credit in that way.  This is why each of the
+# | various modified versions of Unix (all proprietary, like Unix) had a
+# | completely different name that didn't include [-&ldquo;Unix&rdquo;.-]
+# | {+&ldquo;Unix.&rdquo;+}
+#, fuzzy
+#| 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 in a system 99% copied from Unix.  AT&amp;T actually threatened "
+#| "to sue anyone giving AT&amp;T credit in that way.  This is why each of "
+#| "the various modified versions of Unix (all proprietary, like Unix) had a "
+#| "completely different name that didn't include &ldquo;Unix&rdquo;."
 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 "
 "in a system 99% copied from Unix.  AT&amp;T actually threatened to sue "
 "anyone giving AT&amp;T credit in that way.  This is why each of the various "
 "modified versions of Unix (all proprietary, like Unix) had a completely "
-"different name that didn't include &ldquo;Unix&rdquo;."
+"different name that didn't include &ldquo;Unix.&rdquo;"
 msgstr ""
 "역사적으로 유닉스를 개발한 AT&amp;T는 비슷한 시스템의 
이름에 &ldquo;유닉스"
 "&rdquo;를 사용해서 크레딧을 주고 싶지 않았습니다. 
AT&amp;T는 유닉스 코드를 "
@@ -2825,9 +3321,22 @@
 "름이 더 적절한 것입니다."
 
 #. type: Content of: <div><dl><dd><p>
+# | There is a version of GNU which uses the kernel from NetBSD.  Its
+# | developers call it &ldquo;Debian [-GNU/NetBSD&rdquo;,-]
+# | {+GNU/NetBSD,&rdquo;+} but &ldquo;GNU/kernelofNetBSD&rdquo; would be more
+# | accurate, since NetBSD is an entire system, not just the kernel.  This is
+# | not a BSD system, since most of the system is the same as the GNU/Linux
+# | system.
+#, fuzzy
+#| 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/"
+#| "kernelofNetBSD&rdquo; would be more accurate, since NetBSD is an entire "
+#| "system, not just the kernel.  This is not a BSD system, since most of the "
+#| "system is the same as the GNU/Linux system."
 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/"
+"call it &ldquo;Debian GNU/NetBSD,&rdquo; but &ldquo;GNU/"
 "kernelofNetBSD&rdquo; would be more accurate, since NetBSD is an entire "
 "system, not just the kernel.  This is not a BSD system, since most of the "
 "system is the same as the GNU/Linux system."
@@ -2848,8 +3357,21 @@
 "\">#othersys</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | Not in the same sense that we mean by [-&ldquo;GNU/Linux&rdquo;.-]
+# | {+&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.
+#, fuzzy
+#| 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 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."
 msgid ""
-"Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of "
+"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 "
@@ -2953,8 +3475,19 @@
 "지 않습니다. 사실 이 둘이 가지는 공통 사항은 Linux를 
사용한다는 것입니다."
 
 #. type: Content of: <div><dl><dd><p>
+# | If you call the whole GNU/Linux system [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} you will find it necessary to say things like,
+# | &ldquo;Android contains Linux, but it isn't Linux, because it doesn't have
+# | the usual Linux [sic] libraries and utilities [meaning the GNU
+# | system].&rdquo;
+#, fuzzy
+#| 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 Linux, because it doesn't have the usual Linux [sic] libraries and "
+#| "utilities [meaning the GNU system].&rdquo;"
 msgid ""
-"If you call the whole GNU/Linux system &ldquo;Linux&rdquo;, you will find it "
+"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 "
 "Linux, because it doesn't have the usual Linux [sic] libraries and utilities "
 "[meaning the GNU system].&rdquo;"
@@ -3006,7 +3539,7 @@
 #. 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 "
+"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 ""
 
@@ -3014,7 +3547,7 @@
 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;."
+"of the whole system as &ldquo;Linux.&rdquo;"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><p>
@@ -3024,7 +3557,7 @@
 "contain Linux is irrelevant to using them, just as the fact that a car and a "
 "bicycle both have a structure of metal is irrelevant to using those two.  If "
 "you wish to talk about using cars and bikes, you wouldn't speak of &ldquo;"
-"riding metal objects&rdquo; &mdash; not unless you're playing games with the "
+"riding metal objects&rdquo;&mdash;not unless you're playing games with the "
 "reader.  You would say, &ldquo;using cars and bikes.&rdquo; Likewise, the "
 "clear way to talk about using GNU/Linux and Android is to say &ldquo;using "
 "GNU/Linux and Android.&rdquo;"
@@ -3124,11 +3657,22 @@
 "</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | 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;.-] {+&ldquo;GNU.&rdquo;+} When we talk
+# | about the whole system, the name &ldquo;GNU/Linux&rdquo; gives him a share
+# | of the credit.
+#, fuzzy
+#| 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 "
+#| "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."
 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 "
-"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."
+"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."
 msgstr ""
 "그것은 잘못된 것입니다. 그래서 우리는 그렇게 하지 
않습니다. Torvalds의 작품"
 "은 Linux, 커널입니다. 우리는 GNU 프로젝트에 일하거나 또는 
&ldquo;GNU&rdquo;"
@@ -3145,12 +3689,38 @@
 "reference-id\">(<a href=\"#linusagreed\">#linusagreed</a>)</span>"
 
 #. 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\">
+# | He recognized this at the beginning.  The {+<a
+# | 
href=\"https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\";>+}
+# | 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>.
+# |  for more info&rdquo;</a>.-] {+notes</a> said:+}
+#, 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 <a href=\"https://ftp.funet.fi/pub/";
+"linux/historical/kernel/old-versions/RELNOTES-0.01\"> earliest Linux release "
+"notes</a> said:"
+msgstr ""
+"리누스 토발즈는 처음에는 이를 인식했습니다. 첫 Linux 
발표문을 보면 <a href="
+"\"http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
+"RELNOTES-0.01\"> &ldquo;Linux에 쓰인 대부분의 도구는 GNU 
소프트웨어이고 GNU "
+"저작권 아래 있습니다. 이 도구들은 배포판에 들어있지 
않습니다. 더 자세한 정보"
+"는 저(나 GNU)에 문의하세요.&rdquo;</a>라고 적혀있습니다."
+
+#. type: Content of: <div><dl><dd><blockquote><p>
+# | [-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-]{+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>.-] {+info.+}
 #, fuzzy
 #| msgid ""
 #| "He recognized this at the beginning.  The earliest Linux release notes "
@@ -3159,11 +3729,9 @@
 #| "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=\"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>."
+"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."
 msgstr ""
 "리누스 토발즈는 처음에는 이를 인식했습니다. 첫 Linux 
발표문을 보면 <a href="
 "\"http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
@@ -3227,11 +3795,26 @@
 "reference-id\">(<a href=\"#lost\">#lost</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | 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;,-]
+# | {+&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.
+#, fuzzy
+#| 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;: 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."
 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;: "
 "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 "
+"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."
 msgstr ""
@@ -3252,13 +3835,32 @@
 "reference-id\">(<a href=\"#whatgood\">#whatgood</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | 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;,-] {+&ldquo;GNU/Linux,&rdquo;+} you will help
+# | others learn the system's true history, origin, and reason for being.  You
+# | can't correct the misnomer 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;,-] {+&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.
+#, fuzzy
+#| 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;GNU/Linux&rdquo;, you will help others learn the system's true "
+#| "history, origin, and reason for being.  You can't correct the misnomer "
+#| "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."
 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;"
-"GNU/Linux&rdquo;, you will help others learn the system's true history, "
+"GNU/Linux,&rdquo; you will help others learn the system's true history, "
 "origin, and reason for being.  You can't correct the misnomer 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 "
+"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."
 msgstr ""
@@ -3281,22 +3883,48 @@
 "(<a href=\"#explain\">#explain</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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;,-]
+# | {+&ldquo;GNU/Linux,&rdquo;+} and uses your time inefficiently.
+#, fuzzy
+#| 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."
 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."
+"the system &ldquo;GNU/Linux,&rdquo; and uses your time inefficiently."
 msgstr ""
 "여러분이 다른 사람에게 그 방식으로 설명해 우리를 
돕는다면 그 노력에 감사합니"
 "다. 그러나 그것은 가장 좋은 방법이 아닙니다. 
&ldquo;GNU/Linux&rdquo;로 부르"
 "는 것만큼 효과적이지 않고 시간을 비효율적으로 쓰는 
것입니다."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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, and they may learn a correct picture of the system's origin. 
+# | But they are unlikely to repeat the explanation to others whenever they
+# | talk about the system.  They will probably just call it
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} Without particularly
+# | intending to, they will help spread the incorrect picture.
+#, fuzzy
+#| 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, and they may learn a correct picture of the system's origin.  "
+#| "But they are unlikely to repeat the explanation to others whenever they "
+#| "talk about the system.  They will probably just call it &ldquo;"
+#| "Linux&rdquo;.  Without particularly intending to, they will help spread "
+#| "the incorrect picture."
 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, "
 "and they may learn a correct picture of the system's origin.  But they are "
 "unlikely to repeat the explanation to others whenever they talk about the "
-"system.  They will probably just call it &ldquo;Linux&rdquo;.  Without "
+"system.  They will probably just call it &ldquo;Linux.&rdquo; Without "
 "particularly intending to, they will help spread the incorrect picture."
 msgstr ""
 "ê·¸ 방식은 비효과적입니다. 잘 이해되지도 않고 확실이 ì 
„해지지도 않을 것이기 때"
@@ -3431,9 +4059,16 @@
 "span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | It would be wrong to force them, and we don't try.  We call the system
+# | [-&ldquo;GNU/Linux&rdquo;,-] {+&ldquo;GNU/Linux,&rdquo;+} and we ask you
+# | to do it too.
+#, fuzzy
+#| 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."
 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."
+"&ldquo;GNU/Linux,&rdquo; and we ask you to do it too."
 msgstr ""
 "그들에게 강요하는 것은 잘못된 일이며 우리는 그러지 
않습니다. 우리는 시스템을 "
 "&ldquo;GNU/Linux&rdquo;라고 부르며 우리는 그것을 요청할 뿐입
니다."
@@ -3535,9 +4170,19 @@
 "용하지 마십시오."
 
 #. type: Content of: <div><dl><dt>
+# | Since you failed to put something in the GNU GPL to require people to call
+# | the system [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} you deserve what
+# | happened; why are you complaining now? <span
+# | class=\"anchor-reference-id\">(<a href=\"#deserve\">#deserve</a>)</span>
+#, fuzzy
+#| 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 "
+#| "complaining now? <span class=\"anchor-reference-id\">(<a href=\"#deserve"
+#| "\">#deserve</a>)</span>"
 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 "
+"the system &ldquo;GNU,&rdquo; you deserve what happened; why are you "
 "complaining now? <span class=\"anchor-reference-id\">(<a href=\"#deserve"
 "\">#deserve</a>)</span>"
 msgstr ""
@@ -3588,8 +4233,17 @@
 "는 믿음을 부인하지 않고서는 자유 운영체제를 개발하지 
못했을 것입니다."
 
 #. type: Content of: <div><dl><dt>
+# | Since many people call it [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} doesn't that make it right? <span
+# | class=\"anchor-reference-id\">(<a
+# | href=\"#somanyright\">#somanyright</a>)</span>
+#, fuzzy
+#| 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>"
 msgid ""
-"Since many people call it &ldquo;Linux&rdquo;, doesn't that make it right? "
+"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 ""
@@ -3613,9 +4267,20 @@
 "span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | Users are not incapable of learning.  Since &ldquo;GNU/Linux&rdquo;
+# | includes [-&ldquo;Linux&rdquo;,-] {+&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.
+#, fuzzy
+#| 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 add &ldquo;(often erroneously referred to as &lsquo;"
+#| "Linux&rsquo;)&rdquo; once in a while, they will all understand."
 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 "
+"&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."
 msgstr ""

Index: po/gnu-linux-faq.nl-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.nl-diff.html,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- po/gnu-linux-faq.nl-diff.html       31 Aug 2021 10:37:07 -0000      1.49
+++ po/gnu-linux-faq.nl-diff.html       2 Nov 2021 14:41:51 -0000       1.50
@@ -12,30 +12,35 @@
 <body><pre>
 &lt;!--#include virtual="/server/header.html" --&gt;
 &lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.84</strong></del></span> <span 
class="inserted"><ins><em>1.96 --&gt;
-&lt;!-- This page is derived from 
/server/standards/boilerplate.html</em></ins></span> --&gt;
+&lt;!-- This page is derived from /server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="gnulinux" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</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="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&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"&gt;by</em></ins></span> Richard <span 
class="removed"><del><strong>Stallman&lt;/h2&gt;
+&lt;address class="byline"&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;</em></ins></span>
 
-&lt;div class="announcement"&gt;
+&lt;div <span class="removed"><del><strong>class="announcement"&gt;
   &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 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&gt;</strong></del></span> <span 
class="inserted"><ins><em>class="introduction"&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.
+system that many others call just <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> they ask many 
questions.
 Here are common questions, and our answers.&lt;/p&gt;
+<span class="inserted"><ins><em>&lt;/div&gt;
 
-<span class="inserted"><ins><em>&lt;div class="toc"&gt;
+&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;
@@ -130,8 +135,8 @@
 
 &lt;li&gt;&lt;a href="#trademarkfee"&gt;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
-    wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to
+    that would also apply if I say <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux.&rdquo;</em></ins></span>  Is 
it
+    wrong if I use &ldquo;GNU&rdquo; without <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> to
     save the fee?&lt;/a&gt;&lt;/li&gt;
 
 &lt;li&gt;&lt;a href="#many"&gt;Many other projects contributed to the
@@ -169,7 +174,7 @@
 rather than &ldquo;Linux/GNU&rdquo;?&lt;/a&gt;&lt;/li&gt;
 
 &lt;li&gt;&lt;a href="#distronames0"&gt;My distro's developers call it
-    &ldquo;Foobar Linux&rdquo;, but that doesn't say anything about
+    &ldquo;Foobar <span 
class="removed"><del><strong>Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>Linux,&rdquo;</em></ins></span> but that doesn't say 
anything about
     what the system consists of.  Why shouldn't they call it whatever
     they like?&lt;/a&gt;&lt;/li&gt;
 
@@ -281,14 +286,16 @@
 
 &lt;li&gt;&lt;a href="#deserve"&gt;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
+    <span class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span>
+    <span class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> you 
deserve what happened; why are you
     complaining now?&lt;/a&gt;&lt;/li&gt;
 
 &lt;li&gt;&lt;a href="#contradict"&gt;Wouldn't you be better off
     not contradicting what so many people believe?&lt;/a&gt;&lt;/li&gt;
 
 &lt;li&gt;&lt;a href="#somanyright"&gt;Since many people call it
-    &ldquo;Linux&rdquo;, doesn't that make it right?&lt;/a&gt;&lt;/li&gt;
+    <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span>
+    <span class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> 
doesn't that make it right?&lt;/a&gt;&lt;/li&gt;
 
 &lt;li&gt;&lt;a href="#knownname"&gt;Isn't it better to call the
     system by the name most users already know?&lt;/a&gt;&lt;/li&gt;
@@ -380,7 +387,7 @@
 the system's history was such as to fit that name.  For
 instance, they often believe its development was started by Linus
 Torvalds in 1991.  This false picture tends to reinforce the idea
-that the system should be called &ldquo;Linux&rdquo;.&lt;/p&gt;
+that the system should be called <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.&lt;/p&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;&lt;/p&gt;</em></ins></span>
 &lt;p&gt;
 Many of the questions in this file represent people's attempts to
 justify the name they are accustomed to using.&lt;/p&gt;
@@ -391,14 +398,16 @@
 &lt;dd&gt;
 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.
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> the 
name its developer chose.
 &lt;p&gt;
-When people call the whole system &ldquo;Linux&rdquo;, as a consequence
+When people call the whole system <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> as a 
consequence
 they call the whole system by the same name as the kernel.
 This causes many kinds of confusion, because only experts can tell
 whether a statement is about the kernel or the whole system.
-By calling the whole system &ldquo;GNU/Linux&rdquo;, and calling the kernel
-&ldquo;Linux&rdquo;, you avoid the ambiguity.&lt;/p&gt;
+By calling the whole 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> and 
calling the kernel
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> you 
avoid the ambiguity.&lt;/p&gt;
 &lt;/dd&gt;
 
 &lt;dt id="linuxalone"&gt;Would Linux have
@@ -428,7 +437,7 @@
     community if you did not divide people with this request? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#divide"&gt;#divide&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing people. 
 We
+When we ask people to say <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 
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.
 &lt;p&gt;
@@ -456,7 +465,8 @@
 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 freedom are more likely to call the system
-&ldquo;GNU/Linux&rdquo;, and people who learn that the system is 
&ldquo;GNU/Linux&rdquo; are
+<span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> and 
people who learn that the system is &ldquo;GNU/Linux&rdquo; are
 more likely to pay attention to our philosophical arguments for
 freedom and community (which is why the choice of name for the system
 makes a real difference for society).  However, the disagreement would
@@ -485,7 +495,7 @@
 
 &lt;dd&gt;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 system do not mention the name &ldquo;GNU&rdquo;, or the 
ideals
+articles about the system do not mention the name <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> or the ideals
 that GNU stands for.  &lt;a
 href="/gnu/gnu-users-never-heard-of-gnu.html"&gt;GNU Users Who Have Never
 Heard of GNU&lt;/a&gt; explains further.
@@ -493,7 +503,7 @@
 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 GNU is.  For instance, many think it is a collection
-of &lt;a href="#tools"&gt;&ldquo;tools&rdquo;&lt;/a&gt;, or a project to 
develop tools.&lt;/p&gt;
+of <span class="removed"><del><strong>&lt;a 
href="#tools"&gt;&ldquo;tools&rdquo;&lt;/a&gt;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;&lt;a 
href="#tools"&gt;tools&lt;/a&gt;,&rdquo;</em></ins></span> or a project to 
develop tools.&lt;/p&gt;
 &lt;p&gt;
 The wording of this question, which is typical, illustrates another
 common misconception.  To speak of &ldquo;GNU's role&rdquo; in developing
@@ -509,8 +519,9 @@
 <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
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> that it 
was started by Linus Torvalds, and that
+it was intended to be &ldquo;open <span 
class="removed"><del><strong>source&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>source.&rdquo;</em></ins></span>  If you don't tell
 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;
 
@@ -539,10 +550,10 @@
 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 that GNU is the name of a collection of programs&mdash;often they
-say &ldquo;programming tools&rdquo;, since some of our programming tools became
+say &ldquo;programming <span 
class="removed"><del><strong>tools&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>tools,&rdquo;</em></ins></span> since some of our 
programming tools became
 popular on their own.  The idea that &ldquo;GNU&rdquo; is the name of an 
operating
 system is hard to fit into a conceptual framework in which that
-operating system is labeled &ldquo;Linux&rdquo;.
+operating system is labeled <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>
 &lt;p&gt;
 The GNU Project was named after the GNU operating system&mdash;it's the project
 to develop the GNU system.  (See &lt;a
@@ -571,7 +582,7 @@
 programs.&lt;/p&gt;
 &lt;p&gt;
 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.  The
+mean <span 
class="removed"><del><strong>&ldquo;kernel&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;kernel.&rdquo;</em></ins></span>  Both uses of 
the term go back many years.  The
 use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is found in 
a number of
 textbooks on system design, going back to the 80s.  At the same time,
 in the 80s, the &ldquo;Unix operating system&rdquo; was understood to include 
all
@@ -582,12 +593,12 @@
 Most of the time when people speak of the &ldquo;Linux operating system&rdquo;
 they are using &ldquo;operating system&rdquo; in the same sense we use: they 
mean
 the whole collection of programs.  If that's what you are referring
-to, please call it &ldquo;GNU/Linux&rdquo;.  If you mean just the kernel, then
+to, please call it <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux.&rdquo;</em></ins></span>  If 
you mean just the kernel, then
 &ldquo;Linux&rdquo; is the right name for it, but please say 
&ldquo;kernel&rdquo; also to
 avoid ambiguity about which body of software you mean.&lt;/p&gt;
 &lt;p&gt;
 If you prefer to use some other term such as &ldquo;system distribution&rdquo; 
for
-the entire collection of programs, instead of &ldquo;operating system&rdquo;,
+the entire collection of programs, instead of &ldquo;operating <span 
class="removed"><del><strong>system&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>system,&rdquo;</em></ins></span>
 that's fine.  Then you would talk about GNU/Linux system
 distributions.&lt;/p&gt;
 &lt;/dd&gt;
@@ -639,8 +650,8 @@
 &lt;dd&gt;
 The people who argue that way for calling the system
 &ldquo;Linux&rdquo; are using a double standard.  An operating system
-requires compilers, editors, window systems, libraries, and much more
-&mdash; hundreds of programs, even to match what BSD systems included
+requires compilers, editors, window systems, libraries, and much
+more&mdash;hundreds of programs, even to match what BSD systems included
 in 1983.  Since Torvalds didn't develop any of those, how can the
 system be &ldquo;Linux&rdquo;?
 
@@ -661,7 +672,8 @@
 &lt;dd&gt;
 Many &lt;a href="/distros/distros.html"&gt; packaged and installable
 versions of GNU&lt;/a&gt; are available.  None of them is called simply
-&ldquo;GNU&rdquo;, but GNU is what they basically are.
+<span class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> but GNU 
is what they basically are.
 
 &lt;p&gt;
 We expected to release the GNU system packaged for installation, but
@@ -688,7 +700,8 @@
 
 &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.
+<span class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> but that 
doesn't alter what kind of thing GNU is.
 GNU is an operating system.&lt;/p&gt;
 &lt;/dd&gt;
 
@@ -698,11 +711,11 @@
 
 &lt;dd&gt;
 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 system 
is
+than the misuse of the name <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  Normally an 
operating system is
 developed as a single unified project, and the developers choose a
 name for the system as a whole.  The kernel usually does not have a
 name of its own&mdash;instead, people say &ldquo;the kernel of 
such-and-such&rdquo; or
-&ldquo;the such-and-such kernel&rdquo;.
+&ldquo;the such-and-such <span 
class="removed"><del><strong>kernel&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>kernel.&rdquo;</em></ins></span>
 &lt;p&gt;
 Because those two constructions are used synonymously, the expression
 &ldquo;the Linux kernel&rdquo; can easily be misunderstood as meaning 
&ldquo;the kernel
@@ -727,11 +740,11 @@
     How about recommending a shorter name? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#long"&gt;#long&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-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;
+For a while we tried the name <span 
class="removed"><del><strong>&ldquo;LiGNUx&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;LiGNUx,&rdquo;</em></ins></span> which 
combines the words &ldquo;GNU&rdquo;
+and <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  The reaction 
was very bad.  People accept &ldquo;GNU/Linux&rdquo;
 much better.
 &lt;p&gt;
-The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but
+The shortest legitimate name for this system is <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> but
 we call it &ldquo;GNU/Linux&rdquo; &lt;a href="#justgnu"&gt; for the reasons
 given below&lt;/a&gt;.&lt;/p&gt;
 &lt;/dd&gt;
@@ -756,7 +769,7 @@
     &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#long2"&gt;#long2&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-&lt;p&gt;It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you
+&lt;p&gt;It only takes a second to say or type <span 
class="removed"><del><strong>&ldquo;GNU/&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU/.&rdquo;</em></ins></span>  If you
 appreciate the system that we developed, can't you take one second
 to recognize our work?&lt;/p&gt;
 &lt;/dd&gt;
@@ -807,9 +820,9 @@
 honorably and openly, rather than by trying to cut him out of the
 credit for his contribution to the system.&lt;/li&gt;
 &lt;li&gt;
-Since many people know of the system as &ldquo;Linux&rdquo;, if we say 
&ldquo;GNU&rdquo; they
+Since many people know of the system as <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> if we say 
&ldquo;GNU&rdquo; they
 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
+say <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> they 
can make a connection to what they have heard
 about.&lt;/li&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>
@@ -817,16 +830,16 @@
 
 &lt;dt id="trademarkfee"&gt;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 wrong if I use 
&ldquo;GNU&rdquo;
-    without &ldquo;Linux&rdquo;, to save the fee? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#trademarkfee"&gt;#trademarkfee&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
+    would also apply if I say <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux.&rdquo;</em></ins></span>  Is 
it wrong if I use &ldquo;GNU&rdquo;
+    without <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> to save the 
fee? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#trademarkfee"&gt;#trademarkfee&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 &lt;dd&gt;
 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.
 &lt;p&gt;
-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.&lt;/p&gt;
+So if you want to refer to the system simply as <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> to avoid paying
+the fee for calling it <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> we won't 
criticize you.&lt;/p&gt;
 &lt;/dd&gt;
 
 &lt;dt id="many"&gt;Many other projects contributed to
@@ -856,7 +869,7 @@
 &lt;p&gt;
 Different threshold levels would lead to different choices of name for
 the system.  But one name that cannot result from concerns of fairness
-and giving credit, not for any possible threshold level, is 
&ldquo;Linux&rdquo;.
+and giving credit, not for any possible threshold level, is <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>
 It can't be fair to give all the credit to one secondary contribution
 (Linux) while omitting the principal contribution (GNU).&lt;/p&gt;
 &lt;/dd&gt;
@@ -870,7 +883,7 @@
 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
+by calling the system &ldquo;GNU/systemd/Linux,&rdquo; there is nothing
 wrong with doing so.&lt;/p&gt;
 &lt;/dd&gt;
 
@@ -895,7 +908,7 @@
 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 the same argument would apply even more
-strongly to calling it &ldquo;Linux&rdquo;.
+strongly to calling it <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>
 
 &lt;p&gt;
 GNU is a small fraction of the system nowadays, and Linux is an
@@ -932,7 +945,7 @@
 
 &lt;dd&gt;
 Following the rules of English, in the construction &ldquo;GNU Linux&rdquo; the
-word &ldquo;GNU&rdquo; modifies &ldquo;Linux&rdquo;.  This can mean either 
&ldquo;GNU's version of
+word &ldquo;GNU&rdquo; modifies <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  This can mean 
either &ldquo;GNU's version of
 Linux&rdquo; or &ldquo;Linux, which is a GNU package.&rdquo;  Neither of those 
meanings
 fits the situation at hand.
 &lt;p&gt;
@@ -945,23 +958,24 @@
 The free GNU/Linux distros do have
 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,
+firmware <span 
class="removed"><del><strong>&ldquo;blobs&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;blobs.&rdquo;</em></ins></span>  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;
 &lt;p&gt;
 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 &ldquo;combination.&rdquo; (Think of
-&ldquo;Input/Output&rdquo;.)  This system is the combination of GNU
-and Linux; hence, &ldquo;GNU/Linux&rdquo;.&lt;/p&gt;
+<span 
class="removed"><del><strong>&ldquo;Input/Output&rdquo;.)</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Input/Output.&rdquo;)</em></ins></span> 
 This system is the combination of GNU
+and Linux; hence, <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;
-There are other ways to express &ldquo;combination&rdquo;.  If you
+There are other ways to express <span 
class="removed"><del><strong>&ldquo;combination&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;combination.&rdquo;</em></ins></span>  
If you
 think that a plus-sign is clearer, please use that.  In French, a
-hyphen is clear: &ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes
-say &ldquo;GNU con Linux&rdquo;.&lt;/p&gt;
+hyphen is clear: <span 
class="removed"><del><strong>&ldquo;GNU-Linux&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU-Linux.&rdquo;</em></ins></span>  In 
Spanish, we sometimes
+say &ldquo;GNU con <span 
class="removed"><del><strong>Linux&rdquo;.&lt;/p&gt;</strong></del></span> 
<span class="inserted"><ins><em>Linux.&rdquo;&lt;/p&gt;
 &lt;/dd&gt;
 
-&lt;dt <span class="inserted"><ins><em>id="pronounce"&gt;How is the name 
&ldquo;GNU/Linux&rdquo;
+&lt;dt id="pronounce"&gt;How is the name &ldquo;GNU/Linux&rdquo;
 pronounced? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#pronounce"&gt;#pronounce&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 &lt;dd&gt;
 &lt;p&gt;
@@ -977,16 +991,16 @@
 &lt;dd&gt;
 &lt;p&gt;
 Following the rules of English, in the construction &ldquo;GNU
-Emacs&rdquo; the word &ldquo;GNU&rdquo; modifies &ldquo;Emacs&rdquo;.
+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.&lt;/p&gt;
 &lt;p&gt;
 &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.&lt;/p&gt;
+program, so &ldquo;GNU/Emacs&rdquo; is the wrong way to refer to 
it.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
-&lt;dt</em></ins></span> id="whyorder"&gt;Why &ldquo;GNU/Linux&rdquo; rather
+&lt;dt id="whyorder"&gt;Why &ldquo;GNU/Linux&rdquo; rather
 than &ldquo;Linux/GNU&rdquo;? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#whyorder"&gt;#whyorder&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
@@ -998,13 +1012,13 @@
 In addition, &ldquo;GNU/Linux&rdquo; fits the fact that Linux is the
 lowest level of the system and GNU fills technically higher levels.&lt;/p&gt;
 &lt;p&gt;
-However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a 
lot
+However, if you prefer to call the system <span 
class="removed"><del><strong>&ldquo;Linux/GNU&rdquo;,</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;Linux/GNU,&rdquo;</em></ins></span> 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.&lt;/p&gt;
 &lt;/dd&gt;
 
 &lt;dt id="distronames0"&gt;My distro's developers call it
-    &ldquo;Foobar Linux&rdquo;, but that doesn't say anything about
+    &ldquo;Foobar <span 
class="removed"><del><strong>Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>Linux,&rdquo;</em></ins></span> but that doesn't say 
anything about
     what the system consists of.  Why shouldn't they call it whatever
     they like? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#distronames0"&gt;#distronames0&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 &lt;dd&gt;
@@ -1033,9 +1047,10 @@
     anything but &ldquo;Foobar Linux&rdquo;? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#distronames1"&gt;#distronames1&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;&lt;p&gt;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 proper for you to correct the misinformation by
-calling it &ldquo;Foobar GNU/Linux&rdquo;.&lt;/p&gt;&lt;/dd&gt;
+to <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> and call their 
version of it &ldquo;Foobar
+<span class="removed"><del><strong>Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>Linux,&rdquo;</em></ins></span> it's proper 
for you to correct the misinformation by
+calling it &ldquo;Foobar <span 
class="removed"><del><strong>GNU/Linux&rdquo;.&lt;/p&gt;&lt;/dd&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>GNU/Linux.&rdquo;&lt;/p&gt;&lt;/dd&gt;</em></ins></span>
 
 &lt;dt id="companies"&gt;Wouldn't it be more
     effective to ask companies such as Mandrake, Red Hat and IBM to
@@ -1056,7 +1071,7 @@
 just because the road isn't easy.  You may not have as much 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;.&lt;/p&gt;
+more profit calling it <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;/dd&gt;
 
 &lt;dt id="reserve"&gt;Wouldn't it be better to
@@ -1067,7 +1082,7 @@
 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 <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
+of <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  Many 
&ldquo;Linux&rdquo; User Groups make it part of their mission to
 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 <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span>
@@ -1090,7 +1105,8 @@
 With this understanding, they can start to recognize the distributions
 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;
+<span 
class="removed"><del><strong>Linux&rdquo;.&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>Linux.&rdquo;&lt;/p&gt;</em></ins></span>
 &lt;p&gt;
 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
@@ -1130,8 +1146,9 @@
 GNU Hurd to work, we might have done that.  (Alas, that is hindsight.)
 &lt;p&gt;
 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
-and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and we don't
+<span class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> that 
would be somewhat like making a version of the GNU system
+and labeling it <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  That wasn't 
right, and we don't
 want to act like that.&lt;/p&gt;
 &lt;/dd&gt;
 
@@ -1150,7 +1167,7 @@
 &lt;p&gt;
 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 with the GNU Project because he was a &ldquo;Linux user&rdquo;.
+about working with the GNU Project because he was a &ldquo;Linux <span 
class="removed"><del><strong>user&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>user.&rdquo;</em></ins></span>
 That came as a shock, because the people who ported GNU packages to
 other systems had generally wanted to work with us to get their
 changes installed.  Yet these people, developing a system that was
@@ -1158,7 +1175,7 @@
 only) group that was unwilling to work with us.&lt;/p&gt;
 &lt;p&gt;
 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
+version of the GNU system <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> and that this 
confusion was
 obstructing our work.  Asking you to call the system &ldquo;GNU/Linux&rdquo; is
 our response to that problem, and to the other problems caused by the
 &ldquo;Linux&rdquo; misnomer.&lt;/p&gt;
@@ -1177,8 +1194,8 @@
     convention be applied to all programs that are GPL'ed? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#allgpled"&gt;#allgpled&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-We never refer to individual programs as 
&ldquo;GNU/&lt;i&gt;name&lt;/i&gt;&rdquo;.  When a program
-is a GNU package, we may call it &ldquo;GNU &lt;i&gt;name&lt;/i&gt;&rdquo;.
+We never refer to individual programs as <span 
class="removed"><del><strong>&ldquo;GNU/&lt;i&gt;name&lt;/i&gt;&rdquo;.</strong></del></span>
 <span 
class="inserted"><ins><em>&ldquo;GNU/&lt;i&gt;name&lt;/i&gt;.&rdquo;</em></ins></span>
  When a program
+is a GNU package, we may call it &ldquo;GNU <span 
class="removed"><del><strong>&lt;i&gt;name&lt;/i&gt;&rdquo;.</strong></del></span>
 <span 
class="inserted"><ins><em>&lt;i&gt;name&lt;/i&gt;.&rdquo;</em></ins></span>
 &lt;p&gt;
 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
@@ -1231,15 +1248,17 @@
 &lt;p&gt;
 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.  The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not
-Unix&rdquo;, is a humorous way of giving credit to Unix for this,
+Unix.  The name <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> which stands for 
&ldquo;GNU's Not
+<span class="removed"><del><strong>Unix&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>Unix,&rdquo;</em></ins></span> is a humorous 
way of giving credit to Unix for this,
 following a hacker tradition of recursive acronyms that started in the
 70s.&lt;/p&gt;
 &lt;p&gt;
 The first such recursive acronym was TINT, &ldquo;TINT Is Not
-TECO&rdquo;.  The author of TINT wrote another implementation of TECO
+<span class="removed"><del><strong>TECO&rdquo;.</strong></del></span>
+<span class="inserted"><ins><em>TECO.&rdquo;</em></ins></span>  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;&lt;em&gt;somethingorother&lt;/em&gt; 
TECO&rdquo;, he
+calling it by a dull name like &ldquo;&lt;em&gt;somethingorother&lt;/em&gt; 
<span class="removed"><del><strong>TECO&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>TECO,&rdquo;</em></ins></span> he
 thought of a clever amusing name.  (That's what hacking
 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;
@@ -1249,7 +1268,7 @@
 program that was similar to some existing program (let's imagine its
 name was &ldquo;Klever&rdquo;), you could give it a recursive acronym name, 
such
 as &ldquo;MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo;  In this same 
spirit we called our
-replacement for Unix &ldquo;GNU's Not Unix&rdquo;.&lt;/p&gt;
+replacement for Unix &ldquo;GNU's Not <span 
class="removed"><del><strong>Unix&rdquo;.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>Unix.&rdquo;&lt;/p&gt;</em></ins></span>
 &lt;p&gt;
 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
@@ -1257,7 +1276,8 @@
 threatened to sue anyone giving AT&amp;T credit in that way.  This is
 why each of the various modified versions of Unix (all proprietary,
 like Unix) had a completely different name that didn't include
-&ldquo;Unix&rdquo;.&lt;/p&gt;
+<span 
class="removed"><del><strong>&ldquo;Unix&rdquo;.&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Unix.&rdquo;&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="bsd"&gt;Should we say &ldquo;GNU/BSD&rdquo;
@@ -1288,7 +1308,7 @@
 why the name &ldquo;GNU/Linux&rdquo; is appropriate for it.&lt;/p&gt;
 &lt;p&gt;
 There is a version of GNU which uses the kernel from NetBSD.  Its
-developers call it &ldquo;Debian GNU/NetBSD&rdquo;, but 
&ldquo;GNU/kernelofNetBSD&rdquo;
+developers call it &ldquo;Debian <span 
class="removed"><del><strong>GNU/NetBSD&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>GNU/NetBSD,&rdquo;</em></ins></span> but 
&ldquo;GNU/kernelofNetBSD&rdquo;
 would be more accurate, since NetBSD is an entire system, not just
 the kernel.  This is not a BSD system, since most of the system
 is the same as the GNU/Linux system.&lt;/p&gt;
@@ -1299,7 +1319,7 @@
 
 &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
+Not in the same sense that we mean by <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux.&rdquo;</em></ins></span>  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,
@@ -1350,7 +1370,7 @@
 the two have very little code in common.  In fact, the only thing they
 have in common is Linux.&lt;/p&gt;
 &lt;p&gt;
-If you call the whole GNU/Linux system &ldquo;Linux&rdquo;,
+If you call the whole GNU/Linux system <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span>
 you will find it necessary to say things like, &ldquo;Android contains
 Linux, but it isn't Linux, because it doesn't have the usual Linux
 [sic] libraries and utilities [meaning the GNU system].&rdquo;&lt;/p&gt;
@@ -1371,7 +1391,7 @@
 people will</em></ins></span> not <span class="inserted"><ins><em>understand 
the intended meaning.
 &lt;p&gt;
 The public will find it very strange to speak of using Android as
-&ldquo;using Linux&rdquo;.  It's like having</em></ins></span> a <span 
class="removed"><del><strong>meaningful question because</strong></del></span> 
<span class="inserted"><ins><em>conversation, then
+&ldquo;using Linux.&rdquo;  It's like having</em></ins></span> a <span 
class="removed"><del><strong>meaningful question because</strong></del></span> 
<span class="inserted"><ins><em>conversation, then
 saying you were conversing with</em></ins></span> the <span 
class="removed"><del><strong>GNU
 system does not have precise boundaries.</strong></del></span> <span 
class="inserted"><ins><em>person's intestines or the
 person's circulatory system.&lt;/p&gt;</em></ins></span>
@@ -1381,7 +1401,7 @@
 Linux&rdquo; when it's really GNU/Linux,</em></ins></span> by <span 
class="removed"><del><strong>a community.  It includes far
 more than just</strong></del></span> <span class="inserted"><ins><em>way 
of</em></ins></span> the <span class="removed"><del><strong>GNU software 
packages (of which we have</strong></del></span> <span 
class="inserted"><ins><em>usual
 misunderstanding: thinking of the whole system as
-&ldquo;Linux&rdquo;.&lt;/p&gt;
+&ldquo;Linux.&rdquo;&lt;/p&gt;
 &lt;p&gt;
 Use of Android and use of GNU/Linux are totally different, as
 different as driving</em></ins></span> a <span 
class="removed"><del><strong>specific
@@ -1391,8 +1411,8 @@
 fact</em></ins></span> that <span class="removed"><del><strong>yields
 GNU/Linux.</strong></del></span> <span class="inserted"><ins><em>a car and a 
bicycle both have a structure of metal is
 irrelevant to using those two.</em></ins></span>  If you <span 
class="removed"><del><strong>use part</strong></del></span> <span 
class="inserted"><ins><em>wish to talk about using cars
-and bikes, you wouldn't speak</em></ins></span> of <span 
class="inserted"><ins><em>&ldquo;riding metal objects&rdquo;
-&mdash; not unless you're playing games with</em></ins></span> the <span 
class="removed"><del><strong>GNU system</strong></del></span> <span 
class="inserted"><ins><em>reader.  You would
+and bikes, you wouldn't speak</em></ins></span> of <span 
class="inserted"><ins><em>&ldquo;riding metal objects&rdquo;&mdash;not
+unless you're playing games with</em></ins></span> the <span 
class="removed"><del><strong>GNU system</strong></del></span> <span 
class="inserted"><ins><em>reader.  You would
 say, &ldquo;using cars</em></ins></span> and <span 
class="removed"><del><strong>omit part, there is
 no meaningful</strong></del></span> <span 
class="inserted"><ins><em>bikes.&rdquo; Likewise, the clear</em></ins></span> 
way to <span class="removed"><del><strong>say &ldquo;how much&rdquo; you 
used.&lt;/p&gt;
 &lt;p&gt;
@@ -1445,7 +1465,7 @@
 <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
+or label it as <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU.&rdquo;</em></ins></span>  When we talk 
about the whole
 system, the name &ldquo;GNU/Linux&rdquo; gives him a share of the
 <span class="removed"><del><strong>credit.</strong></del></span>
 <span class="inserted"><ins><em>credit.&lt;/p&gt;</em></ins></span>
@@ -1456,13 +1476,17 @@
     agree that Linux is just the kernel? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#linusagreed"&gt;#linusagreed&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-&lt;p&gt;He recognized this at the beginning.  The earliest Linux release notes
+&lt;p&gt;He recognized this at the beginning.  The <span 
class="inserted"><ins><em>&lt;a
+href="https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;</em></ins></span>
+earliest Linux release <span class="removed"><del><strong>notes
 said, &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>
-&ldquo;Most of the tools used with linux are GNU software and are under the
+href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;
+&ldquo;Most</strong></del></span> <span 
class="inserted"><ins><em>notes&lt;/a&gt; said:&lt;/p&gt;
+&lt;blockquote&gt;&lt;p&gt;
+Most</em></ins></span> 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;
+for more <span 
class="removed"><del><strong>info&rdquo;&lt;/a&gt;.&lt;/p&gt;</strong></del></span>
 <span class="inserted"><ins><em>info.
+&lt;/p&gt;&lt;/blockquote&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="finishhurd"&gt;Why not finish the GNU Hurd kernel, release the GNU 
system
@@ -1490,7 +1514,7 @@
 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
+name to use.  You can't make others say <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> but
 you can decide to call the system &ldquo;GNU/Linux&rdquo;
 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;
@@ -1503,10 +1527,10 @@
 <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
+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> you 
will help others learn the system's true
 history, origin, and reason for being.  You can't correct the misnomer
 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
+only a few hundred people see you use the term <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> you 
will
 have educated a substantial number of people with very little work.
 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;
@@ -1518,14 +1542,15 @@
 &lt;dd&gt;
 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.
+calling 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> and 
uses your time inefficiently.
 &lt;p&gt;
 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, and they may learn a correct picture of the system's
 origin.  But they are unlikely to repeat the explanation to others
 whenever they talk about the system.  They will probably just call it
-&ldquo;Linux&rdquo;.  Without particularly intending to, they will help spread 
the
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  
Without particularly intending to, they will help spread the
 incorrect picture.&lt;/p&gt;
 &lt;p&gt;
 It is inefficient because it takes a lot more time.  Saying and
@@ -1591,7 +1616,8 @@
 &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 <span 
class="removed"><del><strong>too.</strong></del></span> <span 
class="inserted"><ins><em>too.&lt;/p&gt;</em></ins></span>
+<span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> 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
@@ -1635,7 +1661,7 @@
 &lt;/dd&gt;
 
 &lt;dt id="deserve"&gt;Since you failed to put
-    something in the GNU GPL to require people to call the system 
&ldquo;GNU&rdquo;,
+    something in the GNU GPL to require people to call the system <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span>
     you deserve what happened; why are you complaining now? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#deserve"&gt;#deserve&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
@@ -1661,7 +1687,7 @@
 &lt;/dd&gt;
 
 &lt;dt id="somanyright"&gt;Since many people call
-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;
+it <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> 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;
 <span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
@@ -1674,7 +1700,7 @@
 &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
+includes <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> 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 <span 
class="removed"><del><strong>understand.</strong></del></span> <span 
class="inserted"><ins><em>understand.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
@@ -1755,7 +1781,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/08/31 10:37:07 $
+$Date: 2021/11/02 14:41:51 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: po/gnu-linux-faq.nl.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.nl.po,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- po/gnu-linux-faq.nl.po      31 Aug 2021 10:37:07 -0000      1.67
+++ po/gnu-linux-faq.nl.po      2 Nov 2021 14:41:51 -0000       1.68
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-linux-faq.html\n"
-"POT-Creation-Date: 2021-08-31 10:27+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Justin van Steijn <jvs@fsfe.org>\n"
 "Language-Team: Dutch\n"
@@ -36,10 +36,19 @@
 msgid "by Richard Stallman"
 msgstr "door Richard Stallman"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+# | When people see that we use and recommend the name GNU/Linux for a system
+# | that many others call just [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} they ask many questions.  Here are common
+# | questions, and our answers.
+#, fuzzy
+#| 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."
 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.  "
+"that many others call just &ldquo;Linux,&rdquo; they ask many questions.  "
 "Here are common questions, and our answers."
 msgstr ""
 "Wanneer mensen merken dat we adviseren om het systeem, dat men meestal "
@@ -256,11 +265,22 @@
 "</a>"
 
 #. type: Content of: <div><div><ul><li>
+# | <a href=\"#trademarkfee\">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;.-] {+&ldquo;GNU/Linux.&rdquo;+} Is it
+# | wrong if I use &ldquo;GNU&rdquo; without [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} to save the fee?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#trademarkfee\">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 wrong if I use &ldquo;GNU&rdquo; without "
+#| "&ldquo;Linux&rdquo;, to save the fee?</a>"
 msgid ""
 "<a href=\"#trademarkfee\">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 wrong if I use &ldquo;GNU&rdquo; without "
-"&ldquo;Linux&rdquo;, to save the fee?</a>"
+"&ldquo;GNU/Linux.&rdquo; Is it wrong if I use &ldquo;GNU&rdquo; without "
+"&ldquo;Linux,&rdquo; to save the fee?</a>"
 msgstr ""
 "<a href=\"#trademarkfee\">Ik moet rechten afdragen wanneer ik &ldquo;"
 "Linux&rdquo; gebruik in de naam van een product en dat geldt ook wanneer ik "
@@ -369,10 +389,19 @@
 "GNU&rdquo;?</a>"
 
 #. type: Content of: <div><div><ul><li>
-msgid ""
-"<a href=\"#distronames0\">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 whatever they like?</a>"
+# | <a href=\"#distronames0\">My distro's developers call it &ldquo;Foobar
+# | [-Linux&rdquo;,-] {+Linux,&rdquo;+} but that doesn't say anything about
+# | what the system consists of.  Why shouldn't they call it whatever they
+# | like?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#distronames0\">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 whatever they like?</a>"
+msgid ""
+"<a href=\"#distronames0\">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 whatever they like?</a>"
 msgstr ""
 "<a href=\"#distronames0\">De ontwikkelaars van mijn distributie noemen het "
 "&ldquo;Foobar Linux&rdquo;, maar dat zegt niets over waar het systeem uit "
@@ -623,9 +652,18 @@
 "dwingt het systeem &ldquo;GNU&rdquo; te noemen?</a>"
 
 #. type: Content of: <div><div><ul><li>
+# | <a href=\"#deserve\">Since you failed to put something in the GNU GPL to
+# | require people to call the system [-&ldquo;GNU&rdquo;,-]
+# | {+&ldquo;GNU,&rdquo;+} you deserve what happened; why are you complaining
+# | now?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#deserve\">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 complaining now?</a>"
 msgid ""
 "<a href=\"#deserve\">Since you failed to put something in the GNU GPL to "
-"require people to call the system &ldquo;GNU&rdquo;, you deserve what "
+"require people to call the system &ldquo;GNU,&rdquo; you deserve what "
 "happened; why are you complaining now?</a>"
 msgstr ""
 "<a href=\"#deserve\">Door geen vermeldingsplicht van GNU in de GNU GPL op te "
@@ -640,8 +678,15 @@
 "heersende overtuiging in te gaan?</a>"
 
 #. type: Content of: <div><div><ul><li>
+# | <a href=\"#somanyright\">Since many people call it
+# | [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} doesn't that make it
+# | right?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#somanyright\">Since many people call it &ldquo;Linux&rdquo;, "
+#| "doesn't that make it right?</a>"
 msgid ""
-"<a href=\"#somanyright\">Since many people call it &ldquo;Linux&rdquo;, "
+"<a href=\"#somanyright\">Since many people call it &ldquo;Linux,&rdquo; "
 "doesn't that make it right?</a>"
 msgstr ""
 "<a href=\"#somanyright\">Doordat zoveel mensen het &ldquo;Linux&rdquo; "
@@ -824,6 +869,24 @@
 "voorsprong."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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 it must be right.  The name &ldquo;Linux&rdquo; also spreads a
+# | false picture of the system's origin, because people tend to suppose that
+# | the system's history was such as to fit that name.  For instance, they
+# | often believe its development was started by Linus Torvalds in 1991.  This
+# | false picture tends to reinforce the idea that the system should be called
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+}
+#, fuzzy
+#| 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 it must be right.  The name &ldquo;Linux&rdquo; also spreads a "
+#| "false picture of the system's origin, because people tend to suppose that "
+#| "the system's history was such as to fit that name.  For instance, they "
+#| "often believe its development was started by Linus Torvalds in 1991.  "
+#| "This false picture tends to reinforce the idea that the system should be "
+#| "called &ldquo;Linux&rdquo;."
 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 +894,7 @@
 "of the system's origin, because people tend to suppose that the system's "
 "history was such as to fit that name.  For instance, they often believe its "
 "development was started by Linus Torvalds in 1991.  This false picture tends "
-"to reinforce the idea that the system should be called &ldquo;Linux&rdquo;."
+"to reinforce the idea that the system should be called &ldquo;Linux.&rdquo;"
 msgstr ""
 "De meeste mensen die het systeem &ldquo;Linux&rdquo; noemen hebben nooit "
 "gehoord waarom dit niet de goede naam is. Ze zagen anderen het gebruiken en "
@@ -861,22 +924,46 @@
 "\">#always</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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;,-] {+&ldquo;Linux,&rdquo;+} the name its developer
+# | chose.
+#, fuzzy
+#| 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."
 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."
+"you're referring specifically to the kernel, you should call it &ldquo;Linux,"
+"&rdquo; the name its developer chose."
 msgstr ""
 "Niet altijd&mdash;alleen wanneer je het over het hele systeem hebt. Wanneer "
 "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><dl><dd><p>
+# | When people call the whole system [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} as a consequence they call the whole system by
+# | the same name as the kernel.  This causes many kinds of confusion, because
+# | only experts can tell whether a statement is about the kernel or the whole
+# | system.  By calling the whole system [-&ldquo;GNU/Linux&rdquo;,-]
+# | {+&ldquo;GNU/Linux,&rdquo;+} and calling the kernel
+# | [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} you avoid the ambiguity.
+#, fuzzy
+#| 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 kinds of confusion, because only experts can tell whether a "
+#| "statement is about the kernel or the whole system.  By calling the whole "
+#| "system &ldquo;GNU/Linux&rdquo;, and calling the kernel &ldquo;"
+#| "Linux&rdquo;, you avoid the ambiguity."
 msgid ""
-"When people call the whole system &ldquo;Linux&rdquo;, as a consequence they "
+"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 "
 "kinds of confusion, because only experts can tell whether a statement is "
 "about the kernel or the whole system.  By calling the whole system &ldquo;"
-"GNU/Linux&rdquo;, and calling the kernel &ldquo;Linux&rdquo;, you avoid the "
+"GNU/Linux,&rdquo; and calling the kernel &ldquo;Linux,&rdquo; you avoid the "
 "ambiguity."
 msgstr ""
 "Wanneer mensen het geheel &ldquo;Linux&rdquo; noemen heeft dit dezelfde naam "
@@ -946,8 +1033,17 @@
 "\">#divide</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | When we ask people to say [-&ldquo;GNU/Linux&rdquo;,-]
+# | {+&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.
+#, fuzzy
+#| 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."
 msgid ""
-"When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing "
+"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 ""
@@ -1003,10 +1099,34 @@
 "niet</a>."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | freedom are more likely to call the system [-&ldquo;GNU/Linux&rdquo;,-]
+# | {+&ldquo;GNU/Linux,&rdquo;+} and people who learn that the system is
+# | &ldquo;GNU/Linux&rdquo; are more likely to pay attention to our
+# | philosophical arguments for freedom and community (which is why the choice
+# | of name for the system makes a real difference for society).  However, the
+# | disagreement would probably exist even if everyone knew the system's real
+# | origin and its proper name, because the issue is a real one.  It can only
+# | go away if we who value freedom either persuade everyone (which won't be
+# | easy) or are defeated entirely (let's hope not).
+#, fuzzy
+#| 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 freedom are more likely to call the system &ldquo;GNU/"
+#| "Linux&rdquo;, and people who learn that the system is &ldquo;GNU/"
+#| "Linux&rdquo; are more likely to pay attention to our philosophical "
+#| "arguments for freedom and community (which is why the choice of name for "
+#| "the system makes a real difference for society).  However, the "
+#| "disagreement would probably exist even if everyone knew the system's real "
+#| "origin and its proper name, because the issue is a real one.  It can only "
+#| "go away if we who value freedom either persuade everyone (which won't be "
+#| "easy) or are defeated entirely (let's hope not)."
 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 "
-"freedom are more likely to call the system &ldquo;GNU/Linux&rdquo;, and "
+"freedom are more likely to call the system &ldquo;GNU/Linux,&rdquo; and "
 "people who learn that the system is &ldquo;GNU/Linux&rdquo; are more likely "
 "to pay attention to our philosophical arguments for freedom and community "
 "(which is why the choice of name for the system makes a real difference for "
@@ -1065,10 +1185,23 @@
 "reference-id\">(<a href=\"#everyoneknows\">#everyoneknows</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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
+# | system do not mention the name [-&ldquo;GNU&rdquo;,-]
+# | {+&ldquo;GNU,&rdquo;+} or the ideals that GNU stands for.  <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never
+# | Heard of GNU</a> explains further.
+#, fuzzy
+#| 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 system do not mention the name &ldquo;GNU&rdquo;, or the ideals that "
+#| "GNU stands for.  <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU "
+#| "Users Who Have Never Heard of GNU</a> explains further."
 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 "
-"system do not mention the name &ldquo;GNU&rdquo;, or the ideals that GNU "
+"system do not mention the name &ldquo;GNU,&rdquo; or the ideals that GNU "
 "stands for.  <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users "
 "Who Have Never Heard of GNU</a> explains further."
 msgstr ""
@@ -1079,11 +1212,22 @@
 "Nog Nooit Van GNU Gehoord Hebben</a> legt dit verder uit."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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 GNU is.  For instance, many think it is a collection of [-<a
+# | href=\"#tools\">&ldquo;tools&rdquo;</a>,-] {+&ldquo;<a
+# | href=\"#tools\">tools</a>,&rdquo;+} or a project to develop tools.
+#, fuzzy
+#| 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 GNU is.  For instance, many think it is a collection of <a "
+#| "href=\"#tools\">&ldquo;tools&rdquo;</a>, or a project to develop tools."
 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 "
-"GNU is.  For instance, many think it is a collection of <a href=\"#tools"
-"\">&ldquo;tools&rdquo;</a>, or a project to develop tools."
+"GNU is.  For instance, many think it is a collection of &ldquo;<a href="
+"\"#tools\">tools</a>,&rdquo; or a project to develop tools."
 msgstr ""
 "De mensen die met dit argument komen zijn waarschijnlijk computernerds die "
 "andere nerds die ze kennen in gedachten hebben. Nerds kennen GNU meestal wel "
@@ -1117,11 +1261,23 @@
 "\"#everyoneknows2\">#everyoneknows2</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | 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;,-] {+&ldquo;Linux,&rdquo;+} that it was started by
+# | Linus Torvalds, and that it was intended to be &ldquo;open
+# | [-source&rdquo;.-] {+source.&rdquo;+} If you don't tell them, who will?
+#, fuzzy
+#| 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;"
+#| "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?"
 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;"
-"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?"
+"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?"
 msgstr ""
 "Wanneer de woorden die je gebruikt geen afspiegeling zijn van je kennis, "
 "leer je anderen dus ook niks. De meeste mensen die gehoord hebben van het "
@@ -1179,14 +1335,31 @@
 "\">#tools</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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
+# | that GNU is the name of a collection of programs&mdash;often they say
+# | &ldquo;programming [-tools&rdquo;,-] {+tools,&rdquo;+} since some of our
+# | programming tools became popular on their own.  The idea that
+# | &ldquo;GNU&rdquo; is the name of an operating system is hard to fit into a
+# | conceptual framework in which that operating system is labeled
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+}
+#, fuzzy
+#| 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 "
+#| "that GNU is the name of a collection of programs&mdash;often they say "
+#| "&ldquo;programming tools&rdquo;, since some of our programming tools "
+#| "became popular on their own.  The idea that &ldquo;GNU&rdquo; is the name "
+#| "of an operating system is hard to fit into a conceptual framework in "
+#| "which that operating system is labeled &ldquo;Linux&rdquo;."
 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 "
 "that GNU is the name of a collection of programs&mdash;often they say &ldquo;"
-"programming tools&rdquo;, since some of our programming tools became popular "
+"programming tools,&rdquo; since some of our programming tools became popular "
 "on their own.  The idea that &ldquo;GNU&rdquo; is the name of an operating "
 "system is hard to fit into a conceptual framework in which that operating "
-"system is labeled &ldquo;Linux&rdquo;."
+"system is labeled &ldquo;Linux.&rdquo;"
 msgstr ""
 "Mensen die denken dat Linux een compleet besturingssysteem is, als ze al van "
 "GNU horen, krijgen dan vaak het verkeerde idee wat betreft GNU. Ze kunnen "
@@ -1254,12 +1427,32 @@
 "starten en stoppen van de programma's."
 
 #. type: Content of: <div><dl><dd><p>
+# | To confuse matters, some people use the term &ldquo;operating
+# | system&rdquo; to mean [-&ldquo;kernel&rdquo;.-] {+&ldquo;kernel.&rdquo;+}
+# | Both uses of the term go back many years.  The use of &ldquo;operating
+# | system&rdquo; to mean &ldquo;kernel&rdquo; is found in a number of
+# | textbooks on system design, going back to the 80s.  At the same time, in
+# | the 80s, the &ldquo;Unix operating system&rdquo; was understood to include
+# | all the system programs, and Berkeley's version of Unix included even
+# | games. Since we intended GNU to be a Unix-like operating system, we use
+# | the term &ldquo;operating system&rdquo; in the same way.
+#, fuzzy
+#| 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.  The use of &ldquo;operating system&rdquo; to mean "
+#| "&ldquo;kernel&rdquo; is found in a number of textbooks on system design, "
+#| "going back to the 80s.  At the same time, in the 80s, the &ldquo;Unix "
+#| "operating system&rdquo; was understood to include all the system "
+#| "programs, and Berkeley's version of Unix included even games. Since we "
+#| "intended GNU to be a Unix-like operating system, we use the term &ldquo;"
+#| "operating system&rdquo; in the same way."
 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.  "
-"The use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is "
-"found in a number of textbooks on system design, going back to the 80s.  At "
-"the same time, in the 80s, the &ldquo;Unix operating system&rdquo; was "
+"to mean &ldquo;kernel.&rdquo; Both uses of the term go back many years.  The "
+"use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is found "
+"in a number of textbooks on system design, going back to the 80s.  At the "
+"same time, in the 80s, the &ldquo;Unix operating system&rdquo; was "
 "understood to include all the system programs, and Berkeley's version of "
 "Unix included even games. Since we intended GNU to be a Unix-like operating "
 "system, we use the term &ldquo;operating system&rdquo; in the same way."
@@ -1276,11 +1469,28 @@
 "gebruiken."
 
 #. type: Content of: <div><dl><dd><p>
+# | Most of the time when people speak of the &ldquo;Linux operating
+# | system&rdquo; they are using &ldquo;operating system&rdquo; in the same
+# | sense we use: they mean the whole collection of programs.  If that's what
+# | you are referring to, please call it [-&ldquo;GNU/Linux&rdquo;.-]
+# | {+&ldquo;GNU/Linux.&rdquo;+} If you mean just the kernel, then
+# | &ldquo;Linux&rdquo; is the right name for it, but please say
+# | &ldquo;kernel&rdquo; also to avoid ambiguity about which body of software
+# | you mean.
+#, fuzzy
+#| 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 "
+#| "sense we use: they mean the whole collection of programs.  If that's what "
+#| "you are referring to, please call it &ldquo;GNU/Linux&rdquo;.  If you "
+#| "mean just the kernel, then &ldquo;Linux&rdquo; is the right name for it, "
+#| "but please say &ldquo;kernel&rdquo; also to avoid ambiguity about which "
+#| "body of software you mean."
 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 "
 "sense we use: they mean the whole collection of programs.  If that's what "
-"you are referring to, please call it &ldquo;GNU/Linux&rdquo;.  If you mean "
+"you are referring to, please call it &ldquo;GNU/Linux.&rdquo; If you mean "
 "just the kernel, then &ldquo;Linux&rdquo; is the right name for it, but "
 "please say &ldquo;kernel&rdquo; also to avoid ambiguity about which body of "
 "software you mean."
@@ -1294,10 +1504,20 @@
 "het woord &ldquo;kernel&rdquo; om misverstanden uit te sluiten."
 
 #. type: Content of: <div><dl><dd><p>
+# | If you prefer to use some other term such as &ldquo;system
+# | distribution&rdquo; for the entire collection of programs, instead of
+# | &ldquo;operating [-system&rdquo;,-] {+system,&rdquo;+} that's fine.  Then
+# | you would talk about GNU/Linux system distributions.
+#, fuzzy
+#| msgid ""
+#| "If you prefer to use some other term such as &ldquo;system "
+#| "distribution&rdquo; for the entire collection of programs, instead of "
+#| "&ldquo;operating system&rdquo;, that's fine.  Then you would talk about "
+#| "GNU/Linux system distributions."
 msgid ""
 "If you prefer to use some other term such as &ldquo;system "
 "distribution&rdquo; for the entire collection of programs, instead of &ldquo;"
-"operating system&rdquo;, that's fine.  Then you would talk about GNU/Linux "
+"operating system,&rdquo; that's fine.  Then you would talk about GNU/Linux "
 "system distributions."
 msgstr ""
 "Wanneer je liever woorden als &ldquo;systeemdistributie&rdquo; gebruikt voor "
@@ -1406,9 +1626,9 @@
 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, "
-"window systems, libraries, and much more &mdash; hundreds of programs, even "
-"to match what BSD systems included in 1983.  Since Torvalds didn't develop "
-"any of those, how can the system be &ldquo;Linux&rdquo;?"
+"window systems, libraries, and much more&mdash;hundreds of programs, even to "
+"match what BSD systems included in 1983.  Since Torvalds didn't develop any "
+"of those, how can the system be &ldquo;Linux&rdquo;?"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><p>
@@ -1437,9 +1657,18 @@
 
 # Nieuw
 #. type: Content of: <div><dl><dd>
+# | Many <a href=\"/distros/distros.html\"> packaged and installable versions
+# | of GNU</a> are available.  None of them is called simply
+# | [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} but GNU is what they
+# | basically are.
+#, fuzzy
+#| 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."
 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</a> are available.  None of them is called simply &ldquo;GNU,&rdquo; but "
 "GNU is what they basically are."
 msgstr ""
 "Veel <a href=\"/distros/distros.html\"> ingepakte en installeerbare versies "
@@ -1494,9 +1723,17 @@
 
 # Nieuw
 #. type: Content of: <div><dl><dd><p>
+# | We never took the last step of packaging GNU under the name
+# | [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} but that doesn't alter what
+# | kind of thing GNU is.  GNU is an operating system.
+#, fuzzy
+#| 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."
 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 "
+"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 ""
 "We hebben nooit de laatste stap genomen om GNU onder de naam &ldquo;"
@@ -1514,13 +1751,28 @@
 "\"anchor-reference-id\">(<a href=\"#afterkernel\">#afterkernel</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | That practice seems to be very rare&mdash;we can't find any examples other
+# | than the misuse of the name [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+} Normally an operating system is developed as a
+# | single unified project, and the developers choose a name for the system as
+# | a whole.  The kernel usually does not have a name of its
+# | own&mdash;instead, people say &ldquo;the kernel of such-and-such&rdquo; or
+# | &ldquo;the such-and-such [-kernel&rdquo;.-] {+kernel.&rdquo;+}
+#, fuzzy
+#| 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 system is developed as a single unified project, and the "
+#| "developers choose a name for the system as a whole.  The kernel usually "
+#| "does not have a name of its own&mdash;instead, people say &ldquo;the "
+#| "kernel of such-and-such&rdquo; or &ldquo;the such-and-such kernel&rdquo;."
 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 "
+"than the misuse of the name &ldquo;Linux.&rdquo; Normally an operating "
 "system is developed as a single unified project, and the developers choose a "
 "name for the system as a whole.  The kernel usually does not have a name of "
 "its own&mdash;instead, people say &ldquo;the kernel of such-and-such&rdquo; "
-"or &ldquo;the such-and-such kernel&rdquo;."
+"or &ldquo;the such-and-such kernel.&rdquo;"
 msgstr ""
 "Die gewoonte blijkt zeldzaam&mdash;we kunnen geen ander voorbeeld vinden dan "
 "het verkeerd gebruik van de naam &ldquo;Linux&rdquo;. Meestal wordt een "
@@ -1578,9 +1830,18 @@
 "a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | For a while we tried the name [-&ldquo;LiGNUx&rdquo;,-]
+# | {+&ldquo;LiGNUx,&rdquo;+} which combines the words &ldquo;GNU&rdquo; and
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} The reaction was very
+# | bad.  People accept &ldquo;GNU/Linux&rdquo; much better.
+#, fuzzy
+#| 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."
 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.  "
+"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 ""
 "Een tijdje hebben we &ldquo;LiGNUx&rdquo; geprobeerd die de woorden &ldquo;"
@@ -1588,8 +1849,16 @@
 "Mensen zijn meer geneigd GNU/Linux te accepteren."
 
 #. type: Content of: <div><dl><dd><p>
+# | The shortest legitimate name for this system is [-&ldquo;GNU&rdquo;,-]
+# | {+&ldquo;GNU,&rdquo;+} but we call it &ldquo;GNU/Linux&rdquo; <a
+# | href=\"#justgnu\"> for the reasons given below</a>.
+#, fuzzy
+#| 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>."
 msgid ""
-"The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but we "
+"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 ""
@@ -1640,8 +1909,16 @@
 
 # Nieuw
 #. type: Content of: <div><dl><dd><p>
+# | It only takes a second to say or type [-&ldquo;GNU/&rdquo;.-]
+# | {+&ldquo;GNU/.&rdquo;+} If you appreciate the system that we developed,
+# | can't you take one second to recognize our work?
+#, fuzzy
+#| 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?"
 msgid ""
-"It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you appreciate "
+"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 ""
@@ -1757,10 +2034,21 @@
 "erkenning die hij verdient."
 
 #. type: Content of: <div><dl><dd><ul><li>
+# | Since many people know of the system as [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} if we say &ldquo;GNU&rdquo; they may simply not
+# | recognize we're talking about the same system.  If we say
+# | [-&ldquo;GNU/Linux&rdquo;,-] {+&ldquo;GNU/Linux,&rdquo;+} they can make a
+# | connection to what they have heard about.
+#, fuzzy
+#| 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 system.  If we say &ldquo;GNU/Linux&rdquo;, they can make a "
+#| "connection to what they have heard about."
 msgid ""
-"Since many people know of the system as &ldquo;Linux&rdquo;, if we say "
+"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 "
-"system.  If we say &ldquo;GNU/Linux&rdquo;, they can make a connection to "
+"system.  If we say &ldquo;GNU/Linux,&rdquo; they can make a connection to "
 "what they have heard about."
 msgstr ""
 "Velen kennen het systeem als &ldquo;Linux&rdquo;, wanneer we &ldquo;"
@@ -1768,10 +2056,23 @@
 "Linux&rdquo; gebruiken zullen ze het herkennen."
 
 #. type: Content of: <div><dl><dt>
+# | 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;.-]
+# | {+&ldquo;GNU/Linux.&rdquo;+} Is it wrong if I use &ldquo;GNU&rdquo;
+# | without [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} to save the fee?
+# | <span class=\"anchor-reference-id\">(<a
+# | href=\"#trademarkfee\">#trademarkfee</a>)</span>
+#, fuzzy
+#| 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 wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to save "
+#| "the fee? <span class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
+#| "\">#trademarkfee</a>)</span>"
 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 "
-"wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to save the "
+"product, and that would also apply if I say &ldquo;GNU/Linux.&rdquo; Is it "
+"wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux,&rdquo; to save the "
 "fee? <span class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
 "\">#trademarkfee</a>)</span>"
 msgstr ""
@@ -1792,9 +2093,17 @@
 "maar je hoeft daarvoor niemand iets te betalen."
 
 #. type: Content of: <div><dl><dd><p>
+# | So if you want to refer to the system simply as [-&ldquo;GNU&rdquo;,-]
+# | {+&ldquo;GNU,&rdquo;+} to avoid paying the fee for calling it
+# | [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} we won't criticize you.
+#, fuzzy
+#| 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."
 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."
+"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 ""
 "Dus wanneer je het systeem eenvoudigweg &ldquo;GNU&rdquo; wilt noemen om je "
 "zo een afdracht te besparen wanneer je het &ldquo;Linux&rdquo; zou noemen, "
@@ -1852,12 +2161,25 @@
 "en dat maakt ons ook niet uit."
 
 #. type: Content of: <div><dl><dd><p>
+# | Different threshold levels would lead to different choices of name for the
+# | system.  But one name that cannot result from concerns of fairness and
+# | giving credit, not for any possible threshold level, is
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} It can't be fair to give
+# | all the credit to one secondary contribution (Linux) while omitting the
+# | principal contribution (GNU).
+#, fuzzy
+#| 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 giving credit, not for any possible threshold level, is &ldquo;"
+#| "Linux&rdquo;.  It can't be fair to give all the credit to one secondary "
+#| "contribution (Linux) while omitting the principal contribution (GNU)."
 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 "
-"giving credit, not for any possible threshold level, is &ldquo;"
-"Linux&rdquo;.  It can't be fair to give all the credit to one secondary "
-"contribution (Linux) while omitting the principal contribution (GNU)."
+"giving credit, not for any possible threshold level, is &ldquo;Linux.&rdquo; "
+"It can't be fair to give all the credit to one secondary contribution "
+"(Linux) while omitting the principal contribution (GNU)."
 msgstr ""
 "De naamgeving hangt dus af van de keuze van die grens. Maar &eacute;&eacute;"
 "n naam kun je er, vanuit het oogpunt van erkenning, niet aan geven en dat is "
@@ -1892,7 +2214,7 @@
 "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."
+"system &ldquo;GNU/systemd/Linux,&rdquo; there is nothing wrong with doing so."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
@@ -1939,11 +2261,21 @@
 "\"#allsmall\">#allsmall</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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 the same argument would apply even more strongly to calling it
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+}
+#, fuzzy
+#| 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 the same argument would apply even more strongly to calling it &ldquo;"
+#| "Linux&rdquo;."
 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 "
-"the same argument would apply even more strongly to calling it &ldquo;"
-"Linux&rdquo;."
+"the same argument would apply even more strongly to calling it &ldquo;Linux."
+"&rdquo;"
 msgstr ""
 "In 2008 zagen we dat de GNU-pakketten 15% uitmaakten van de complete "
 "gNewSense GNU/Linux distributie. Linux slechts 1,5%. Dit argument zou dus "
@@ -2006,9 +2338,21 @@
 "\">#whyslash</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | Following the rules of English, in the construction &ldquo;GNU
+# | Linux&rdquo; the word &ldquo;GNU&rdquo; modifies [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+} This can mean either &ldquo;GNU's version of
+# | Linux&rdquo; or &ldquo;Linux, which is a GNU package.&rdquo; Neither of
+# | those meanings fits the situation at hand.
+#, fuzzy
+#| 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 either &ldquo;GNU's version of Linux&rdquo; or &ldquo;"
+#| "Linux, which is a GNU package.&rdquo; Neither of those meanings fits the "
+#| "situation at hand."
 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 "
+"the word &ldquo;GNU&rdquo; modifies &ldquo;Linux.&rdquo; This can mean "
 "either &ldquo;GNU's version of Linux&rdquo; or &ldquo;Linux, which is a GNU "
 "package.&rdquo; Neither of those meanings fits the situation at hand."
 msgstr ""
@@ -2035,9 +2379,10 @@
 # | [-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.
+# | non[---]free firmware [-&ldquo;blobs&rdquo;.-] {+&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 "
@@ -2051,7 +2396,7 @@
 "We're not talking about a distinct GNU version of Linux, the kernel.  The "
 "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 "
+"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."
@@ -2064,11 +2409,24 @@
 "Linux&rdquo;; kunnen noemen maar dat wordt te verwarrend."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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 &ldquo;combination.&rdquo; (Think of
+# | [-&ldquo;Input/Output&rdquo;.)-] {+&ldquo;Input/Output.&rdquo;)+}  This
+# | system is the combination of GNU and Linux; hence,
+# | [-&ldquo;GNU/Linux&rdquo;.-] {+&ldquo;GNU/Linux.&rdquo;+}
+#, fuzzy
+#| 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 &ldquo;combination.&rdquo; (Think of &ldquo;Input/Output&rdquo;.)  "
+#| "This system is the combination of GNU and Linux; hence, &ldquo;GNU/"
+#| "Linux&rdquo;."
 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 "
-"&ldquo;combination.&rdquo; (Think of &ldquo;Input/Output&rdquo;.)  This "
-"system is the combination of GNU and Linux; hence, &ldquo;GNU/Linux&rdquo;."
+"&ldquo;combination.&rdquo; (Think of &ldquo;Input/Output.&rdquo;)  This "
+"system is the combination of GNU and Linux; hence, &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "We hebben het over een versie van GNU, het besturingssysteem, uitgevoerd met "
 "Linux als kernel. Een schuine streep is hier dus van toepassing omdat dit de "
@@ -2076,11 +2434,22 @@
 "is de combinatie van GNU en Linux; &ldquo;GNU/Linux&rdquo; dus."
 
 #. 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: "
-"&ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes say &ldquo;GNU con "
-"Linux&rdquo;."
+# | There are other ways to express [-&ldquo;combination&rdquo;.-]
+# | {+&ldquo;combination.&rdquo;+} If you think that a plus-sign is clearer,
+# | please use that.  In French, a hyphen is clear:
+# | [-&ldquo;GNU-Linux&rdquo;.-] {+&ldquo;GNU-Linux.&rdquo;+} In Spanish, we
+# | sometimes say &ldquo;GNU con [-Linux&rdquo;.-] {+Linux.&rdquo;+}
+#, fuzzy
+#| 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: &ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes say &ldquo;GNU "
+#| "con Linux&rdquo;."
+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: "
+"&ldquo;GNU-Linux.&rdquo; In Spanish, we sometimes say &ldquo;GNU con Linux."
+"&rdquo;"
 msgstr ""
 "Er zijn nog andere vormen om de &ldquo;combinatie&rdquo; aan te duiden. Als "
 "je denkt dat een plusteken beter is, gebruik dat dan. In het Frans is een "
@@ -2134,7 +2503,7 @@
 # | 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
-# | Linux&rdquo; or &ldquo;Linux,-] {+&ldquo;Emacs&rdquo;.  That is the right
+# | Linux&rdquo; or &ldquo;Linux,-] {+&ldquo;Emacs.&rdquo; That is the right
 # | way to describe a program called Emacs+} which is a GNU [-package.&rdquo;
 # | Neither of those meanings fits the situation at hand.-] {+package.+}
 #, fuzzy
@@ -2146,7 +2515,7 @@
 #| "situation at hand."
 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 "
+"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 ""
 "Volgens de regels van de Engelse taal verandert het woord &ldquo;GNU&rdquo; "
@@ -2188,8 +2557,17 @@
 "diepste niveau van het systeem is en GNU de technisch hogere niveaus vormt."
 
 #. type: Content of: <div><dl><dd><p>
+# | However, if you prefer to call the system [-&ldquo;Linux/GNU&rdquo;,-]
+# | {+&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.
+#, fuzzy
+#| 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."
 msgid ""
-"However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a "
+"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 ""
@@ -2199,8 +2577,19 @@
 
 # Nieuw
 #. type: Content of: <div><dl><dt>
+# | My distro's developers call it &ldquo;Foobar [-Linux&rdquo;,-]
+# | {+Linux,&rdquo;+} but that doesn't say anything about what the system
+# | consists of.  Why shouldn't they call it whatever they like? <span
+# | class=\"anchor-reference-id\">(<a
+# | href=\"#distronames0\">#distronames0</a>)</span>
+#, fuzzy
+#| 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 whatever they like? <span class=\"anchor-reference-id\">(<a "
+#| "href=\"#distronames0\">#distronames0</a>)</span>"
 msgid ""
-"My distro's developers call it &ldquo;Foobar Linux&rdquo;, but that doesn't "
+"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 "
 "whatever they like? <span class=\"anchor-reference-id\">(<a href="
 "\"#distronames0\">#distronames0</a>)</span>"
@@ -2268,11 +2657,22 @@
 "\"#distronames1\">#distronames1</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | When they spread misinformation by changing &ldquo;GNU&rdquo; to
+# | [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} and call their version
+# | of it &ldquo;Foobar [-Linux&rdquo;,-] {+Linux,&rdquo;+} it's proper for
+# | you to correct the misinformation by calling it &ldquo;Foobar
+# | [-GNU/Linux&rdquo;.-] {+GNU/Linux.&rdquo;+}
+#, fuzzy
+#| 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 proper for you to correct the misinformation by calling it &ldquo;"
+#| "Foobar GNU/Linux&rdquo;."
 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 "
+"Linux,&rdquo; and call their version of it &ldquo;Foobar Linux,&rdquo; it's "
 "proper for you to correct the misinformation by calling it &ldquo;Foobar GNU/"
-"Linux&rdquo;."
+"Linux.&rdquo;"
 msgstr ""
 "Als zij verkeerde informatie verspreiden door “GNU” te veranderen in 
“Linux” "
 "en hun versie ervan &ldquo;Foobar Linux&rdquo; noemen, dan is het jouw goed "
@@ -2308,12 +2708,24 @@
 "het kon het bedrijf niet schelen of het juist was of niet."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | 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;.-] {+&ldquo;GNU/Linux.&rdquo;+}
+#, fuzzy
+#| 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 "
+#| "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;."
 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 "
 "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;."
+"&ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "We kunnen ze niet dwingen maar we zullen ook niet snel opgeven. Je zult "
 "wellicht niet zoveel invloed hebben als een IBM of Red Hat maar je kunt nog "
@@ -2337,12 +2749,12 @@
 # | 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.
+# | [-&ldquo;Linux&rdquo;.-] {+&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 "
@@ -2357,13 +2769,12 @@
 msgid ""
 "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 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 nonfree "
-"applications and drivers), or making the system more popular even at the "
-"cost of freedom."
+"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 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 nonfree applications "
+"and drivers), or making the system more popular even at the cost of freedom."
 msgstr ""
 "De veelgebruikte praktijk om niet-vrije software toe te voegen aan een GNU/"
 "Linux-systeem is een groot probleem voor onze gemeenschap. Het leert "
@@ -2401,7 +2812,8 @@
 # | 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;.
+# | they are proper and appropriate &ldquo;versions of [-Linux&rdquo;.-]
+# | {+Linux.&rdquo;+}
 #, fuzzy
 #| msgid ""
 #| "The way to lead these users to see a connection with freedom is exactly "
@@ -2418,7 +2830,7 @@
 "specifically for the sake of the users' freedom.  With this understanding, "
 "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;."
+"proper and appropriate &ldquo;versions of Linux.&rdquo;"
 msgstr ""
 "Om bij gebruikers toch de boodschap van vrijheid over te laten komen moeten "
 "we precies het tegenovergestelde doen: ze vertellen dat al deze systemen wel "
@@ -2521,11 +2933,22 @@
 "(helaas is dat achterafpraterij)."
 
 #. type: Content of: <div><dl><dd><p>
+# | If we were to take an existing version of GNU/Linux and relabel it as
+# | [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} that would be somewhat like
+# | making a version of the GNU system and labeling it
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} That wasn't right, and
+# | we don't want to act like that.
+#, fuzzy
+#| 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 and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and "
+#| "we don't want to act like that."
 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 "
-"and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and we don't want "
-"to act like that."
+"GNU,&rdquo; that would be somewhat like making a version of the GNU system "
+"and labeling it &ldquo;Linux.&rdquo; That wasn't right, and we don't want to "
+"act like that."
 msgstr ""
 "Wanneer we nu een bestaande versie van GNU/Linux nemen en het hernoemen naar "
 "&ldquo;GNU&rdquo;, zou dat net zoiets zijn als een GNU-systeem hernoemen "
@@ -2559,11 +2982,29 @@
 "ge&iuml;nstalleerd konden worden."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | with the GNU Project because he was a &ldquo;Linux [-user&rdquo;.-]
+# | {+user.&rdquo;+} That came as a shock, because the people who ported GNU
+# | packages to other systems had generally wanted to work with us to get
+# | their changes installed.  Yet these people, developing a system that was
+# | primarily based on GNU, were the first (and still practically the only)
+# | group that was unwilling to work with us.
+#, fuzzy
+#| 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 "
+#| "with the GNU Project because he was a &ldquo;Linux user&rdquo;.  That "
+#| "came as a shock, because the people who ported GNU packages to other "
+#| "systems had generally wanted to work with us to get their changes "
+#| "installed.  Yet these people, developing a system that was primarily "
+#| "based on GNU, were the first (and still practically the only) group that "
+#| "was unwilling to work with us."
 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 "
-"with the GNU Project because he was a &ldquo;Linux user&rdquo;.  That came "
-"as a shock, because the people who ported GNU packages to other systems had "
+"with the GNU Project because he was a &ldquo;Linux user.&rdquo; That came as "
+"a shock, because the people who ported GNU packages to other systems had "
 "generally wanted to work with us to get their changes installed.  Yet these "
 "people, developing a system that was primarily based on GNU, were the first "
 "(and still practically the only) group that was unwilling to work with us."
@@ -2579,9 +3020,22 @@
 "werken."
 
 #. type: Content of: <div><dl><dd><p>
+# | It was this experience that first showed us that people were calling a
+# | version of the GNU system [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} and that this confusion was obstructing our work.
+# |  Asking you to call the system &ldquo;GNU/Linux&rdquo; is our response to
+# | that problem, and to the other problems caused by the &ldquo;Linux&rdquo;
+# | misnomer.
+#, fuzzy
+#| 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 obstructing our work.  Asking you to call the system &ldquo;GNU/"
+#| "Linux&rdquo; is our response to that problem, and to the other problems "
+#| "caused by the &ldquo;Linux&rdquo; misnomer."
 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 "
+"version of the GNU system &ldquo;Linux,&rdquo; and that this confusion was "
 "obstructing our work.  Asking you to call the system &ldquo;GNU/Linux&rdquo; "
 "is our response to that problem, and to the other problems caused by the "
 "&ldquo;Linux&rdquo; misnomer."
@@ -2622,10 +3076,18 @@
 "\">#allgpled</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | We never refer to individual programs as
+# | [-&ldquo;GNU/<i>name</i>&rdquo;.-] {+&ldquo;GNU/<i>name</i>.&rdquo;+} When
+# | a program is a GNU package, we may call it &ldquo;GNU
+# | [-<i>name</i>&rdquo;.-] {+<i>name</i>.&rdquo;+}
+#, fuzzy
+#| 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;."
 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;."
+"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 ""
 "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;."
@@ -2740,10 +3202,24 @@
 "moest opnieuw worden geschreven."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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. 
+# | The name [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} which stands for
+# | &ldquo;GNU's Not [-Unix&rdquo;,-] {+Unix,&rdquo;+} is a humorous way of
+# | giving credit to Unix for this, following a hacker tradition of recursive
+# | acronyms that started in the 70s.
+#, fuzzy
+#| 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.  The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not "
+#| "Unix&rdquo;, is a humorous way of giving credit to Unix for this, "
+#| "following a hacker tradition of recursive acronyms that started in the "
+#| "70s."
 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.  "
-"The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not Unix&rdquo;, "
+"The name &ldquo;GNU,&rdquo; which stands for &ldquo;GNU's Not Unix,&rdquo; "
 "is a humorous way of giving credit to Unix for this, following a hacker "
 "tradition of recursive acronyms that started in the 70s."
 msgstr ""
@@ -2755,11 +3231,12 @@
 "bewijst het daarmee alle eer die het toekomt."
 
 #. 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
+# | The first such recursive acronym was TINT, &ldquo;TINT Is Not
+# | [-TECO&rdquo;.-] {+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;,-] {+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
@@ -2772,10 +3249,10 @@
 #| "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 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 "
+"like &ldquo;<em>somethingorother</em> TECO,&rdquo; he thought of a clever "
 "amusing name.  (That's what hacking means: <a href=\"https://stallman.org/";
 "articles/on-hacking.html\">playful cleverness</a>.)"
 msgstr ""
@@ -2787,13 +3264,28 @@
 "stallman.org/articles/on-hacking.html\">speelse slimmigheid</a>.)"
 
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | was similar to some existing program (let's imagine its name was
+# | &ldquo;Klever&rdquo;), you could give it a recursive acronym name, such as
+# | &ldquo;MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same
+# | spirit we called our replacement for Unix &ldquo;GNU's Not
+# | [-Unix&rdquo;.-] {+Unix.&rdquo;+}
+#, fuzzy
+#| 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 was similar to some existing program (let's imagine its name was "
+#| "&ldquo;Klever&rdquo;), you could give it a recursive acronym name, such "
+#| "as &ldquo;MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same "
+#| "spirit we called our replacement for Unix &ldquo;GNU's Not Unix&rdquo;."
 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 "
 "was similar to some existing program (let's imagine its name was &ldquo;"
 "Klever&rdquo;), you could give it a recursive acronym name, such as &ldquo;"
 "MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same spirit we "
-"called our replacement for Unix &ldquo;GNU's Not Unix&rdquo;."
+"called our replacement for Unix &ldquo;GNU's Not Unix.&rdquo;"
 msgstr ""
 "Andere hackers vonden dit zo leuk dat we deze aanpak imiteerden. Het werd "
 "traditie om een programma, dat werd herschreven en gebaseerd was op iets "
@@ -2803,13 +3295,28 @@
 "&ldquo;GNU's Niet Unix&rdquo;."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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 in a system 99% copied from Unix.  AT&amp;T actually threatened to
+# | sue anyone giving AT&amp;T credit in that way.  This is why each of the
+# | various modified versions of Unix (all proprietary, like Unix) had a
+# | completely different name that didn't include [-&ldquo;Unix&rdquo;.-]
+# | {+&ldquo;Unix.&rdquo;+}
+#, fuzzy
+#| 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 in a system 99% copied from Unix.  AT&amp;T actually threatened "
+#| "to sue anyone giving AT&amp;T credit in that way.  This is why each of "
+#| "the various modified versions of Unix (all proprietary, like Unix) had a "
+#| "completely different name that didn't include &ldquo;Unix&rdquo;."
 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 "
 "in a system 99% copied from Unix.  AT&amp;T actually threatened to sue "
 "anyone giving AT&amp;T credit in that way.  This is why each of the various "
 "modified versions of Unix (all proprietary, like Unix) had a completely "
-"different name that didn't include &ldquo;Unix&rdquo;."
+"different name that didn't include &ldquo;Unix.&rdquo;"
 msgstr ""
 "Van oudsher verbood AT&amp;T, de ontwikkelaar van Unix, eenieder om het eer "
 "te bewijzen door de naam &ldquo;Unix&rdquo; te gebruiken in hierop "
@@ -2894,9 +3401,22 @@
 "&ldquo;GNU/Linux&rdquo; veel toepasselijker."
 
 #. type: Content of: <div><dl><dd><p>
+# | There is a version of GNU which uses the kernel from NetBSD.  Its
+# | developers call it &ldquo;Debian [-GNU/NetBSD&rdquo;,-]
+# | {+GNU/NetBSD,&rdquo;+} but &ldquo;GNU/kernelofNetBSD&rdquo; would be more
+# | accurate, since NetBSD is an entire system, not just the kernel.  This is
+# | not a BSD system, since most of the system is the same as the GNU/Linux
+# | system.
+#, fuzzy
+#| 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/"
+#| "kernelofNetBSD&rdquo; would be more accurate, since NetBSD is an entire "
+#| "system, not just the kernel.  This is not a BSD system, since most of the "
+#| "system is the same as the GNU/Linux system."
 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/"
+"call it &ldquo;Debian GNU/NetBSD,&rdquo; but &ldquo;GNU/"
 "kernelofNetBSD&rdquo; would be more accurate, since NetBSD is an entire "
 "system, not just the kernel.  This is not a BSD system, since most of the "
 "system is the same as the GNU/Linux system."
@@ -2918,8 +3438,21 @@
 "\"#othersys\">#othersys</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | Not in the same sense that we mean by [-&ldquo;GNU/Linux&rdquo;.-]
+# | {+&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.
+#, fuzzy
+#| 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 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."
 msgid ""
-"Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of "
+"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 "
@@ -3033,8 +3566,19 @@
 
 # Nieuw
 #. type: Content of: <div><dl><dd><p>
+# | If you call the whole GNU/Linux system [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} you will find it necessary to say things like,
+# | &ldquo;Android contains Linux, but it isn't Linux, because it doesn't have
+# | the usual Linux [sic] libraries and utilities [meaning the GNU
+# | system].&rdquo;
+#, fuzzy
+#| 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 Linux, because it doesn't have the usual Linux [sic] libraries and "
+#| "utilities [meaning the GNU system].&rdquo;"
 msgid ""
-"If you call the whole GNU/Linux system &ldquo;Linux&rdquo;, you will find it "
+"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 "
 "Linux, because it doesn't have the usual Linux [sic] libraries and utilities "
 "[meaning the GNU system].&rdquo;"
@@ -3073,7 +3617,7 @@
 #. 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 "
+"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 ""
 
@@ -3081,7 +3625,7 @@
 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;."
+"of the whole system as &ldquo;Linux.&rdquo;"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><p>
@@ -3091,7 +3635,7 @@
 "contain Linux is irrelevant to using them, just as the fact that a car and a "
 "bicycle both have a structure of metal is irrelevant to using those two.  If "
 "you wish to talk about using cars and bikes, you wouldn't speak of &ldquo;"
-"riding metal objects&rdquo; &mdash; not unless you're playing games with the "
+"riding metal objects&rdquo;&mdash;not unless you're playing games with the "
 "reader.  You would say, &ldquo;using cars and bikes.&rdquo; Likewise, the "
 "clear way to talk about using GNU/Linux and Android is to say &ldquo;using "
 "GNU/Linux and Android.&rdquo;"
@@ -3193,11 +3737,22 @@
 "</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | 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;.-] {+&ldquo;GNU.&rdquo;+} When we talk
+# | about the whole system, the name &ldquo;GNU/Linux&rdquo; gives him a share
+# | of the credit.
+#, fuzzy
+#| 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 "
+#| "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."
 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 "
-"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."
+"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."
 msgstr ""
 "Klopt, daarom doen we het niet. Het werk van Torvalds is Linux, de kernel; "
 "we vermijden zorgvuldig om dit bij het GNU-project te betrekken of het als "
@@ -3213,12 +3768,39 @@
 "\"anchor-reference-id\">(<a href=\"#linusagreed\">#linusagreed</a>)</span>"
 
 #. 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\">
+# | He recognized this at the beginning.  The {+<a
+# | 
href=\"https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\";>+}
+# | 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>.
+# |  for more info&rdquo;</a>.-] {+notes</a> said:+}
+#, 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 <a href=\"https://ftp.funet.fi/pub/";
+"linux/historical/kernel/old-versions/RELNOTES-0.01\"> earliest Linux release "
+"notes</a> said:"
+msgstr ""
+"Hij kwam hier in het begin al mee. In de eerste Linux release notes stond "
+"al, <a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
+"RELNOTES-0.01\"> &ldquo;De meeste hulpmiddelen die linux gebruikt zijn GNU "
+"programma's en vallen onder de GNU auteursplicht. Die programma's zitten "
+"niet in deze distributie - vraag mij (of GNU) voor meer informatie&rdquo;</"
+"a>."
+
+#. type: Content of: <div><dl><dd><blockquote><p>
+# | [-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-]{+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>.-] {+info.+}
 #, fuzzy
 #| msgid ""
 #| "He recognized this at the beginning.  The earliest Linux release notes "
@@ -3227,11 +3809,9 @@
 #| "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=\"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>."
+"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."
 msgstr ""
 "Hij kwam hier in het begin al mee. In de eerste Linux release notes stond "
 "al, <a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
@@ -3302,11 +3882,26 @@
 
 # bewustwordingscampagne
 #. type: Content of: <div><dl><dd><p>
+# | 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;,-]
+# | {+&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.
+#, fuzzy
+#| 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;: 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."
 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;: "
 "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 "
+"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."
 msgstr ""
@@ -3330,13 +3925,32 @@
 "span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | 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;,-] {+&ldquo;GNU/Linux,&rdquo;+} you will help
+# | others learn the system's true history, origin, and reason for being.  You
+# | can't correct the misnomer 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;,-] {+&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.
+#, fuzzy
+#| 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;GNU/Linux&rdquo;, you will help others learn the system's true "
+#| "history, origin, and reason for being.  You can't correct the misnomer "
+#| "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."
 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;"
-"GNU/Linux&rdquo;, you will help others learn the system's true history, "
+"GNU/Linux,&rdquo; you will help others learn the system's true history, "
 "origin, and reason for being.  You can't correct the misnomer 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 "
+"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."
 msgstr ""
@@ -3360,10 +3974,20 @@
 "reference-id\">(<a href=\"#explain\">#explain</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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;,-]
+# | {+&ldquo;GNU/Linux,&rdquo;+} and uses your time inefficiently.
+#, fuzzy
+#| 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."
 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."
+"the system &ldquo;GNU/Linux,&rdquo; and uses your time inefficiently."
 msgstr ""
 "Wanneer je ons wil helpen door die verklaring te geven aan anderen dan "
 "zullen we je inspanning waarderen maar het is niet de beste manier. Het is "
@@ -3371,12 +3995,28 @@
 "noemen en ook minder economisch."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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, and they may learn a correct picture of the system's origin. 
+# | But they are unlikely to repeat the explanation to others whenever they
+# | talk about the system.  They will probably just call it
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} Without particularly
+# | intending to, they will help spread the incorrect picture.
+#, fuzzy
+#| 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, and they may learn a correct picture of the system's origin.  "
+#| "But they are unlikely to repeat the explanation to others whenever they "
+#| "talk about the system.  They will probably just call it &ldquo;"
+#| "Linux&rdquo;.  Without particularly intending to, they will help spread "
+#| "the incorrect picture."
 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, "
 "and they may learn a correct picture of the system's origin.  But they are "
 "unlikely to repeat the explanation to others whenever they talk about the "
-"system.  They will probably just call it &ldquo;Linux&rdquo;.  Without "
+"system.  They will probably just call it &ldquo;Linux.&rdquo; Without "
 "particularly intending to, they will help spread the incorrect picture."
 msgstr ""
 "Het is niet economisch omdat het misschien niet beklijft en de verklaring "
@@ -3512,9 +4152,16 @@
 "\">#force</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | It would be wrong to force them, and we don't try.  We call the system
+# | [-&ldquo;GNU/Linux&rdquo;,-] {+&ldquo;GNU/Linux,&rdquo;+} and we ask you
+# | to do it too.
+#, fuzzy
+#| 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."
 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."
+"&ldquo;GNU/Linux,&rdquo; and we ask you to do it too."
 msgstr ""
 "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."
@@ -3619,9 +4266,19 @@
 "het gaat."
 
 #. type: Content of: <div><dl><dt>
+# | Since you failed to put something in the GNU GPL to require people to call
+# | the system [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} you deserve what
+# | happened; why are you complaining now? <span
+# | class=\"anchor-reference-id\">(<a href=\"#deserve\">#deserve</a>)</span>
+#, fuzzy
+#| 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 "
+#| "complaining now? <span class=\"anchor-reference-id\">(<a href=\"#deserve"
+#| "\">#deserve</a>)</span>"
 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 "
+"the system &ldquo;GNU,&rdquo; you deserve what happened; why are you "
 "complaining now? <span class=\"anchor-reference-id\">(<a href=\"#deserve"
 "\">#deserve</a>)</span>"
 msgstr ""
@@ -3673,8 +4330,17 @@
 "zijn, niet hadden getrotseerd."
 
 #. type: Content of: <div><dl><dt>
+# | Since many people call it [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} doesn't that make it right? <span
+# | class=\"anchor-reference-id\">(<a
+# | href=\"#somanyright\">#somanyright</a>)</span>
+#, fuzzy
+#| 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>"
 msgid ""
-"Since many people call it &ldquo;Linux&rdquo;, doesn't that make it right? "
+"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 ""
@@ -3700,9 +4366,20 @@
 
 # Nieuw
 #. type: Content of: <div><dl><dd><p>
+# | Users are not incapable of learning.  Since &ldquo;GNU/Linux&rdquo;
+# | includes [-&ldquo;Linux&rdquo;,-] {+&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.
+#, fuzzy
+#| 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 add &ldquo;(often erroneously referred to as &lsquo;"
+#| "Linux&rsquo;)&rdquo; once in a while, they will all understand."
 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 "
+"&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."
 msgstr ""

Index: po/gnu-linux-faq.pl-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.pl-diff.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- po/gnu-linux-faq.pl-diff.html       31 Aug 2021 10:37:08 -0000      1.26
+++ po/gnu-linux-faq.pl-diff.html       2 Nov 2021 14:41:51 -0000       1.27
@@ -12,30 +12,35 @@
 <body><pre>
 &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;!-- This page is derived from /server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="gnulinux" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</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="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&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"&gt;by</em></ins></span> Richard <span 
class="removed"><del><strong>Stallman&lt;/h2&gt;
+&lt;address class="byline"&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;</em></ins></span>
 
-&lt;div class="announcement"&gt;
+&lt;div <span class="removed"><del><strong>class="announcement"&gt;
   &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 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&gt;</strong></del></span> <span 
class="inserted"><ins><em>class="introduction"&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.
+system that many others call just <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> they ask many 
questions.
 Here are common questions, and our answers.&lt;/p&gt;
+<span class="inserted"><ins><em>&lt;/div&gt;
 
-<span class="inserted"><ins><em>&lt;div class="toc"&gt;
+&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;
@@ -130,8 +135,8 @@
 
 &lt;li&gt;&lt;a <span class="removed"><del><strong>href="#trademarkfee" 
id="TOCtrademarkfee"&gt;I</strong></del></span> <span 
class="inserted"><ins><em>href="#trademarkfee"&gt;I</em></ins></span> 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
-    wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to
+    that would also apply if I say <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux.&rdquo;</em></ins></span>  Is 
it
+    wrong if I use &ldquo;GNU&rdquo; without <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> to
     save the fee?&lt;/a&gt;&lt;/li&gt;
 
 &lt;li&gt;&lt;a <span class="removed"><del><strong>href="#many" 
id="TOCmany"&gt;Many</strong></del></span> <span 
class="inserted"><ins><em>href="#many"&gt;Many</em></ins></span> other projects 
contributed to the
@@ -169,7 +174,7 @@
 rather than &ldquo;Linux/GNU&rdquo;?&lt;/a&gt;&lt;/li&gt;
 
 &lt;li&gt;&lt;a <span class="removed"><del><strong>href="#distronames0" 
id="TOCdistronames0"&gt;My</strong></del></span> <span 
class="inserted"><ins><em>href="#distronames0"&gt;My</em></ins></span> distro's 
developers call it
-    &ldquo;Foobar Linux&rdquo;, but that doesn't say anything about
+    &ldquo;Foobar <span 
class="removed"><del><strong>Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>Linux,&rdquo;</em></ins></span> but that doesn't say 
anything about
     what the system consists of.  Why shouldn't they call it whatever
     they like?&lt;/a&gt;&lt;/li&gt;
 
@@ -281,14 +286,16 @@
 
 &lt;li&gt;&lt;a <span class="removed"><del><strong>href="#deserve" 
id="TOCdeserve"&gt;Since</strong></del></span> <span 
class="inserted"><ins><em>href="#deserve"&gt;Since</em></ins></span> 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
+    <span class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span>
+    <span class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> you 
deserve what happened; why are you
     complaining now?&lt;/a&gt;&lt;/li&gt;
 
 &lt;li&gt;&lt;a <span class="removed"><del><strong>href="#contradict" 
id="TOCcontradict"&gt;Wouldn't</strong></del></span> <span 
class="inserted"><ins><em>href="#contradict"&gt;Wouldn't</em></ins></span> you 
be better off
     not contradicting what so many people believe?&lt;/a&gt;&lt;/li&gt;
 
 &lt;li&gt;&lt;a <span class="removed"><del><strong>href="#somanyright" 
id="TOCsomanyright"&gt;Since</strong></del></span> <span 
class="inserted"><ins><em>href="#somanyright"&gt;Since</em></ins></span> many 
people call it
-    &ldquo;Linux&rdquo;, doesn't that make it right?&lt;/a&gt;&lt;/li&gt;
+    <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span>
+    <span class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> 
doesn't that make it right?&lt;/a&gt;&lt;/li&gt;
 
 &lt;li&gt;&lt;a <span class="removed"><del><strong>href="#knownname" 
id="TOCknownname"&gt;Isn't</strong></del></span> <span 
class="inserted"><ins><em>href="#knownname"&gt;Isn't</em></ins></span> it 
better to call the
     system by the name most users already know?&lt;/a&gt;&lt;/li&gt;
@@ -377,7 +384,7 @@
 the system's history was such as to fit that name.  For
 instance, they often believe its development was started by Linus
 Torvalds in 1991.  This false picture tends to reinforce the idea
-that the system should be called &ldquo;Linux&rdquo;.&lt;/p&gt;
+that the system should be called <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.&lt;/p&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;&lt;/p&gt;</em></ins></span>
 &lt;p&gt;
 Many of the questions in this file represent people's attempts to
 justify the name they are accustomed to using.&lt;/p&gt;
@@ -388,14 +395,16 @@
 &lt;dd&gt;
 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.
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> the 
name its developer chose.
 &lt;p&gt;
-When people call the whole system &ldquo;Linux&rdquo;, as a consequence
+When people call the whole system <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> as a 
consequence
 they call the whole system by the same name as the kernel.
 This causes many kinds of confusion, because only experts can tell
 whether a statement is about the kernel or the whole system.
-By calling the whole system &ldquo;GNU/Linux&rdquo;, and calling the kernel
-&ldquo;Linux&rdquo;, you avoid the ambiguity.&lt;/p&gt;
+By calling the whole 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> and 
calling the kernel
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> you 
avoid the ambiguity.&lt;/p&gt;
 &lt;/dd&gt;
 
 &lt;dt id="linuxalone"&gt;Would Linux have
@@ -425,7 +434,7 @@
     community if you did not divide people with this request? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#divide"&gt;#divide&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing people. 
 We
+When we ask people to say <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 
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.
 &lt;p&gt;
@@ -453,7 +462,8 @@
 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 freedom are more likely to call the system
-&ldquo;GNU/Linux&rdquo;, and people who learn that the system is 
&ldquo;GNU/Linux&rdquo; are
+<span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> and 
people who learn that the system is &ldquo;GNU/Linux&rdquo; are
 more likely to pay attention to our philosophical arguments for
 freedom and community (which is why the choice of name for the system
 makes a real difference for society).  However, the disagreement would
@@ -482,7 +492,7 @@
 
 &lt;dd&gt;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 system do not mention the name &ldquo;GNU&rdquo;, or the 
ideals
+articles about the system do not mention the name <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> or the ideals
 that GNU stands for.  &lt;a
 href="/gnu/gnu-users-never-heard-of-gnu.html"&gt;GNU Users Who Have Never
 Heard of GNU&lt;/a&gt; explains further.
@@ -490,7 +500,7 @@
 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 GNU is.  For instance, many think it is a collection
-of &lt;a href="#tools"&gt;&ldquo;tools&rdquo;&lt;/a&gt;, or a project to 
develop tools.&lt;/p&gt;
+of <span class="removed"><del><strong>&lt;a 
href="#tools"&gt;&ldquo;tools&rdquo;&lt;/a&gt;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;&lt;a 
href="#tools"&gt;tools&lt;/a&gt;,&rdquo;</em></ins></span> or a project to 
develop tools.&lt;/p&gt;
 &lt;p&gt;
 The wording of this question, which is typical, illustrates another
 common misconception.  To speak of &ldquo;GNU's role&rdquo; in developing
@@ -506,8 +516,9 @@
 <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
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> that it 
was started by Linus Torvalds, and that
+it was intended to be &ldquo;open <span 
class="removed"><del><strong>source&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>source.&rdquo;</em></ins></span>  If you don't tell
 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;
 
@@ -536,10 +547,10 @@
 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 that GNU is the name of a collection of programs&mdash;often they
-say &ldquo;programming tools&rdquo;, since some of our programming tools became
+say &ldquo;programming <span 
class="removed"><del><strong>tools&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>tools,&rdquo;</em></ins></span> since some of our 
programming tools became
 popular on their own.  The idea that &ldquo;GNU&rdquo; is the name of an 
operating
 system is hard to fit into a conceptual framework in which that
-operating system is labeled &ldquo;Linux&rdquo;.
+operating system is labeled <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>
 &lt;p&gt;
 The GNU Project was named after the GNU operating system&mdash;it's the project
 to develop the GNU system.  (See &lt;a
@@ -568,7 +579,7 @@
 programs.&lt;/p&gt;
 &lt;p&gt;
 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.  The
+mean <span 
class="removed"><del><strong>&ldquo;kernel&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;kernel.&rdquo;</em></ins></span>  Both uses of 
the term go back many years.  The
 use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is found in 
a number of
 textbooks on system design, going back to the 80s.  At the same time,
 in the 80s, the &ldquo;Unix operating system&rdquo; was understood to include 
all
@@ -579,12 +590,12 @@
 Most of the time when people speak of the &ldquo;Linux operating system&rdquo;
 they are using &ldquo;operating system&rdquo; in the same sense we use: they 
mean
 the whole collection of programs.  If that's what you are referring
-to, please call it &ldquo;GNU/Linux&rdquo;.  If you mean just the kernel, then
+to, please call it <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux.&rdquo;</em></ins></span>  If 
you mean just the kernel, then
 &ldquo;Linux&rdquo; is the right name for it, but please say 
&ldquo;kernel&rdquo; also to
 avoid ambiguity about which body of software you mean.&lt;/p&gt;
 &lt;p&gt;
 If you prefer to use some other term such as &ldquo;system distribution&rdquo; 
for
-the entire collection of programs, instead of &ldquo;operating system&rdquo;,
+the entire collection of programs, instead of &ldquo;operating <span 
class="removed"><del><strong>system&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>system,&rdquo;</em></ins></span>
 that's fine.  Then you would talk about GNU/Linux system
 distributions.&lt;/p&gt;
 &lt;/dd&gt;
@@ -636,8 +647,8 @@
 &lt;dd&gt;
 The people who argue that way for calling the system
 &ldquo;Linux&rdquo; are using a double standard.  An operating system
-requires compilers, editors, window systems, libraries, and much more
-&mdash; hundreds of programs, even to match what BSD systems included
+requires compilers, editors, window systems, libraries, and much
+more&mdash;hundreds of programs, even to match what BSD systems included
 in 1983.  Since Torvalds didn't develop any of those, how can the
 system be &ldquo;Linux&rdquo;?
 
@@ -658,7 +669,8 @@
 &lt;dd&gt;
 Many &lt;a href="/distros/distros.html"&gt; packaged and installable
 versions of GNU&lt;/a&gt; are available.  None of them is called simply
-&ldquo;GNU&rdquo;, but GNU is what they basically are.
+<span class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> but GNU 
is what they basically are.
 
 &lt;p&gt;
 We expected to release the GNU system packaged for installation, but
@@ -685,7 +697,8 @@
 
 &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.
+<span class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> but that 
doesn't alter what kind of thing GNU is.
 GNU is an operating system.&lt;/p&gt;
 &lt;/dd&gt;
 
@@ -695,11 +708,11 @@
 
 &lt;dd&gt;
 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 system 
is
+than the misuse of the name <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  Normally an 
operating system is
 developed as a single unified project, and the developers choose a
 name for the system as a whole.  The kernel usually does not have a
 name of its own&mdash;instead, people say &ldquo;the kernel of 
such-and-such&rdquo; or
-&ldquo;the such-and-such kernel&rdquo;.
+&ldquo;the such-and-such <span 
class="removed"><del><strong>kernel&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>kernel.&rdquo;</em></ins></span>
 &lt;p&gt;
 Because those two constructions are used synonymously, the expression
 &ldquo;the Linux kernel&rdquo; can easily be misunderstood as meaning 
&ldquo;the kernel
@@ -724,11 +737,11 @@
     How about recommending a shorter name? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#long"&gt;#long&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-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;
+For a while we tried the name <span 
class="removed"><del><strong>&ldquo;LiGNUx&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;LiGNUx,&rdquo;</em></ins></span> which 
combines the words &ldquo;GNU&rdquo;
+and <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  The reaction 
was very bad.  People accept &ldquo;GNU/Linux&rdquo;
 much better.
 &lt;p&gt;
-The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but
+The shortest legitimate name for this system is <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> but
 we call it &ldquo;GNU/Linux&rdquo; &lt;a href="#justgnu"&gt; for the reasons
 given below&lt;/a&gt;.&lt;/p&gt;
 &lt;/dd&gt;
@@ -753,7 +766,7 @@
     &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#long2"&gt;#long2&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-&lt;p&gt;It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you
+&lt;p&gt;It only takes a second to say or type <span 
class="removed"><del><strong>&ldquo;GNU/&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU/.&rdquo;</em></ins></span>  If you
 appreciate the system that we developed, can't you take one second
 to recognize our work?&lt;/p&gt;
 &lt;/dd&gt;
@@ -804,9 +817,9 @@
 honorably and openly, rather than by trying to cut him out of the
 credit for his contribution to the system.&lt;/li&gt;
 &lt;li&gt;
-Since many people know of the system as &ldquo;Linux&rdquo;, if we say 
&ldquo;GNU&rdquo; they
+Since many people know of the system as <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> if we say 
&ldquo;GNU&rdquo; they
 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
+say <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> they 
can make a connection to what they have heard
 about.&lt;/li&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>
@@ -814,16 +827,16 @@
 
 &lt;dt id="trademarkfee"&gt;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 wrong if I use 
&ldquo;GNU&rdquo;
-    without &ldquo;Linux&rdquo;, to save the fee? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#trademarkfee"&gt;#trademarkfee&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
+    would also apply if I say <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux.&rdquo;</em></ins></span>  Is 
it wrong if I use &ldquo;GNU&rdquo;
+    without <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> to save the 
fee? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#trademarkfee"&gt;#trademarkfee&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 &lt;dd&gt;
 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.
 &lt;p&gt;
-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.&lt;/p&gt;
+So if you want to refer to the system simply as <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> to avoid paying
+the fee for calling it <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> we won't 
criticize you.&lt;/p&gt;
 &lt;/dd&gt;
 
 &lt;dt id="many"&gt;Many other projects contributed to
@@ -853,7 +866,7 @@
 &lt;p&gt;
 Different threshold levels would lead to different choices of name for
 the system.  But one name that cannot result from concerns of fairness
-and giving credit, not for any possible threshold level, is 
&ldquo;Linux&rdquo;.
+and giving credit, not for any possible threshold level, is <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>
 It can't be fair to give all the credit to one secondary contribution
 (Linux) while omitting the principal contribution (GNU).&lt;/p&gt;
 &lt;/dd&gt;
@@ -867,7 +880,7 @@
 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
+by calling the system &ldquo;GNU/systemd/Linux,&rdquo; there is nothing
 wrong with doing so.&lt;/p&gt;
 &lt;/dd&gt;
 
@@ -892,7 +905,7 @@
 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 the same argument would apply even more
-strongly to calling it &ldquo;Linux&rdquo;.
+strongly to calling it <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>
 
 &lt;p&gt;
 GNU is a small fraction of the system nowadays, and Linux is an
@@ -929,7 +942,7 @@
 
 &lt;dd&gt;
 Following the rules of English, in the construction &ldquo;GNU Linux&rdquo; the
-word &ldquo;GNU&rdquo; modifies &ldquo;Linux&rdquo;.  This can mean either 
&ldquo;GNU's version of
+word &ldquo;GNU&rdquo; modifies <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  This can mean 
either &ldquo;GNU's version of
 Linux&rdquo; or &ldquo;Linux, which is a GNU package.&rdquo;  Neither of those 
meanings
 fits the situation at hand.
 &lt;p&gt;
@@ -942,23 +955,24 @@
 The free GNU/Linux distros do have
 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,
+firmware <span 
class="removed"><del><strong>&ldquo;blobs&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;blobs.&rdquo;</em></ins></span>  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;
 &lt;p&gt;
 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 &ldquo;combination.&rdquo; (Think of
-&ldquo;Input/Output&rdquo;.)  This system is the combination of GNU
-and Linux; hence, &ldquo;GNU/Linux&rdquo;.&lt;/p&gt;
+<span 
class="removed"><del><strong>&ldquo;Input/Output&rdquo;.)</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Input/Output.&rdquo;)</em></ins></span> 
 This system is the combination of GNU
+and Linux; hence, <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;
-There are other ways to express &ldquo;combination&rdquo;.  If you
+There are other ways to express <span 
class="removed"><del><strong>&ldquo;combination&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;combination.&rdquo;</em></ins></span>  
If you
 think that a plus-sign is clearer, please use that.  In French, a
-hyphen is clear: &ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes
-say &ldquo;GNU con Linux&rdquo;.&lt;/p&gt;
+hyphen is clear: <span 
class="removed"><del><strong>&ldquo;GNU-Linux&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU-Linux.&rdquo;</em></ins></span>  In 
Spanish, we sometimes
+say &ldquo;GNU con <span 
class="removed"><del><strong>Linux&rdquo;.&lt;/p&gt;</strong></del></span> 
<span class="inserted"><ins><em>Linux.&rdquo;&lt;/p&gt;
 &lt;/dd&gt;
 
-&lt;dt <span class="inserted"><ins><em>id="pronounce"&gt;How is the name 
&ldquo;GNU/Linux&rdquo;
+&lt;dt id="pronounce"&gt;How is the name &ldquo;GNU/Linux&rdquo;
 pronounced? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#pronounce"&gt;#pronounce&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 &lt;dd&gt;
 &lt;p&gt;
@@ -974,16 +988,16 @@
 &lt;dd&gt;
 &lt;p&gt;
 Following the rules of English, in the construction &ldquo;GNU
-Emacs&rdquo; the word &ldquo;GNU&rdquo; modifies &ldquo;Emacs&rdquo;.
+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.&lt;/p&gt;
 &lt;p&gt;
 &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.&lt;/p&gt;
+program, so &ldquo;GNU/Emacs&rdquo; is the wrong way to refer to 
it.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
-&lt;dt</em></ins></span> id="whyorder"&gt;Why &ldquo;GNU/Linux&rdquo; rather
+&lt;dt id="whyorder"&gt;Why &ldquo;GNU/Linux&rdquo; rather
 than &ldquo;Linux/GNU&rdquo;? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#whyorder"&gt;#whyorder&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
@@ -995,13 +1009,13 @@
 In addition, &ldquo;GNU/Linux&rdquo; fits the fact that Linux is the
 lowest level of the system and GNU fills technically higher 
levels.&lt;/p&gt;</em></ins></span>
 &lt;p&gt;
-However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a 
lot
+However, if you prefer to call the system <span 
class="removed"><del><strong>&ldquo;Linux/GNU&rdquo;,</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;Linux/GNU,&rdquo;</em></ins></span> 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.&lt;/p&gt;
 &lt;/dd&gt;
 
 &lt;dt id="distronames0"&gt;My distro's developers call it
-    &ldquo;Foobar Linux&rdquo;, but that doesn't say anything about
+    &ldquo;Foobar <span 
class="removed"><del><strong>Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>Linux,&rdquo;</em></ins></span> but that doesn't say 
anything about
     what the system consists of.  Why shouldn't they call it whatever
     they like? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#distronames0"&gt;#distronames0&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 &lt;dd&gt;
@@ -1032,11 +1046,11 @@
 <span class="removed"><del><strong>&lt;dd&gt;&lt;p&gt;If it's allowed for them 
to change</strong></del></span>
 
 <span class="inserted"><ins><em>&lt;dd&gt;&lt;p&gt;When they spread 
misinformation by changing</em></ins></span> &ldquo;GNU&rdquo;
-to <span class="inserted"><ins><em>&ldquo;Linux&rdquo;, and call their version 
of it</em></ins></span> &ldquo;Foobar
-Linux&rdquo;, it's <span 
class="removed"><del><strong>allowed</strong></del></span> <span 
class="inserted"><ins><em>proper</em></ins></span> for you to <span 
class="removed"><del><strong>change it back and
+to <span class="inserted"><ins><em>&ldquo;Linux,&rdquo; and call their version 
of it</em></ins></span> &ldquo;Foobar <span 
class="removed"><del><strong>Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>Linux,&rdquo;</em></ins></span> it's <span 
class="removed"><del><strong>allowed</strong></del></span> <span 
class="inserted"><ins><em>proper</em></ins></span> for you to <span 
class="removed"><del><strong>change it back and
 call</strong></del></span> <span class="inserted"><ins><em>correct the 
misinformation by
 calling</em></ins></span> it &ldquo;Foobar <span 
class="removed"><del><strong>GNU/Linux&rdquo;.  This is what you ought to do,
-to avoid their error.&lt;/p&gt;&lt;/dd&gt;</strong></del></span> <span 
class="inserted"><ins><em>GNU/Linux&rdquo;.&lt;/p&gt;&lt;/dd&gt;</em></ins></span>
+to avoid their error.&lt;/p&gt;&lt;/dd&gt;</strong></del></span> <span 
class="inserted"><ins><em>GNU/Linux.&rdquo;&lt;/p&gt;&lt;/dd&gt;</em></ins></span>
 
 &lt;dt id="companies"&gt;Wouldn't it be more
     effective to ask companies such as Mandrake, Red Hat and IBM to
@@ -1057,7 +1071,7 @@
 just because the road isn't easy.  You may not have as much 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;.&lt;/p&gt;
+more profit calling it <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;/dd&gt;
 
 &lt;dt id="reserve"&gt;Wouldn't it be better to
@@ -1068,7 +1082,7 @@
 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 <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
+of <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  Many 
&ldquo;Linux&rdquo; User Groups make it part of their mission to
 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 <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span>
@@ -1091,7 +1105,8 @@
 With this understanding, they can start to recognize the distributions
 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;
+<span 
class="removed"><del><strong>Linux&rdquo;.&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>Linux.&rdquo;&lt;/p&gt;</em></ins></span>
 &lt;p&gt;
 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
@@ -1131,8 +1146,9 @@
 GNU Hurd to work, we might have done that.  (Alas, that is hindsight.)
 &lt;p&gt;
 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
-and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and we don't
+<span class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> that 
would be somewhat like making a version of the GNU system
+and labeling it <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  That wasn't 
right, and we don't
 want to act like that.&lt;/p&gt;
 &lt;/dd&gt;
 
@@ -1151,7 +1167,7 @@
 &lt;p&gt;
 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 with the GNU Project because he was a &ldquo;Linux user&rdquo;.
+about working with the GNU Project because he was a &ldquo;Linux <span 
class="removed"><del><strong>user&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>user.&rdquo;</em></ins></span>
 That came as a shock, because the people who ported GNU packages to
 other systems had generally wanted to work with us to get their
 changes installed.  Yet these people, developing a system that was
@@ -1159,7 +1175,7 @@
 only) group that was unwilling to work with us.&lt;/p&gt;
 &lt;p&gt;
 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
+version of the GNU system <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> and that this 
confusion was
 obstructing our work.  Asking you to call the system &ldquo;GNU/Linux&rdquo; is
 our response to that problem, and to the other problems caused by the
 &ldquo;Linux&rdquo; misnomer.&lt;/p&gt;
@@ -1178,8 +1194,8 @@
     convention be applied to all programs that are GPL'ed? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#allgpled"&gt;#allgpled&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-We never refer to individual programs as 
&ldquo;GNU/&lt;i&gt;name&lt;/i&gt;&rdquo;.  When a program
-is a GNU package, we may call it &ldquo;GNU &lt;i&gt;name&lt;/i&gt;&rdquo;.
+We never refer to individual programs as <span 
class="removed"><del><strong>&ldquo;GNU/&lt;i&gt;name&lt;/i&gt;&rdquo;.</strong></del></span>
 <span 
class="inserted"><ins><em>&ldquo;GNU/&lt;i&gt;name&lt;/i&gt;.&rdquo;</em></ins></span>
  When a program
+is a GNU package, we may call it &ldquo;GNU <span 
class="removed"><del><strong>&lt;i&gt;name&lt;/i&gt;&rdquo;.</strong></del></span>
 <span 
class="inserted"><ins><em>&lt;i&gt;name&lt;/i&gt;.&rdquo;</em></ins></span>
 &lt;p&gt;
 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
@@ -1232,15 +1248,17 @@
 &lt;p&gt;
 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.  The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not
-Unix&rdquo;, is a humorous way of giving credit to Unix for this,
+Unix.  The name <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> which stands for 
&ldquo;GNU's Not
+<span class="removed"><del><strong>Unix&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>Unix,&rdquo;</em></ins></span> is a humorous 
way of giving credit to Unix for this,
 following a hacker tradition of recursive acronyms that started in the
 70s.&lt;/p&gt;
 &lt;p&gt;
 The first such recursive acronym was TINT, &ldquo;TINT Is Not
-TECO&rdquo;.  The author of TINT wrote another implementation of TECO
+<span class="removed"><del><strong>TECO&rdquo;.</strong></del></span>
+<span class="inserted"><ins><em>TECO.&rdquo;</em></ins></span>  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;&lt;em&gt;somethingorother&lt;/em&gt; 
TECO&rdquo;, he
+calling it by a dull name like &ldquo;&lt;em&gt;somethingorother&lt;/em&gt; 
<span class="removed"><del><strong>TECO&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>TECO,&rdquo;</em></ins></span> he
 thought of a clever amusing name.  (That's what hacking
 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;
@@ -1250,7 +1268,7 @@
 program that was similar to some existing program (let's imagine its
 name was &ldquo;Klever&rdquo;), you could give it a recursive acronym name, 
such
 as &ldquo;MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo;  In this same 
spirit we called our
-replacement for Unix &ldquo;GNU's Not Unix&rdquo;.&lt;/p&gt;
+replacement for Unix &ldquo;GNU's Not <span 
class="removed"><del><strong>Unix&rdquo;.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>Unix.&rdquo;&lt;/p&gt;</em></ins></span>
 &lt;p&gt;
 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
@@ -1258,7 +1276,8 @@
 threatened to sue anyone giving AT&amp;T credit in that way.  This is
 why each of the various modified versions of Unix (all proprietary,
 like Unix) had a completely different name that didn't include
-&ldquo;Unix&rdquo;.&lt;/p&gt;
+<span 
class="removed"><del><strong>&ldquo;Unix&rdquo;.&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Unix.&rdquo;&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="bsd"&gt;Should we say &ldquo;GNU/BSD&rdquo;
@@ -1289,7 +1308,7 @@
 why the name &ldquo;GNU/Linux&rdquo; is appropriate for it.&lt;/p&gt;
 &lt;p&gt;
 There is a version of GNU which uses the kernel from NetBSD.  Its
-developers call it &ldquo;Debian GNU/NetBSD&rdquo;, but 
&ldquo;GNU/kernelofNetBSD&rdquo;
+developers call it &ldquo;Debian <span 
class="removed"><del><strong>GNU/NetBSD&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>GNU/NetBSD,&rdquo;</em></ins></span> but 
&ldquo;GNU/kernelofNetBSD&rdquo;
 would be more accurate, since NetBSD is an entire system, not just
 the kernel.  This is not a BSD system, since most of the system
 is the same as the GNU/Linux system.&lt;/p&gt;
@@ -1300,7 +1319,7 @@
 
 &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
+Not in the same sense that we mean by <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux.&rdquo;</em></ins></span>  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,
@@ -1351,7 +1370,7 @@
 the two have very little code in common.  In fact, the only thing they
 have in common is Linux.&lt;/p&gt;
 &lt;p&gt;
-If you call the whole GNU/Linux system &ldquo;Linux&rdquo;,
+If you call the whole GNU/Linux system <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span>
 you will find it necessary to say things like, &ldquo;Android contains
 Linux, but it isn't Linux, because it doesn't have the usual Linux
 [sic] libraries and utilities [meaning the GNU system].&rdquo;&lt;/p&gt;
@@ -1372,7 +1391,7 @@
 people will</em></ins></span> not <span class="inserted"><ins><em>understand 
the intended meaning.
 &lt;p&gt;
 The public will find it very strange to speak of using Android as
-&ldquo;using Linux&rdquo;.  It's like having</em></ins></span> a <span 
class="removed"><del><strong>meaningful question because</strong></del></span> 
<span class="inserted"><ins><em>conversation, then
+&ldquo;using Linux.&rdquo;  It's like having</em></ins></span> a <span 
class="removed"><del><strong>meaningful question because</strong></del></span> 
<span class="inserted"><ins><em>conversation, then
 saying you were conversing with</em></ins></span> the <span 
class="removed"><del><strong>GNU
 system does not have precise boundaries.</strong></del></span> <span 
class="inserted"><ins><em>person's intestines or the
 person's circulatory system.&lt;/p&gt;</em></ins></span>
@@ -1382,7 +1401,7 @@
 Linux&rdquo; when it's really GNU/Linux,</em></ins></span> by <span 
class="removed"><del><strong>a community.  It includes far
 more than just</strong></del></span> <span class="inserted"><ins><em>way 
of</em></ins></span> the <span class="removed"><del><strong>GNU software 
packages (of which we have</strong></del></span> <span 
class="inserted"><ins><em>usual
 misunderstanding: thinking of the whole system as
-&ldquo;Linux&rdquo;.&lt;/p&gt;
+&ldquo;Linux.&rdquo;&lt;/p&gt;
 &lt;p&gt;
 Use of Android and use of GNU/Linux are totally different, as
 different as driving</em></ins></span> a <span 
class="removed"><del><strong>specific
@@ -1392,8 +1411,8 @@
 fact</em></ins></span> that <span class="removed"><del><strong>yields
 GNU/Linux.</strong></del></span> <span class="inserted"><ins><em>a car and a 
bicycle both have a structure of metal is
 irrelevant to using those two.</em></ins></span>  If you <span 
class="removed"><del><strong>use part</strong></del></span> <span 
class="inserted"><ins><em>wish to talk about using cars
-and bikes, you wouldn't speak</em></ins></span> of <span 
class="inserted"><ins><em>&ldquo;riding metal objects&rdquo;
-&mdash; not unless you're playing games with</em></ins></span> the <span 
class="removed"><del><strong>GNU system</strong></del></span> <span 
class="inserted"><ins><em>reader.  You would
+and bikes, you wouldn't speak</em></ins></span> of <span 
class="inserted"><ins><em>&ldquo;riding metal objects&rdquo;&mdash;not
+unless you're playing games with</em></ins></span> the <span 
class="removed"><del><strong>GNU system</strong></del></span> <span 
class="inserted"><ins><em>reader.  You would
 say, &ldquo;using cars</em></ins></span> and <span 
class="removed"><del><strong>omit part, there is
 no meaningful</strong></del></span> <span 
class="inserted"><ins><em>bikes.&rdquo; Likewise, the clear</em></ins></span> 
way to <span class="removed"><del><strong>say &ldquo;how much&rdquo; you 
used.&lt;/p&gt;
 &lt;p&gt;
@@ -1446,7 +1465,7 @@
 <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
+or label it as <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU.&rdquo;</em></ins></span>  When we talk 
about the whole
 system, the name &ldquo;GNU/Linux&rdquo; gives him a share of the
 <span class="removed"><del><strong>credit.</strong></del></span>
 <span class="inserted"><ins><em>credit.&lt;/p&gt;</em></ins></span>
@@ -1457,13 +1476,17 @@
     agree that Linux is just the kernel? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#linusagreed"&gt;#linusagreed&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-&lt;p&gt;He recognized this at the beginning.  The earliest Linux release notes
+&lt;p&gt;He recognized this at the beginning.  The <span 
class="inserted"><ins><em>&lt;a
+href="https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;</em></ins></span>
+earliest Linux release <span class="removed"><del><strong>notes
 said, &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>
-&ldquo;Most of the tools used with linux are GNU software and are under the
+href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;
+&ldquo;Most</strong></del></span> <span 
class="inserted"><ins><em>notes&lt;/a&gt; said:&lt;/p&gt;
+&lt;blockquote&gt;&lt;p&gt;
+Most</em></ins></span> 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;
+for more <span 
class="removed"><del><strong>info&rdquo;&lt;/a&gt;.&lt;/p&gt;</strong></del></span>
 <span class="inserted"><ins><em>info.
+&lt;/p&gt;&lt;/blockquote&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="finishhurd"&gt;Why not finish the GNU Hurd kernel, release the GNU 
system
@@ -1491,7 +1514,7 @@
 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
+name to use.  You can't make others say <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> but
 you can decide to call the system &ldquo;GNU/Linux&rdquo;
 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;
@@ -1504,10 +1527,10 @@
 <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
+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> you 
will help others learn the system's true
 history, origin, and reason for being.  You can't correct the misnomer
 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
+only a few hundred people see you use the term <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> you 
will
 have educated a substantial number of people with very little work.
 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;
@@ -1519,14 +1542,15 @@
 &lt;dd&gt;
 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.
+calling 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> and 
uses your time inefficiently.
 &lt;p&gt;
 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, and they may learn a correct picture of the system's
 origin.  But they are unlikely to repeat the explanation to others
 whenever they talk about the system.  They will probably just call it
-&ldquo;Linux&rdquo;.  Without particularly intending to, they will help spread 
the
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  
Without particularly intending to, they will help spread the
 incorrect picture.&lt;/p&gt;
 &lt;p&gt;
 It is inefficient because it takes a lot more time.  Saying and
@@ -1592,7 +1616,8 @@
 &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 <span 
class="removed"><del><strong>too.</strong></del></span> <span 
class="inserted"><ins><em>too.&lt;/p&gt;</em></ins></span>
+<span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> 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
@@ -1636,7 +1661,7 @@
 &lt;/dd&gt;
 
 &lt;dt id="deserve"&gt;Since you failed to put
-    something in the GNU GPL to require people to call the system 
&ldquo;GNU&rdquo;,
+    something in the GNU GPL to require people to call the system <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span>
     you deserve what happened; why are you complaining now? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#deserve"&gt;#deserve&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
@@ -1662,7 +1687,7 @@
 &lt;/dd&gt;
 
 &lt;dt id="somanyright"&gt;Since many people call
-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;
+it <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> 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;
 <span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
@@ -1675,7 +1700,7 @@
 &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
+includes <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> 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 <span 
class="removed"><del><strong>understand.</strong></del></span> <span 
class="inserted"><ins><em>understand.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
@@ -1756,7 +1781,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/08/31 10:37:08 $
+$Date: 2021/11/02 14:41:51 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: po/gnu-linux-faq.pl.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.pl.po,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -b -r1.88 -r1.89
--- po/gnu-linux-faq.pl.po      31 Aug 2021 10:37:08 -0000      1.88
+++ po/gnu-linux-faq.pl.po      2 Nov 2021 14:41:51 -0000       1.89
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-linux-faq.html\n"
-"POT-Creation-Date: 2021-08-31 10:27+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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"
@@ -37,10 +37,19 @@
 msgid "by Richard Stallman"
 msgstr "Richard Stallman"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+# | When people see that we use and recommend the name GNU/Linux for a system
+# | that many others call just [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} they ask many questions.  Here are common
+# | questions, and our answers.
+#, fuzzy
+#| 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."
 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.  "
+"that many others call just &ldquo;Linux,&rdquo; they ask many questions.  "
 "Here are common questions, and our answers."
 msgstr ""
 "Gdy ludzie zauważają, że&nbsp;używamy i&nbsp;zalecamy używanie nazwy 
GNU/"
@@ -255,11 +264,22 @@
 "byłoby błędem nazwanie systemu po&nbsp;prostu &bdquo;GNU&rdquo;?</a>"
 
 #. type: Content of: <div><div><ul><li>
+# | <a href=\"#trademarkfee\">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;.-] {+&ldquo;GNU/Linux.&rdquo;+} Is it
+# | wrong if I use &ldquo;GNU&rdquo; without [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} to save the fee?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#trademarkfee\">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 wrong if I use &ldquo;GNU&rdquo; without "
+#| "&ldquo;Linux&rdquo;, to save the fee?</a>"
 msgid ""
 "<a href=\"#trademarkfee\">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 wrong if I use &ldquo;GNU&rdquo; without "
-"&ldquo;Linux&rdquo;, to save the fee?</a>"
+"&ldquo;GNU/Linux.&rdquo; Is it wrong if I use &ldquo;GNU&rdquo; without "
+"&ldquo;Linux,&rdquo; to save the fee?</a>"
 msgstr ""
 "<a href=\"#trademarkfee\">Musiałbym uiścić opłatę, gdybym chciał użyć 
słowa "
 "&bdquo;Linux&rdquo; w&nbsp;nazwie swojego produktu; odnosi się to również "
@@ -371,10 +391,19 @@
 "Linux/GNU&rdquo;?</a>"
 
 #. type: Content of: <div><div><ul><li>
-msgid ""
-"<a href=\"#distronames0\">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 whatever they like?</a>"
+# | <a href=\"#distronames0\">My distro's developers call it &ldquo;Foobar
+# | [-Linux&rdquo;,-] {+Linux,&rdquo;+} but that doesn't say anything about
+# | what the system consists of.  Why shouldn't they call it whatever they
+# | like?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#distronames0\">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 whatever they like?</a>"
+msgid ""
+"<a href=\"#distronames0\">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 whatever they like?</a>"
 msgstr ""
 "<a href=\"#distronames0\">Deweloperzy mojej dystrybucji nazywają ją &bdquo;"
 "Foobar Linux&rdquo;, ale&nbsp;to nic nie mówi o zawartości systemu. 
Dlaczego "
@@ -635,9 +664,18 @@
 "</a>"
 
 #. type: Content of: <div><div><ul><li>
+# | <a href=\"#deserve\">Since you failed to put something in the GNU GPL to
+# | require people to call the system [-&ldquo;GNU&rdquo;,-]
+# | {+&ldquo;GNU,&rdquo;+} you deserve what happened; why are you complaining
+# | now?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#deserve\">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 complaining now?</a>"
 msgid ""
 "<a href=\"#deserve\">Since you failed to put something in the GNU GPL to "
-"require people to call the system &ldquo;GNU&rdquo;, you deserve what "
+"require people to call the system &ldquo;GNU,&rdquo; you deserve what "
 "happened; why are you complaining now?</a>"
 msgstr ""
 "<a href=\"#deserve\">Skoro nie umieściliście w&nbsp;licencji GNU GPL punktu 
"
@@ -653,8 +691,15 @@
 "gdybyście nie sprzeciwiali się temu, w&nbsp;co wierzy tylu ludzi?</a>"
 
 #. type: Content of: <div><div><ul><li>
+# | <a href=\"#somanyright\">Since many people call it
+# | [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} doesn't that make it
+# | right?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#somanyright\">Since many people call it &ldquo;Linux&rdquo;, "
+#| "doesn't that make it right?</a>"
 msgid ""
-"<a href=\"#somanyright\">Since many people call it &ldquo;Linux&rdquo;, "
+"<a href=\"#somanyright\">Since many people call it &ldquo;Linux,&rdquo; "
 "doesn't that make it right?</a>"
 msgstr ""
 "<a href=\"#somanyright\">Skoro tylu ludzi używa nazwy &bdquo;Linux&rdquo;, "
@@ -840,6 +885,24 @@
 "się rozprzestrzenić."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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 it must be right.  The name &ldquo;Linux&rdquo; also spreads a
+# | false picture of the system's origin, because people tend to suppose that
+# | the system's history was such as to fit that name.  For instance, they
+# | often believe its development was started by Linus Torvalds in 1991.  This
+# | false picture tends to reinforce the idea that the system should be called
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+}
+#, fuzzy
+#| 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 it must be right.  The name &ldquo;Linux&rdquo; also spreads a "
+#| "false picture of the system's origin, because people tend to suppose that "
+#| "the system's history was such as to fit that name.  For instance, they "
+#| "often believe its development was started by Linus Torvalds in 1991.  "
+#| "This false picture tends to reinforce the idea that the system should be "
+#| "called &ldquo;Linux&rdquo;."
 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 "
@@ -847,7 +910,7 @@
 "of the system's origin, because people tend to suppose that the system's "
 "history was such as to fit that name.  For instance, they often believe its "
 "development was started by Linus Torvalds in 1991.  This false picture tends "
-"to reinforce the idea that the system should be called &ldquo;Linux&rdquo;."
+"to reinforce the idea that the system should be called &ldquo;Linux.&rdquo;"
 msgstr ""
 "Większość ludzi nazywających ten system &bdquo;Linux&rdquo; nigdy nie "
 "słyszała, czemu to nie jest właściwe. Widzieli innych ludzi używających 
tej "
@@ -877,22 +940,46 @@
 "\">#always</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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;,-] {+&ldquo;Linux,&rdquo;+} the name its developer
+# | chose.
+#, fuzzy
+#| 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."
 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."
+"you're referring specifically to the kernel, you should call it &ldquo;Linux,"
+"&rdquo; the name its developer chose."
 msgstr ""
 "Nie zawsze&nbsp;&ndash; tylko wtedy, kiedy mówicie o całym systemie. Kiedy "
 "chodzi wam konkretnie o jądro, powinniście nazywać je &bdquo;Linux&rdquo;, 
"
 "tak jak nazwał je jego autor."
 
 #. type: Content of: <div><dl><dd><p>
+# | When people call the whole system [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} as a consequence they call the whole system by
+# | the same name as the kernel.  This causes many kinds of confusion, because
+# | only experts can tell whether a statement is about the kernel or the whole
+# | system.  By calling the whole system [-&ldquo;GNU/Linux&rdquo;,-]
+# | {+&ldquo;GNU/Linux,&rdquo;+} and calling the kernel
+# | [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} you avoid the ambiguity.
+#, fuzzy
+#| 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 kinds of confusion, because only experts can tell whether a "
+#| "statement is about the kernel or the whole system.  By calling the whole "
+#| "system &ldquo;GNU/Linux&rdquo;, and calling the kernel &ldquo;"
+#| "Linux&rdquo;, you avoid the ambiguity."
 msgid ""
-"When people call the whole system &ldquo;Linux&rdquo;, as a consequence they "
+"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 "
 "kinds of confusion, because only experts can tell whether a statement is "
 "about the kernel or the whole system.  By calling the whole system &ldquo;"
-"GNU/Linux&rdquo;, and calling the kernel &ldquo;Linux&rdquo;, you avoid the "
+"GNU/Linux,&rdquo; and calling the kernel &ldquo;Linux,&rdquo; you avoid the "
 "ambiguity."
 msgstr ""
 "Kiedy ludzie nazywają cały system &bdquo;Linuksem&rdquo;, w&nbsp;rezultacie 
"
@@ -965,8 +1052,17 @@
 "\"#divide\">#divide</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | When we ask people to say [-&ldquo;GNU/Linux&rdquo;,-]
+# | {+&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.
+#, fuzzy
+#| 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."
 msgid ""
-"When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing "
+"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 ""
@@ -1025,10 +1121,34 @@
 "jest lepszy niż Open Source&rdquo;</a>."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | freedom are more likely to call the system [-&ldquo;GNU/Linux&rdquo;,-]
+# | {+&ldquo;GNU/Linux,&rdquo;+} and people who learn that the system is
+# | &ldquo;GNU/Linux&rdquo; are more likely to pay attention to our
+# | philosophical arguments for freedom and community (which is why the choice
+# | of name for the system makes a real difference for society).  However, the
+# | disagreement would probably exist even if everyone knew the system's real
+# | origin and its proper name, because the issue is a real one.  It can only
+# | go away if we who value freedom either persuade everyone (which won't be
+# | easy) or are defeated entirely (let's hope not).
+#, fuzzy
+#| 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 freedom are more likely to call the system &ldquo;GNU/"
+#| "Linux&rdquo;, and people who learn that the system is &ldquo;GNU/"
+#| "Linux&rdquo; are more likely to pay attention to our philosophical "
+#| "arguments for freedom and community (which is why the choice of name for "
+#| "the system makes a real difference for society).  However, the "
+#| "disagreement would probably exist even if everyone knew the system's real "
+#| "origin and its proper name, because the issue is a real one.  It can only "
+#| "go away if we who value freedom either persuade everyone (which won't be "
+#| "easy) or are defeated entirely (let's hope not)."
 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 "
-"freedom are more likely to call the system &ldquo;GNU/Linux&rdquo;, and "
+"freedom are more likely to call the system &ldquo;GNU/Linux,&rdquo; and "
 "people who learn that the system is &ldquo;GNU/Linux&rdquo; are more likely "
 "to pay attention to our philosophical arguments for freedom and community "
 "(which is why the choice of name for the system makes a real difference for "
@@ -1087,10 +1207,23 @@
 "\">#everyoneknows</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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
+# | system do not mention the name [-&ldquo;GNU&rdquo;,-]
+# | {+&ldquo;GNU,&rdquo;+} or the ideals that GNU stands for.  <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never
+# | Heard of GNU</a> explains further.
+#, fuzzy
+#| 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 system do not mention the name &ldquo;GNU&rdquo;, or the ideals that "
+#| "GNU stands for.  <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU "
+#| "Users Who Have Never Heard of GNU</a> explains further."
 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 "
-"system do not mention the name &ldquo;GNU&rdquo;, or the ideals that GNU "
+"system do not mention the name &ldquo;GNU,&rdquo; or the ideals that GNU "
 "stands for.  <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users "
 "Who Have Never Heard of GNU</a> explains further."
 msgstr ""
@@ -1102,11 +1235,22 @@
 "zagadnienie."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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 GNU is.  For instance, many think it is a collection of [-<a
+# | href=\"#tools\">&ldquo;tools&rdquo;</a>,-] {+&ldquo;<a
+# | href=\"#tools\">tools</a>,&rdquo;+} or a project to develop tools.
+#, fuzzy
+#| 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 GNU is.  For instance, many think it is a collection of <a "
+#| "href=\"#tools\">&ldquo;tools&rdquo;</a>, or a project to develop tools."
 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 "
-"GNU is.  For instance, many think it is a collection of <a href=\"#tools"
-"\">&ldquo;tools&rdquo;</a>, or a project to develop tools."
+"GNU is.  For instance, many think it is a collection of &ldquo;<a href="
+"\"#tools\">tools</a>,&rdquo; or a project to develop tools."
 msgstr ""
 "Ludzie, którzy tak twierdzą, to prawdopodobnie geekowie (komputerowi "
 "maniacy) mający na&nbsp;myśli geeków, których znają. Geekowie często 
wiedzą "
@@ -1140,11 +1284,23 @@
 "href=\"#everyoneknows2\">#everyoneknows2</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | 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;,-] {+&ldquo;Linux,&rdquo;+} that it was started by
+# | Linus Torvalds, and that it was intended to be &ldquo;open
+# | [-source&rdquo;.-] {+source.&rdquo;+} If you don't tell them, who will?
+#, fuzzy
+#| 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;"
+#| "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?"
 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;"
-"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?"
+"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?"
 msgstr ""
 "Jeśli Wasze słowa nie odzwierciedlają Waszej wiedzy, nie uczycie innych "
 "ludzi. Większość ludzi, która słyszała o GNU/Linuksie jako o systemie 
myśli, "
@@ -1204,14 +1360,31 @@
 "\">#tools</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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
+# | that GNU is the name of a collection of programs&mdash;often they say
+# | &ldquo;programming [-tools&rdquo;,-] {+tools,&rdquo;+} since some of our
+# | programming tools became popular on their own.  The idea that
+# | &ldquo;GNU&rdquo; is the name of an operating system is hard to fit into a
+# | conceptual framework in which that operating system is labeled
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+}
+#, fuzzy
+#| 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 "
+#| "that GNU is the name of a collection of programs&mdash;often they say "
+#| "&ldquo;programming tools&rdquo;, since some of our programming tools "
+#| "became popular on their own.  The idea that &ldquo;GNU&rdquo; is the name "
+#| "of an operating system is hard to fit into a conceptual framework in "
+#| "which that operating system is labeled &ldquo;Linux&rdquo;."
 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 "
 "that GNU is the name of a collection of programs&mdash;often they say &ldquo;"
-"programming tools&rdquo;, since some of our programming tools became popular "
+"programming tools,&rdquo; since some of our programming tools became popular "
 "on their own.  The idea that &ldquo;GNU&rdquo; is the name of an operating "
 "system is hard to fit into a conceptual framework in which that operating "
-"system is labeled &ldquo;Linux&rdquo;."
+"system is labeled &ldquo;Linux.&rdquo;"
 msgstr ""
 "Gdy ludzie, którzy uważają że&nbsp;Linux to cały system operacyjny, "
 "jeżeli&nbsp;w ogóle usłyszą o projekcje GNU, często mają błędne 
wyobrażenie "
@@ -1280,12 +1453,32 @@
 "programów."
 
 #. type: Content of: <div><dl><dd><p>
+# | To confuse matters, some people use the term &ldquo;operating
+# | system&rdquo; to mean [-&ldquo;kernel&rdquo;.-] {+&ldquo;kernel.&rdquo;+}
+# | Both uses of the term go back many years.  The use of &ldquo;operating
+# | system&rdquo; to mean &ldquo;kernel&rdquo; is found in a number of
+# | textbooks on system design, going back to the 80s.  At the same time, in
+# | the 80s, the &ldquo;Unix operating system&rdquo; was understood to include
+# | all the system programs, and Berkeley's version of Unix included even
+# | games. Since we intended GNU to be a Unix-like operating system, we use
+# | the term &ldquo;operating system&rdquo; in the same way.
+#, fuzzy
+#| 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.  The use of &ldquo;operating system&rdquo; to mean "
+#| "&ldquo;kernel&rdquo; is found in a number of textbooks on system design, "
+#| "going back to the 80s.  At the same time, in the 80s, the &ldquo;Unix "
+#| "operating system&rdquo; was understood to include all the system "
+#| "programs, and Berkeley's version of Unix included even games. Since we "
+#| "intended GNU to be a Unix-like operating system, we use the term &ldquo;"
+#| "operating system&rdquo; in the same way."
 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.  "
-"The use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is "
-"found in a number of textbooks on system design, going back to the 80s.  At "
-"the same time, in the 80s, the &ldquo;Unix operating system&rdquo; was "
+"to mean &ldquo;kernel.&rdquo; Both uses of the term go back many years.  The "
+"use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is found "
+"in a number of textbooks on system design, going back to the 80s.  At the "
+"same time, in the 80s, the &ldquo;Unix operating system&rdquo; was "
 "understood to include all the system programs, and Berkeley's version of "
 "Unix included even games. Since we intended GNU to be a Unix-like operating "
 "system, we use the term &ldquo;operating system&rdquo; in the same way."
@@ -1302,11 +1495,28 @@
 "używamy terminu &bdquo;system operacyjny&rdquo; w&nbsp;ten sam sposób."
 
 #. type: Content of: <div><dl><dd><p>
+# | Most of the time when people speak of the &ldquo;Linux operating
+# | system&rdquo; they are using &ldquo;operating system&rdquo; in the same
+# | sense we use: they mean the whole collection of programs.  If that's what
+# | you are referring to, please call it [-&ldquo;GNU/Linux&rdquo;.-]
+# | {+&ldquo;GNU/Linux.&rdquo;+} If you mean just the kernel, then
+# | &ldquo;Linux&rdquo; is the right name for it, but please say
+# | &ldquo;kernel&rdquo; also to avoid ambiguity about which body of software
+# | you mean.
+#, fuzzy
+#| 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 "
+#| "sense we use: they mean the whole collection of programs.  If that's what "
+#| "you are referring to, please call it &ldquo;GNU/Linux&rdquo;.  If you "
+#| "mean just the kernel, then &ldquo;Linux&rdquo; is the right name for it, "
+#| "but please say &ldquo;kernel&rdquo; also to avoid ambiguity about which "
+#| "body of software you mean."
 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 "
 "sense we use: they mean the whole collection of programs.  If that's what "
-"you are referring to, please call it &ldquo;GNU/Linux&rdquo;.  If you mean "
+"you are referring to, please call it &ldquo;GNU/Linux.&rdquo; If you mean "
 "just the kernel, then &ldquo;Linux&rdquo; is the right name for it, but "
 "please say &ldquo;kernel&rdquo; also to avoid ambiguity about which body of "
 "software you mean."
@@ -1321,10 +1531,20 @@
 "część oprogramowania wam chodzi."
 
 #. type: Content of: <div><dl><dd><p>
+# | If you prefer to use some other term such as &ldquo;system
+# | distribution&rdquo; for the entire collection of programs, instead of
+# | &ldquo;operating [-system&rdquo;,-] {+system,&rdquo;+} that's fine.  Then
+# | you would talk about GNU/Linux system distributions.
+#, fuzzy
+#| msgid ""
+#| "If you prefer to use some other term such as &ldquo;system "
+#| "distribution&rdquo; for the entire collection of programs, instead of "
+#| "&ldquo;operating system&rdquo;, that's fine.  Then you would talk about "
+#| "GNU/Linux system distributions."
 msgid ""
 "If you prefer to use some other term such as &ldquo;system "
 "distribution&rdquo; for the entire collection of programs, instead of &ldquo;"
-"operating system&rdquo;, that's fine.  Then you would talk about GNU/Linux "
+"operating system,&rdquo; that's fine.  Then you would talk about GNU/Linux "
 "system distributions."
 msgstr ""
 "Jeżeli&nbsp;wolicie używać jakiegoś innego terminu, takiego jak &bdquo;"
@@ -1436,9 +1656,9 @@
 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, "
-"window systems, libraries, and much more &mdash; hundreds of programs, even "
-"to match what BSD systems included in 1983.  Since Torvalds didn't develop "
-"any of those, how can the system be &ldquo;Linux&rdquo;?"
+"window systems, libraries, and much more&mdash;hundreds of programs, even to "
+"match what BSD systems included in 1983.  Since Torvalds didn't develop any "
+"of those, how can the system be &ldquo;Linux&rdquo;?"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><p>
@@ -1465,9 +1685,18 @@
 "(<a href=\"#notinstallable\">#notinstallable</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | Many <a href=\"/distros/distros.html\"> packaged and installable versions
+# | of GNU</a> are available.  None of them is called simply
+# | [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} but GNU is what they
+# | basically are.
+#, fuzzy
+#| 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."
 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</a> are available.  None of them is called simply &ldquo;GNU,&rdquo; but "
 "GNU is what they basically are."
 msgstr ""
 "Jest dostępne wiele <a href=\"/distros/distros.html\">zapakowanych i&nbsp;"
@@ -1518,9 +1747,17 @@
 "pakowanie znacznej części systemu GNU."
 
 #. type: Content of: <div><dl><dd><p>
+# | We never took the last step of packaging GNU under the name
+# | [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} but that doesn't alter what
+# | kind of thing GNU is.  GNU is an operating system.
+#, fuzzy
+#| 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."
 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 "
+"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 ""
 "Nigdy nie podjęliśmy tego ostatniego kroku pakując GNU pod&nbsp;nazwą 
&bdquo;"
@@ -1538,13 +1775,28 @@
 "\">(<a href=\"#afterkernel\">#afterkernel</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | That practice seems to be very rare&mdash;we can't find any examples other
+# | than the misuse of the name [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+} Normally an operating system is developed as a
+# | single unified project, and the developers choose a name for the system as
+# | a whole.  The kernel usually does not have a name of its
+# | own&mdash;instead, people say &ldquo;the kernel of such-and-such&rdquo; or
+# | &ldquo;the such-and-such [-kernel&rdquo;.-] {+kernel.&rdquo;+}
+#, fuzzy
+#| 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 system is developed as a single unified project, and the "
+#| "developers choose a name for the system as a whole.  The kernel usually "
+#| "does not have a name of its own&mdash;instead, people say &ldquo;the "
+#| "kernel of such-and-such&rdquo; or &ldquo;the such-and-such kernel&rdquo;."
 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 "
+"than the misuse of the name &ldquo;Linux.&rdquo; Normally an operating "
 "system is developed as a single unified project, and the developers choose a "
 "name for the system as a whole.  The kernel usually does not have a name of "
 "its own&mdash;instead, people say &ldquo;the kernel of such-and-such&rdquo; "
-"or &ldquo;the such-and-such kernel&rdquo;."
+"or &ldquo;the such-and-such kernel.&rdquo;"
 msgstr ""
 "Taka praktyka wydaje się bardzo rzadka&ndash;nie znajdujemy przykładów "
 "innych niż błędne użycie nazwy &bdquo;Linux&rdquo;. Zazwyczaj system "
@@ -1602,9 +1854,18 @@
 "href=\"#long\">#long</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | For a while we tried the name [-&ldquo;LiGNUx&rdquo;,-]
+# | {+&ldquo;LiGNUx,&rdquo;+} which combines the words &ldquo;GNU&rdquo; and
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} The reaction was very
+# | bad.  People accept &ldquo;GNU/Linux&rdquo; much better.
+#, fuzzy
+#| 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."
 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.  "
+"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 ""
 "Przez krótki czas próbowaliśmy używać nazwy \"LiGNUx\", która była "
@@ -1613,8 +1874,16 @@
 "GNU/Linux&rdquo;."
 
 #. type: Content of: <div><dl><dd><p>
+# | The shortest legitimate name for this system is [-&ldquo;GNU&rdquo;,-]
+# | {+&ldquo;GNU,&rdquo;+} but we call it &ldquo;GNU/Linux&rdquo; <a
+# | href=\"#justgnu\"> for the reasons given below</a>.
+#, fuzzy
+#| 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>."
 msgid ""
-"The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but we "
+"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 ""
@@ -1654,8 +1923,16 @@
 "\"anchor-reference-id\">(<a href=\"#long\">#long2</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | It only takes a second to say or type [-&ldquo;GNU/&rdquo;.-]
+# | {+&ldquo;GNU/.&rdquo;+} If you appreciate the system that we developed,
+# | can't you take one second to recognize our work?
+#, fuzzy
+#| 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?"
 msgid ""
-"It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you appreciate "
+"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 ""
@@ -1769,10 +2046,21 @@
 "do&nbsp;rozwoju systemu."
 
 #. type: Content of: <div><dl><dd><ul><li>
+# | Since many people know of the system as [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} if we say &ldquo;GNU&rdquo; they may simply not
+# | recognize we're talking about the same system.  If we say
+# | [-&ldquo;GNU/Linux&rdquo;,-] {+&ldquo;GNU/Linux,&rdquo;+} they can make a
+# | connection to what they have heard about.
+#, fuzzy
+#| 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 system.  If we say &ldquo;GNU/Linux&rdquo;, they can make a "
+#| "connection to what they have heard about."
 msgid ""
-"Since many people know of the system as &ldquo;Linux&rdquo;, if we say "
+"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 "
-"system.  If we say &ldquo;GNU/Linux&rdquo;, they can make a connection to "
+"system.  If we say &ldquo;GNU/Linux,&rdquo; they can make a connection to "
 "what they have heard about."
 msgstr ""
 "Ponieważ&nbsp;wielu ludzi zna ten system operacyjny jako &bdquo;"
@@ -1782,10 +2070,23 @@
 "Linux."
 
 #. type: Content of: <div><dl><dt>
+# | 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;.-]
+# | {+&ldquo;GNU/Linux.&rdquo;+} Is it wrong if I use &ldquo;GNU&rdquo;
+# | without [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} to save the fee?
+# | <span class=\"anchor-reference-id\">(<a
+# | href=\"#trademarkfee\">#trademarkfee</a>)</span>
+#, fuzzy
+#| 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 wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to save "
+#| "the fee? <span class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
+#| "\">#trademarkfee</a>)</span>"
 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 "
-"wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to save the "
+"product, and that would also apply if I say &ldquo;GNU/Linux.&rdquo; Is it "
+"wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux,&rdquo; to save the "
 "fee? <span class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
 "\">#trademarkfee</a>)</span>"
 msgstr ""
@@ -1807,9 +2108,17 @@
 "obowiązku płacić za&nbsp;przywilej wyrażenia swego uznania."
 
 #. type: Content of: <div><dl><dd><p>
+# | So if you want to refer to the system simply as [-&ldquo;GNU&rdquo;,-]
+# | {+&ldquo;GNU,&rdquo;+} to avoid paying the fee for calling it
+# | [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} we won't criticize you.
+#, fuzzy
+#| 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."
 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."
+"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 ""
 "Zatem&nbsp;jeśli żeby uniknąć opłat za&nbsp;nazywanie go &bdquo;"
 "Linuksem&rdquo; chcecie określać ten system po&nbsp;prostu jako &bdquo;"
@@ -1871,12 +2180,25 @@
 "więc&nbsp;gdziekolwiek go ustawicie, nie będziemy się o to sprzeczać."
 
 #. type: Content of: <div><dl><dd><p>
+# | Different threshold levels would lead to different choices of name for the
+# | system.  But one name that cannot result from concerns of fairness and
+# | giving credit, not for any possible threshold level, is
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} It can't be fair to give
+# | all the credit to one secondary contribution (Linux) while omitting the
+# | principal contribution (GNU).
+#, fuzzy
+#| 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 giving credit, not for any possible threshold level, is &ldquo;"
+#| "Linux&rdquo;.  It can't be fair to give all the credit to one secondary "
+#| "contribution (Linux) while omitting the principal contribution (GNU)."
 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 "
-"giving credit, not for any possible threshold level, is &ldquo;"
-"Linux&rdquo;.  It can't be fair to give all the credit to one secondary "
-"contribution (Linux) while omitting the principal contribution (GNU)."
+"giving credit, not for any possible threshold level, is &ldquo;Linux.&rdquo; "
+"It can't be fair to give all the credit to one secondary contribution "
+"(Linux) while omitting the principal contribution (GNU)."
 msgstr ""
 "Różne poziomy progowania prowadziłyby do&nbsp;różnych wyborów nazwy dla 
"
 "systemu. Jedyną nazwą, która nie wynika z&nbsp;rozważań o 
sprawiedliwości "
@@ -1912,7 +2234,7 @@
 "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."
+"system &ldquo;GNU/systemd/Linux,&rdquo; there is nothing wrong with doing so."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
@@ -1960,11 +2282,21 @@
 "\">#allsmall</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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 the same argument would apply even more strongly to calling it
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+}
+#, fuzzy
+#| 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 the same argument would apply even more strongly to calling it &ldquo;"
+#| "Linux&rdquo;."
 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 "
-"the same argument would apply even more strongly to calling it &ldquo;"
-"Linux&rdquo;."
+"the same argument would apply even more strongly to calling it &ldquo;Linux."
+"&rdquo;"
 msgstr ""
 "W&nbsp;2008 roku pakiety GNU stanowiły 15% &bdquo;głównego&rdquo; "
 "repozytorium dystrybucji gNewSense GNU/Linux. Linux stanowił 1,5%. Ten sam "
@@ -2030,9 +2362,21 @@
 "span>"
 
 #. type: Content of: <div><dl><dd>
+# | Following the rules of English, in the construction &ldquo;GNU
+# | Linux&rdquo; the word &ldquo;GNU&rdquo; modifies [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+} This can mean either &ldquo;GNU's version of
+# | Linux&rdquo; or &ldquo;Linux, which is a GNU package.&rdquo; Neither of
+# | those meanings fits the situation at hand.
+#, fuzzy
+#| 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 either &ldquo;GNU's version of Linux&rdquo; or &ldquo;"
+#| "Linux, which is a GNU package.&rdquo; Neither of those meanings fits the "
+#| "situation at hand."
 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 "
+"the word &ldquo;GNU&rdquo; modifies &ldquo;Linux.&rdquo; This can mean "
 "either &ldquo;GNU's version of Linux&rdquo; or &ldquo;Linux, which is a GNU "
 "package.&rdquo; Neither of those meanings fits the situation at hand."
 msgstr ""
@@ -2061,9 +2405,10 @@
 # | [-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.
+# | non[---]free firmware [-&ldquo;blobs&rdquo;.-] {+&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 "
@@ -2077,7 +2422,7 @@
 "We're not talking about a distinct GNU version of Linux, the kernel.  The "
 "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 "
+"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."
@@ -2091,11 +2436,24 @@
 "myląca."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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 &ldquo;combination.&rdquo; (Think of
+# | [-&ldquo;Input/Output&rdquo;.)-] {+&ldquo;Input/Output.&rdquo;)+}  This
+# | system is the combination of GNU and Linux; hence,
+# | [-&ldquo;GNU/Linux&rdquo;.-] {+&ldquo;GNU/Linux.&rdquo;+}
+#, fuzzy
+#| 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 &ldquo;combination.&rdquo; (Think of &ldquo;Input/Output&rdquo;.)  "
+#| "This system is the combination of GNU and Linux; hence, &ldquo;GNU/"
+#| "Linux&rdquo;."
 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 "
-"&ldquo;combination.&rdquo; (Think of &ldquo;Input/Output&rdquo;.)  This "
-"system is the combination of GNU and Linux; hence, &ldquo;GNU/Linux&rdquo;."
+"&ldquo;combination.&rdquo; (Think of &ldquo;Input/Output.&rdquo;)  This "
+"system is the combination of GNU and Linux; hence, &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "Mówimy o wersji GNU, systemu operacyjnego, wyróżniającej się tym, 
że&nbsp;"
 "używa Linuksa jako jądra. Ukośnik dobrze pasuje do&nbsp;tej sytuacji, "
@@ -2104,11 +2462,22 @@
 "stąd &bdquo;GNU/Linux&rdquo;."
 
 #. 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: "
-"&ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes say &ldquo;GNU con "
-"Linux&rdquo;."
+# | There are other ways to express [-&ldquo;combination&rdquo;.-]
+# | {+&ldquo;combination.&rdquo;+} If you think that a plus-sign is clearer,
+# | please use that.  In French, a hyphen is clear:
+# | [-&ldquo;GNU-Linux&rdquo;.-] {+&ldquo;GNU-Linux.&rdquo;+} In Spanish, we
+# | sometimes say &ldquo;GNU con [-Linux&rdquo;.-] {+Linux.&rdquo;+}
+#, fuzzy
+#| 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: &ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes say &ldquo;GNU "
+#| "con Linux&rdquo;."
+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: "
+"&ldquo;GNU-Linux.&rdquo; In Spanish, we sometimes say &ldquo;GNU con Linux."
+"&rdquo;"
 msgstr ""
 "Są inne sposoby wyrażania &bdquo;połączenia&rdquo;. 
Jeżeli&nbsp;myślicie, "
 "że&nbsp;znak plusa jest bardziej oczywisty, używajcie go. W&nbsp;języku "
@@ -2162,7 +2531,7 @@
 # | 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
-# | Linux&rdquo; or &ldquo;Linux,-] {+&ldquo;Emacs&rdquo;.  That is the right
+# | Linux&rdquo; or &ldquo;Linux,-] {+&ldquo;Emacs.&rdquo; That is the right
 # | way to describe a program called Emacs+} which is a GNU [-package.&rdquo;
 # | Neither of those meanings fits the situation at hand.-] {+package.+}
 #, fuzzy
@@ -2174,7 +2543,7 @@
 #| "situation at hand."
 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 "
+"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 ""
 "Zgodnie z&nbsp;regułami języka angielskiego w&nbsp;konstrukcji &bdquo;GNU "
@@ -2216,8 +2585,17 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dd><p>
+# | However, if you prefer to call the system [-&ldquo;Linux/GNU&rdquo;,-]
+# | {+&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.
+#, fuzzy
+#| 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."
 msgid ""
-"However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a "
+"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 ""
@@ -2227,8 +2605,19 @@
 "system to Linux."
 
 #. type: Content of: <div><dl><dt>
+# | My distro's developers call it &ldquo;Foobar [-Linux&rdquo;,-]
+# | {+Linux,&rdquo;+} but that doesn't say anything about what the system
+# | consists of.  Why shouldn't they call it whatever they like? <span
+# | class=\"anchor-reference-id\">(<a
+# | href=\"#distronames0\">#distronames0</a>)</span>
+#, fuzzy
+#| 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 whatever they like? <span class=\"anchor-reference-id\">(<a "
+#| "href=\"#distronames0\">#distronames0</a>)</span>"
 msgid ""
-"My distro's developers call it &ldquo;Foobar Linux&rdquo;, but that doesn't "
+"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 "
 "whatever they like? <span class=\"anchor-reference-id\">(<a href="
 "\"#distronames0\">#distronames0</a>)</span>"
@@ -2295,11 +2684,11 @@
 
 #. 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+}
-# | for you to [-change it back and call-] {+correct the misinformation by
-# | calling+} it &ldquo;Foobar GNU/Linux&rdquo;.  [-This is what you ought to
-# | do, to avoid their error.-]
+# | changing+} &ldquo;GNU&rdquo; to [-&ldquo;Linux&rdquo;, it's allowed for
+# | you to change it back-] {+&ldquo;Linux,&rdquo;+} and call {+their version
+# | of+} it &ldquo;Foobar [-GNU/Linux&rdquo;.  This is what-] {+Linux,&rdquo;
+# | it's proper for+} you [-ought to do,-] to [-avoid their error.-] {+correct
+# | the misinformation by calling it &ldquo;Foobar GNU/Linux.&rdquo;+}
 #, fuzzy
 #| msgid ""
 #| "If it's allowed for them to change &ldquo;GNU&rdquo; to &ldquo;"
@@ -2308,9 +2697,9 @@
 #| "error."
 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 "
+"Linux,&rdquo; and call their version of it &ldquo;Foobar Linux,&rdquo; it's "
 "proper for you to correct the misinformation by calling it &ldquo;Foobar GNU/"
-"Linux&rdquo;."
+"Linux.&rdquo;"
 msgstr ""
 "Jeżeli&nbsp;ludziom tworzącym dystrybucję wolno zmienić &bdquo;GNU&rdquo; 
"
 "na&nbsp;&bdquo;Linux&rdquo;, to wolno wam zrobić to samo i&nbsp;nazwać "
@@ -2350,12 +2739,24 @@
 "słuszne."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | 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;.-] {+&ldquo;GNU/Linux.&rdquo;+}
+#, fuzzy
+#| 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 "
+#| "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;."
 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 "
 "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;."
+"&ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "Nie możemy ich zmienić, ale&nbsp;nie jesteśmy z&nbsp;tych, co się poddają
 "
 "tylko dlatego, że&nbsp;droga [do celu] nie jest łatwa. Możecie nie mieć "
@@ -2379,12 +2780,12 @@
 # | 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.
+# | [-&ldquo;Linux&rdquo;.-] {+&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 "
@@ -2399,13 +2800,12 @@
 msgid ""
 "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 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 nonfree "
-"applications and drivers), or making the system more popular even at the "
-"cost of freedom."
+"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 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 nonfree applications "
+"and drivers), or making the system more popular even at the cost of freedom."
 msgstr ""
 "Często stosowana praktyka dodawania nie-wolnego oprogramowania do&nbsp;"
 "systemu GNU/Linux jest poważnym problemem dla naszej wspólnoty. Uczy ona "
@@ -2445,7 +2845,8 @@
 # | 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;.
+# | they are proper and appropriate &ldquo;versions of [-Linux&rdquo;.-]
+# | {+Linux.&rdquo;+}
 #, fuzzy
 #| msgid ""
 #| "The way to lead these users to see a connection with freedom is exactly "
@@ -2462,7 +2863,7 @@
 "specifically for the sake of the users' freedom.  With this understanding, "
 "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;."
+"proper and appropriate &ldquo;versions of Linux.&rdquo;"
 msgstr ""
 "Sposób na&nbsp;to, żeby użytkownicy dostrzegli powiązanie systemu z&nbsp;"
 "wolnością jest dokładnie odwrotny: trzeba informować ich, 
że&nbsp;wszystkie "
@@ -2568,11 +2969,22 @@
 "wiedza po&nbsp;fakcie)."
 
 #. type: Content of: <div><dl><dd><p>
+# | If we were to take an existing version of GNU/Linux and relabel it as
+# | [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} that would be somewhat like
+# | making a version of the GNU system and labeling it
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} That wasn't right, and
+# | we don't want to act like that.
+#, fuzzy
+#| 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 and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and "
+#| "we don't want to act like that."
 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 "
-"and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and we don't want "
-"to act like that."
+"GNU,&rdquo; that would be somewhat like making a version of the GNU system "
+"and labeling it &ldquo;Linux.&rdquo; That wasn't right, and we don't want to "
+"act like that."
 msgstr ""
 "Jeżeli&nbsp;istniejącą wersję GNU/Linuksa przemianujemy na&nbsp;&bdquo;"
 "GNU&rdquo;, wtedy byłoby to coś w&nbsp;stylu zrobienia wersji systemu GNU "
@@ -2609,11 +3021,29 @@
 "uporządkowane przed ich dołączeniem."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | with the GNU Project because he was a &ldquo;Linux [-user&rdquo;.-]
+# | {+user.&rdquo;+} That came as a shock, because the people who ported GNU
+# | packages to other systems had generally wanted to work with us to get
+# | their changes installed.  Yet these people, developing a system that was
+# | primarily based on GNU, were the first (and still practically the only)
+# | group that was unwilling to work with us.
+#, fuzzy
+#| 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 "
+#| "with the GNU Project because he was a &ldquo;Linux user&rdquo;.  That "
+#| "came as a shock, because the people who ported GNU packages to other "
+#| "systems had generally wanted to work with us to get their changes "
+#| "installed.  Yet these people, developing a system that was primarily "
+#| "based on GNU, were the first (and still practically the only) group that "
+#| "was unwilling to work with us."
 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 "
-"with the GNU Project because he was a &ldquo;Linux user&rdquo;.  That came "
-"as a shock, because the people who ported GNU packages to other systems had "
+"with the GNU Project because he was a &ldquo;Linux user.&rdquo; That came as "
+"a shock, because the people who ported GNU packages to other systems had "
 "generally wanted to work with us to get their changes installed.  Yet these "
 "people, developing a system that was primarily based on GNU, were the first "
 "(and still practically the only) group that was unwilling to work with us."
@@ -2629,9 +3059,22 @@
 "nie chciała z&nbsp;nami współpracować."
 
 #. type: Content of: <div><dl><dd><p>
+# | It was this experience that first showed us that people were calling a
+# | version of the GNU system [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} and that this confusion was obstructing our work.
+# |  Asking you to call the system &ldquo;GNU/Linux&rdquo; is our response to
+# | that problem, and to the other problems caused by the &ldquo;Linux&rdquo;
+# | misnomer.
+#, fuzzy
+#| 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 obstructing our work.  Asking you to call the system &ldquo;GNU/"
+#| "Linux&rdquo; is our response to that problem, and to the other problems "
+#| "caused by the &ldquo;Linux&rdquo; misnomer."
 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 "
+"version of the GNU system &ldquo;Linux,&rdquo; and that this confusion was "
 "obstructing our work.  Asking you to call the system &ldquo;GNU/Linux&rdquo; "
 "is our response to that problem, and to the other problems caused by the "
 "&ldquo;Linux&rdquo; misnomer."
@@ -2673,10 +3116,18 @@
 "reference-id\">(<a href=\"#allgpled\">#allgpled</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | We never refer to individual programs as
+# | [-&ldquo;GNU/<i>name</i>&rdquo;.-] {+&ldquo;GNU/<i>name</i>.&rdquo;+} When
+# | a program is a GNU package, we may call it &ldquo;GNU
+# | [-<i>name</i>&rdquo;.-] {+<i>name</i>.&rdquo;+}
+#, fuzzy
+#| 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;."
 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;."
+"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 ""
 "Nigdy nie mówimy o poszczególnych programach jako &bdquo;GNU/<i>nazwa</"
 "i>&rdquo;. Jeśli program jest pakietem GNU, możemy nazywać go &bdquo;GNU "
@@ -2797,10 +3248,24 @@
 "musiało być napisane od&nbsp;nowa."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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. 
+# | The name [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} which stands for
+# | &ldquo;GNU's Not [-Unix&rdquo;,-] {+Unix,&rdquo;+} is a humorous way of
+# | giving credit to Unix for this, following a hacker tradition of recursive
+# | acronyms that started in the 70s.
+#, fuzzy
+#| 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.  The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not "
+#| "Unix&rdquo;, is a humorous way of giving credit to Unix for this, "
+#| "following a hacker tradition of recursive acronyms that started in the "
+#| "70s."
 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.  "
-"The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not Unix&rdquo;, "
+"The name &ldquo;GNU,&rdquo; which stands for &ldquo;GNU's Not Unix,&rdquo; "
 "is a humorous way of giving credit to Unix for this, following a hacker "
 "tradition of recursive acronyms that started in the 70s."
 msgstr ""
@@ -2812,11 +3277,12 @@
 "lat 70."
 
 #. 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
+# | The first such recursive acronym was TINT, &ldquo;TINT Is Not
+# | [-TECO&rdquo;.-] {+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;,-] {+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
@@ -2829,10 +3295,10 @@
 #| "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 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 "
+"like &ldquo;<em>somethingorother</em> TECO,&rdquo; he thought of a clever "
 "amusing name.  (That's what hacking means: <a href=\"https://stallman.org/";
 "articles/on-hacking.html\">playful cleverness</a>.)"
 msgstr ""
@@ -2845,13 +3311,28 @@
 "zabawa</a>)."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | was similar to some existing program (let's imagine its name was
+# | &ldquo;Klever&rdquo;), you could give it a recursive acronym name, such as
+# | &ldquo;MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same
+# | spirit we called our replacement for Unix &ldquo;GNU's Not
+# | [-Unix&rdquo;.-] {+Unix.&rdquo;+}
+#, fuzzy
+#| 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 was similar to some existing program (let's imagine its name was "
+#| "&ldquo;Klever&rdquo;), you could give it a recursive acronym name, such "
+#| "as &ldquo;MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same "
+#| "spirit we called our replacement for Unix &ldquo;GNU's Not Unix&rdquo;."
 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 "
 "was similar to some existing program (let's imagine its name was &ldquo;"
 "Klever&rdquo;), you could give it a recursive acronym name, such as &ldquo;"
 "MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same spirit we "
-"called our replacement for Unix &ldquo;GNU's Not Unix&rdquo;."
+"called our replacement for Unix &ldquo;GNU's Not Unix.&rdquo;"
 msgstr ""
 "Nazwa spodobała się innym hakerom tak bardzo, że&nbsp;zaczęliśmy 
naśladować "
 "ten zwyczaj. Stało się tradycją, że&nbsp;gdy pisze się od&nbsp;podstaw "
@@ -2863,13 +3344,28 @@
 "Unix&rdquo; (&bdquo;GNU to Nie Unix&rdquo;)."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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 in a system 99% copied from Unix.  AT&amp;T actually threatened to
+# | sue anyone giving AT&amp;T credit in that way.  This is why each of the
+# | various modified versions of Unix (all proprietary, like Unix) had a
+# | completely different name that didn't include [-&ldquo;Unix&rdquo;.-]
+# | {+&ldquo;Unix.&rdquo;+}
+#, fuzzy
+#| 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 in a system 99% copied from Unix.  AT&amp;T actually threatened "
+#| "to sue anyone giving AT&amp;T credit in that way.  This is why each of "
+#| "the various modified versions of Unix (all proprietary, like Unix) had a "
+#| "completely different name that didn't include &ldquo;Unix&rdquo;."
 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 "
 "in a system 99% copied from Unix.  AT&amp;T actually threatened to sue "
 "anyone giving AT&amp;T credit in that way.  This is why each of the various "
 "modified versions of Unix (all proprietary, like Unix) had a completely "
-"different name that didn't include &ldquo;Unix&rdquo;."
+"different name that didn't include &ldquo;Unix.&rdquo;"
 msgstr ""
 "W&nbsp;przeszłości firma AT&amp;T, która stworzyła Uniksa, nie chciała, 
by "
 "ktokolwiek nawiązywał do&nbsp;tej nazwy poprzez&nbsp;używanie słowa 
&bdquo;"
@@ -2958,9 +3454,22 @@
 "dlatego nazwa &bdquo;GNU/Linux&rdquo; jest dla niego właściwa."
 
 #. type: Content of: <div><dl><dd><p>
+# | There is a version of GNU which uses the kernel from NetBSD.  Its
+# | developers call it &ldquo;Debian [-GNU/NetBSD&rdquo;,-]
+# | {+GNU/NetBSD,&rdquo;+} but &ldquo;GNU/kernelofNetBSD&rdquo; would be more
+# | accurate, since NetBSD is an entire system, not just the kernel.  This is
+# | not a BSD system, since most of the system is the same as the GNU/Linux
+# | system.
+#, fuzzy
+#| 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/"
+#| "kernelofNetBSD&rdquo; would be more accurate, since NetBSD is an entire "
+#| "system, not just the kernel.  This is not a BSD system, since most of the "
+#| "system is the same as the GNU/Linux system."
 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/"
+"call it &ldquo;Debian GNU/NetBSD,&rdquo; but &ldquo;GNU/"
 "kernelofNetBSD&rdquo; would be more accurate, since NetBSD is an entire "
 "system, not just the kernel.  This is not a BSD system, since most of the "
 "system is the same as the GNU/Linux system."
@@ -2982,8 +3491,21 @@
 "reference-id\">(<a href=\"#othersys\">#othersys</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | Not in the same sense that we mean by [-&ldquo;GNU/Linux&rdquo;.-]
+# | {+&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.
+#, fuzzy
+#| 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 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."
 msgid ""
-"Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of "
+"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 "
@@ -3093,8 +3615,19 @@
 "jedynym wspólnym elementem jest Linux."
 
 #. type: Content of: <div><dl><dd><p>
+# | If you call the whole GNU/Linux system [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} you will find it necessary to say things like,
+# | &ldquo;Android contains Linux, but it isn't Linux, because it doesn't have
+# | the usual Linux [sic] libraries and utilities [meaning the GNU
+# | system].&rdquo;
+#, fuzzy
+#| 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 Linux, because it doesn't have the usual Linux [sic] libraries and "
+#| "utilities [meaning the GNU system].&rdquo;"
 msgid ""
-"If you call the whole GNU/Linux system &ldquo;Linux&rdquo;, you will find it "
+"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 "
 "Linux, because it doesn't have the usual Linux [sic] libraries and utilities "
 "[meaning the GNU system].&rdquo;"
@@ -3132,7 +3665,7 @@
 #. 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 "
+"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 ""
 
@@ -3140,7 +3673,7 @@
 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;."
+"of the whole system as &ldquo;Linux.&rdquo;"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><p>
@@ -3150,7 +3683,7 @@
 "contain Linux is irrelevant to using them, just as the fact that a car and a "
 "bicycle both have a structure of metal is irrelevant to using those two.  If "
 "you wish to talk about using cars and bikes, you wouldn't speak of &ldquo;"
-"riding metal objects&rdquo; &mdash; not unless you're playing games with the "
+"riding metal objects&rdquo;&mdash;not unless you're playing games with the "
 "reader.  You would say, &ldquo;using cars and bikes.&rdquo; Likewise, the "
 "clear way to talk about using GNU/Linux and Android is to say &ldquo;using "
 "GNU/Linux and Android.&rdquo;"
@@ -3253,11 +3786,22 @@
 "span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | 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;.-] {+&ldquo;GNU.&rdquo;+} When we talk
+# | about the whole system, the name &ldquo;GNU/Linux&rdquo; gives him a share
+# | of the credit.
+#, fuzzy
+#| 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 "
+#| "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."
 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 "
-"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."
+"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."
 msgstr ""
 "To byłoby nieuczciwe, dlatego&nbsp;tego nie robimy. Rezultatem pracy "
 "Torvaldsa jest Linux, jądro. Staramy się nie przypisywać wyników pracy "
@@ -3275,12 +3819,13 @@
 "\">#linusagreed</a>)</span>"
 
 #. 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\">
+# | He recognized this at the beginning.  The {+<a
+# | 
href=\"https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\";>+}
+# | 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>.
+# |  for more info&rdquo;</a>.-] {+notes</a> said:+}
 #, fuzzy
 #| msgid ""
 #| "He recognized this at the beginning.  The earliest Linux release notes "
@@ -3289,11 +3834,35 @@
 #| "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=\"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>."
+"He recognized this at the beginning.  The <a href=\"https://ftp.funet.fi/pub/";
+"linux/historical/kernel/old-versions/RELNOTES-0.01\"> earliest Linux release "
+"notes</a> said:"
+msgstr ""
+"Przyznał się do&nbsp;tego na&nbsp;samym początku. Uwagi do&nbsp;wydania "
+"najwcześniejszego Linuksa mówiły, <a href=\"http://ftp.funet.fi/pub/linux/";
+"historical/kernel/old-versions/RELNOTES-0.01\"> &bdquo;Większość narzędzi 
"
+"używanym wraz z&nbsp;linuksem są oprogramowaniem GNU i&nbsp;są wydane "
+"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><dl><dd><blockquote><p>
+# | [-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-]{+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>.-] {+info.+}
+#, 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 ""
+"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."
 msgstr ""
 "Przyznał się do&nbsp;tego na&nbsp;samym początku. Uwagi do&nbsp;wydania "
 "najwcześniejszego Linuksa mówiły, <a href=\"http://ftp.funet.fi/pub/linux/";
@@ -3360,11 +3929,26 @@
 "\"anchor-reference-id\">(<a href=\"#lost\">#lost</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | 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;,-]
+# | {+&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.
+#, fuzzy
+#| 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;: 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."
 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;: "
 "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 "
+"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."
 msgstr ""
@@ -3386,13 +3970,32 @@
 "reference-id\">(<a href=\"#whatgood\">#whatgood</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | 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;,-] {+&ldquo;GNU/Linux,&rdquo;+} you will help
+# | others learn the system's true history, origin, and reason for being.  You
+# | can't correct the misnomer 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;,-] {+&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.
+#, fuzzy
+#| 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;GNU/Linux&rdquo;, you will help others learn the system's true "
+#| "history, origin, and reason for being.  You can't correct the misnomer "
+#| "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."
 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;"
-"GNU/Linux&rdquo;, you will help others learn the system's true history, "
+"GNU/Linux,&rdquo; you will help others learn the system's true history, "
 "origin, and reason for being.  You can't correct the misnomer 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 "
+"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."
 msgstr ""
@@ -3418,10 +4021,20 @@
 "\">(<a href=\"#explain\">#explain</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | 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;,-]
+# | {+&ldquo;GNU/Linux,&rdquo;+} and uses your time inefficiently.
+#, fuzzy
+#| 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."
 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."
+"the system &ldquo;GNU/Linux,&rdquo; and uses your time inefficiently."
 msgstr ""
 "Doceniamy Wasz wysiłek jeżeli&nbsp;pomagacie nam wyjaśniając w&nbsp;ten "
 "sposób kwestię nazwy systemu, jednak&nbsp;to nie jest najlepsza metoda. Nie 
"
@@ -3429,12 +4042,28 @@
 "jest wydajna pod&nbsp;względem czasowym."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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, and they may learn a correct picture of the system's origin. 
+# | But they are unlikely to repeat the explanation to others whenever they
+# | talk about the system.  They will probably just call it
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} Without particularly
+# | intending to, they will help spread the incorrect picture.
+#, fuzzy
+#| 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, and they may learn a correct picture of the system's origin.  "
+#| "But they are unlikely to repeat the explanation to others whenever they "
+#| "talk about the system.  They will probably just call it &ldquo;"
+#| "Linux&rdquo;.  Without particularly intending to, they will help spread "
+#| "the incorrect picture."
 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, "
 "and they may learn a correct picture of the system's origin.  But they are "
 "unlikely to repeat the explanation to others whenever they talk about the "
-"system.  They will probably just call it &ldquo;Linux&rdquo;.  Without "
+"system.  They will probably just call it &ldquo;Linux.&rdquo; Without "
 "particularly intending to, they will help spread the incorrect picture."
 msgstr ""
 "Nie jest efektywna, ponieważ&nbsp;wyjaśnienie kwestii nazwy systemu może 
nie "
@@ -3578,9 +4207,16 @@
 "\">#force</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | It would be wrong to force them, and we don't try.  We call the system
+# | [-&ldquo;GNU/Linux&rdquo;,-] {+&ldquo;GNU/Linux,&rdquo;+} and we ask you
+# | to do it too.
+#, fuzzy
+#| 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."
 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."
+"&ldquo;GNU/Linux,&rdquo; and we ask you to do it too."
 msgstr ""
 "Złym byłoby zmuszanie ich do&nbsp;tego, czego nie robimy. Mówimy 
&bdquo;GNU/"
 "Linux&rdquo; na&nbsp;system i&nbsp;[jedynie] prosimy Was o czynienie tego "
@@ -3688,9 +4324,19 @@
 "terminu &bdquo;licencja BSD&rdquo; bez&nbsp;wymieniana o którą chodzi."
 
 #. type: Content of: <div><dl><dt>
+# | Since you failed to put something in the GNU GPL to require people to call
+# | the system [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} you deserve what
+# | happened; why are you complaining now? <span
+# | class=\"anchor-reference-id\">(<a href=\"#deserve\">#deserve</a>)</span>
+#, fuzzy
+#| 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 "
+#| "complaining now? <span class=\"anchor-reference-id\">(<a href=\"#deserve"
+#| "\">#deserve</a>)</span>"
 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 "
+"the system &ldquo;GNU,&rdquo; you deserve what happened; why are you "
 "complaining now? <span class=\"anchor-reference-id\">(<a href=\"#deserve"
 "\">#deserve</a>)</span>"
 msgstr ""
@@ -3746,8 +4392,17 @@
 "że&nbsp;oprogramowanie prawnie zastrzeżone jest właściwe 
i&nbsp;akceptowalne."
 
 #. type: Content of: <div><dl><dt>
+# | Since many people call it [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} doesn't that make it right? <span
+# | class=\"anchor-reference-id\">(<a
+# | href=\"#somanyright\">#somanyright</a>)</span>
+#, fuzzy
+#| 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>"
 msgid ""
-"Since many people call it &ldquo;Linux&rdquo;, doesn't that make it right? "
+"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 ""
@@ -3770,9 +4425,20 @@
 "span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | Users are not incapable of learning.  Since &ldquo;GNU/Linux&rdquo;
+# | includes [-&ldquo;Linux&rdquo;,-] {+&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.
+#, fuzzy
+#| 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 add &ldquo;(often erroneously referred to as &lsquo;"
+#| "Linux&rsquo;)&rdquo; once in a while, they will all understand."
 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 "
+"&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."
 msgstr ""

Index: po/gnu-linux-faq.pot
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.pot,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- po/gnu-linux-faq.pot        31 Aug 2021 10:37:08 -0000      1.58
+++ po/gnu-linux-faq.pot        2 Nov 2021 14:41:51 -0000       1.59
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-linux-faq.html\n"
-"POT-Creation-Date: 2021-08-31 10:27+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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"
@@ -28,10 +28,10 @@
 msgid "by Richard Stallman"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><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.  "
+"that many others call just &ldquo;Linux,&rdquo; they ask many questions.  "
 "Here are common questions, and our answers."
 msgstr ""
 
@@ -198,8 +198,8 @@
 msgid ""
 "<a href=\"#trademarkfee\">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 wrong if I use &ldquo;GNU&rdquo; without "
-"&ldquo;Linux&rdquo;, to save the fee?</a>"
+"say &ldquo;GNU/Linux.&rdquo; Is it wrong if I use &ldquo;GNU&rdquo; without "
+"&ldquo;Linux,&rdquo; to save the fee?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
@@ -263,7 +263,7 @@
 #. type: Content of: <div><div><ul><li>
 msgid ""
 "<a href=\"#distronames0\">My distro's developers call it &ldquo;Foobar "
-"Linux&rdquo;, but that doesn't say anything about what the system consists "
+"Linux,&rdquo; but that doesn't say anything about what the system consists "
 "of.  Why shouldn't they call it whatever they like?</a>"
 msgstr ""
 
@@ -452,7 +452,7 @@
 #. type: Content of: <div><div><ul><li>
 msgid ""
 "<a href=\"#deserve\">Since you failed to put something in the GNU GPL to "
-"require people to call the system &ldquo;GNU&rdquo;, you deserve what "
+"require people to call the system &ldquo;GNU,&rdquo; you deserve what "
 "happened; why are you complaining now?</a>"
 msgstr ""
 
@@ -464,7 +464,7 @@
 
 #. type: Content of: <div><div><ul><li>
 msgid ""
-"<a href=\"#somanyright\">Since many people call it &ldquo;Linux&rdquo;, "
+"<a href=\"#somanyright\">Since many people call it &ldquo;Linux,&rdquo; "
 "doesn't that make it right?</a>"
 msgstr ""
 
@@ -587,7 +587,7 @@
 "of the system's origin, because people tend to suppose that the system's "
 "history was such as to fit that name.  For instance, they often believe its "
 "development was started by Linus Torvalds in 1991.  This false picture tends "
-"to reinforce the idea that the system should be called &ldquo;Linux&rdquo;."
+"to reinforce the idea that the system should be called &ldquo;Linux.&rdquo;"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><p>
@@ -606,16 +606,16 @@
 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."
+"&ldquo;Linux,&rdquo; the name its developer chose."
 msgstr ""
 
 #. type: Content of: <div><dl><dd><p>
 msgid ""
-"When people call the whole system &ldquo;Linux&rdquo;, as a consequence they "
+"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 "
 "kinds of confusion, because only experts can tell whether a statement is "
 "about the kernel or the whole system.  By calling the whole system "
-"&ldquo;GNU/Linux&rdquo;, and calling the kernel &ldquo;Linux&rdquo;, you "
+"&ldquo;GNU/Linux,&rdquo; and calling the kernel &ldquo;Linux,&rdquo; you "
 "avoid the ambiguity."
 msgstr ""
 
@@ -661,7 +661,7 @@
 
 #. type: Content of: <div><dl><dd>
 msgid ""
-"When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing "
+"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 ""
@@ -699,7 +699,7 @@
 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 "
-"freedom are more likely to call the system &ldquo;GNU/Linux&rdquo;, and "
+"freedom are more likely to call the system &ldquo;GNU/Linux,&rdquo; and "
 "people who learn that the system is &ldquo;GNU/Linux&rdquo; are more likely "
 "to pay attention to our philosophical arguments for freedom and community "
 "(which is why the choice of name for the system makes a real difference for "
@@ -738,7 +738,7 @@
 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 "
-"system do not mention the name &ldquo;GNU&rdquo;, or the ideals that GNU "
+"system do not mention the name &ldquo;GNU,&rdquo; or the ideals that GNU "
 "stands for.  <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users "
 "Who Have Never Heard of GNU</a> explains further."
 msgstr ""
@@ -747,8 +747,8 @@
 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 "
-"GNU is.  For instance, many think it is a collection of <a "
-"href=\"#tools\">&ldquo;tools&rdquo;</a>, or a project to develop tools."
+"GNU is.  For instance, many think it is a collection of &ldquo;<a "
+"href=\"#tools\">tools</a>,&rdquo; or a project to develop tools."
 msgstr ""
 
 #. type: Content of: <div><dl><dd><p>
@@ -771,8 +771,8 @@
 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;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?"
+"&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?"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
@@ -815,10 +815,10 @@
 "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 "
 "that GNU is the name of a collection of programs&mdash;often they say "
-"&ldquo;programming tools&rdquo;, since some of our programming tools became "
+"&ldquo;programming tools,&rdquo; since some of our programming tools became "
 "popular on their own.  The idea that &ldquo;GNU&rdquo; is the name of an "
 "operating system is hard to fit into a conceptual framework in which that "
-"operating system is labeled &ldquo;Linux&rdquo;."
+"operating system is labeled &ldquo;Linux.&rdquo;"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><p>
@@ -863,10 +863,10 @@
 #. 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.  "
-"The use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is "
-"found in a number of textbooks on system design, going back to the 80s.  At "
-"the same time, in the 80s, the &ldquo;Unix operating system&rdquo; was "
+"to mean &ldquo;kernel.&rdquo; Both uses of the term go back many years.  The "
+"use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is found "
+"in a number of textbooks on system design, going back to the 80s.  At the "
+"same time, in the 80s, the &ldquo;Unix operating system&rdquo; was "
 "understood to include all the system programs, and Berkeley's version of "
 "Unix included even games. Since we intended GNU to be a Unix-like operating "
 "system, we use the term &ldquo;operating system&rdquo; in the same way."
@@ -877,7 +877,7 @@
 "Most of the time when people speak of the &ldquo;Linux operating "
 "system&rdquo; they are using &ldquo;operating system&rdquo; in the same "
 "sense we use: they mean the whole collection of programs.  If that's what "
-"you are referring to, please call it &ldquo;GNU/Linux&rdquo;.  If you mean "
+"you are referring to, please call it &ldquo;GNU/Linux.&rdquo; If you mean "
 "just the kernel, then &ldquo;Linux&rdquo; is the right name for it, but "
 "please say &ldquo;kernel&rdquo; also to avoid ambiguity about which body of "
 "software you mean."
@@ -887,7 +887,7 @@
 msgid ""
 "If you prefer to use some other term such as &ldquo;system "
 "distribution&rdquo; for the entire collection of programs, instead of "
-"&ldquo;operating system&rdquo;, that's fine.  Then you would talk about "
+"&ldquo;operating system,&rdquo; that's fine.  Then you would talk about "
 "GNU/Linux system distributions."
 msgstr ""
 
@@ -956,9 +956,9 @@
 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, "
-"window systems, libraries, and much more &mdash; hundreds of programs, even "
-"to match what BSD systems included in 1983.  Since Torvalds didn't develop "
-"any of those, how can the system be &ldquo;Linux&rdquo;?"
+"window systems, libraries, and much more&mdash;hundreds of programs, even to "
+"match what BSD systems included in 1983.  Since Torvalds didn't develop any "
+"of those, how can the system be &ldquo;Linux&rdquo;?"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><p>
@@ -984,7 +984,7 @@
 #. 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</a> are available.  None of them is called simply &ldquo;GNU,&rdquo; but "
 "GNU is what they basically are."
 msgstr ""
 
@@ -1018,7 +1018,7 @@
 #. 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 "
+"&ldquo;GNU,&rdquo; but that doesn't alter what kind of thing GNU is.  GNU is "
 "an operating system."
 msgstr ""
 
@@ -1033,11 +1033,11 @@
 #. 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 "
+"than the misuse of the name &ldquo;Linux.&rdquo; Normally an operating "
 "system is developed as a single unified project, and the developers choose a "
 "name for the system as a whole.  The kernel usually does not have a name of "
 "its own&mdash;instead, people say &ldquo;the kernel of such-and-such&rdquo; "
-"or &ldquo;the such-and-such kernel&rdquo;."
+"or &ldquo;the such-and-such kernel.&rdquo;"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><p>
@@ -1074,14 +1074,14 @@
 
 #. 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.  "
+"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><dl><dd><p>
 msgid ""
-"The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but we "
+"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 ""
@@ -1116,7 +1116,7 @@
 
 #. type: Content of: <div><dl><dd><p>
 msgid ""
-"It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you appreciate "
+"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 ""
@@ -1190,17 +1190,17 @@
 
 #. type: Content of: <div><dl><dd><ul><li>
 msgid ""
-"Since many people know of the system as &ldquo;Linux&rdquo;, if we say "
+"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 "
-"system.  If we say &ldquo;GNU/Linux&rdquo;, they can make a connection to "
+"system.  If we say &ldquo;GNU/Linux,&rdquo; they can make a connection to "
 "what they have heard about."
 msgstr ""
 
 #. 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 "
-"wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to save the "
+"product, and that would also apply if I say &ldquo;GNU/Linux.&rdquo; Is it "
+"wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux,&rdquo; to save the "
 "fee? <span class=\"anchor-reference-id\">(<a "
 "href=\"#trademarkfee\">#trademarkfee</a>)</span>"
 msgstr ""
@@ -1214,8 +1214,8 @@
 
 #. 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."
+"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><dl><dt>
@@ -1257,10 +1257,9 @@
 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 "
-"giving credit, not for any possible threshold level, is "
-"&ldquo;Linux&rdquo;.  It can't be fair to give all the credit to one "
-"secondary contribution (Linux) while omitting the principal contribution "
-"(GNU)."
+"giving credit, not for any possible threshold level, is &ldquo;Linux.&rdquo; "
+"It can't be fair to give all the credit to one secondary contribution "
+"(Linux) while omitting the principal contribution (GNU)."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
@@ -1275,7 +1274,7 @@
 "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 "
+"system &ldquo;GNU/systemd/Linux,&rdquo; there is nothing wrong with doing "
 "so."
 msgstr ""
 
@@ -1313,7 +1312,7 @@
 "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 "
 "the same argument would apply even more strongly to calling it "
-"&ldquo;Linux&rdquo;."
+"&ldquo;Linux.&rdquo;"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><p>
@@ -1358,7 +1357,7 @@
 #. 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 "
+"the word &ldquo;GNU&rdquo; modifies &ldquo;Linux.&rdquo; This can mean "
 "either &ldquo;GNU's version of Linux&rdquo; or &ldquo;Linux, which is a GNU "
 "package.&rdquo; Neither of those meanings fits the situation at hand."
 msgstr ""
@@ -1377,25 +1376,25 @@
 "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."
+"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><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 "
-"&ldquo;combination.&rdquo; (Think of &ldquo;Input/Output&rdquo;.)  This "
-"system is the combination of GNU and Linux; hence, &ldquo;GNU/Linux&rdquo;."
+"&ldquo;combination.&rdquo; (Think of &ldquo;Input/Output.&rdquo;)  This "
+"system is the combination of GNU and Linux; hence, &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 
 #. 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: "
-"&ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes say &ldquo;GNU con "
-"Linux&rdquo;."
+"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: "
+"&ldquo;GNU-Linux.&rdquo; In Spanish, we sometimes say &ldquo;GNU con "
+"Linux.&rdquo;"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
@@ -1421,7 +1420,7 @@
 #. 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 "
+"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 ""
 
@@ -1453,14 +1452,14 @@
 
 #. type: Content of: <div><dl><dd><p>
 msgid ""
-"However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a "
+"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><dl><dt>
 msgid ""
-"My distro's developers call it &ldquo;Foobar Linux&rdquo;, but that doesn't "
+"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 "
 "whatever they like? <span class=\"anchor-reference-id\">(<a "
 "href=\"#distronames0\">#distronames0</a>)</span>"
@@ -1507,9 +1506,9 @@
 #. 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 proper for you to correct the misinformation by calling "
-"it &ldquo;Foobar GNU/Linux&rdquo;."
+"&ldquo;Linux,&rdquo; and call their version of it &ldquo;Foobar "
+"Linux,&rdquo; it's proper for you to correct the misinformation by calling "
+"it &ldquo;Foobar GNU/Linux.&rdquo;"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
@@ -1538,7 +1537,7 @@
 "because the road isn't easy.  You may not have as much 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;."
+"&ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
@@ -1554,7 +1553,7 @@
 "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 "
+"&ldquo;Linux.&rdquo; Many &ldquo;Linux&rdquo; User Groups make it part of "
 "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 "
@@ -1583,7 +1582,7 @@
 "specifically for the sake of the users' freedom.  With this understanding, "
 "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;."
+"proper and appropriate &ldquo;versions of Linux.&rdquo;"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><p>
@@ -1645,8 +1644,8 @@
 #. 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 and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and we don't "
+"&ldquo;GNU,&rdquo; that would be somewhat like making a version of the GNU "
+"system and labeling it &ldquo;Linux.&rdquo; That wasn't right, and we don't "
 "want to act like that."
 msgstr ""
 
@@ -1671,8 +1670,8 @@
 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 "
-"with the GNU Project because he was a &ldquo;Linux user&rdquo;.  That came "
-"as a shock, because the people who ported GNU packages to other systems had "
+"with the GNU Project because he was a &ldquo;Linux user.&rdquo; That came as "
+"a shock, because the people who ported GNU packages to other systems had "
 "generally wanted to work with us to get their changes installed.  Yet these "
 "people, developing a system that was primarily based on GNU, were the first "
 "(and still practically the only) group that was unwilling to work with us."
@@ -1681,7 +1680,7 @@
 #. 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 "
+"version of the GNU system &ldquo;Linux,&rdquo; and that this confusion was "
 "obstructing our work.  Asking you to call the system &ldquo;GNU/Linux&rdquo; "
 "is our response to that problem, and to the other problems caused by the "
 "&ldquo;Linux&rdquo; misnomer."
@@ -1709,9 +1708,8 @@
 
 #. 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;."
+"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><dl><dd><p>
@@ -1788,17 +1786,17 @@
 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.  "
-"The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not Unix&rdquo;, "
+"The name &ldquo;GNU,&rdquo; which stands for &ldquo;GNU's Not Unix,&rdquo; "
 "is a humorous way of giving credit to Unix for this, following a hacker "
 "tradition of recursive acronyms that started in the 70s."
 msgstr ""
 
 #. type: Content of: <div><dl><dd><p>
 msgid ""
-"The first such recursive acronym was TINT, &ldquo;TINT Is Not TECO&rdquo;.  "
+"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 "
+"like &ldquo;<em>somethingorother</em> TECO,&rdquo; he thought of a clever "
 "amusing name.  (That's what hacking means: <a "
 "href=\"https://stallman.org/articles/on-hacking.html\";>playful "
 "cleverness</a>.)"
@@ -1811,7 +1809,7 @@
 "was similar to some existing program (let's imagine its name was "
 "&ldquo;Klever&rdquo;), you could give it a recursive acronym name, such as "
 "&ldquo;MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same spirit "
-"we called our replacement for Unix &ldquo;GNU's Not Unix&rdquo;."
+"we called our replacement for Unix &ldquo;GNU's Not Unix.&rdquo;"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><p>
@@ -1821,7 +1819,7 @@
 "in a system 99% copied from Unix.  AT&amp;T actually threatened to sue "
 "anyone giving AT&amp;T credit in that way.  This is why each of the various "
 "modified versions of Unix (all proprietary, like Unix) had a completely "
-"different name that didn't include &ldquo;Unix&rdquo;."
+"different name that didn't include &ldquo;Unix.&rdquo;"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
@@ -1871,7 +1869,7 @@
 #. 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 "
+"call it &ldquo;Debian GNU/NetBSD,&rdquo; but "
 "&ldquo;GNU/kernelofNetBSD&rdquo; would be more accurate, since NetBSD is an "
 "entire system, not just the kernel.  This is not a BSD system, since most of "
 "the system is the same as the GNU/Linux system."
@@ -1886,7 +1884,7 @@
 
 #. type: Content of: <div><dl><dd><p>
 msgid ""
-"Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of "
+"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 "
@@ -1960,7 +1958,7 @@
 
 #. type: Content of: <div><dl><dd><p>
 msgid ""
-"If you call the whole GNU/Linux system &ldquo;Linux&rdquo;, you will find it "
+"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 "
 "Linux, because it doesn't have the usual Linux [sic] libraries and utilities "
 "[meaning the GNU system].&rdquo;"
@@ -1990,7 +1988,7 @@
 #. 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 "
+"&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 ""
@@ -1999,7 +1997,7 @@
 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;."
+"of the whole system as &ldquo;Linux.&rdquo;"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><p>
@@ -2009,7 +2007,7 @@
 "contain Linux is irrelevant to using them, just as the fact that a car and a "
 "bicycle both have a structure of metal is irrelevant to using those two.  If "
 "you wish to talk about using cars and bikes, you wouldn't speak of "
-"&ldquo;riding metal objects&rdquo; &mdash; not unless you're playing games "
+"&ldquo;riding metal objects&rdquo;&mdash;not unless you're playing games "
 "with the reader.  You would say, &ldquo;using cars and bikes.&rdquo; "
 "Likewise, the clear way to talk about using GNU/Linux and Android is to say "
 "&ldquo;using GNU/Linux and Android.&rdquo;"
@@ -2069,8 +2067,8 @@
 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 "
-"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."
+"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."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
@@ -2082,12 +2080,16 @@
 
 #. type: Content of: <div><dl><dd><p>
 msgid ""
-"He recognized this at the beginning.  The earliest Linux release notes said, "
-"<a "
+"He recognized this at the beginning.  The <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>."
+"earliest Linux release notes</a> said:"
+msgstr ""
+
+#. type: Content of: <div><dl><dd><blockquote><p>
+msgid ""
+"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."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
@@ -2126,7 +2128,7 @@
 "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 "
+"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."
 msgstr ""
@@ -2142,10 +2144,10 @@
 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;GNU/Linux&rdquo;, you will help others learn the system's true "
+"&ldquo;GNU/Linux,&rdquo; you will help others learn the system's true "
 "history, origin, and reason for being.  You can't correct the misnomer "
 "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 "
+"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."
 msgstr ""
@@ -2161,7 +2163,7 @@
 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."
+"the system &ldquo;GNU/Linux,&rdquo; and uses your time inefficiently."
 msgstr ""
 
 #. type: Content of: <div><dl><dd><p>
@@ -2170,7 +2172,7 @@
 "propagate.  Some of the people who hear your explanation will pay attention, "
 "and they may learn a correct picture of the system's origin.  But they are "
 "unlikely to repeat the explanation to others whenever they talk about the "
-"system.  They will probably just call it &ldquo;Linux&rdquo;.  Without "
+"system.  They will probably just call it &ldquo;Linux.&rdquo; Without "
 "particularly intending to, they will help spread the incorrect picture."
 msgstr ""
 
@@ -2260,7 +2262,7 @@
 #. 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."
+"&ldquo;GNU/Linux,&rdquo; and we ask you to do it too."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
@@ -2319,7 +2321,7 @@
 #. 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 "
+"the system &ldquo;GNU,&rdquo; you deserve what happened; why are you "
 "complaining now? <span class=\"anchor-reference-id\">(<a "
 "href=\"#deserve\">#deserve</a>)</span>"
 msgstr ""
@@ -2358,7 +2360,7 @@
 
 #. type: Content of: <div><dl><dt>
 msgid ""
-"Since many people call it &ldquo;Linux&rdquo;, doesn't that make it right? "
+"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 ""
@@ -2377,7 +2379,7 @@
 #. 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 "
+"&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."
 msgstr ""

Index: po/gnu-linux-faq.pt-br.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.pt-br.po,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- po/gnu-linux-faq.pt-br.po   5 Sep 2021 15:33:44 -0000       1.26
+++ po/gnu-linux-faq.pt-br.po   2 Nov 2021 14:41:51 -0000       1.27
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnu-linux-faq.html\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-31 10:27+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2021-09-05 11:56-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-11-02 14:27+0000\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "X-Generator: Gtranslator 40.0\n"
 
@@ -33,10 +34,15 @@
 msgid "by Richard Stallman"
 msgstr "por Richard Stallman"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| 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."
 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.  "
+"that many others call just &ldquo;Linux,&rdquo; they ask many questions.  "
 "Here are common questions, and our answers."
 msgstr ""
 "Quando as pessoas percebem que usamos e recomendamos o nome GNU/Linux para "
@@ -249,11 +255,17 @@
 "incorreto chamar o sistema apenas de “GNU”?</a>"
 
 #. type: Content of: <div><div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#trademarkfee\">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 wrong if I use &ldquo;GNU&rdquo; without "
+#| "&ldquo;Linux&rdquo;, to save the fee?</a>"
 msgid ""
 "<a href=\"#trademarkfee\">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 wrong if I use &ldquo;GNU&rdquo; without "
-"&ldquo;Linux&rdquo;, to save the fee?</a>"
+"&ldquo;GNU/Linux.&rdquo; Is it wrong if I use &ldquo;GNU&rdquo; without "
+"&ldquo;Linux,&rdquo; to save the fee?</a>"
 msgstr ""
 "<a href=\"#trademarkfee\">Eu teria que pagar uma taxa se eu usar “Linux” 
no "
 "nome de um produto, e isso também se aplicaria se eu disser “GNU/Linux”. 
"
@@ -336,10 +348,15 @@
 msgstr "<a href=\"#whyorder\">Por que “GNU/Linux” em vez de 
“Linux/GNU”?</a>"
 
 #. type: Content of: <div><div><ul><li>
-msgid ""
-"<a href=\"#distronames0\">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 whatever they like?</a>"
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#distronames0\">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 whatever they like?</a>"
+msgid ""
+"<a href=\"#distronames0\">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 whatever they like?</a>"
 msgstr ""
 "<a href=\"#distronames0\">Os desenvolvedores da minha distro a chamam de "
 "“Foobar Linux”, mas isso não diz nada sobre em que o sistema consiste. 
Por "
@@ -589,9 +606,14 @@
 "exigir que as pessoas chamem o sistema de “GNU”?</a>"
 
 #. type: Content of: <div><div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#deserve\">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 complaining now?</a>"
 msgid ""
 "<a href=\"#deserve\">Since you failed to put something in the GNU GPL to "
-"require people to call the system &ldquo;GNU&rdquo;, you deserve what "
+"require people to call the system &ldquo;GNU,&rdquo; you deserve what "
 "happened; why are you complaining now?</a>"
 msgstr ""
 "<a href=\"#deserve\">Já que vocês falharam em colocar alguma coisa na GNU "
@@ -607,8 +629,12 @@
 "tantas pessoas acreditam?</a>"
 
 #. type: Content of: <div><div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#somanyright\">Since many people call it &ldquo;Linux&rdquo;, "
+#| "doesn't that make it right?</a>"
 msgid ""
-"<a href=\"#somanyright\">Since many people call it &ldquo;Linux&rdquo;, "
+"<a href=\"#somanyright\">Since many people call it &ldquo;Linux,&rdquo; "
 "doesn't that make it right?</a>"
 msgstr ""
 "<a href=\"#somanyright\">Já que muitas pessoas o chamam de “Linux”, isso 
não "
@@ -779,6 +805,16 @@
 "então, a confusão teve uma grande vantagem."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 it must be right.  The name &ldquo;Linux&rdquo; also spreads a "
+#| "false picture of the system's origin, because people tend to suppose that "
+#| "the system's history was such as to fit that name.  For instance, they "
+#| "often believe its development was started by Linus Torvalds in 1991.  "
+#| "This false picture tends to reinforce the idea that the system should be "
+#| "called &ldquo;Linux&rdquo;."
 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 "
@@ -786,7 +822,7 @@
 "of the system's origin, because people tend to suppose that the system's "
 "history was such as to fit that name.  For instance, they often believe its "
 "development was started by Linus Torvalds in 1991.  This false picture tends "
-"to reinforce the idea that the system should be called &ldquo;Linux&rdquo;."
+"to reinforce the idea that the system should be called &ldquo;Linux.&rdquo;"
 msgstr ""
 "A maioria das pessoas que chamam o sistema de “Linux” nunca ouviu o 
porquê "
 "disso não estar correto. Eles viram outros usando esse nome e presumiram que 
"
@@ -814,22 +850,35 @@
 "reference-id\">(<a href=\"#always\">#always</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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."
 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."
+"you're referring specifically to the kernel, you should call it &ldquo;Linux,"
+"&rdquo; the name its developer chose."
 msgstr ""
 "Não sempre &ndash; apenas quando você está falando sobre todo o sistema. "
 "Quando você está se referindo especificamente ao kernel, você deve 
chamá-lo "
 "“Linux”, o nome que seu desenvolvedor escolheu."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 kinds of confusion, because only experts can tell whether a "
+#| "statement is about the kernel or the whole system.  By calling the whole "
+#| "system &ldquo;GNU/Linux&rdquo;, and calling the kernel &ldquo;"
+#| "Linux&rdquo;, you avoid the ambiguity."
 msgid ""
-"When people call the whole system &ldquo;Linux&rdquo;, as a consequence they "
+"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 "
 "kinds of confusion, because only experts can tell whether a statement is "
 "about the kernel or the whole system.  By calling the whole system &ldquo;"
-"GNU/Linux&rdquo;, and calling the kernel &ldquo;Linux&rdquo;, you avoid the "
+"GNU/Linux,&rdquo; and calling the kernel &ldquo;Linux,&rdquo; you avoid the "
 "ambiguity."
 msgstr ""
 "Quando as pessoas chamam todo o sistema de “Linux”, como consequência, 
eles "
@@ -898,8 +947,13 @@
 "\">#divide</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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."
 msgid ""
-"When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing "
+"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 ""
@@ -955,10 +1009,23 @@
 "aberto não compartilha dos objetivos do software livre</a>."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 freedom are more likely to call the system &ldquo;GNU/"
+#| "Linux&rdquo;, and people who learn that the system is &ldquo;GNU/"
+#| "Linux&rdquo; are more likely to pay attention to our philosophical "
+#| "arguments for freedom and community (which is why the choice of name for "
+#| "the system makes a real difference for society).  However, the "
+#| "disagreement would probably exist even if everyone knew the system's real "
+#| "origin and its proper name, because the issue is a real one.  It can only "
+#| "go away if we who value freedom either persuade everyone (which won't be "
+#| "easy) or are defeated entirely (let's hope not)."
 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 "
-"freedom are more likely to call the system &ldquo;GNU/Linux&rdquo;, and "
+"freedom are more likely to call the system &ldquo;GNU/Linux,&rdquo; and "
 "people who learn that the system is &ldquo;GNU/Linux&rdquo; are more likely "
 "to pay attention to our philosophical arguments for freedom and community "
 "(which is why the choice of name for the system makes a real difference for "
@@ -1015,10 +1082,17 @@
 "(<a href=\"#everyoneknows\">#everyoneknows</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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 system do not mention the name &ldquo;GNU&rdquo;, or the ideals that "
+#| "GNU stands for.  <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU "
+#| "Users Who Have Never Heard of GNU</a> explains further."
 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 "
-"system do not mention the name &ldquo;GNU&rdquo;, or the ideals that GNU "
+"system do not mention the name &ldquo;GNU,&rdquo; or the ideals that GNU "
 "stands for.  <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users "
 "Who Have Never Heard of GNU</a> explains further."
 msgstr ""
@@ -1029,11 +1103,17 @@
 "\">Usuários do GNU que nunca ouviram falar do GNU</a> explica ainda mais."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 GNU is.  For instance, many think it is a collection of <a "
+#| "href=\"#tools\">&ldquo;tools&rdquo;</a>, or a project to develop tools."
 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 "
-"GNU is.  For instance, many think it is a collection of <a href=\"#tools"
-"\">&ldquo;tools&rdquo;</a>, or a project to develop tools."
+"GNU is.  For instance, many think it is a collection of &ldquo;<a href="
+"\"#tools\">tools</a>,&rdquo; or a project to develop tools."
 msgstr ""
 "As pessoas que dizem isso provavelmente são <i>geeks</i> pensando nos "
 "<i>geeks</i> que eles conhecem. Os <i>geeks</i> muitas vezes sabem sobre o "
@@ -1065,11 +1145,18 @@
 "\"#everyoneknows2\">#everyoneknows2</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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;"
+#| "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?"
 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;"
-"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?"
+"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?"
 msgstr ""
 "Se suas palavras não refletem seu conhecimento, você não ensina aos 
outros. "
 "A maioria das pessoas que ouviram falar do sistema GNU/Linux acham que é "
@@ -1125,14 +1212,23 @@
 "span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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 "
+#| "that GNU is the name of a collection of programs&mdash;often they say "
+#| "&ldquo;programming tools&rdquo;, since some of our programming tools "
+#| "became popular on their own.  The idea that &ldquo;GNU&rdquo; is the name "
+#| "of an operating system is hard to fit into a conceptual framework in "
+#| "which that operating system is labeled &ldquo;Linux&rdquo;."
 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 "
 "that GNU is the name of a collection of programs&mdash;often they say &ldquo;"
-"programming tools&rdquo;, since some of our programming tools became popular "
+"programming tools,&rdquo; since some of our programming tools became popular "
 "on their own.  The idea that &ldquo;GNU&rdquo; is the name of an operating "
 "system is hard to fit into a conceptual framework in which that operating "
-"system is labeled &ldquo;Linux&rdquo;."
+"system is labeled &ldquo;Linux.&rdquo;"
 msgstr ""
 "Pessoas que pensam que o Linux é um sistema operacional completo, se ouvem "
 "sobre o GNU, muitas vezes ficam com uma ideia errada do que é o GNU. Eles "
@@ -1199,12 +1295,23 @@
 "executados. O kernel também cuida de iniciar e parar outros programas."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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.  The use of &ldquo;operating system&rdquo; to mean "
+#| "&ldquo;kernel&rdquo; is found in a number of textbooks on system design, "
+#| "going back to the 80s.  At the same time, in the 80s, the &ldquo;Unix "
+#| "operating system&rdquo; was understood to include all the system "
+#| "programs, and Berkeley's version of Unix included even games. Since we "
+#| "intended GNU to be a Unix-like operating system, we use the term &ldquo;"
+#| "operating system&rdquo; in the same way."
 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.  "
-"The use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is "
-"found in a number of textbooks on system design, going back to the 80s.  At "
-"the same time, in the 80s, the &ldquo;Unix operating system&rdquo; was "
+"to mean &ldquo;kernel.&rdquo; Both uses of the term go back many years.  The "
+"use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is found "
+"in a number of textbooks on system design, going back to the 80s.  At the "
+"same time, in the 80s, the &ldquo;Unix operating system&rdquo; was "
 "understood to include all the system programs, and Berkeley's version of "
 "Unix included even games. Since we intended GNU to be a Unix-like operating "
 "system, we use the term &ldquo;operating system&rdquo; in the same way."
@@ -1219,11 +1326,20 @@
 "ao Unix, usamos o termo “sistema operacional” do mesmo jeito."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 "
+#| "sense we use: they mean the whole collection of programs.  If that's what "
+#| "you are referring to, please call it &ldquo;GNU/Linux&rdquo;.  If you "
+#| "mean just the kernel, then &ldquo;Linux&rdquo; is the right name for it, "
+#| "but please say &ldquo;kernel&rdquo; also to avoid ambiguity about which "
+#| "body of software you mean."
 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 "
 "sense we use: they mean the whole collection of programs.  If that's what "
-"you are referring to, please call it &ldquo;GNU/Linux&rdquo;.  If you mean "
+"you are referring to, please call it &ldquo;GNU/Linux.&rdquo; If you mean "
 "just the kernel, then &ldquo;Linux&rdquo; is the right name for it, but "
 "please say &ldquo;kernel&rdquo; also to avoid ambiguity about which body of "
 "software you mean."
@@ -1236,10 +1352,16 @@
 "ambiguidade sobre qual corpo de software você quer dizer."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "If you prefer to use some other term such as &ldquo;system "
+#| "distribution&rdquo; for the entire collection of programs, instead of "
+#| "&ldquo;operating system&rdquo;, that's fine.  Then you would talk about "
+#| "GNU/Linux system distributions."
 msgid ""
 "If you prefer to use some other term such as &ldquo;system "
 "distribution&rdquo; for the entire collection of programs, instead of &ldquo;"
-"operating system&rdquo;, that's fine.  Then you would talk about GNU/Linux "
+"operating system,&rdquo; that's fine.  Then you would talk about GNU/Linux "
 "system distributions."
 msgstr ""
 "Se você preferir usar algum outro termo, como “distribuição de 
sistema” para "
@@ -1333,12 +1455,20 @@
 "reference-id\">(<a href=\"#nokernel\">#nokernel</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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, window systems, libraries, and much more &mdash; hundreds of "
+#| "programs, even to match what BSD systems included in 1983.  Since "
+#| "Torvalds didn't develop any of those, how can the system be &ldquo;"
+#| "Linux&rdquo;?"
 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, "
-"window systems, libraries, and much more &mdash; hundreds of programs, even "
-"to match what BSD systems included in 1983.  Since Torvalds didn't develop "
-"any of those, how can the system be &ldquo;Linux&rdquo;?"
+"window systems, libraries, and much more&mdash;hundreds of programs, even to "
+"match what BSD systems included in 1983.  Since Torvalds didn't develop any "
+"of those, how can the system be &ldquo;Linux&rdquo;?"
 msgstr ""
 "As pessoas que argumentam dessa maneira ao chamar o sistema de “Linux” 
estão "
 "usando um padrão duplo. Um sistema operacional requer compiladores, "
@@ -1375,9 +1505,14 @@
 "href=\"#notinstallable\">#notinstallable</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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."
 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</a> are available.  None of them is called simply &ldquo;GNU,&rdquo; but "
 "GNU is what they basically are."
 msgstr ""
 "Muitas <a href=\"/distros/distros.html\"> versões empacotadas e instaláveis 
"
@@ -1429,9 +1564,14 @@
 "GNU."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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."
 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 "
+"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 ""
 "Nós nunca demos o último passo de empacotar GNU sob o nome “GNU”, mas 
isso "
@@ -1448,13 +1588,21 @@
 "href=\"#afterkernel\">#afterkernel</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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 system is developed as a single unified project, and the "
+#| "developers choose a name for the system as a whole.  The kernel usually "
+#| "does not have a name of its own&mdash;instead, people say &ldquo;the "
+#| "kernel of such-and-such&rdquo; or &ldquo;the such-and-such kernel&rdquo;."
 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 "
+"than the misuse of the name &ldquo;Linux.&rdquo; Normally an operating "
 "system is developed as a single unified project, and the developers choose a "
 "name for the system as a whole.  The kernel usually does not have a name of "
 "its own&mdash;instead, people say &ldquo;the kernel of such-and-such&rdquo; "
-"or &ldquo;the such-and-such kernel&rdquo;."
+"or &ldquo;the such-and-such kernel.&rdquo;"
 msgstr ""
 "Essa prática parece ser muito rara &ndash; não conseguimos encontrar outros 
"
 "exemplos além do uso indevido do nome “Linux”. Normalmente, um sistema "
@@ -1510,9 +1658,14 @@
 "\">#long</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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."
 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.  "
+"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 ""
 "Por um tempo, tentamos o nome “LiGNUx”, que combina as palavras “GNU” 
e "
@@ -1520,8 +1673,13 @@
 "melhor."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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>."
 msgid ""
-"The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but we "
+"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 ""
@@ -1568,8 +1726,13 @@
 "\"#long2\">#long2</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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?"
 msgid ""
-"It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you appreciate "
+"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 ""
@@ -1676,10 +1839,16 @@
 "sistema."
 
 #. type: Content of: <div><dl><dd><ul><li>
+#, fuzzy
+#| 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 system.  If we say &ldquo;GNU/Linux&rdquo;, they can make a "
+#| "connection to what they have heard about."
 msgid ""
-"Since many people know of the system as &ldquo;Linux&rdquo;, if we say "
+"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 "
-"system.  If we say &ldquo;GNU/Linux&rdquo;, they can make a connection to "
+"system.  If we say &ldquo;GNU/Linux,&rdquo; they can make a connection to "
 "what they have heard about."
 msgstr ""
 "Como muitas pessoas conhecem o sistema como “Linux”, se dissermos 
“GNU” eles "
@@ -1688,10 +1857,17 @@
 "falar."
 
 #. type: Content of: <div><dl><dt>
+#, fuzzy
+#| 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 wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to save "
+#| "the fee? <span class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
+#| "\">#trademarkfee</a>)</span>"
 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 "
-"wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to save the "
+"product, and that would also apply if I say &ldquo;GNU/Linux.&rdquo; Is it "
+"wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux,&rdquo; to save the "
 "fee? <span class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
 "\">#trademarkfee</a>)</span>"
 msgstr ""
@@ -1711,9 +1887,14 @@
 "tem obrigação de pagar o privilégio de fazê-lo."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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."
 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."
+"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 ""
 "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."
@@ -1774,12 +1955,19 @@
 "discutiremos contra isso."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 giving credit, not for any possible threshold level, is &ldquo;"
+#| "Linux&rdquo;.  It can't be fair to give all the credit to one secondary "
+#| "contribution (Linux) while omitting the principal contribution (GNU)."
 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 "
-"giving credit, not for any possible threshold level, is &ldquo;"
-"Linux&rdquo;.  It can't be fair to give all the credit to one secondary "
-"contribution (Linux) while omitting the principal contribution (GNU)."
+"giving credit, not for any possible threshold level, is &ldquo;Linux.&rdquo; "
+"It can't be fair to give all the credit to one secondary contribution "
+"(Linux) while omitting the principal contribution (GNU)."
 msgstr ""
 "Diferentes níveis de limites levariam a diferentes opções de nome para o "
 "sistema. Mas um nome que não pode resultar de preocupações de justiça e 
de "
@@ -1798,11 +1986,18 @@
 "id\">(<a href=\"#others\">#others</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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).  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."
 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).  "
 "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."
+"system &ldquo;GNU/systemd/Linux,&rdquo; there is nothing wrong with doing so."
 msgstr ""
 "O systemd é um componente bastante importante, mas não tão importante 
quanto "
 "o kernel (Linux), nem tão importante quanto a base do sistema como um todo "
@@ -1853,11 +2048,17 @@
 "\">#allsmall</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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 the same argument would apply even more strongly to calling it &ldquo;"
+#| "Linux&rdquo;."
 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 "
-"the same argument would apply even more strongly to calling it &ldquo;"
-"Linux&rdquo;."
+"the same argument would apply even more strongly to calling it &ldquo;Linux."
+"&rdquo;"
 msgstr ""
 "Em 2008, descobrimos que os pacotes GNU representavam 15% do repositório "
 "“main” da distribuição gNewSense GNU/Linux. O Linux constituiu 1,5%. 
Então, "
@@ -1920,9 +2121,16 @@
 "\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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 either &ldquo;GNU's version of Linux&rdquo; or &ldquo;"
+#| "Linux, which is a GNU package.&rdquo; Neither of those meanings fits the "
+#| "situation at hand."
 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 "
+"the word &ldquo;GNU&rdquo; modifies &ldquo;Linux.&rdquo; This can mean "
 "either &ldquo;GNU's version of Linux&rdquo; or &ldquo;Linux, which is a GNU "
 "package.&rdquo; Neither of those meanings fits the situation at hand."
 msgstr ""
@@ -1944,11 +2152,20 @@
 "significado de “Linux, que é um pacote GNU” não está certo."
 
 #. 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=\"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."
 msgid ""
 "We're not talking about a distinct GNU version of Linux, the kernel.  The "
 "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 "
+"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."
@@ -1961,11 +2178,18 @@
 "seria muito confuso."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 &ldquo;combination.&rdquo; (Think of &ldquo;Input/Output&rdquo;.)  "
+#| "This system is the combination of GNU and Linux; hence, &ldquo;GNU/"
+#| "Linux&rdquo;."
 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 "
-"&ldquo;combination.&rdquo; (Think of &ldquo;Input/Output&rdquo;.)  This "
-"system is the combination of GNU and Linux; hence, &ldquo;GNU/Linux&rdquo;."
+"&ldquo;combination.&rdquo; (Think of &ldquo;Input/Output.&rdquo;)  This "
+"system is the combination of GNU and Linux; hence, &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "Estamos falando de uma versão do GNU, o sistema operacional, distinguido por 
"
 "ter o Linux como kernel. Uma barra se encaixa na situação, porque isso "
@@ -1973,11 +2197,17 @@
 "combinação de GNU e Linux; daí, “GNU/Linux”."
 
 #. 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: "
-"&ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes say &ldquo;GNU con "
-"Linux&rdquo;."
+#, fuzzy
+#| 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: &ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes say &ldquo;GNU "
+#| "con Linux&rdquo;."
+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: "
+"&ldquo;GNU-Linux.&rdquo; In Spanish, we sometimes say &ldquo;GNU con Linux."
+"&rdquo;"
 msgstr ""
 "Existem outras formas de expressar “combinação”. Se você acha que um 
sinal "
 "de mais é mais claro, use isso. Em francês, um hífen é claro: 
“GNU-Linux”. "
@@ -2011,9 +2241,15 @@
 "\"anchor-reference-id\">(<a href=\"#whynoslash\">#whynoslash</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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."
 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 "
+"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 ""
 "Seguindo as regras do inglês, na construção “GNU Emacs” a palavra 
“GNU” "
@@ -2057,8 +2293,13 @@
 "sistema e que o GNU preenche níveis tecnicamente mais altos."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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."
 msgid ""
-"However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a "
+"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 ""
@@ -2067,8 +2308,14 @@
 "fazer parecer que todo o sistema é o Linux."
 
 #. type: Content of: <div><dl><dt>
+#, fuzzy
+#| 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 whatever they like? <span class=\"anchor-reference-id\">(<a "
+#| "href=\"#distronames0\">#distronames0</a>)</span>"
 msgid ""
-"My distro's developers call it &ldquo;Foobar Linux&rdquo;, but that doesn't "
+"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 "
 "whatever they like? <span class=\"anchor-reference-id\">(<a href="
 "\"#distronames0\">#distronames0</a>)</span>"
@@ -2132,11 +2379,17 @@
 "id\">(<a href=\"#distronames1\">#distronames1</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 proper for you to correct the misinformation by calling it &ldquo;"
+#| "Foobar GNU/Linux&rdquo;."
 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 "
+"Linux,&rdquo; and call their version of it &ldquo;Foobar Linux,&rdquo; it's "
 "proper for you to correct the misinformation by calling it &ldquo;Foobar GNU/"
-"Linux&rdquo;."
+"Linux.&rdquo;"
 msgstr ""
 "Quando elas espalham a desinformação mudando “GNU” para “Linux” e 
chamam a "
 "sua versão de “Foobar Linux”, é apropriado você corrigir a 
desinformação ao "
@@ -2173,12 +2426,19 @@
 "importava com o que estava certo."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 "
+#| "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;."
 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 "
 "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;."
+"&ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "Não podemos forçá-los a corrigir isso, mas não somos o tipo de desistir 
só "
 "porque a estrada não é fácil. Você pode não ter tanta influência à sua 
"
@@ -2198,16 +2458,26 @@
 "class=\"anchor-reference-id\">(<a href=\"#reserve\">#reserve</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| msgid ""
+#| "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 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 nonfree "
+#| "applications and drivers), or making the system more popular even at the "
+#| "cost of freedom."
 msgid ""
 "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 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 nonfree "
-"applications and drivers), or making the system more popular even at the "
-"cost of freedom."
+"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 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 nonfree applications "
+"and drivers), or making the system more popular even at the cost of freedom."
 msgstr ""
 "A prática generalizada de adicionar software não livre ao sistema GNU/Linux 
"
 "é um grande problema para nossa comunidade. Ele ensina aos usuários que o "
@@ -2238,6 +2508,15 @@
 "que nunca pensaram que estes sistemas eram o GNU em primeiro lugar."
 
 #. 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 "
+#| "nonfree 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> "
@@ -2245,7 +2524,7 @@
 "specifically for the sake of the users' freedom.  With this understanding, "
 "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;."
+"proper and appropriate &ldquo;versions of Linux.&rdquo;"
 msgstr ""
 "A maneira de liderar esses usuários para ver uma conexão com a liberdade é 
"
 "exatamente o oposto: informá-los de que todas essas versões do sistema "
@@ -2340,11 +2619,17 @@
 "isso é passado.)"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and "
+#| "we don't want to act like that."
 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 "
-"and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and we don't want "
-"to act like that."
+"GNU,&rdquo; that would be somewhat like making a version of the GNU system "
+"and labeling it &ldquo;Linux.&rdquo; That wasn't right, and we don't want to "
+"act like that."
 msgstr ""
 "Se nós tomássemos uma versão existente do GNU/Linux e rotulássemos-a como 
"
 "“GNU”, isso seria um pouco como fazer uma versão do sistema GNU e "
@@ -2378,11 +2663,21 @@
 "limpadas para instalação."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 "
+#| "with the GNU Project because he was a &ldquo;Linux user&rdquo;.  That "
+#| "came as a shock, because the people who ported GNU packages to other "
+#| "systems had generally wanted to work with us to get their changes "
+#| "installed.  Yet these people, developing a system that was primarily "
+#| "based on GNU, were the first (and still practically the only) group that "
+#| "was unwilling to work with us."
 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 "
-"with the GNU Project because he was a &ldquo;Linux user&rdquo;.  That came "
-"as a shock, because the people who ported GNU packages to other systems had "
+"with the GNU Project because he was a &ldquo;Linux user.&rdquo; That came as "
+"a shock, because the people who ported GNU packages to other systems had "
 "generally wanted to work with us to get their changes installed.  Yet these "
 "people, developing a system that was primarily based on GNU, were the first "
 "(and still practically the only) group that was unwilling to work with us."
@@ -2397,9 +2692,16 @@
 "que não estava disposto a trabalhar conosco."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 obstructing our work.  Asking you to call the system &ldquo;GNU/"
+#| "Linux&rdquo; is our response to that problem, and to the other problems "
+#| "caused by the &ldquo;Linux&rdquo; misnomer."
 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 "
+"version of the GNU system &ldquo;Linux,&rdquo; and that this confusion was "
 "obstructing our work.  Asking you to call the system &ldquo;GNU/Linux&rdquo; "
 "is our response to that problem, and to the other problems caused by the "
 "&ldquo;Linux&rdquo; misnomer."
@@ -2440,10 +2742,14 @@
 "span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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;."
 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;."
+"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 ""
 "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>”."
@@ -2556,10 +2862,18 @@
 "que ser escrito novamente."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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.  The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not "
+#| "Unix&rdquo;, is a humorous way of giving credit to Unix for this, "
+#| "following a hacker tradition of recursive acronyms that started in the "
+#| "70s."
 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.  "
-"The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not Unix&rdquo;, "
+"The name &ldquo;GNU,&rdquo; which stands for &ldquo;GNU's Not Unix,&rdquo; "
 "is a humorous way of giving credit to Unix for this, following a hacker "
 "tradition of recursive acronyms that started in the 70s."
 msgstr ""
@@ -2570,11 +2884,20 @@
 "uma tradição hacker de siglas recursivas que começaram na década de 70."
 
 #. 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=\"https://stallman.org/articles/on-hacking.html\";>playful "
+#| "cleverness</a>.)"
 msgid ""
-"The first such recursive acronym was TINT, &ldquo;TINT Is Not TECO&rdquo;.  "
+"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 "
+"like &ldquo;<em>somethingorother</em> TECO,&rdquo; he thought of a clever "
 "amusing name.  (That's what hacking means: <a href=\"https://stallman.org/";
 "articles/on-hacking.html\">playful cleverness</a>.)"
 msgstr ""
@@ -2587,13 +2910,21 @@
 "hacking.html\">inteligência brincalhona</a>.)"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 was similar to some existing program (let's imagine its name was "
+#| "&ldquo;Klever&rdquo;), you could give it a recursive acronym name, such "
+#| "as &ldquo;MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same "
+#| "spirit we called our replacement for Unix &ldquo;GNU's Not Unix&rdquo;."
 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 "
 "was similar to some existing program (let's imagine its name was &ldquo;"
 "Klever&rdquo;), you could give it a recursive acronym name, such as &ldquo;"
 "MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same spirit we "
-"called our replacement for Unix &ldquo;GNU's Not Unix&rdquo;."
+"called our replacement for Unix &ldquo;GNU's Not Unix.&rdquo;"
 msgstr ""
 "Outros hackers gostaram tanto do nome que imitamos a abordagem. Tornou-se "
 "uma tradição que, ao escrever do zero um programa que era semelhante a 
algum "
@@ -2603,13 +2934,21 @@
 "<cite>“GNU's Not Unix”</cite>."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 in a system 99% copied from Unix.  AT&amp;T actually threatened "
+#| "to sue anyone giving AT&amp;T credit in that way.  This is why each of "
+#| "the various modified versions of Unix (all proprietary, like Unix) had a "
+#| "completely different name that didn't include &ldquo;Unix&rdquo;."
 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 "
 "in a system 99% copied from Unix.  AT&amp;T actually threatened to sue "
 "anyone giving AT&amp;T credit in that way.  This is why each of the various "
 "modified versions of Unix (all proprietary, like Unix) had a completely "
-"different name that didn't include &ldquo;Unix&rdquo;."
+"different name that didn't include &ldquo;Unix.&rdquo;"
 msgstr ""
 "Historicamente, a AT&amp;T, que desenvolveu o Unix, não queria que ninguém "
 "lhe desse crédito usando o “Unix” em nome de um sistema similar, nem 
mesmo "
@@ -2683,9 +3022,16 @@
 "“GNU/Linux” é apropriado para isso."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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/"
+#| "kernelofNetBSD&rdquo; would be more accurate, since NetBSD is an entire "
+#| "system, not just the kernel.  This is not a BSD system, since most of the "
+#| "system is the same as the GNU/Linux system."
 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/"
+"call it &ldquo;Debian GNU/NetBSD,&rdquo; but &ldquo;GNU/"
 "kernelofNetBSD&rdquo; would be more accurate, since NetBSD is an entire "
 "system, not just the kernel.  This is not a BSD system, since most of the "
 "system is the same as the GNU/Linux system."
@@ -2707,8 +3053,15 @@
 "href=\"#othersys\">#othersys</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 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."
 msgid ""
-"Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of "
+"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 "
@@ -2817,8 +3170,14 @@
 "é o Linux."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 Linux, because it doesn't have the usual Linux [sic] libraries and "
+#| "utilities [meaning the GNU system].&rdquo;"
 msgid ""
-"If you call the whole GNU/Linux system &ldquo;Linux&rdquo;, you will find it "
+"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 "
 "Linux, because it doesn't have the usual Linux [sic] libraries and utilities "
 "[meaning the GNU system].&rdquo;"
@@ -2861,9 +3220,15 @@
 "significado pretendido."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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."
 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 "
+"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 ""
 "O público achará muito estranho falar do uso do Android como “usando o "
@@ -2871,23 +3236,39 @@
 "com os intestinos da pessoa ou com o sistema circulatório da pessoa."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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;."
 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;."
+"of the whole system as &ldquo;Linux.&rdquo;"
 msgstr ""
 "O público <em>vai</em> entender a ideia de “usando o Linux” quando é "
 "realmente GNU/Linux, por meio do mal-entendido usual: pensar em todo o "
 "sistema como “Linux”."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 "
+#| "contain Linux is irrelevant to using them, just as the fact that a car "
+#| "and a bicycle both have a structure of metal is irrelevant to using those "
+#| "two.  If you wish to talk about using cars and bikes, you wouldn't speak "
+#| "of &ldquo;riding metal objects&rdquo; &mdash; not unless you're playing "
+#| "games with the reader.  You would say, &ldquo;using cars and bikes."
+#| "&rdquo; Likewise, the clear way to talk about using GNU/Linux and Android "
+#| "is to say &ldquo;using GNU/Linux and Android.&rdquo;"
 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 "
 "contain Linux is irrelevant to using them, just as the fact that a car and a "
 "bicycle both have a structure of metal is irrelevant to using those two.  If "
 "you wish to talk about using cars and bikes, you wouldn't speak of &ldquo;"
-"riding metal objects&rdquo; &mdash; not unless you're playing games with the "
+"riding metal objects&rdquo;&mdash;not unless you're playing games with the "
 "reader.  You would say, &ldquo;using cars and bikes.&rdquo; Likewise, the "
 "clear way to talk about using GNU/Linux and Android is to say &ldquo;using "
 "GNU/Linux and Android.&rdquo;"
@@ -2980,11 +3361,17 @@
 "\"anchor-reference-id\">(<a href=\"#claimlinux\">#claimlinux</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 "
+#| "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."
 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 "
-"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."
+"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."
 msgstr ""
 "Seria errado, então não fazemos isso. O trabalho de Torvalds é o Linux, o "
 "kernel; temos o cuidado de não atribuir esse trabalho ao Projeto GNU ou "
@@ -3000,12 +3387,36 @@
 "\"anchor-reference-id\">(<a href=\"#linusagreed\">#linusagreed</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
-msgid ""
-"He recognized this at the beginning.  The earliest Linux release notes said, "
-"<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>."
+#, fuzzy
+#| msgid ""
+#| "He recognized this at the beginning.  The earliest Linux release notes "
+#| "said, <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>."
+msgid ""
+"He recognized this at the beginning.  The <a href=\"https://ftp.funet.fi/pub/";
+"linux/historical/kernel/old-versions/RELNOTES-0.01\"> earliest Linux release "
+"notes</a> said:"
+msgstr ""
+"Ele reconheceu isso no início. As primeiras notas de lançamento do Linux "
+"disseram: <a href=\"https://ftp.funet.fi/pub/linux/historical/kernel/old-";
+"versions/RELNOTES-0.01\"> “A maioria das ferramentas usadas com linux é "
+"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><dl><dd><blockquote><p>
+#, fuzzy
+#| msgid ""
+#| "He recognized this at the beginning.  The earliest Linux release notes "
+#| "said, <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>."
+msgid ""
+"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."
 msgstr ""
 "Ele reconheceu isso no início. As primeiras notas de lançamento do Linux "
 "disseram: <a href=\"https://ftp.funet.fi/pub/linux/historical/kernel/old-";
@@ -3056,11 +3467,19 @@
 "reference-id\">(<a href=\"#lost\">#lost</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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;: 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."
 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;: "
 "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 "
+"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."
 msgstr ""
@@ -3081,13 +3500,23 @@
 "href=\"#whatgood\">#whatgood</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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;GNU/Linux&rdquo;, you will help others learn the system's true "
+#| "history, origin, and reason for being.  You can't correct the misnomer "
+#| "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."
 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;"
-"GNU/Linux&rdquo;, you will help others learn the system's true history, "
+"GNU/Linux,&rdquo; you will help others learn the system's true history, "
 "origin, and reason for being.  You can't correct the misnomer 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 "
+"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."
 msgstr ""
@@ -3111,22 +3540,37 @@
 "\">(<a href=\"#explain\">#explain</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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."
 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."
+"the system &ldquo;GNU/Linux,&rdquo; and uses your time inefficiently."
 msgstr ""
 "Se você nos ajudar, explicando aos outros dessa maneira, agradecemos seu "
 "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><dl><dd><p>
+#, fuzzy
+#| 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, and they may learn a correct picture of the system's origin.  "
+#| "But they are unlikely to repeat the explanation to others whenever they "
+#| "talk about the system.  They will probably just call it &ldquo;"
+#| "Linux&rdquo;.  Without particularly intending to, they will help spread "
+#| "the incorrect picture."
 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, "
 "and they may learn a correct picture of the system's origin.  But they are "
 "unlikely to repeat the explanation to others whenever they talk about the "
-"system.  They will probably just call it &ldquo;Linux&rdquo;.  Without "
+"system.  They will probably just call it &ldquo;Linux.&rdquo; Without "
 "particularly intending to, they will help spread the incorrect picture."
 msgstr ""
 "É ineficaz porque pode não ser assimilado, e certamente não se propagará. 
"
@@ -3262,9 +3706,13 @@
 "class=\"anchor-reference-id\">(<a href=\"#force\">#force</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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."
 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."
+"&ldquo;GNU/Linux,&rdquo; and we ask you to do it too."
 msgstr ""
 "Seria errado forçá-los, e não tentamos. Chamamos o sistema de 
“GNU/Linux” e "
 "pedimos que você faça isso também."
@@ -3348,9 +3796,15 @@
 "BSD” sem especificar qual delas."
 
 #. type: Content of: <div><dl><dt>
+#, fuzzy
+#| 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 "
+#| "complaining now? <span class=\"anchor-reference-id\">(<a href=\"#deserve"
+#| "\">#deserve</a>)</span>"
 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 "
+"the system &ldquo;GNU,&rdquo; you deserve what happened; why are you "
 "complaining now? <span class=\"anchor-reference-id\">(<a href=\"#deserve"
 "\">#deserve</a>)</span>"
 msgstr ""
@@ -3406,8 +3860,13 @@
 "legítimo e aceitável."
 
 #. type: Content of: <div><dl><dt>
+#, fuzzy
+#| 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>"
 msgid ""
-"Since many people call it &ldquo;Linux&rdquo;, doesn't that make it right? "
+"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 ""
@@ -3430,9 +3889,15 @@
 "\">#knownname</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 add &ldquo;(often erroneously referred to as &lsquo;"
+#| "Linux&rsquo;)&rdquo; once in a while, they will all understand."
 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 "
+"&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."
 msgstr ""

Index: po/gnu-linux-faq.ru.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.ru.po,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -b -r1.128 -r1.129
--- po/gnu-linux-faq.ru.po      2 Sep 2021 17:36:33 -0000       1.128
+++ po/gnu-linux-faq.ru.po      2 Nov 2021 14:41:51 -0000       1.129
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-linux-faq.html\n"
-"POT-Creation-Date: 2021-08-31 10:27+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2021-09-02 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-11-02 14:27+0000\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
@@ -35,10 +36,19 @@
 msgstr "Ричард Столмен"
 
 # type: Content of: <p>
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+# | When people see that we use and recommend the name GNU/Linux for a system
+# | that many others call just [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} they ask many questions.  Here are common
+# | questions, and our answers.
+#, fuzzy
+#| 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."
 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.  "
+"that many others call just &ldquo;Linux,&rdquo; they ask many questions.  "
 "Here are common questions, and our answers."
 msgstr ""
 "Когда люди видят, что мы используем и 
рекомендуем название &ldquo;GNU/"
@@ -257,11 +267,22 @@
 "GNU&rdquo;?</a>"
 
 #. type: Content of: <div><div><ul><li>
+# | <a href=\"#trademarkfee\">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;.-] {+&ldquo;GNU/Linux.&rdquo;+} Is it
+# | wrong if I use &ldquo;GNU&rdquo; without [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} to save the fee?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#trademarkfee\">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 wrong if I use &ldquo;GNU&rdquo; without "
+#| "&ldquo;Linux&rdquo;, to save the fee?</a>"
 msgid ""
 "<a href=\"#trademarkfee\">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 wrong if I use &ldquo;GNU&rdquo; without "
-"&ldquo;Linux&rdquo;, to save the fee?</a>"
+"&ldquo;GNU/Linux.&rdquo; Is it wrong if I use &ldquo;GNU&rdquo; without "
+"&ldquo;Linux,&rdquo; to save the fee?</a>"
 msgstr ""
 "<a href=\"#trademarkfee\">Если бы я использовал 
&ldquo;Linux&rdquo; в "
 "названии продукта, мне пришлось бы за это 
платить; это относится и к "
@@ -349,10 +370,19 @@
 "GNU&rdquo;?</a>"
 
 #. type: Content of: <div><div><ul><li>
-msgid ""
-"<a href=\"#distronames0\">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 whatever they like?</a>"
+# | <a href=\"#distronames0\">My distro's developers call it &ldquo;Foobar
+# | [-Linux&rdquo;,-] {+Linux,&rdquo;+} but that doesn't say anything about
+# | what the system consists of.  Why shouldn't they call it whatever they
+# | like?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#distronames0\">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 whatever they like?</a>"
+msgid ""
+"<a href=\"#distronames0\">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 whatever they like?</a>"
 msgstr ""
 "<a href=\"#distronames0\">Разработчики моего 
дистрибутива называют его "
 "&ldquo;Foobar Linux&rdquo;, но это ничего не говорит о 
том, из чего состоит "
@@ -610,9 +640,18 @@
 "систему &ldquo;GNU&rdquo;?</a>"
 
 #. type: Content of: <div><div><ul><li>
+# | <a href=\"#deserve\">Since you failed to put something in the GNU GPL to
+# | require people to call the system [-&ldquo;GNU&rdquo;,-]
+# | {+&ldquo;GNU,&rdquo;+} you deserve what happened; why are you complaining
+# | now?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#deserve\">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 complaining now?</a>"
 msgid ""
 "<a href=\"#deserve\">Since you failed to put something in the GNU GPL to "
-"require people to call the system &ldquo;GNU&rdquo;, you deserve what "
+"require people to call the system &ldquo;GNU,&rdquo; you deserve what "
 "happened; why are you complaining now?</a>"
 msgstr ""
 "<a href=\"#deserve\">Поскольку вы не внесли в GNU GPL 
требования называть "
@@ -628,8 +667,15 @@
 "в чем убеждено так много людей?</a>"
 
 #. type: Content of: <div><div><ul><li>
+# | <a href=\"#somanyright\">Since many people call it
+# | [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} doesn't that make it
+# | right?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#somanyright\">Since many people call it &ldquo;Linux&rdquo;, "
+#| "doesn't that make it right?</a>"
 msgid ""
-"<a href=\"#somanyright\">Since many people call it &ldquo;Linux&rdquo;, "
+"<a href=\"#somanyright\">Since many people call it &ldquo;Linux,&rdquo; "
 "doesn't that make it right?</a>"
 msgstr ""
 "<a href=\"#somanyright\">Разве то, что многие 
называют ее &ldquo;"
@@ -816,6 +862,24 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
+# | 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 it must be right.  The name &ldquo;Linux&rdquo; also spreads a
+# | false picture of the system's origin, because people tend to suppose that
+# | the system's history was such as to fit that name.  For instance, they
+# | often believe its development was started by Linus Torvalds in 1991.  This
+# | false picture tends to reinforce the idea that the system should be called
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+}
+#, fuzzy
+#| 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 it must be right.  The name &ldquo;Linux&rdquo; also spreads a "
+#| "false picture of the system's origin, because people tend to suppose that "
+#| "the system's history was such as to fit that name.  For instance, they "
+#| "often believe its development was started by Linus Torvalds in 1991.  "
+#| "This false picture tends to reinforce the idea that the system should be "
+#| "called &ldquo;Linux&rdquo;."
 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 +887,7 @@
 "of the system's origin, because people tend to suppose that the system's "
 "history was such as to fit that name.  For instance, they often believe its "
 "development was started by Linus Torvalds in 1991.  This false picture tends "
-"to reinforce the idea that the system should be called &ldquo;Linux&rdquo;."
+"to reinforce the idea that the system should be called &ldquo;Linux.&rdquo;"
 msgstr ""
 "Большинство людей, которые называют эту 
систему &ldquo;Linux&rdquo;, никогда "
 "не слышало о том, что это не верно. Они 
видели, что другие употребляют это "
@@ -855,10 +919,19 @@
 
 # type: Content of: <dl><dd>
 #. type: Content of: <div><dl><dd>
+# | 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;,-] {+&ldquo;Linux,&rdquo;+} the name its developer
+# | chose.
+#, fuzzy
+#| 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."
 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."
+"you're referring specifically to the kernel, you should call it &ldquo;Linux,"
+"&rdquo; the name its developer chose."
 msgstr ""
 "Не всегда&nbsp;&mdash; только тогда, когда вы 
говорите о системе в целом. "
 "Когда вы имеете в виду именно ядро, вам 
следует называть его &ldquo;"
@@ -866,12 +939,27 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
+# | When people call the whole system [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} as a consequence they call the whole system by
+# | the same name as the kernel.  This causes many kinds of confusion, because
+# | only experts can tell whether a statement is about the kernel or the whole
+# | system.  By calling the whole system [-&ldquo;GNU/Linux&rdquo;,-]
+# | {+&ldquo;GNU/Linux,&rdquo;+} and calling the kernel
+# | [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} you avoid the ambiguity.
+#, fuzzy
+#| 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 kinds of confusion, because only experts can tell whether a "
+#| "statement is about the kernel or the whole system.  By calling the whole "
+#| "system &ldquo;GNU/Linux&rdquo;, and calling the kernel &ldquo;"
+#| "Linux&rdquo;, you avoid the ambiguity."
 msgid ""
-"When people call the whole system &ldquo;Linux&rdquo;, as a consequence they "
+"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 "
 "kinds of confusion, because only experts can tell whether a statement is "
 "about the kernel or the whole system.  By calling the whole system &ldquo;"
-"GNU/Linux&rdquo;, and calling the kernel &ldquo;Linux&rdquo;, you avoid the "
+"GNU/Linux,&rdquo; and calling the kernel &ldquo;Linux,&rdquo; you avoid the "
 "ambiguity."
 msgstr ""
 "Когда люди называют всю систему 
&ldquo;Linux&rdquo;, они&nbsp;&mdash; как "
@@ -951,8 +1039,17 @@
 
 # type: Content of: <dl><dd>
 #. type: Content of: <div><dl><dd>
+# | When we ask people to say [-&ldquo;GNU/Linux&rdquo;,-]
+# | {+&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.
+#, fuzzy
+#| 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."
 msgid ""
-"When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing "
+"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 ""
@@ -1014,10 +1111,34 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | freedom are more likely to call the system [-&ldquo;GNU/Linux&rdquo;,-]
+# | {+&ldquo;GNU/Linux,&rdquo;+} and people who learn that the system is
+# | &ldquo;GNU/Linux&rdquo; are more likely to pay attention to our
+# | philosophical arguments for freedom and community (which is why the choice
+# | of name for the system makes a real difference for society).  However, the
+# | disagreement would probably exist even if everyone knew the system's real
+# | origin and its proper name, because the issue is a real one.  It can only
+# | go away if we who value freedom either persuade everyone (which won't be
+# | easy) or are defeated entirely (let's hope not).
+#, fuzzy
+#| 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 freedom are more likely to call the system &ldquo;GNU/"
+#| "Linux&rdquo;, and people who learn that the system is &ldquo;GNU/"
+#| "Linux&rdquo; are more likely to pay attention to our philosophical "
+#| "arguments for freedom and community (which is why the choice of name for "
+#| "the system makes a real difference for society).  However, the "
+#| "disagreement would probably exist even if everyone knew the system's real "
+#| "origin and its proper name, because the issue is a real one.  It can only "
+#| "go away if we who value freedom either persuade everyone (which won't be "
+#| "easy) or are defeated entirely (let's hope not)."
 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 "
-"freedom are more likely to call the system &ldquo;GNU/Linux&rdquo;, and "
+"freedom are more likely to call the system &ldquo;GNU/Linux,&rdquo; and "
 "people who learn that the system is &ldquo;GNU/Linux&rdquo; are more likely "
 "to pay attention to our philosophical arguments for freedom and community "
 "(which is why the choice of name for the system makes a real difference for "
@@ -1078,10 +1199,23 @@
 
 # type: Content of: <dl><dd>
 #. type: Content of: <div><dl><dd>
+# | 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
+# | system do not mention the name [-&ldquo;GNU&rdquo;,-]
+# | {+&ldquo;GNU,&rdquo;+} or the ideals that GNU stands for.  <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never
+# | Heard of GNU</a> explains further.
+#, fuzzy
+#| 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 system do not mention the name &ldquo;GNU&rdquo;, or the ideals that "
+#| "GNU stands for.  <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU "
+#| "Users Who Have Never Heard of GNU</a> explains further."
 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 "
-"system do not mention the name &ldquo;GNU&rdquo;, or the ideals that GNU "
+"system do not mention the name &ldquo;GNU,&rdquo; or the ideals that GNU "
 "stands for.  <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users "
 "Who Have Never Heard of GNU</a> explains further."
 msgstr ""
@@ -1094,11 +1228,22 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
+# | 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 GNU is.  For instance, many think it is a collection of [-<a
+# | href=\"#tools\">&ldquo;tools&rdquo;</a>,-] {+&ldquo;<a
+# | href=\"#tools\">tools</a>,&rdquo;+} or a project to develop tools.
+#, fuzzy
+#| 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 GNU is.  For instance, many think it is a collection of <a "
+#| "href=\"#tools\">&ldquo;tools&rdquo;</a>, or a project to develop tools."
 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 "
-"GNU is.  For instance, many think it is a collection of <a href=\"#tools"
-"\">&ldquo;tools&rdquo;</a>, or a project to develop tools."
+"GNU is.  For instance, many think it is a collection of &ldquo;<a href="
+"\"#tools\">tools</a>,&rdquo; or a project to develop tools."
 msgstr ""
 "Люди, которые так говорят, вероятно, тех
нари, которые имеют в виду других "
 "знакомых технарей. Технари часто знают о 
GNU, однако многие из них имеют "
@@ -1134,11 +1279,23 @@
 
 # type: Content of: <dl><dd>
 #. type: Content of: <div><dl><dd><p>
+# | 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;,-] {+&ldquo;Linux,&rdquo;+} that it was started by
+# | Linus Torvalds, and that it was intended to be &ldquo;open
+# | [-source&rdquo;.-] {+source.&rdquo;+} If you don't tell them, who will?
+#, fuzzy
+#| 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;"
+#| "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?"
 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;"
-"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?"
+"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?"
 msgstr ""
 "Если ваши слова не отражают вашего знания, 
то вы не передаете его другим. "
 "Большинство людей, которые слышали о 
системе GNU/Linux, думают, что это "
@@ -1205,14 +1362,31 @@
 
 # type: Content of: <dl><dd>
 #. type: Content of: <div><dl><dd>
+# | 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
+# | that GNU is the name of a collection of programs&mdash;often they say
+# | &ldquo;programming [-tools&rdquo;,-] {+tools,&rdquo;+} since some of our
+# | programming tools became popular on their own.  The idea that
+# | &ldquo;GNU&rdquo; is the name of an operating system is hard to fit into a
+# | conceptual framework in which that operating system is labeled
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+}
+#, fuzzy
+#| 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 "
+#| "that GNU is the name of a collection of programs&mdash;often they say "
+#| "&ldquo;programming tools&rdquo;, since some of our programming tools "
+#| "became popular on their own.  The idea that &ldquo;GNU&rdquo; is the name "
+#| "of an operating system is hard to fit into a conceptual framework in "
+#| "which that operating system is labeled &ldquo;Linux&rdquo;."
 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 "
 "that GNU is the name of a collection of programs&mdash;often they say &ldquo;"
-"programming tools&rdquo;, since some of our programming tools became popular "
+"programming tools,&rdquo; since some of our programming tools became popular "
 "on their own.  The idea that &ldquo;GNU&rdquo; is the name of an operating "
 "system is hard to fit into a conceptual framework in which that operating "
-"system is labeled &ldquo;Linux&rdquo;."
+"system is labeled &ldquo;Linux.&rdquo;"
 msgstr ""
 "Люди, которые полагают, что Linux&nbsp;&mdash; это 
вся операционная система, "
 "если когда-нибудь и слышат о GNU, то нередко 
получают неверное представление "
@@ -1286,12 +1460,32 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
+# | To confuse matters, some people use the term &ldquo;operating
+# | system&rdquo; to mean [-&ldquo;kernel&rdquo;.-] {+&ldquo;kernel.&rdquo;+}
+# | Both uses of the term go back many years.  The use of &ldquo;operating
+# | system&rdquo; to mean &ldquo;kernel&rdquo; is found in a number of
+# | textbooks on system design, going back to the 80s.  At the same time, in
+# | the 80s, the &ldquo;Unix operating system&rdquo; was understood to include
+# | all the system programs, and Berkeley's version of Unix included even
+# | games. Since we intended GNU to be a Unix-like operating system, we use
+# | the term &ldquo;operating system&rdquo; in the same way.
+#, fuzzy
+#| 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.  The use of &ldquo;operating system&rdquo; to mean "
+#| "&ldquo;kernel&rdquo; is found in a number of textbooks on system design, "
+#| "going back to the 80s.  At the same time, in the 80s, the &ldquo;Unix "
+#| "operating system&rdquo; was understood to include all the system "
+#| "programs, and Berkeley's version of Unix included even games. Since we "
+#| "intended GNU to be a Unix-like operating system, we use the term &ldquo;"
+#| "operating system&rdquo; in the same way."
 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.  "
-"The use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is "
-"found in a number of textbooks on system design, going back to the 80s.  At "
-"the same time, in the 80s, the &ldquo;Unix operating system&rdquo; was "
+"to mean &ldquo;kernel.&rdquo; Both uses of the term go back many years.  The "
+"use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is found "
+"in a number of textbooks on system design, going back to the 80s.  At the "
+"same time, in the 80s, the &ldquo;Unix operating system&rdquo; was "
 "understood to include all the system programs, and Berkeley's version of "
 "Unix included even games. Since we intended GNU to be a Unix-like operating "
 "system, we use the term &ldquo;operating system&rdquo; in the same way."
@@ -1309,11 +1503,28 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
+# | Most of the time when people speak of the &ldquo;Linux operating
+# | system&rdquo; they are using &ldquo;operating system&rdquo; in the same
+# | sense we use: they mean the whole collection of programs.  If that's what
+# | you are referring to, please call it [-&ldquo;GNU/Linux&rdquo;.-]
+# | {+&ldquo;GNU/Linux.&rdquo;+} If you mean just the kernel, then
+# | &ldquo;Linux&rdquo; is the right name for it, but please say
+# | &ldquo;kernel&rdquo; also to avoid ambiguity about which body of software
+# | you mean.
+#, fuzzy
+#| 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 "
+#| "sense we use: they mean the whole collection of programs.  If that's what "
+#| "you are referring to, please call it &ldquo;GNU/Linux&rdquo;.  If you "
+#| "mean just the kernel, then &ldquo;Linux&rdquo; is the right name for it, "
+#| "but please say &ldquo;kernel&rdquo; also to avoid ambiguity about which "
+#| "body of software you mean."
 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 "
 "sense we use: they mean the whole collection of programs.  If that's what "
-"you are referring to, please call it &ldquo;GNU/Linux&rdquo;.  If you mean "
+"you are referring to, please call it &ldquo;GNU/Linux.&rdquo; If you mean "
 "just the kernel, then &ldquo;Linux&rdquo; is the right name for it, but "
 "please say &ldquo;kernel&rdquo; also to avoid ambiguity about which body of "
 "software you mean."
@@ -1328,10 +1539,20 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
+# | If you prefer to use some other term such as &ldquo;system
+# | distribution&rdquo; for the entire collection of programs, instead of
+# | &ldquo;operating [-system&rdquo;,-] {+system,&rdquo;+} that's fine.  Then
+# | you would talk about GNU/Linux system distributions.
+#, fuzzy
+#| msgid ""
+#| "If you prefer to use some other term such as &ldquo;system "
+#| "distribution&rdquo; for the entire collection of programs, instead of "
+#| "&ldquo;operating system&rdquo;, that's fine.  Then you would talk about "
+#| "GNU/Linux system distributions."
 msgid ""
 "If you prefer to use some other term such as &ldquo;system "
 "distribution&rdquo; for the entire collection of programs, instead of &ldquo;"
-"operating system&rdquo;, that's fine.  Then you would talk about GNU/Linux "
+"operating system,&rdquo; that's fine.  Then you would talk about GNU/Linux "
 "system distributions."
 msgstr ""
 "Если вы предпочитаете употреблять другой 
термин, как, например, &ldquo;"
@@ -1435,12 +1656,26 @@
 "href=\"#nokernel\">#nokernel</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | The people who argue that way for calling the system &ldquo;Linux&rdquo;
+# | are using a double standard.  An operating system requires compilers,
+# | editors, window systems, libraries, and much [-more &mdash; hundreds-]
+# | {+more&mdash;hundreds+} of programs, even to match what BSD systems
+# | included in 1983.  Since Torvalds didn't develop any of those, how can the
+# | system be &ldquo;Linux&rdquo;?
+#, fuzzy
+#| 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, window systems, libraries, and much more &mdash; hundreds of "
+#| "programs, even to match what BSD systems included in 1983.  Since "
+#| "Torvalds didn't develop any of those, how can the system be &ldquo;"
+#| "Linux&rdquo;?"
 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, "
-"window systems, libraries, and much more &mdash; hundreds of programs, even "
-"to match what BSD systems included in 1983.  Since Torvalds didn't develop "
-"any of those, how can the system be &ldquo;Linux&rdquo;?"
+"window systems, libraries, and much more&mdash;hundreds of programs, even to "
+"match what BSD systems included in 1983.  Since Torvalds didn't develop any "
+"of those, how can the system be &ldquo;Linux&rdquo;?"
 msgstr ""
 "Те, кто таким образом обосновывает 
название системы &ldquo;Linux&rdquo;, "
 "применяют двойные стандарты. Для 
операционной системы требуются 
компиляторы, "
@@ -1479,9 +1714,18 @@
 "reference-id\">(<a href=\"#notinstallable\">#notinstallable</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+# | Many <a href=\"/distros/distros.html\"> packaged and installable versions
+# | of GNU</a> are available.  None of them is called simply
+# | [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} but GNU is what they
+# | basically are.
+#, fuzzy
+#| 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."
 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</a> are available.  None of them is called simply &ldquo;GNU,&rdquo; but "
 "GNU is what they basically are."
 msgstr ""
 "Сейчас доступно много <a href=\"/distros/distros.html\"> 
версий GNU, "
@@ -1533,9 +1777,17 @@
 "GuixSD. Это подразумевает переупаковку 
существенной части системы GNU."
 
 #. type: Content of: <div><dl><dd><p>
+# | We never took the last step of packaging GNU under the name
+# | [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} but that doesn't alter what
+# | kind of thing GNU is.  GNU is an operating system.
+#, fuzzy
+#| 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."
 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 "
+"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 ""
 "Мы так и не сделали последнего шага 
выпуска дистрибутива GNU под названием "
@@ -1555,13 +1807,28 @@
 
 # type: Content of: <dl><dd>
 #. type: Content of: <div><dl><dd>
+# | That practice seems to be very rare&mdash;we can't find any examples other
+# | than the misuse of the name [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+} Normally an operating system is developed as a
+# | single unified project, and the developers choose a name for the system as
+# | a whole.  The kernel usually does not have a name of its
+# | own&mdash;instead, people say &ldquo;the kernel of such-and-such&rdquo; or
+# | &ldquo;the such-and-such [-kernel&rdquo;.-] {+kernel.&rdquo;+}
+#, fuzzy
+#| 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 system is developed as a single unified project, and the "
+#| "developers choose a name for the system as a whole.  The kernel usually "
+#| "does not have a name of its own&mdash;instead, people say &ldquo;the "
+#| "kernel of such-and-such&rdquo; or &ldquo;the such-and-such kernel&rdquo;."
 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 "
+"than the misuse of the name &ldquo;Linux.&rdquo; Normally an operating "
 "system is developed as a single unified project, and the developers choose a "
 "name for the system as a whole.  The kernel usually does not have a name of "
 "its own&mdash;instead, people say &ldquo;the kernel of such-and-such&rdquo; "
-"or &ldquo;the such-and-such kernel&rdquo;."
+"or &ldquo;the such-and-such kernel.&rdquo;"
 msgstr ""
 "Такая практика очень редка&nbsp;&mdash; мы не 
находим ни одного ее примера, "
 "кроме неправильного употребления 
названия &ldquo;Linux&rdquo;. Обычно "
@@ -1622,9 +1889,18 @@
 
 # type: Content of: <dl><dd>
 #. type: Content of: <div><dl><dd>
+# | For a while we tried the name [-&ldquo;LiGNUx&rdquo;,-]
+# | {+&ldquo;LiGNUx,&rdquo;+} which combines the words &ldquo;GNU&rdquo; and
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} The reaction was very
+# | bad.  People accept &ldquo;GNU/Linux&rdquo; much better.
+#, fuzzy
+#| 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."
 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.  "
+"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 ""
 "Некоторое время мы пытались использовать 
название &ldquo;LiGNUx&rdquo;, "
@@ -1634,8 +1910,16 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
+# | The shortest legitimate name for this system is [-&ldquo;GNU&rdquo;,-]
+# | {+&ldquo;GNU,&rdquo;+} but we call it &ldquo;GNU/Linux&rdquo; <a
+# | href=\"#justgnu\"> for the reasons given below</a>.
+#, fuzzy
+#| 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>."
 msgid ""
-"The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but we "
+"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 ""
@@ -1687,8 +1971,16 @@
 "\"anchor-reference-id\">(<a href=\"#long2\">#long2</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | It only takes a second to say or type [-&ldquo;GNU/&rdquo;.-]
+# | {+&ldquo;GNU/.&rdquo;+} If you appreciate the system that we developed,
+# | can't you take one second to recognize our work?
+#, fuzzy
+#| 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?"
 msgid ""
-"It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you appreciate "
+"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 ""
@@ -1803,10 +2095,21 @@
 
 # type: Content of: <dl><dd><ul><li>
 #. type: Content of: <div><dl><dd><ul><li>
+# | Since many people know of the system as [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} if we say &ldquo;GNU&rdquo; they may simply not
+# | recognize we're talking about the same system.  If we say
+# | [-&ldquo;GNU/Linux&rdquo;,-] {+&ldquo;GNU/Linux,&rdquo;+} they can make a
+# | connection to what they have heard about.
+#, fuzzy
+#| 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 system.  If we say &ldquo;GNU/Linux&rdquo;, they can make a "
+#| "connection to what they have heard about."
 msgid ""
-"Since many people know of the system as &ldquo;Linux&rdquo;, if we say "
+"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 "
-"system.  If we say &ldquo;GNU/Linux&rdquo;, they can make a connection to "
+"system.  If we say &ldquo;GNU/Linux,&rdquo; they can make a connection to "
 "what they have heard about."
 msgstr ""
 "Поскольку многие люди знают эту систему 
как &ldquo;Linux&rdquo;, если мы "
@@ -1816,10 +2119,23 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <div><dl><dt>
+# | 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;.-]
+# | {+&ldquo;GNU/Linux.&rdquo;+} Is it wrong if I use &ldquo;GNU&rdquo;
+# | without [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} to save the fee?
+# | <span class=\"anchor-reference-id\">(<a
+# | href=\"#trademarkfee\">#trademarkfee</a>)</span>
+#, fuzzy
+#| 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 wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to save "
+#| "the fee? <span class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
+#| "\">#trademarkfee</a>)</span>"
 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 "
-"wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to save the "
+"product, and that would also apply if I say &ldquo;GNU/Linux.&rdquo; Is it "
+"wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux,&rdquo; to save the "
 "fee? <span class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
 "\">#trademarkfee</a>)</span>"
 msgstr ""
@@ -1842,9 +2158,17 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
+# | So if you want to refer to the system simply as [-&ldquo;GNU&rdquo;,-]
+# | {+&ldquo;GNU,&rdquo;+} to avoid paying the fee for calling it
+# | [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} we won't criticize you.
+#, fuzzy
+#| 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."
 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."
+"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 ""
 "Поэтому если вы захотите назвать систему 
просто &ldquo;GNU&rdquo;, чтобы не "
 "платить за то, что называете ее &ldquo;Linux&rdquo;, 
мы вас не осудим."
@@ -1911,12 +2235,25 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
+# | Different threshold levels would lead to different choices of name for the
+# | system.  But one name that cannot result from concerns of fairness and
+# | giving credit, not for any possible threshold level, is
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} It can't be fair to give
+# | all the credit to one secondary contribution (Linux) while omitting the
+# | principal contribution (GNU).
+#, fuzzy
+#| 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 giving credit, not for any possible threshold level, is &ldquo;"
+#| "Linux&rdquo;.  It can't be fair to give all the credit to one secondary "
+#| "contribution (Linux) while omitting the principal contribution (GNU)."
 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 "
-"giving credit, not for any possible threshold level, is &ldquo;"
-"Linux&rdquo;.  It can't be fair to give all the credit to one secondary "
-"contribution (Linux) while omitting the principal contribution (GNU)."
+"giving credit, not for any possible threshold level, is &ldquo;Linux.&rdquo; "
+"It can't be fair to give all the credit to one secondary contribution "
+"(Linux) while omitting the principal contribution (GNU)."
 msgstr ""
 "Разные места для проведения черты 
приводят к разным вариантам названия "
 "системы. Но одно название не может 
возникнуть из соображений справедливости "
@@ -1937,11 +2274,23 @@
 "\"#others\">#others</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | 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;,-]
+# | {+&ldquo;GNU/systemd/Linux,&rdquo;+} there is nothing wrong with doing so.
+#, fuzzy
+#| 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).  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."
 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).  "
 "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."
+"system &ldquo;GNU/systemd/Linux,&rdquo; there is nothing wrong with doing so."
 msgstr ""
 "Systemd&nbsp;&mdash; довольно важный компонент, но 
он не настолько важен, "
 "как ядро (Linux), и не настолько важен, как 
основа системы в целом (GNU). "
@@ -1997,11 +2346,21 @@
 
 # type: Content of: <dl><dd>
 #. type: Content of: <div><dl><dd>
+# | 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 the same argument would apply even more strongly to calling it
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+}
+#, fuzzy
+#| 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 the same argument would apply even more strongly to calling it &ldquo;"
+#| "Linux&rdquo;."
 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 "
-"the same argument would apply even more strongly to calling it &ldquo;"
-"Linux&rdquo;."
+"the same argument would apply even more strongly to calling it &ldquo;Linux."
+"&rdquo;"
 msgstr ""
 "В 2008 году мы обнаружили, что пакеты GNU 
составляли 15% раздела &ldquo;"
 "main&rdquo; дистрибутива GNU/Linux gNewSense. На долю Linux 
пришлось 1,5%. "
@@ -2072,9 +2431,21 @@
 
 # type: Content of: <dl><dd>
 #. type: Content of: <div><dl><dd>
+# | Following the rules of English, in the construction &ldquo;GNU
+# | Linux&rdquo; the word &ldquo;GNU&rdquo; modifies [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+} This can mean either &ldquo;GNU's version of
+# | Linux&rdquo; or &ldquo;Linux, which is a GNU package.&rdquo; Neither of
+# | those meanings fits the situation at hand.
+#, fuzzy
+#| 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 either &ldquo;GNU's version of Linux&rdquo; or &ldquo;"
+#| "Linux, which is a GNU package.&rdquo; Neither of those meanings fits the "
+#| "situation at hand."
 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 "
+"the word &ldquo;GNU&rdquo; modifies &ldquo;Linux.&rdquo; This can mean "
 "either &ldquo;GNU's version of Linux&rdquo; or &ldquo;Linux, which is a GNU "
 "package.&rdquo; Neither of those meanings fits the situation at hand."
 msgstr ""
@@ -2098,11 +2469,27 @@
 
 # type: Content of: <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=\"https://directory.fsf.org/wiki/Linux-libre\";>separate version of
+# | Linux</a>, since the &ldquo;standard&rdquo; version contains nonfree
+# | firmware [-&ldquo;blobs&rdquo;.-] {+&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=\"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."
 msgid ""
 "We're not talking about a distinct GNU version of Linux, the kernel.  The "
 "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 "
+"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."
@@ -2117,11 +2504,24 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
+# | 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 &ldquo;combination.&rdquo; (Think of
+# | [-&ldquo;Input/Output&rdquo;.)-] {+&ldquo;Input/Output.&rdquo;)+}  This
+# | system is the combination of GNU and Linux; hence,
+# | [-&ldquo;GNU/Linux&rdquo;.-] {+&ldquo;GNU/Linux.&rdquo;+}
+#, fuzzy
+#| 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 &ldquo;combination.&rdquo; (Think of &ldquo;Input/Output&rdquo;.)  "
+#| "This system is the combination of GNU and Linux; hence, &ldquo;GNU/"
+#| "Linux&rdquo;."
 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 "
-"&ldquo;combination.&rdquo; (Think of &ldquo;Input/Output&rdquo;.)  This "
-"system is the combination of GNU and Linux; hence, &ldquo;GNU/Linux&rdquo;."
+"&ldquo;combination.&rdquo; (Think of &ldquo;Input/Output.&rdquo;)  This "
+"system is the combination of GNU and Linux; hence, &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "Мы говорим о версии операционной системы 
GNU, которая отличается наличием "
 "Linux в качестве ядра. Знак &ldquo;дробь&rdquo; подх
одит к данной ситуации, "
@@ -2131,11 +2531,22 @@
 
 # type: Content of: <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: "
-"&ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes say &ldquo;GNU con "
-"Linux&rdquo;."
+# | There are other ways to express [-&ldquo;combination&rdquo;.-]
+# | {+&ldquo;combination.&rdquo;+} If you think that a plus-sign is clearer,
+# | please use that.  In French, a hyphen is clear:
+# | [-&ldquo;GNU-Linux&rdquo;.-] {+&ldquo;GNU-Linux.&rdquo;+} In Spanish, we
+# | sometimes say &ldquo;GNU con [-Linux&rdquo;.-] {+Linux.&rdquo;+}
+#, fuzzy
+#| 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: &ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes say &ldquo;GNU "
+#| "con Linux&rdquo;."
+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: "
+"&ldquo;GNU-Linux.&rdquo; In Spanish, we sometimes say &ldquo;GNU con Linux."
+"&rdquo;"
 msgstr ""
 "Есть и другие способы выразить 
&ldquo;комбинацию&rdquo;. Если вы считаете, "
 "что знак &ldquo;плюс&rdquo; понятнее, 
пожалуйста, употребляйте его. Во "
@@ -2176,9 +2587,19 @@
 
 # type: Content of: <dl><dd>
 #. type: Content of: <div><dl><dd><p>
+# | Following the rules of English, in the construction &ldquo;GNU
+# | Emacs&rdquo; the word &ldquo;GNU&rdquo; modifies [-&ldquo;Emacs&rdquo;.-]
+# | {+&ldquo;Emacs.&rdquo;+} That is the right way to describe a program
+# | called Emacs which is a GNU package.
+#, fuzzy
+#| 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."
 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 "
+"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 ""
 "Согласно правилам английского языка, в 
конструкции &ldquo;GNU Emacs&rdquo; "
@@ -2225,8 +2646,17 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
+# | However, if you prefer to call the system [-&ldquo;Linux/GNU&rdquo;,-]
+# | {+&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.
+#, fuzzy
+#| 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."
 msgid ""
-"However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a "
+"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 ""
@@ -2236,8 +2666,19 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <div><dl><dt>
+# | My distro's developers call it &ldquo;Foobar [-Linux&rdquo;,-]
+# | {+Linux,&rdquo;+} but that doesn't say anything about what the system
+# | consists of.  Why shouldn't they call it whatever they like? <span
+# | class=\"anchor-reference-id\">(<a
+# | href=\"#distronames0\">#distronames0</a>)</span>
+#, fuzzy
+#| 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 whatever they like? <span class=\"anchor-reference-id\">(<a "
+#| "href=\"#distronames0\">#distronames0</a>)</span>"
 msgid ""
-"My distro's developers call it &ldquo;Foobar Linux&rdquo;, but that doesn't "
+"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 "
 "whatever they like? <span class=\"anchor-reference-id\">(<a href="
 "\"#distronames0\">#distronames0</a>)</span>"
@@ -2307,11 +2748,22 @@
 "\"#distronames1\">#distronames1</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | When they spread misinformation by changing &ldquo;GNU&rdquo; to
+# | [-&ldquo;Linux&rdquo;,-] {+&ldquo;Linux,&rdquo;+} and call their version
+# | of it &ldquo;Foobar [-Linux&rdquo;,-] {+Linux,&rdquo;+} it's proper for
+# | you to correct the misinformation by calling it &ldquo;Foobar
+# | [-GNU/Linux&rdquo;.-] {+GNU/Linux.&rdquo;+}
+#, fuzzy
+#| 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 proper for you to correct the misinformation by calling it &ldquo;"
+#| "Foobar GNU/Linux&rdquo;."
 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 "
+"Linux,&rdquo; and call their version of it &ldquo;Foobar Linux,&rdquo; it's "
 "proper for you to correct the misinformation by calling it &ldquo;Foobar GNU/"
-"Linux&rdquo;."
+"Linux.&rdquo;"
 msgstr ""
 "Когда они распространяют ложную 
информацию, меняя &ldquo;GNU&rdquo; на "
 "&ldquo;Linux&rdquo;, и называют свою версию &ldquo;Foobar 
Linux&rdquo;, для "
@@ -2353,12 +2805,24 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | 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;.-] {+&ldquo;GNU/Linux.&rdquo;+}
+#, fuzzy
+#| 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 "
+#| "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;."
 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 "
 "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;."
+"&ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "Мы не можем заставить их исправить это, но 
мы не из тех, кто сдается лишь "
 "потому, что дорога трудна. У вас может не 
быть такого влияния в своей среде, "
@@ -2381,16 +2845,35 @@
 
 # type: Content of: <dl><dd>
 #. type: Content of: <div><dl><dd>
+# | 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;.-] {+&ldquo;Linux.&rdquo;+} Many &ldquo;Linux&rdquo;
+# | User Groups make it part of 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 nonfree applications and drivers),
+# | or making the system more popular even at the cost of freedom.
+#, fuzzy
+#| msgid ""
+#| "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 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 nonfree "
+#| "applications and drivers), or making the system more popular even at the "
+#| "cost of freedom."
 msgid ""
 "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 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 nonfree "
-"applications and drivers), or making the system more popular even at the "
-"cost of freedom."
+"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 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 nonfree applications "
+"and drivers), or making the system more popular even at the cost of freedom."
 msgstr ""
 "Широко распространенная практика 
добавления несвободных программ в систему "
 "GNU/Linux&nbsp;&mdash; это серьезная проблема 
нашего сообщества. Эта "
@@ -2426,6 +2909,23 @@
 
 # type: Content of: <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 nonfree
+# | software as perverted, adulterated versions of GNU, instead of thinking
+# | they are proper and appropriate &ldquo;versions of [-Linux&rdquo;.-]
+# | {+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 "
+#| "nonfree 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> "
@@ -2433,7 +2933,7 @@
 "specifically for the sake of the users' freedom.  With this understanding, "
 "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;."
+"proper and appropriate &ldquo;versions of Linux.&rdquo;"
 msgstr ""
 "Чтобы указать этим пользователям на связь 
со свободой, нужно поступать в "
 "точности наоборот: необходимо 
проинформировать их о том, что все эти 
версии "
@@ -2539,11 +3039,22 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
+# | If we were to take an existing version of GNU/Linux and relabel it as
+# | [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} that would be somewhat like
+# | making a version of the GNU system and labeling it
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} That wasn't right, and
+# | we don't want to act like that.
+#, fuzzy
+#| 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 and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and "
+#| "we don't want to act like that."
 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 "
-"and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and we don't want "
-"to act like that."
+"GNU,&rdquo; that would be somewhat like making a version of the GNU system "
+"and labeling it &ldquo;Linux.&rdquo; That wasn't right, and we don't want to "
+"act like that."
 msgstr ""
 "Если бы мы взяли существующую версию GNU/Linux 
и переименовали ее в &ldquo;"
 "GNU&rdquo;, это было бы примерно то же самое, 
что взять версию системы GNU и "
@@ -2582,11 +3093,29 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | with the GNU Project because he was a &ldquo;Linux [-user&rdquo;.-]
+# | {+user.&rdquo;+} That came as a shock, because the people who ported GNU
+# | packages to other systems had generally wanted to work with us to get
+# | their changes installed.  Yet these people, developing a system that was
+# | primarily based on GNU, were the first (and still practically the only)
+# | group that was unwilling to work with us.
+#, fuzzy
+#| 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 "
+#| "with the GNU Project because he was a &ldquo;Linux user&rdquo;.  That "
+#| "came as a shock, because the people who ported GNU packages to other "
+#| "systems had generally wanted to work with us to get their changes "
+#| "installed.  Yet these people, developing a system that was primarily "
+#| "based on GNU, were the first (and still practically the only) group that "
+#| "was unwilling to work with us."
 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 "
-"with the GNU Project because he was a &ldquo;Linux user&rdquo;.  That came "
-"as a shock, because the people who ported GNU packages to other systems had "
+"with the GNU Project because he was a &ldquo;Linux user.&rdquo; That came as "
+"a shock, because the people who ported GNU packages to other systems had "
 "generally wanted to work with us to get their changes installed.  Yet these "
 "people, developing a system that was primarily based on GNU, were the first "
 "(and still practically the only) group that was unwilling to work with us."
@@ -2602,9 +3131,22 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
+# | It was this experience that first showed us that people were calling a
+# | version of the GNU system [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} and that this confusion was obstructing our work.
+# |  Asking you to call the system &ldquo;GNU/Linux&rdquo; is our response to
+# | that problem, and to the other problems caused by the &ldquo;Linux&rdquo;
+# | misnomer.
+#, fuzzy
+#| 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 obstructing our work.  Asking you to call the system &ldquo;GNU/"
+#| "Linux&rdquo; is our response to that problem, and to the other problems "
+#| "caused by the &ldquo;Linux&rdquo; misnomer."
 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 "
+"version of the GNU system &ldquo;Linux,&rdquo; and that this confusion was "
 "obstructing our work.  Asking you to call the system &ldquo;GNU/Linux&rdquo; "
 "is our response to that problem, and to the other problems caused by the "
 "&ldquo;Linux&rdquo; misnomer."
@@ -2650,10 +3192,18 @@
 
 # type: Content of: <dl><dd>
 #. type: Content of: <div><dl><dd>
+# | We never refer to individual programs as
+# | [-&ldquo;GNU/<i>name</i>&rdquo;.-] {+&ldquo;GNU/<i>name</i>.&rdquo;+} When
+# | a program is a GNU package, we may call it &ldquo;GNU
+# | [-<i>name</i>&rdquo;.-] {+<i>name</i>.&rdquo;+}
+#, fuzzy
+#| 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;."
 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;."
+"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 ""
 "Мы никогда не упоминаем об отдельных 
программах как о &ldquo;GNU/[название]"
 "&rdquo;. Если программа является одним из 
пакетов GNU, мы можем называть ее "
@@ -2779,10 +3329,24 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
+# | 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. 
+# | The name [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} which stands for
+# | &ldquo;GNU's Not [-Unix&rdquo;,-] {+Unix,&rdquo;+} is a humorous way of
+# | giving credit to Unix for this, following a hacker tradition of recursive
+# | acronyms that started in the 70s.
+#, fuzzy
+#| 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.  The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not "
+#| "Unix&rdquo;, is a humorous way of giving credit to Unix for this, "
+#| "following a hacker tradition of recursive acronyms that started in the "
+#| "70s."
 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.  "
-"The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not Unix&rdquo;, "
+"The name &ldquo;GNU,&rdquo; which stands for &ldquo;GNU's Not Unix,&rdquo; "
 "is a humorous way of giving credit to Unix for this, following a hacker "
 "tradition of recursive acronyms that started in the 70s."
 msgstr ""
@@ -2795,11 +3359,28 @@
 "рекурсивные сокращения, появившейся в 
семидесятые годы."
 
 #. type: Content of: <div><dl><dd><p>
+# | The first such recursive acronym was TINT, &ldquo;TINT Is Not
+# | [-TECO&rdquo;.-] {+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;,-] {+TECO,&rdquo;+} he
+# | thought of a clever amusing name.  (That's what hacking means: <a
+# | href=\"https://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=\"https://stallman.org/articles/on-hacking.html\";>playful "
+#| "cleverness</a>.)"
 msgid ""
-"The first such recursive acronym was TINT, &ldquo;TINT Is Not TECO&rdquo;.  "
+"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 "
+"like &ldquo;<em>somethingorother</em> TECO,&rdquo; he thought of a clever "
 "amusing name.  (That's what hacking means: <a href=\"https://stallman.org/";
 "articles/on-hacking.html\">playful cleverness</a>.)"
 msgstr ""
@@ -2813,13 +3394,28 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | was similar to some existing program (let's imagine its name was
+# | &ldquo;Klever&rdquo;), you could give it a recursive acronym name, such as
+# | &ldquo;MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same
+# | spirit we called our replacement for Unix &ldquo;GNU's Not
+# | [-Unix&rdquo;.-] {+Unix.&rdquo;+}
+#, fuzzy
+#| 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 was similar to some existing program (let's imagine its name was "
+#| "&ldquo;Klever&rdquo;), you could give it a recursive acronym name, such "
+#| "as &ldquo;MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same "
+#| "spirit we called our replacement for Unix &ldquo;GNU's Not Unix&rdquo;."
 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 "
 "was similar to some existing program (let's imagine its name was &ldquo;"
 "Klever&rdquo;), you could give it a recursive acronym name, such as &ldquo;"
 "MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same spirit we "
-"called our replacement for Unix &ldquo;GNU's Not Unix&rdquo;."
+"called our replacement for Unix &ldquo;GNU's Not Unix.&rdquo;"
 msgstr ""
 "Другим хакерам так понравилось это 
название, что мы начали подражать этому. "
 "Стало традицией, что, когда вы писали с 
нуля программу, подобную некоторой "
@@ -2831,13 +3427,28 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
+# | 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 in a system 99% copied from Unix.  AT&amp;T actually threatened to
+# | sue anyone giving AT&amp;T credit in that way.  This is why each of the
+# | various modified versions of Unix (all proprietary, like Unix) had a
+# | completely different name that didn't include [-&ldquo;Unix&rdquo;.-]
+# | {+&ldquo;Unix.&rdquo;+}
+#, fuzzy
+#| 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 in a system 99% copied from Unix.  AT&amp;T actually threatened "
+#| "to sue anyone giving AT&amp;T credit in that way.  This is why each of "
+#| "the various modified versions of Unix (all proprietary, like Unix) had a "
+#| "completely different name that didn't include &ldquo;Unix&rdquo;."
 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 "
 "in a system 99% copied from Unix.  AT&amp;T actually threatened to sue "
 "anyone giving AT&amp;T credit in that way.  This is why each of the various "
 "modified versions of Unix (all proprietary, like Unix) had a completely "
-"different name that didn't include &ldquo;Unix&rdquo;."
+"different name that didn't include &ldquo;Unix.&rdquo;"
 msgstr ""
 "Исторически сложилось, что AT&amp;T, которая 
разработала Unix, не хотела, "
 "чтобы кто-либо отдавал ей должное путем 
употребления &ldquo;Unix&rdquo; в "
@@ -2919,9 +3530,22 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
+# | There is a version of GNU which uses the kernel from NetBSD.  Its
+# | developers call it &ldquo;Debian [-GNU/NetBSD&rdquo;,-]
+# | {+GNU/NetBSD,&rdquo;+} but &ldquo;GNU/kernelofNetBSD&rdquo; would be more
+# | accurate, since NetBSD is an entire system, not just the kernel.  This is
+# | not a BSD system, since most of the system is the same as the GNU/Linux
+# | system.
+#, fuzzy
+#| 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/"
+#| "kernelofNetBSD&rdquo; would be more accurate, since NetBSD is an entire "
+#| "system, not just the kernel.  This is not a BSD system, since most of the "
+#| "system is the same as the GNU/Linux system."
 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/"
+"call it &ldquo;Debian GNU/NetBSD,&rdquo; but &ldquo;GNU/"
 "kernelofNetBSD&rdquo; would be more accurate, since NetBSD is an entire "
 "system, not just the kernel.  This is not a BSD system, since most of the "
 "system is the same as the GNU/Linux system."
@@ -2945,8 +3569,21 @@
 
 # type: Content of: <dl><dd>
 #. type: Content of: <div><dl><dd><p>
+# | Not in the same sense that we mean by [-&ldquo;GNU/Linux&rdquo;.-]
+# | {+&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.
+#, fuzzy
+#| 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 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."
 msgid ""
-"Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of "
+"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 "
@@ -3056,8 +3693,19 @@
 "очень мало общего. На самом деле общее у 
них только одно: Linux."
 
 #. type: Content of: <div><dl><dd><p>
+# | If you call the whole GNU/Linux system [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} you will find it necessary to say things like,
+# | &ldquo;Android contains Linux, but it isn't Linux, because it doesn't have
+# | the usual Linux [sic] libraries and utilities [meaning the GNU
+# | system].&rdquo;
+#, fuzzy
+#| 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 Linux, because it doesn't have the usual Linux [sic] libraries and "
+#| "utilities [meaning the GNU system].&rdquo;"
 msgid ""
-"If you call the whole GNU/Linux system &ldquo;Linux&rdquo;, you will find it "
+"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 "
 "Linux, because it doesn't have the usual Linux [sic] libraries and utilities "
 "[meaning the GNU system].&rdquo;"
@@ -3098,9 +3746,19 @@
 msgstr "Отнюдь. Такое употребление настолько 
натянуто, что вас не поймут."
 
 #. type: Content of: <div><dl><dd><p>
+# | The public will find it very strange to speak of using Android as
+# | &ldquo;using [-Linux&rdquo;.-] {+Linux.&rdquo;+} It's like having a
+# | conversation, then saying you were conversing with the person's intestines
+# | or the person's circulatory system.
+#, fuzzy
+#| 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."
 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 "
+"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 ""
 "Людям покажется очень странным, когда 
говорят о том, что использование "
@@ -3109,23 +3767,52 @@
 "кровеносной системой человека."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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;.-] {+&ldquo;Linux.&rdquo;+}
+#, fuzzy
+#| 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;."
 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;."
+"of the whole system as &ldquo;Linux.&rdquo;"
 msgstr ""
 "Люди <em>понимают</em>, что означает 
&ldquo;использование Linux&rdquo;, "
 "когда это на самом деле GNU/Linux, благодаря 
обычному заблуждению: когда о "
 "системе в целом думают как о &ldquo;Linux&rdquo;."
 
 #. type: Content of: <div><dl><dd><p>
+# | 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
+# | contain Linux is irrelevant to using them, just as the fact that a car and
+# | a bicycle both have a structure of metal is irrelevant to using those two.
+# |  If you wish to talk about using cars and bikes, you wouldn't speak of
+# | &ldquo;riding metal [-objects&rdquo; &mdash; not-]
+# | {+objects&rdquo;&mdash;not+} unless you're playing games with the reader. 
+# | You would say, &ldquo;using cars and bikes.&rdquo; Likewise, the clear way
+# | to talk about using GNU/Linux and Android is to say &ldquo;using GNU/Linux
+# | and Android.&rdquo;
+#, fuzzy
+#| 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 "
+#| "contain Linux is irrelevant to using them, just as the fact that a car "
+#| "and a bicycle both have a structure of metal is irrelevant to using those "
+#| "two.  If you wish to talk about using cars and bikes, you wouldn't speak "
+#| "of &ldquo;riding metal objects&rdquo; &mdash; not unless you're playing "
+#| "games with the reader.  You would say, &ldquo;using cars and bikes."
+#| "&rdquo; Likewise, the clear way to talk about using GNU/Linux and Android "
+#| "is to say &ldquo;using GNU/Linux and Android.&rdquo;"
 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 "
 "contain Linux is irrelevant to using them, just as the fact that a car and a "
 "bicycle both have a structure of metal is irrelevant to using those two.  If "
 "you wish to talk about using cars and bikes, you wouldn't speak of &ldquo;"
-"riding metal objects&rdquo; &mdash; not unless you're playing games with the "
+"riding metal objects&rdquo;&mdash;not unless you're playing games with the "
 "reader.  You would say, &ldquo;using cars and bikes.&rdquo; Likewise, the "
 "clear way to talk about using GNU/Linux and Android is to say &ldquo;using "
 "GNU/Linux and Android.&rdquo;"
@@ -3225,11 +3912,22 @@
 
 # type: Content of: <dl><dd>
 #. type: Content of: <div><dl><dd><p>
+# | 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;.-] {+&ldquo;GNU.&rdquo;+} When we talk
+# | about the whole system, the name &ldquo;GNU/Linux&rdquo; gives him a share
+# | of the credit.
+#, fuzzy
+#| 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 "
+#| "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."
 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 "
-"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."
+"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."
 msgstr ""
 "Это было бы нечестно, поэтому мы так не 
поступаем. Работа Торвальдса&nbsp;"
 "&mdash; Linux (ядро); мы аккуратно стараемся не 
приписывать эту работу "
@@ -3247,12 +3945,50 @@
 
 # type: Content of: <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=\"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>."
+# | He recognized this at the beginning.  The {+<a
+# | 
href=\"https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\";>+}
+# | earliest Linux release [-notes said, <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>.-] {+notes</a> said:+}
+#, fuzzy
+#| msgid ""
+#| "He recognized this at the beginning.  The earliest Linux release notes "
+#| "said, <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>."
+msgid ""
+"He recognized this at the beginning.  The <a href=\"https://ftp.funet.fi/pub/";
+"linux/historical/kernel/old-versions/RELNOTES-0.01\"> earliest Linux release "
+"notes</a> said:"
+msgstr ""
+"Вначале он признавал это. В примечаниях к 
самому раннему выпуску Linux "
+"сказано: &ldquo;Большинство инструментов, 
используемых с linux, являются "
+"программами GNU и подчинены авторскому 
леву GNU. Эти инструменты не вошли в "
+"дистрибутив&nbsp;&mdash; обращайтесь ко мне 
(или в GNU) за дополнительной "
+"информацией&rdquo;<a href=\"#ft1\">[1]</a>."
+
+# type: Content of: <dl><dd><p>
+#. type: Content of: <div><dl><dd><blockquote><p>
+# | [-He recognized this at the beginning.  The earliest Linux release notes
+# | said, <a
+# | 
href=\"https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\";>
+# | &ldquo;Most-]{+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>.-] {+info.+}
+#, fuzzy
+#| msgid ""
+#| "He recognized this at the beginning.  The earliest Linux release notes "
+#| "said, <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>."
+msgid ""
+"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."
 msgstr ""
 "Вначале он признавал это. В примечаниях к 
самому раннему выпуску Linux "
 "сказано: &ldquo;Большинство инструментов, 
используемых с linux, являются "
@@ -3307,11 +4043,26 @@
 
 # type: Content of: <dl><dd>
 #. type: Content of: <div><dl><dd><p>
+# | 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;,-]
+# | {+&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.
+#, fuzzy
+#| 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;: 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."
 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;: "
 "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 "
+"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."
 msgstr ""
@@ -3336,13 +4087,32 @@
 
 # type: Content of: <dl><dd>
 #. type: Content of: <div><dl><dd><p>
+# | 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;,-] {+&ldquo;GNU/Linux,&rdquo;+} you will help
+# | others learn the system's true history, origin, and reason for being.  You
+# | can't correct the misnomer 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;,-] {+&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.
+#, fuzzy
+#| 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;GNU/Linux&rdquo;, you will help others learn the system's true "
+#| "history, origin, and reason for being.  You can't correct the misnomer "
+#| "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."
 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;"
-"GNU/Linux&rdquo;, you will help others learn the system's true history, "
+"GNU/Linux,&rdquo; you will help others learn the system's true history, "
 "origin, and reason for being.  You can't correct the misnomer 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 "
+"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."
 msgstr ""
@@ -3369,10 +4139,20 @@
 
 # type: Content of: <dl><dd>
 #. type: Content of: <div><dl><dd>
+# | 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;,-]
+# | {+&ldquo;GNU/Linux,&rdquo;+} and uses your time inefficiently.
+#, fuzzy
+#| 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."
 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."
+"the system &ldquo;GNU/Linux,&rdquo; and uses your time inefficiently."
 msgstr ""
 "Если вы помогаете нам, объясняя это людям 
таким образом, мы благодарны вам "
 "за эту работу, однако это не лучший метод. 
Это не приводит к таким "
@@ -3381,12 +4161,28 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
+# | 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, and they may learn a correct picture of the system's origin. 
+# | But they are unlikely to repeat the explanation to others whenever they
+# | talk about the system.  They will probably just call it
+# | [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} Without particularly
+# | intending to, they will help spread the incorrect picture.
+#, fuzzy
+#| 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, and they may learn a correct picture of the system's origin.  "
+#| "But they are unlikely to repeat the explanation to others whenever they "
+#| "talk about the system.  They will probably just call it &ldquo;"
+#| "Linux&rdquo;.  Without particularly intending to, they will help spread "
+#| "the incorrect picture."
 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, "
 "and they may learn a correct picture of the system's origin.  But they are "
 "unlikely to repeat the explanation to others whenever they talk about the "
-"system.  They will probably just call it &ldquo;Linux&rdquo;.  Without "
+"system.  They will probably just call it &ldquo;Linux.&rdquo; Without "
 "particularly intending to, they will help spread the incorrect picture."
 msgstr ""
 "Это не приводит к нужным результатам, 
потому что может не дойти до сознания "
@@ -3538,9 +4334,16 @@
 
 # type: Content of: <dl><dd>
 #. type: Content of: <div><dl><dd><p>
+# | It would be wrong to force them, and we don't try.  We call the system
+# | [-&ldquo;GNU/Linux&rdquo;,-] {+&ldquo;GNU/Linux,&rdquo;+} and we ask you
+# | to do it too.
+#, fuzzy
+#| 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."
 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."
+"&ldquo;GNU/Linux,&rdquo; and we ask you to do it too."
 msgstr ""
 "Было бы нечестно заставлять их, и мы не 
пытаемся делать это. Мы называем "
 "систему &ldquo;GNU/Linux&rdquo; и просим вас 
поступать так же."
@@ -3635,9 +4438,19 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <div><dl><dt>
+# | Since you failed to put something in the GNU GPL to require people to call
+# | the system [-&ldquo;GNU&rdquo;,-] {+&ldquo;GNU,&rdquo;+} you deserve what
+# | happened; why are you complaining now? <span
+# | class=\"anchor-reference-id\">(<a href=\"#deserve\">#deserve</a>)</span>
+#, fuzzy
+#| 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 "
+#| "complaining now? <span class=\"anchor-reference-id\">(<a href=\"#deserve"
+#| "\">#deserve</a>)</span>"
 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 "
+"the system &ldquo;GNU,&rdquo; you deserve what happened; why are you "
 "complaining now? <span class=\"anchor-reference-id\">(<a href=\"#deserve"
 "\">#deserve</a>)</span>"
 msgstr ""
@@ -3698,8 +4511,17 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <div><dl><dt>
+# | Since many people call it [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} doesn't that make it right? <span
+# | class=\"anchor-reference-id\">(<a
+# | href=\"#somanyright\">#somanyright</a>)</span>
+#, fuzzy
+#| 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>"
 msgid ""
-"Since many people call it &ldquo;Linux&rdquo;, doesn't that make it right? "
+"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 ""
@@ -3724,9 +4546,20 @@
 "\">#knowname</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+# | Users are not incapable of learning.  Since &ldquo;GNU/Linux&rdquo;
+# | includes [-&ldquo;Linux&rdquo;,-] {+&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.
+#, fuzzy
+#| 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 add &ldquo;(often erroneously referred to as &lsquo;"
+#| "Linux&rsquo;)&rdquo; once in a while, they will all understand."
 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 "
+"&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."
 msgstr ""

Index: po/gnu-linux-faq.sq.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.sq.po,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -b -r1.121 -r1.122
--- po/gnu-linux-faq.sq.po      7 Sep 2021 12:03:51 -0000       1.121
+++ po/gnu-linux-faq.sq.po      2 Nov 2021 14:41:51 -0000       1.122
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gnu-linux-faq.html\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-31 10:27+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2021-09-07 14:13+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-11-02 14:27+0000\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.4.2\n"
 
@@ -29,10 +30,15 @@
 msgid "by Richard Stallman"
 msgstr "nga Richard Stallman"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| 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."
 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.  "
+"that many others call just &ldquo;Linux,&rdquo; they ask many questions.  "
 "Here are common questions, and our answers."
 msgstr ""
 "Kur njerëzit shohin se ne përdorim dhe këshillojmë emrin GNU/Linux për 
një "
@@ -248,11 +254,17 @@
 "kundër fakteve që sistemi të quhej thjesht “GNU”?</a>"
 
 #. type: Content of: <div><div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#trademarkfee\">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 wrong if I use &ldquo;GNU&rdquo; without "
+#| "&ldquo;Linux&rdquo;, to save the fee?</a>"
 msgid ""
 "<a href=\"#trademarkfee\">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 wrong if I use &ldquo;GNU&rdquo; without "
-"&ldquo;Linux&rdquo;, to save the fee?</a>"
+"&ldquo;GNU/Linux.&rdquo; Is it wrong if I use &ldquo;GNU&rdquo; without "
+"&ldquo;Linux,&rdquo; to save the fee?</a>"
 msgstr ""
 "<a href=\"#trademarkfee\">Do të më duhet të paguaj ndonjë shumë po qe se 
"
 "përdor “Linux” në emrin e një produkti, dhe kjo do të ndodhte edhe 
nëse them "
@@ -337,10 +349,15 @@
 msgstr "<a href=\"#whyorder\">Pse “GNU/Linux” dhe jo “Linux/GNU”?</a>"
 
 #. type: Content of: <div><div><ul><li>
-msgid ""
-"<a href=\"#distronames0\">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 whatever they like?</a>"
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#distronames0\">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 whatever they like?</a>"
+msgid ""
+"<a href=\"#distronames0\">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 whatever they like?</a>"
 msgstr ""
 "<a href=\"#distronames0\">Aksh shpërndarje zhvilluesit e quajnë “Aksh "
 "Linux”, por kjo nuk tregon asgjë mbi çka përbëhet sistemi.  Pse të mos 
e "
@@ -594,9 +611,14 @@
 "njerëzve ta quajnë sistemin “GNU”?</a>"
 
 #. type: Content of: <div><div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#deserve\">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 complaining now?</a>"
 msgid ""
 "<a href=\"#deserve\">Since you failed to put something in the GNU GPL to "
-"require people to call the system &ldquo;GNU&rdquo;, you deserve what "
+"require people to call the system &ldquo;GNU,&rdquo; you deserve what "
 "happened; why are you complaining now?</a>"
 msgstr ""
 "<a href=\"#deserve\">Meqë dështuat të vendosnit diçka te GNU GPL-ja për 
t’u "
@@ -612,8 +634,12 @@
 "çka shumë vetë e besojnë?</a>"
 
 #. type: Content of: <div><div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#somanyright\">Since many people call it &ldquo;Linux&rdquo;, "
+#| "doesn't that make it right?</a>"
 msgid ""
-"<a href=\"#somanyright\">Since many people call it &ldquo;Linux&rdquo;, "
+"<a href=\"#somanyright\">Since many people call it &ldquo;Linux,&rdquo; "
 "doesn't that make it right?</a>"
 msgstr ""
 "<a href=\"#somanyright\">Meqë shumë vetë e quajnë “Linux”, a e bën 
kjo të "
@@ -781,6 +807,16 @@
 "këtë praktikë.  Në atë kohë, ngatërrimi pat filluar duke qenë më 
para."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 it must be right.  The name &ldquo;Linux&rdquo; also spreads a "
+#| "false picture of the system's origin, because people tend to suppose that "
+#| "the system's history was such as to fit that name.  For instance, they "
+#| "often believe its development was started by Linus Torvalds in 1991.  "
+#| "This false picture tends to reinforce the idea that the system should be "
+#| "called &ldquo;Linux&rdquo;."
 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 "
@@ -788,7 +824,7 @@
 "of the system's origin, because people tend to suppose that the system's "
 "history was such as to fit that name.  For instance, they often believe its "
 "development was started by Linus Torvalds in 1991.  This false picture tends "
-"to reinforce the idea that the system should be called &ldquo;Linux&rdquo;."
+"to reinforce the idea that the system should be called &ldquo;Linux.&rdquo;"
 msgstr ""
 "Shumica e njerëzve që e quan sistemin “Linux” s’kanë dëgjuar kurrë 
pse kjo "
 "s’është gjëja e saktë.  Panë të tjerë që e përdornin këtë emër 
dhe e morën "
@@ -816,21 +852,34 @@
 "reference-id\">(<a href=\"#always\">#always</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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."
 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."
+"you're referring specifically to the kernel, you should call it &ldquo;Linux,"
+"&rdquo; the name its developer chose."
 msgstr ""
 "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><dl><dd><p>
+#, fuzzy
+#| 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 kinds of confusion, because only experts can tell whether a "
+#| "statement is about the kernel or the whole system.  By calling the whole "
+#| "system &ldquo;GNU/Linux&rdquo;, and calling the kernel &ldquo;"
+#| "Linux&rdquo;, you avoid the ambiguity."
 msgid ""
-"When people call the whole system &ldquo;Linux&rdquo;, as a consequence they "
+"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 "
 "kinds of confusion, because only experts can tell whether a statement is "
 "about the kernel or the whole system.  By calling the whole system &ldquo;"
-"GNU/Linux&rdquo;, and calling the kernel &ldquo;Linux&rdquo;, you avoid the "
+"GNU/Linux,&rdquo; and calling the kernel &ldquo;Linux,&rdquo; you avoid the "
 "ambiguity."
 msgstr ""
 "Kur njerëzit e quajnë krejt sistemin &ldquo;Linux&rdquo;, në fakt quajnë "
@@ -901,8 +950,13 @@
 "\">#divide</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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."
 msgid ""
-"When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing "
+"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 ""
@@ -958,10 +1012,23 @@
 "të Lirë</a>."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 freedom are more likely to call the system &ldquo;GNU/"
+#| "Linux&rdquo;, and people who learn that the system is &ldquo;GNU/"
+#| "Linux&rdquo; are more likely to pay attention to our philosophical "
+#| "arguments for freedom and community (which is why the choice of name for "
+#| "the system makes a real difference for society).  However, the "
+#| "disagreement would probably exist even if everyone knew the system's real "
+#| "origin and its proper name, because the issue is a real one.  It can only "
+#| "go away if we who value freedom either persuade everyone (which won't be "
+#| "easy) or are defeated entirely (let's hope not)."
 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 "
-"freedom are more likely to call the system &ldquo;GNU/Linux&rdquo;, and "
+"freedom are more likely to call the system &ldquo;GNU/Linux,&rdquo; and "
 "people who learn that the system is &ldquo;GNU/Linux&rdquo; are more likely "
 "to pay attention to our philosophical arguments for freedom and community "
 "(which is why the choice of name for the system makes a real difference for "
@@ -1017,10 +1084,17 @@
 "href=\"#everyoneknows\">#everyoneknows</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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 system do not mention the name &ldquo;GNU&rdquo;, or the ideals that "
+#| "GNU stands for.  <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU "
+#| "Users Who Have Never Heard of GNU</a> explains further."
 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 "
-"system do not mention the name &ldquo;GNU&rdquo;, or the ideals that GNU "
+"system do not mention the name &ldquo;GNU,&rdquo; or the ideals that GNU "
 "stands for.  <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users "
 "Who Have Never Heard of GNU</a> explains further."
 msgstr ""
@@ -1031,11 +1105,17 @@
 "heard-of-gnu.html\">Përdorues GNU Që Nuk Kanë Dëgjuar Kurrë Për 
GNU-në</a>."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 GNU is.  For instance, many think it is a collection of <a "
+#| "href=\"#tools\">&ldquo;tools&rdquo;</a>, or a project to develop tools."
 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 "
-"GNU is.  For instance, many think it is a collection of <a href=\"#tools"
-"\">&ldquo;tools&rdquo;</a>, or a project to develop tools."
+"GNU is.  For instance, many think it is a collection of &ldquo;<a href="
+"\"#tools\">tools</a>,&rdquo; or a project to develop tools."
 msgstr ""
 "Njerëzit që e thonë këtë ndoshta janë \"geeks\", me të tjerë geeks-a 
në "
 "mendje.  Geeks-at shpesh kanë dijeni mbi GNU-në, por shumë prej tyre kanë 
"
@@ -1068,11 +1148,18 @@
 "a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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;"
+#| "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?"
 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;"
-"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?"
+"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?"
 msgstr ""
 "Po qe se fjalët tuaja nuk pasqyrojnë dijet tuaja, nuk u mësoni gjë të "
 "tjerëve.  Shumica e njerëzve që kanë dëgjuar për sistemin GNU/Linux 
mendojnë "
@@ -1128,14 +1215,23 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#tools\">#tools</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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 "
+#| "that GNU is the name of a collection of programs&mdash;often they say "
+#| "&ldquo;programming tools&rdquo;, since some of our programming tools "
+#| "became popular on their own.  The idea that &ldquo;GNU&rdquo; is the name "
+#| "of an operating system is hard to fit into a conceptual framework in "
+#| "which that operating system is labeled &ldquo;Linux&rdquo;."
 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 "
 "that GNU is the name of a collection of programs&mdash;often they say &ldquo;"
-"programming tools&rdquo;, since some of our programming tools became popular "
+"programming tools,&rdquo; since some of our programming tools became popular "
 "on their own.  The idea that &ldquo;GNU&rdquo; is the name of an operating "
 "system is hard to fit into a conceptual framework in which that operating "
-"system is labeled &ldquo;Linux&rdquo;."
+"system is labeled &ldquo;Linux.&rdquo;"
 msgstr ""
 "Njerëzit që mendojnë se Linux-i është një sistem operativ i plotë, po 
qe se "
 "dëgjojnë gjë për GNU-në, shpesh përftojnë një ide të gabuar rreth se 
çka "
@@ -1201,12 +1297,23 @@
 "kujdeset gjithashtu për nisjen dhe ndalimin e programeve të tjera."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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.  The use of &ldquo;operating system&rdquo; to mean "
+#| "&ldquo;kernel&rdquo; is found in a number of textbooks on system design, "
+#| "going back to the 80s.  At the same time, in the 80s, the &ldquo;Unix "
+#| "operating system&rdquo; was understood to include all the system "
+#| "programs, and Berkeley's version of Unix included even games. Since we "
+#| "intended GNU to be a Unix-like operating system, we use the term &ldquo;"
+#| "operating system&rdquo; in the same way."
 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.  "
-"The use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is "
-"found in a number of textbooks on system design, going back to the 80s.  At "
-"the same time, in the 80s, the &ldquo;Unix operating system&rdquo; was "
+"to mean &ldquo;kernel.&rdquo; Both uses of the term go back many years.  The "
+"use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is found "
+"in a number of textbooks on system design, going back to the 80s.  At the "
+"same time, in the 80s, the &ldquo;Unix operating system&rdquo; was "
 "understood to include all the system programs, and Berkeley's version of "
 "Unix included even games. Since we intended GNU to be a Unix-like operating "
 "system, we use the term &ldquo;operating system&rdquo; in the same way."
@@ -1222,11 +1329,20 @@
 "operativ” në të njëjtën mënyrë."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 "
+#| "sense we use: they mean the whole collection of programs.  If that's what "
+#| "you are referring to, please call it &ldquo;GNU/Linux&rdquo;.  If you "
+#| "mean just the kernel, then &ldquo;Linux&rdquo; is the right name for it, "
+#| "but please say &ldquo;kernel&rdquo; also to avoid ambiguity about which "
+#| "body of software you mean."
 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 "
 "sense we use: they mean the whole collection of programs.  If that's what "
-"you are referring to, please call it &ldquo;GNU/Linux&rdquo;.  If you mean "
+"you are referring to, please call it &ldquo;GNU/Linux.&rdquo; If you mean "
 "just the kernel, then &ldquo;Linux&rdquo; is the right name for it, but "
 "please say &ldquo;kernel&rdquo; also to avoid ambiguity about which body of "
 "software you mean."
@@ -1240,10 +1356,16 @@
 "lidhur se për cilën pjesë software-i e keni fjalën."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "If you prefer to use some other term such as &ldquo;system "
+#| "distribution&rdquo; for the entire collection of programs, instead of "
+#| "&ldquo;operating system&rdquo;, that's fine.  Then you would talk about "
+#| "GNU/Linux system distributions."
 msgid ""
 "If you prefer to use some other term such as &ldquo;system "
 "distribution&rdquo; for the entire collection of programs, instead of &ldquo;"
-"operating system&rdquo;, that's fine.  Then you would talk about GNU/Linux "
+"operating system,&rdquo; that's fine.  Then you would talk about GNU/Linux "
 "system distributions."
 msgstr ""
 "Po qe se parapëlqeni përdorimin e disa termave të tjerë të tillë si "
@@ -1339,12 +1461,20 @@
 "reference-id\">(<a href=\"#nokernel\">#nokernel</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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, window systems, libraries, and much more &mdash; hundreds of "
+#| "programs, even to match what BSD systems included in 1983.  Since "
+#| "Torvalds didn't develop any of those, how can the system be &ldquo;"
+#| "Linux&rdquo;?"
 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, "
-"window systems, libraries, and much more &mdash; hundreds of programs, even "
-"to match what BSD systems included in 1983.  Since Torvalds didn't develop "
-"any of those, how can the system be &ldquo;Linux&rdquo;?"
+"window systems, libraries, and much more&mdash;hundreds of programs, even to "
+"match what BSD systems included in 1983.  Since Torvalds didn't develop any "
+"of those, how can the system be &ldquo;Linux&rdquo;?"
 msgstr ""
 "Njerëzit shprehen kështu për quajtjen e sistemit &ldquo;Linux&rdquo; "
 "përdorin një standard të dyfishtë.  Një sistem operativ lyp përpilues, "
@@ -1382,9 +1512,14 @@
 "\"#notinstallable\">#notinstallable</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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."
 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</a> are available.  None of them is called simply &ldquo;GNU,&rdquo; but "
 "GNU is what they basically are."
 msgstr ""
 "Ka gati mjaft <a href=\"/distros/distros.html\"> versione të paketuara dhe "
@@ -1434,9 +1569,14 @@
 "përfshin një ripaketim të një pjese domethënëse të sistemit GNU."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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."
 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 "
+"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 ""
 "Nuk e kryem kurrë hapin e fundit për paketimin e GNU-së nën emrin 
“GNU”, por "
@@ -1454,13 +1594,21 @@
 "\"anchor-reference-id\">(<a href=\"#afterkernel\">#afterkernel</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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 system is developed as a single unified project, and the "
+#| "developers choose a name for the system as a whole.  The kernel usually "
+#| "does not have a name of its own&mdash;instead, people say &ldquo;the "
+#| "kernel of such-and-such&rdquo; or &ldquo;the such-and-such kernel&rdquo;."
 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 "
+"than the misuse of the name &ldquo;Linux.&rdquo; Normally an operating "
 "system is developed as a single unified project, and the developers choose a "
 "name for the system as a whole.  The kernel usually does not have a name of "
 "its own&mdash;instead, people say &ldquo;the kernel of such-and-such&rdquo; "
-"or &ldquo;the such-and-such kernel&rdquo;."
+"or &ldquo;the such-and-such kernel.&rdquo;"
 msgstr ""
 "Kjo praktikë duket të jetë shumë e rrallë&mdash;nuk gjejmë dot ndonjë "
 "shembull tjetër veç keqpërdorimit të emrit “Linux”.  Normalisht, një 
sistem "
@@ -1516,9 +1664,14 @@
 "href=\"#long\">#long</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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."
 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.  "
+"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 ""
 "Për ca kohë provuam emrin “LiGNUx”, që ndërthur fjalët “GNU” dhe 
“Linux”.  "
@@ -1526,8 +1679,13 @@
 "mirë."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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>."
 msgid ""
-"The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but we "
+"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 ""
@@ -1573,8 +1731,13 @@
 "href=\"#long2\">#long2</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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?"
 msgid ""
-"It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you appreciate "
+"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 ""
@@ -1682,10 +1845,16 @@
 "në vend se të përpiqemi që t’i hamë hakun për kontributin e tij te 
sistemi."
 
 #. type: Content of: <div><dl><dd><ul><li>
+#, fuzzy
+#| 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 system.  If we say &ldquo;GNU/Linux&rdquo;, they can make a "
+#| "connection to what they have heard about."
 msgid ""
-"Since many people know of the system as &ldquo;Linux&rdquo;, if we say "
+"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 "
-"system.  If we say &ldquo;GNU/Linux&rdquo;, they can make a connection to "
+"system.  If we say &ldquo;GNU/Linux,&rdquo; they can make a connection to "
 "what they have heard about."
 msgstr ""
 "Ngaqë mjaft njerëz e njohin sistemin si “Linux”, po të thoshim 
“GNU” ata "
@@ -1693,10 +1862,17 @@
 "themi “GNU/Linux”, mund ta lidhin këtë me çfarë kanë dëgjuar rreth 
temës."
 
 #. type: Content of: <div><dl><dt>
+#, fuzzy
+#| 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 wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to save "
+#| "the fee? <span class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
+#| "\">#trademarkfee</a>)</span>"
 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 "
-"wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to save the "
+"product, and that would also apply if I say &ldquo;GNU/Linux.&rdquo; Is it "
+"wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux,&rdquo; to save the "
 "fee? <span class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
 "\">#trademarkfee</a>)</span>"
 msgstr ""
@@ -1716,9 +1892,14 @@
 "por nuk keni ndonjë borxh, për ta larë me privilegjin e të bërit 
kështu."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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."
 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."
+"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 ""
 "Pra, nëse doni t’i referoheni sistemit thjesht si “GNU”, për shmangie 
pagese "
 "ngaqë e quani “Linux”, nuk do t’ju kritikojmë."
@@ -1779,12 +1960,19 @@
 "vendosni, nuk kemi për ta kundërshtuar."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 giving credit, not for any possible threshold level, is &ldquo;"
+#| "Linux&rdquo;.  It can't be fair to give all the credit to one secondary "
+#| "contribution (Linux) while omitting the principal contribution (GNU)."
 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 "
-"giving credit, not for any possible threshold level, is &ldquo;"
-"Linux&rdquo;.  It can't be fair to give all the credit to one secondary "
-"contribution (Linux) while omitting the principal contribution (GNU)."
+"giving credit, not for any possible threshold level, is &ldquo;Linux.&rdquo; "
+"It can't be fair to give all the credit to one secondary contribution "
+"(Linux) while omitting the principal contribution (GNU)."
 msgstr ""
 "Nivele të ndryshëm pragu do të shpinin në zgjedhje të ndryshme për 
emrin e "
 "sistemit.  Por një emër që nuk rrjedh nga shqetësimet mbi të qenët i "
@@ -1804,11 +1992,18 @@
 "\"anchor-reference-id\">(<a href=\"#others\">#others</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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).  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."
 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).  "
 "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."
+"system &ldquo;GNU/systemd/Linux,&rdquo; there is nothing wrong with doing so."
 msgstr ""
 "<em>systemd</em> është një përbërës jo pak i rëndësishëm, por jo aq 
i "
 "rëndësishëm sa kerneli (Linux-i), as edhe aq i rëndësishëm sa baza e "
@@ -1859,11 +2054,17 @@
 "\">#allsmall</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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 the same argument would apply even more strongly to calling it &ldquo;"
+#| "Linux&rdquo;."
 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 "
-"the same argument would apply even more strongly to calling it &ldquo;"
-"Linux&rdquo;."
+"the same argument would apply even more strongly to calling it &ldquo;Linux."
+"&rdquo;"
 msgstr ""
 "Në 2008, nxorëm se paketat GNU përbënin 15% të depos “kryesore” të "
 "shpërndarjes GNU/Linux gNewSense.  Linux-i përbënte 1.5%.  Ndaj i njëjti "
@@ -1926,9 +2127,16 @@
 "reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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 either &ldquo;GNU's version of Linux&rdquo; or &ldquo;"
+#| "Linux, which is a GNU package.&rdquo; Neither of those meanings fits the "
+#| "situation at hand."
 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 "
+"the word &ldquo;GNU&rdquo; modifies &ldquo;Linux.&rdquo; This can mean "
 "either &ldquo;GNU's version of Linux&rdquo; or &ldquo;Linux, which is a GNU "
 "package.&rdquo; Neither of those meanings fits the situation at hand."
 msgstr ""
@@ -1950,11 +2158,20 @@
 "i, që është një paketë GNU” nuk qëndron."
 
 #. 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=\"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."
 msgid ""
 "We're not talking about a distinct GNU version of Linux, the kernel.  The "
 "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 "
+"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."
@@ -1967,11 +2184,18 @@
 "ngaqë do të ishte shumë ngatërruese."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 &ldquo;combination.&rdquo; (Think of &ldquo;Input/Output&rdquo;.)  "
+#| "This system is the combination of GNU and Linux; hence, &ldquo;GNU/"
+#| "Linux&rdquo;."
 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 "
-"&ldquo;combination.&rdquo; (Think of &ldquo;Input/Output&rdquo;.)  This "
-"system is the combination of GNU and Linux; hence, &ldquo;GNU/Linux&rdquo;."
+"&ldquo;combination.&rdquo; (Think of &ldquo;Input/Output.&rdquo;)  This "
+"system is the combination of GNU and Linux; hence, &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "Po flasim për një version të GNU-së, sistemit operativ, të dallueshëm 
nga "
 "pasja e Linux-it për kernel.  Pjerrësja i shërben rastit, ngaqë do të 
thotë "
@@ -1979,11 +2203,17 @@
 "GNU-së dhe Linux-it; prej këndej rrjedh edhe “GNU/Linux”."
 
 #. 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: "
-"&ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes say &ldquo;GNU con "
-"Linux&rdquo;."
+#, fuzzy
+#| 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: &ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes say &ldquo;GNU "
+#| "con Linux&rdquo;."
+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: "
+"&ldquo;GNU-Linux.&rdquo; In Spanish, we sometimes say &ldquo;GNU con Linux."
+"&rdquo;"
 msgstr ""
 "Ka mënyra të tjera për të shprehur “ndërthurjen”.  Nëse mendoni që 
shenja "
 "plus është më e qartë, ju lutemi, përdoreni.  Në Frëngjisht, një 
vijë në mes "
@@ -2019,9 +2249,15 @@
 "</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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."
 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 "
+"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 ""
 "Duke ndjekur rregullat e anglishtes, në trajtën “GNU Emacs”, fjala 
“GNU” "
@@ -2065,8 +2301,13 @@
 "ulët i sistemit dhe që GNU-ja plotëson nivele teknikisht më të lartë."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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."
 msgid ""
-"However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a "
+"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 ""
@@ -2075,8 +2316,14 @@
 "jashtë e GNU-së dhe që e bën të duket sikur krejt sistemi është Linux."
 
 #. type: Content of: <div><dl><dt>
+#, fuzzy
+#| 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 whatever they like? <span class=\"anchor-reference-id\">(<a "
+#| "href=\"#distronames0\">#distronames0</a>)</span>"
 msgid ""
-"My distro's developers call it &ldquo;Foobar Linux&rdquo;, but that doesn't "
+"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 "
 "whatever they like? <span class=\"anchor-reference-id\">(<a href="
 "\"#distronames0\">#distronames0</a>)</span>"
@@ -2138,11 +2385,17 @@
 "id\">(<a href=\"#distronames1\">#distronames1</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 proper for you to correct the misinformation by calling it &ldquo;"
+#| "Foobar GNU/Linux&rdquo;."
 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 "
+"Linux,&rdquo; and call their version of it &ldquo;Foobar Linux,&rdquo; it's "
 "proper for you to correct the misinformation by calling it &ldquo;Foobar GNU/"
-"Linux&rdquo;."
+"Linux.&rdquo;"
 msgstr ""
 "Kur përhapin informacione të gabuara duke ndryshuar “GNU” në 
“Linux”, dhe e "
 "quajnë versionin e tyre “Aksh Linux”, është e drejtë që ta ndreqni "
@@ -2179,12 +2432,19 @@
 "të tjera, asaj shoqërie nuk iu bë vonë se çfarë qe e drejtë."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 "
+#| "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;."
 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 "
 "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;."
+"&ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "Nuk i bëjmë dot ta bëjnë këtë si duhet, por nuk jemi nga ata që heqin 
dorë "
 "meqë rruga nuk qenkësh e lehtë.  Mund të mos keni aq ndikim në dorën 
tuaj sa "
@@ -2204,16 +2464,26 @@
 "class=\"anchor-reference-id\">(<a href=\"#reserve\">#reserve</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| msgid ""
+#| "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 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 nonfree "
+#| "applications and drivers), or making the system more popular even at the "
+#| "cost of freedom."
 msgid ""
 "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 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 nonfree "
-"applications and drivers), or making the system more popular even at the "
-"cost of freedom."
+"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 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 nonfree applications "
+"and drivers), or making the system more popular even at the cost of freedom."
 msgstr ""
 "Praktika shumë e përhapur e shtimit të software-it jo të lirë te sistemi 
GNU/"
 "Linux është problem i madh për bashkësinë tonë.  Ajo sikur u mëson "
@@ -2246,6 +2516,15 @@
 "qenë GNU së pari."
 
 #. 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 "
+#| "nonfree 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> "
@@ -2253,7 +2532,7 @@
 "specifically for the sake of the users' freedom.  With this understanding, "
 "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;."
+"proper and appropriate &ldquo;versions of Linux.&rdquo;"
 msgstr ""
 "Rruga për t’i drejtuar këta përdorues të shohin lidhjen me lirinë 
është "
 "saktësisht e kundërta: t’u bëhet e ditur atyre se krejt këto versione "
@@ -2347,11 +2626,17 @@
 "funksiononte, mund ta kishim bërë.  (Por kësaj i thonë: mend pas 
kuvendi.)"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and "
+#| "we don't want to act like that."
 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 "
-"and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and we don't want "
-"to act like that."
+"GNU,&rdquo; that would be somewhat like making a version of the GNU system "
+"and labeling it &ldquo;Linux.&rdquo; That wasn't right, and we don't want to "
+"act like that."
 msgstr ""
 "Po të qe për të marrë një version të GNU/Linux-it dhe ta rietiketojmë 
si "
 "“GNU”, do të qe si të merrnim një version të sistemit GNU dhe ta 
etiketonim "
@@ -2386,11 +2671,21 @@
 "kishin nevojë të pastroheshin."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 "
+#| "with the GNU Project because he was a &ldquo;Linux user&rdquo;.  That "
+#| "came as a shock, because the people who ported GNU packages to other "
+#| "systems had generally wanted to work with us to get their changes "
+#| "installed.  Yet these people, developing a system that was primarily "
+#| "based on GNU, were the first (and still practically the only) group that "
+#| "was unwilling to work with us."
 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 "
-"with the GNU Project because he was a &ldquo;Linux user&rdquo;.  That came "
-"as a shock, because the people who ported GNU packages to other systems had "
+"with the GNU Project because he was a &ldquo;Linux user.&rdquo; That came as "
+"a shock, because the people who ported GNU packages to other systems had "
 "generally wanted to work with us to get their changes installed.  Yet these "
 "people, developing a system that was primarily based on GNU, were the first "
 "(and still practically the only) group that was unwilling to work with us."
@@ -2405,9 +2700,16 @@
 "punonin me ne."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 obstructing our work.  Asking you to call the system &ldquo;GNU/"
+#| "Linux&rdquo; is our response to that problem, and to the other problems "
+#| "caused by the &ldquo;Linux&rdquo; misnomer."
 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 "
+"version of the GNU system &ldquo;Linux,&rdquo; and that this confusion was "
 "obstructing our work.  Asking you to call the system &ldquo;GNU/Linux&rdquo; "
 "is our response to that problem, and to the other problems caused by the "
 "&ldquo;Linux&rdquo; misnomer."
@@ -2448,10 +2750,14 @@
 "\"#allgpled\">#allgpled</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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;."
 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;."
+"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 ""
 "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”."
@@ -2565,10 +2871,18 @@
 "pjesë të tyre, nga Unix-i; gjithçka duhej shkruar nga e para."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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.  The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not "
+#| "Unix&rdquo;, is a humorous way of giving credit to Unix for this, "
+#| "following a hacker tradition of recursive acronyms that started in the "
+#| "70s."
 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.  "
-"The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not Unix&rdquo;, "
+"The name &ldquo;GNU,&rdquo; which stands for &ldquo;GNU's Not Unix,&rdquo; "
 "is a humorous way of giving credit to Unix for this, following a hacker "
 "tradition of recursive acronyms that started in the 70s."
 msgstr ""
@@ -2579,11 +2893,20 @@
 "hacker-ësh për shkurtime ripërsëritëse që zuri fill në vitet ’70."
 
 #. 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=\"https://stallman.org/articles/on-hacking.html\";>playful "
+#| "cleverness</a>.)"
 msgid ""
-"The first such recursive acronym was TINT, &ldquo;TINT Is Not TECO&rdquo;.  "
+"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 "
+"like &ldquo;<em>somethingorother</em> TECO,&rdquo; he thought of a clever "
 "amusing name.  (That's what hacking means: <a href=\"https://stallman.org/";
 "articles/on-hacking.html\">playful cleverness</a>.)"
 msgstr ""
@@ -2595,13 +2918,21 @@
 "hacking.html\">mençuri lojcake</a>.)"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 was similar to some existing program (let's imagine its name was "
+#| "&ldquo;Klever&rdquo;), you could give it a recursive acronym name, such "
+#| "as &ldquo;MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same "
+#| "spirit we called our replacement for Unix &ldquo;GNU's Not Unix&rdquo;."
 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 "
 "was similar to some existing program (let's imagine its name was &ldquo;"
 "Klever&rdquo;), you could give it a recursive acronym name, such as &ldquo;"
 "MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same spirit we "
-"called our replacement for Unix &ldquo;GNU's Not Unix&rdquo;."
+"called our replacement for Unix &ldquo;GNU's Not Unix.&rdquo;"
 msgstr ""
 "Hacker-ë të tjerë e pëlqyen kaq shumë emrin sa filluan ta imitojnë 
stilin.  "
 "U bë si traditë që, sa herë që shkruanit nga e para një program që qe 
i "
@@ -2611,13 +2942,21 @@
 "“GNU’s Not Unix”."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 in a system 99% copied from Unix.  AT&amp;T actually threatened "
+#| "to sue anyone giving AT&amp;T credit in that way.  This is why each of "
+#| "the various modified versions of Unix (all proprietary, like Unix) had a "
+#| "completely different name that didn't include &ldquo;Unix&rdquo;."
 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 "
 "in a system 99% copied from Unix.  AT&amp;T actually threatened to sue "
 "anyone giving AT&amp;T credit in that way.  This is why each of the various "
 "modified versions of Unix (all proprietary, like Unix) had a completely "
-"different name that didn't include &ldquo;Unix&rdquo;."
+"different name that didn't include &ldquo;Unix.&rdquo;"
 msgstr ""
 "Historikisht, AT&amp;T, që krijoi Unix-in, nuk donte që ndonjë t’i jepte 
"
 "hakën duke përdorur &ldquo;Unix&rdquo; te emri i një sistemi të 
ngjashëm, as "
@@ -2691,9 +3030,16 @@
 "emri “GNU/Linux” është i përshtatshëm për të."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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/"
+#| "kernelofNetBSD&rdquo; would be more accurate, since NetBSD is an entire "
+#| "system, not just the kernel.  This is not a BSD system, since most of the "
+#| "system is the same as the GNU/Linux system."
 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/"
+"call it &ldquo;Debian GNU/NetBSD,&rdquo; but &ldquo;GNU/"
 "kernelofNetBSD&rdquo; would be more accurate, since NetBSD is an entire "
 "system, not just the kernel.  This is not a BSD system, since most of the "
 "system is the same as the GNU/Linux system."
@@ -2715,8 +3061,15 @@
 "\">#othersys</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 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."
 msgid ""
-"Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of "
+"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 "
@@ -2822,8 +3175,14 @@
 "të përbashkët është Linux-i."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 Linux, because it doesn't have the usual Linux [sic] libraries and "
+#| "utilities [meaning the GNU system].&rdquo;"
 msgid ""
-"If you call the whole GNU/Linux system &ldquo;Linux&rdquo;, you will find it "
+"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 "
 "Linux, because it doesn't have the usual Linux [sic] libraries and utilities "
 "[meaning the GNU system].&rdquo;"
@@ -2866,9 +3225,15 @@
 "domethënien e synuar."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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."
 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 "
+"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 ""
 "Publikut do t’i duket shumë e çuditshme të flitet për përdorim të 
Android-it "
@@ -2876,23 +3241,39 @@
 "thuhet se biseduat me zorrët apo me sistemin e frymëmarrjes së atij 
personi."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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;."
 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;."
+"of the whole system as &ldquo;Linux.&rdquo;"
 msgstr ""
 "Publiku <em>do ta</em> kuptojë idenë e “të përdorurit të Linux-it” 
kur është "
 "vërtet GNU/Linux, përmes keqkuptimit të rëndomtë: duke e menduar krejt "
 "sitemin si “Linux”."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 "
+#| "contain Linux is irrelevant to using them, just as the fact that a car "
+#| "and a bicycle both have a structure of metal is irrelevant to using those "
+#| "two.  If you wish to talk about using cars and bikes, you wouldn't speak "
+#| "of &ldquo;riding metal objects&rdquo; &mdash; not unless you're playing "
+#| "games with the reader.  You would say, &ldquo;using cars and bikes."
+#| "&rdquo; Likewise, the clear way to talk about using GNU/Linux and Android "
+#| "is to say &ldquo;using GNU/Linux and Android.&rdquo;"
 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 "
 "contain Linux is irrelevant to using them, just as the fact that a car and a "
 "bicycle both have a structure of metal is irrelevant to using those two.  If "
 "you wish to talk about using cars and bikes, you wouldn't speak of &ldquo;"
-"riding metal objects&rdquo; &mdash; not unless you're playing games with the "
+"riding metal objects&rdquo;&mdash;not unless you're playing games with the "
 "reader.  You would say, &ldquo;using cars and bikes.&rdquo; Likewise, the "
 "clear way to talk about using GNU/Linux and Android is to say &ldquo;using "
 "GNU/Linux and Android.&rdquo;"
@@ -2987,11 +3368,17 @@
 "span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 "
+#| "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."
 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 "
-"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."
+"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."
 msgstr ""
 "Do të ishte gabim, ndaj këtë nuk e bëjmë.  Vepra e Torvalds-it është 
Linux-"
 "i, kerneli; ne bëjmë kujdes që të mos ia veshim atë vepër Projektit GNU 
ose "
@@ -3007,12 +3394,37 @@
 "\"anchor-reference-id\">(<a href=\"#linusagreed\">#linusagreed</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
-msgid ""
-"He recognized this at the beginning.  The earliest Linux release notes said, "
-"<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>."
+#, fuzzy
+#| msgid ""
+#| "He recognized this at the beginning.  The earliest Linux release notes "
+#| "said, <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>."
+msgid ""
+"He recognized this at the beginning.  The <a href=\"https://ftp.funet.fi/pub/";
+"linux/historical/kernel/old-versions/RELNOTES-0.01\"> earliest Linux release "
+"notes</a> said:"
+msgstr ""
+"Ai e pranoi këtë në ato fillime.  Shënimet e hedhjeve në qarkullim për 
Linux-"
+"in më të hershëm thonë, <a 
href=\"https://ftp.funet.fi/pub/linux/historical/";
+"kernel/old-versions/RELNOTES-0.01\"> “Shumica e mjeteve të përdorura me "
+"linux-in janë <em>software</em> GNU dhe gjenden nën <em>GNU copyleft</em>. "
+"Këto mjete nuk janë pjesë e shpërndarjes - për më tepër hollësi, 
pyetmëni "
+"mua (ose GNU-në)”</a>."
+
+#. type: Content of: <div><dl><dd><blockquote><p>
+#, fuzzy
+#| msgid ""
+#| "He recognized this at the beginning.  The earliest Linux release notes "
+#| "said, <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>."
+msgid ""
+"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."
 msgstr ""
 "Ai e pranoi këtë në ato fillime.  Shënimet e hedhjeve në qarkullim për 
Linux-"
 "in më të hershëm thonë, <a 
href=\"https://ftp.funet.fi/pub/linux/historical/";
@@ -3066,11 +3478,19 @@
 "id\">(<a href=\"#lost\">#lost</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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;: 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."
 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;: "
 "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 "
+"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."
 msgstr ""
@@ -3092,13 +3512,23 @@
 "\"#whatgood\">#whatgood</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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;GNU/Linux&rdquo;, you will help others learn the system's true "
+#| "history, origin, and reason for being.  You can't correct the misnomer "
+#| "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."
 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;"
-"GNU/Linux&rdquo;, you will help others learn the system's true history, "
+"GNU/Linux,&rdquo; you will help others learn the system's true history, "
 "origin, and reason for being.  You can't correct the misnomer 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 "
+"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."
 msgstr ""
@@ -3122,10 +3552,16 @@
 "\"anchor-reference-id\">(<a href=\"#explain\">#explain</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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."
 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."
+"the system &ldquo;GNU/Linux,&rdquo; and uses your time inefficiently."
 msgstr ""
 "Nëse na ndihmoni duke u shpjeguar të tjerëve në këtë mënyrë, e 
vlerësojmë "
 "mundimin tuaj, por kjo nuk është metoda më e mirë.  Nuk është aq e 
efektshme "
@@ -3133,12 +3569,21 @@
 "paefektshme."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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, and they may learn a correct picture of the system's origin.  "
+#| "But they are unlikely to repeat the explanation to others whenever they "
+#| "talk about the system.  They will probably just call it &ldquo;"
+#| "Linux&rdquo;.  Without particularly intending to, they will help spread "
+#| "the incorrect picture."
 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, "
 "and they may learn a correct picture of the system's origin.  But they are "
 "unlikely to repeat the explanation to others whenever they talk about the "
-"system.  They will probably just call it &ldquo;Linux&rdquo;.  Without "
+"system.  They will probably just call it &ldquo;Linux.&rdquo; Without "
 "particularly intending to, they will help spread the incorrect picture."
 msgstr ""
 "Është e paefektshme sepse nuk ka për t’u qartësuar, dhe me siguri nuk 
ka për "
@@ -3274,9 +3719,13 @@
 "class=\"anchor-reference-id\">(<a href=\"#force\">#force</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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."
 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."
+"&ldquo;GNU/Linux,&rdquo; and we ask you to do it too."
 msgstr ""
 "Do të qe gabim të detyrohen, dhe as provojmë.  Ne e quajmë sistemin 
“GNU/"
 "Linux”, dhe ju kërkojmë të bëni njësoj."
@@ -3360,9 +3809,15 @@
 "termin “licencë BSD” pa specifikuar se për cilën bëhet fjalë."
 
 #. type: Content of: <div><dl><dt>
+#, fuzzy
+#| 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 "
+#| "complaining now? <span class=\"anchor-reference-id\">(<a href=\"#deserve"
+#| "\">#deserve</a>)</span>"
 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 "
+"the system &ldquo;GNU,&rdquo; you deserve what happened; why are you "
 "complaining now? <span class=\"anchor-reference-id\">(<a href=\"#deserve"
 "\">#deserve</a>)</span>"
 msgstr ""
@@ -3416,8 +3871,13 @@
 "është i ligjshëm dhe i pranueshëm."
 
 #. type: Content of: <div><dl><dt>
+#, fuzzy
+#| 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>"
 msgid ""
-"Since many people call it &ldquo;Linux&rdquo;, doesn't that make it right? "
+"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 ""
@@ -3440,9 +3900,15 @@
 "\">#knownname</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 add &ldquo;(often erroneously referred to as &lsquo;"
+#| "Linux&rsquo;)&rdquo; once in a while, they will all understand."
 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 "
+"&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."
 msgstr ""

Index: po/gnu-linux-faq.sr.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.sr.po,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- po/gnu-linux-faq.sr.po      31 Aug 2021 10:37:08 -0000      1.68
+++ po/gnu-linux-faq.sr.po      2 Nov 2021 14:41:51 -0000       1.69
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-linux-faq.html\n"
-"POT-Creation-Date: 2021-08-31 10:27+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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"
@@ -34,10 +34,15 @@
 msgid "by Richard Stallman"
 msgstr "ЧПП ГНУ-а са Линуксом од Ричарда 
Сталмана"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| 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."
 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.  "
+"that many others call just &ldquo;Linux,&rdquo; they ask many questions.  "
 "Here are common questions, and our answers."
 msgstr ""
 "Људи који примете да ми користимо и 
препоручујемо назив „ГНУ са "
@@ -236,11 +241,17 @@
 "неистинито називати систем просто 
„ГНУ-ом“?</a>"
 
 #. type: Content of: <div><div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#trademarkfee\">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 wrong if I use &ldquo;GNU&rdquo; without "
+#| "&ldquo;Linux&rdquo;, to save the fee?</a>"
 msgid ""
 "<a href=\"#trademarkfee\">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 wrong if I use &ldquo;GNU&rdquo; without "
-"&ldquo;Linux&rdquo;, to save the fee?</a>"
+"&ldquo;GNU/Linux.&rdquo; Is it wrong if I use &ldquo;GNU&rdquo; without "
+"&ldquo;Linux,&rdquo; to save the fee?</a>"
 msgstr ""
 "<a href=\"#trademarkfee\">Уколико користим назив 
„Линукс“ у називу "
 "производа, морам да за то платим. Исто важи 
и ако користим назив „ГНУ са "
@@ -335,11 +346,17 @@
 "<a href=\"#whyorder\">Зашто „ГНУ са Линуксом“ 
уместо „Линукс са ГНУ-ом“?</a>"
 
 #. type: Content of: <div><div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#distronames\">My distro is called &ldquo;Foobar Linux&rdquo;; "
+#| "doesn't that show it's really Linux?</a>"
 msgid ""
-"<a href=\"#distronames0\">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 whatever they like?</a>"
+"<a href=\"#distronames0\">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 whatever they like?</a>"
 msgstr ""
+"<a href=\"#distronames\">Моја дистрибуција се зове 
„Нештонешто Линукс“. Зар "
+"то не говори да се ради о Линуксу?</a>"
 
 #. type: Content of: <div><div><ul><li>
 msgid ""
@@ -579,9 +596,14 @@
 "да се систем назива „ГНУ-ом“?</a>"
 
 #. type: Content of: <div><div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#deserve\">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 complaining now?</a>"
 msgid ""
 "<a href=\"#deserve\">Since you failed to put something in the GNU GPL to "
-"require people to call the system &ldquo;GNU&rdquo;, you deserve what "
+"require people to call the system &ldquo;GNU,&rdquo; you deserve what "
 "happened; why are you complaining now?</a>"
 msgstr ""
 "<a href=\"#deserve\">Пошто нисте ставили нешто у 
ГНУ-ову ОЈЛ што би "
@@ -597,8 +619,12 @@
 "ставу толиких људи?</a>"
 
 #. type: Content of: <div><div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#somanyright\">Since many people call it &ldquo;Linux&rdquo;, "
+#| "doesn't that make it right?</a>"
 msgid ""
-"<a href=\"#somanyright\">Since many people call it &ldquo;Linux&rdquo;, "
+"<a href=\"#somanyright\">Since many people call it &ldquo;Linux,&rdquo; "
 "doesn't that make it right?</a>"
 msgstr ""
 "<a href=\"#somanyright\">Пошто има доста људи који 
називају систем "
@@ -769,6 +795,16 @@
 "од људи да исправе ову праксу. Али до тада 
је забуна узела велики замајац."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 it must be right.  The name &ldquo;Linux&rdquo; also spreads a "
+#| "false picture of the system's origin, because people tend to suppose that "
+#| "the system's history was such as to fit that name.  For instance, they "
+#| "often believe its development was started by Linus Torvalds in 1991.  "
+#| "This false picture tends to reinforce the idea that the system should be "
+#| "called &ldquo;Linux&rdquo;."
 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 "
@@ -776,7 +812,7 @@
 "of the system's origin, because people tend to suppose that the system's "
 "history was such as to fit that name.  For instance, they often believe its "
 "development was started by Linus Torvalds in 1991.  This false picture tends "
-"to reinforce the idea that the system should be called &ldquo;Linux&rdquo;."
+"to reinforce the idea that the system should be called &ldquo;Linux.&rdquo;"
 msgstr ""
 "Већина људи који називају систем 
„Линуксом“ никад нису ни чули зашто то 
није "
 "исправно. Они су чули да други користе то 
име и претпостављају да је "
@@ -803,22 +839,35 @@
 "\"anchor-reference-id\">(<a href=\"#always\">#always</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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."
 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."
+"you're referring specifically to the kernel, you should call it &ldquo;Linux,"
+"&rdquo; the name its developer chose."
 msgstr ""
 "Не увек, већ само ако мислите на цео 
систем. Када мислите искључиво на "
 "језгро, требало би да га називате 
„Линуксом“, називом који је изабрао његов "
 "градитељ."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 kinds of confusion, because only experts can tell whether a "
+#| "statement is about the kernel or the whole system.  By calling the whole "
+#| "system &ldquo;GNU/Linux&rdquo;, and calling the kernel &ldquo;"
+#| "Linux&rdquo;, you avoid the ambiguity."
 msgid ""
-"When people call the whole system &ldquo;Linux&rdquo;, as a consequence they "
+"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 "
 "kinds of confusion, because only experts can tell whether a statement is "
 "about the kernel or the whole system.  By calling the whole system &ldquo;"
-"GNU/Linux&rdquo;, and calling the kernel &ldquo;Linux&rdquo;, you avoid the "
+"GNU/Linux,&rdquo; and calling the kernel &ldquo;Linux,&rdquo; you avoid the "
 "ambiguity."
 msgstr ""
 "Када људи називају цео систем 
„Линуксом“, они називају цео систем по 
језгру. "
@@ -885,8 +934,13 @@
 "\"anchor-reference-id\">(<a href=\"#divide\">#divide</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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."
 msgid ""
-"When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing "
+"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 ""
@@ -940,10 +994,23 @@
 "a>."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 freedom are more likely to call the system &ldquo;GNU/"
+#| "Linux&rdquo;, and people who learn that the system is &ldquo;GNU/"
+#| "Linux&rdquo; are more likely to pay attention to our philosophical "
+#| "arguments for freedom and community (which is why the choice of name for "
+#| "the system makes a real difference for society).  However, the "
+#| "disagreement would probably exist even if everyone knew the system's real "
+#| "origin and its proper name, because the issue is a real one.  It can only "
+#| "go away if we who value freedom either persuade everyone (which won't be "
+#| "easy) or are defeated entirely (let's hope not)."
 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 "
-"freedom are more likely to call the system &ldquo;GNU/Linux&rdquo;, and "
+"freedom are more likely to call the system &ldquo;GNU/Linux,&rdquo; and "
 "people who learn that the system is &ldquo;GNU/Linux&rdquo; are more likely "
 "to pay attention to our philosophical arguments for freedom and community "
 "(which is why the choice of name for the system makes a real difference for "
@@ -998,10 +1065,17 @@
 "\"#everyoneknows\">#everyoneknows</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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 system do not mention the name &ldquo;GNU&rdquo;, or the ideals that "
+#| "GNU stands for.  <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU "
+#| "Users Who Have Never Heard of GNU</a> explains further."
 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 "
-"system do not mention the name &ldquo;GNU&rdquo;, or the ideals that GNU "
+"system do not mention the name &ldquo;GNU,&rdquo; or the ideals that GNU "
 "stands for.  <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users "
 "Who Have Never Heard of GNU</a> explains further."
 msgstr ""
@@ -1012,11 +1086,17 @@
 "нису чули за ГНУ</a> пружа додатна 
објашњења."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 GNU is.  For instance, many think it is a collection of <a "
+#| "href=\"#tools\">&ldquo;tools&rdquo;</a>, or a project to develop tools."
 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 "
-"GNU is.  For instance, many think it is a collection of <a href=\"#tools"
-"\">&ldquo;tools&rdquo;</a>, or a project to develop tools."
+"GNU is.  For instance, many think it is a collection of &ldquo;<a href="
+"\"#tools\">tools</a>,&rdquo; or a project to develop tools."
 msgstr ""
 "Људи који ово питају су највероватније 
залуђеници који мисле на залуђенике "
 "које они познају. Залуђеници су најчешће 
чули за ГНУ, али већина гаји сасвим "
@@ -1048,11 +1128,18 @@
 "\"#everyoneknows2\">#everyoneknows2</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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;"
+#| "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?"
 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;"
-"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?"
+"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?"
 msgstr ""
 "Ако ваше речи не одражавају ваше знање, 
онда не подучавате друге. Већина "
 "људи која је чула за систем ГНУ са 
Линуксом сматра да је он „Линукс“, кога "
@@ -1108,14 +1195,23 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#tools\">#tools</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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 "
+#| "that GNU is the name of a collection of programs&mdash;often they say "
+#| "&ldquo;programming tools&rdquo;, since some of our programming tools "
+#| "became popular on their own.  The idea that &ldquo;GNU&rdquo; is the name "
+#| "of an operating system is hard to fit into a conceptual framework in "
+#| "which that operating system is labeled &ldquo;Linux&rdquo;."
 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 "
 "that GNU is the name of a collection of programs&mdash;often they say &ldquo;"
-"programming tools&rdquo;, since some of our programming tools became popular "
+"programming tools,&rdquo; since some of our programming tools became popular "
 "on their own.  The idea that &ldquo;GNU&rdquo; is the name of an operating "
 "system is hard to fit into a conceptual framework in which that operating "
-"system is labeled &ldquo;Linux&rdquo;."
+"system is labeled &ldquo;Linux.&rdquo;"
 msgstr ""
 "Уколико уопште и чују за ГНУ, људи који 
мисле да је Линукс цео оперативни "
 "систем често погрешно схвате шта је ГНУ. 
Они могу бити мишљења да је ГНУ "
@@ -1182,12 +1278,23 @@
 "покретањем и заустављањем других 
програма."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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.  The use of &ldquo;operating system&rdquo; to mean "
+#| "&ldquo;kernel&rdquo; is found in a number of textbooks on system design, "
+#| "going back to the 80s.  At the same time, in the 80s, the &ldquo;Unix "
+#| "operating system&rdquo; was understood to include all the system "
+#| "programs, and Berkeley's version of Unix included even games. Since we "
+#| "intended GNU to be a Unix-like operating system, we use the term &ldquo;"
+#| "operating system&rdquo; in the same way."
 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.  "
-"The use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is "
-"found in a number of textbooks on system design, going back to the 80s.  At "
-"the same time, in the 80s, the &ldquo;Unix operating system&rdquo; was "
+"to mean &ldquo;kernel.&rdquo; Both uses of the term go back many years.  The "
+"use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is found "
+"in a number of textbooks on system design, going back to the 80s.  At the "
+"same time, in the 80s, the &ldquo;Unix operating system&rdquo; was "
 "understood to include all the system programs, and Berkeley's version of "
 "Unix included even games. Since we intended GNU to be a Unix-like operating "
 "system, we use the term &ldquo;operating system&rdquo; in the same way."
@@ -1202,11 +1309,20 @@
 "користимо израз „оперативни систем“ на 
овај последњи начин."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 "
+#| "sense we use: they mean the whole collection of programs.  If that's what "
+#| "you are referring to, please call it &ldquo;GNU/Linux&rdquo;.  If you "
+#| "mean just the kernel, then &ldquo;Linux&rdquo; is the right name for it, "
+#| "but please say &ldquo;kernel&rdquo; also to avoid ambiguity about which "
+#| "body of software you mean."
 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 "
 "sense we use: they mean the whole collection of programs.  If that's what "
-"you are referring to, please call it &ldquo;GNU/Linux&rdquo;.  If you mean "
+"you are referring to, please call it &ldquo;GNU/Linux.&rdquo; If you mean "
 "just the kernel, then &ldquo;Linux&rdquo; is the right name for it, but "
 "please say &ldquo;kernel&rdquo; also to avoid ambiguity about which body of "
 "software you mean."
@@ -1219,10 +1335,16 @@
 "„део тела“ софтвера мислите."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "If you prefer to use some other term such as &ldquo;system "
+#| "distribution&rdquo; for the entire collection of programs, instead of "
+#| "&ldquo;operating system&rdquo;, that's fine.  Then you would talk about "
+#| "GNU/Linux system distributions."
 msgid ""
 "If you prefer to use some other term such as &ldquo;system "
 "distribution&rdquo; for the entire collection of programs, instead of &ldquo;"
-"operating system&rdquo;, that's fine.  Then you would talk about GNU/Linux "
+"operating system,&rdquo; that's fine.  Then you would talk about GNU/Linux "
 "system distributions."
 msgstr ""
 "Уколико више волите да користите неки 
други израз уместо „оперативни систем“ "
@@ -1328,9 +1450,9 @@
 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, "
-"window systems, libraries, and much more &mdash; hundreds of programs, even "
-"to match what BSD systems included in 1983.  Since Torvalds didn't develop "
-"any of those, how can the system be &ldquo;Linux&rdquo;?"
+"window systems, libraries, and much more&mdash;hundreds of programs, even to "
+"match what BSD systems included in 1983.  Since Torvalds didn't develop any "
+"of those, how can the system be &ldquo;Linux&rdquo;?"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><p>
@@ -1356,7 +1478,7 @@
 #. 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</a> are available.  None of them is called simply &ldquo;GNU,&rdquo; but "
 "GNU is what they basically are."
 msgstr ""
 
@@ -1389,8 +1511,8 @@
 
 #. 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 "
+"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 ""
 
@@ -1405,13 +1527,21 @@
 "\"#afterkernel\">#afterkernel</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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 system is developed as a single unified project, and the "
+#| "developers choose a name for the system as a whole.  The kernel usually "
+#| "does not have a name of its own&mdash;instead, people say &ldquo;the "
+#| "kernel of such-and-such&rdquo; or &ldquo;the such-and-such kernel&rdquo;."
 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 "
+"than the misuse of the name &ldquo;Linux.&rdquo; Normally an operating "
 "system is developed as a single unified project, and the developers choose a "
 "name for the system as a whole.  The kernel usually does not have a name of "
 "its own&mdash;instead, people say &ldquo;the kernel of such-and-such&rdquo; "
-"or &ldquo;the such-and-such kernel&rdquo;."
+"or &ldquo;the such-and-such kernel.&rdquo;"
 msgstr ""
 "Таква пракса је веома ретка — не можемо да 
пронађемо ниједан такав пример "
 "осим погрешне употребе назива „Линукс“. 
Обично се оперативни систем развија "
@@ -1459,9 +1589,14 @@
 "href=\"#long\">#long</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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."
 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.  "
+"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 ""
 "Ми смо неко време покушали да користимо 
назив „ЛиГНУкс“, који комбинује речи "
@@ -1469,8 +1604,13 @@
 "прихватају назив „ГНУ са Линуксом“."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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>."
 msgid ""
-"The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but we "
+"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 ""
@@ -1507,7 +1647,7 @@
 
 #. type: Content of: <div><dl><dd><p>
 msgid ""
-"It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you appreciate "
+"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 ""
@@ -1601,10 +1741,16 @@
 "не покушавамо да занемаримо његов 
допринос систему."
 
 #. type: Content of: <div><dl><dd><ul><li>
+#, fuzzy
+#| 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 system.  If we say &ldquo;GNU/Linux&rdquo;, they can make a "
+#| "connection to what they have heard about."
 msgid ""
-"Since many people know of the system as &ldquo;Linux&rdquo;, if we say "
+"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 "
-"system.  If we say &ldquo;GNU/Linux&rdquo;, they can make a connection to "
+"system.  If we say &ldquo;GNU/Linux,&rdquo; they can make a connection to "
 "what they have heard about."
 msgstr ""
 "Пошто многи људи знају за систем 
„Линукс“, уколико кажемо „ГНУ“ они могу 
да "
@@ -1612,10 +1758,17 @@
 "повезати оно што ми причамо са оним што су 
већ чули."
 
 #. type: Content of: <div><dl><dt>
+#, fuzzy
+#| 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 wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to save "
+#| "the fee? <span class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
+#| "\">#trademarkfee</a>)</span>"
 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 "
-"wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to save the "
+"product, and that would also apply if I say &ldquo;GNU/Linux.&rdquo; Is it "
+"wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux,&rdquo; to save the "
 "fee? <span class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
 "\">#trademarkfee</a>)</span>"
 msgstr ""
@@ -1636,9 +1789,14 @@
 "обавезни да плаћате привилегију да то 
радите."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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."
 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."
+"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 ""
 "Зато вас нећемо критиковати ако желите да 
систем називате само „ГНУ-ом“, "
 "како бисте избегли плаћање за назив 
„Линукс“."
@@ -1698,12 +1856,19 @@
 "нећемо противити ма где да је поставите."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 giving credit, not for any possible threshold level, is &ldquo;"
+#| "Linux&rdquo;.  It can't be fair to give all the credit to one secondary "
+#| "contribution (Linux) while omitting the principal contribution (GNU)."
 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 "
-"giving credit, not for any possible threshold level, is &ldquo;"
-"Linux&rdquo;.  It can't be fair to give all the credit to one secondary "
-"contribution (Linux) while omitting the principal contribution (GNU)."
+"giving credit, not for any possible threshold level, is &ldquo;Linux.&rdquo; "
+"It can't be fair to give all the credit to one secondary contribution "
+"(Linux) while omitting the principal contribution (GNU)."
 msgstr ""
 "Различите границе воде у различит избор 
назива система. Али назив који "
 "никако не може настати из бриге за 
правичност и одавање признања је "
@@ -1732,7 +1897,7 @@
 "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."
+"system &ldquo;GNU/systemd/Linux,&rdquo; there is nothing wrong with doing so."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
@@ -1776,11 +1941,17 @@
 "\"anchor-reference-id\">(<a href=\"#allsmall\">#allsmall</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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 the same argument would apply even more strongly to calling it &ldquo;"
+#| "Linux&rdquo;."
 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 "
-"the same argument would apply even more strongly to calling it &ldquo;"
-"Linux&rdquo;."
+"the same argument would apply even more strongly to calling it &ldquo;Linux."
+"&rdquo;"
 msgstr ""
 "Године 2008. смо сазнали да ГНУ-ови пакети 
чине 15% „главног“ складишта "
 "дистрибуције ГНУ-а са Линуксом <em>gNewSense</em>. 
Линукс чини 1,5%. Зато би "
@@ -1843,9 +2014,16 @@
 "reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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 either &ldquo;GNU's version of Linux&rdquo; or &ldquo;"
+#| "Linux, which is a GNU package.&rdquo; Neither of those meanings fits the "
+#| "situation at hand."
 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 "
+"the word &ldquo;GNU&rdquo; modifies &ldquo;Linux.&rdquo; This can mean "
 "either &ldquo;GNU's version of Linux&rdquo; or &ldquo;Linux, which is a GNU "
 "package.&rdquo; Neither of those meanings fits the situation at hand."
 msgstr ""
@@ -1881,7 +2059,7 @@
 "We're not talking about a distinct GNU version of Linux, the kernel.  The "
 "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 "
+"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."
@@ -1894,11 +2072,18 @@
 "не бисмо желели да је тако називамо јер би 
то било збуњујуће."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 &ldquo;combination.&rdquo; (Think of &ldquo;Input/Output&rdquo;.)  "
+#| "This system is the combination of GNU and Linux; hence, &ldquo;GNU/"
+#| "Linux&rdquo;."
 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 "
-"&ldquo;combination.&rdquo; (Think of &ldquo;Input/Output&rdquo;.)  This "
-"system is the combination of GNU and Linux; hence, &ldquo;GNU/Linux&rdquo;."
+"&ldquo;combination.&rdquo; (Think of &ldquo;Input/Output.&rdquo;)  This "
+"system is the combination of GNU and Linux; hence, &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "Ради се о верзији оперативног система ГНУ, 
која се разликује од других по "
 "томе што јој је Линукс језгро. Коса 
црта<sup><a href=\"#TransNote3\">[3]</"
@@ -1907,11 +2092,17 @@
 "исправно „ГНУ са Линуксом“."
 
 #. 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: "
-"&ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes say &ldquo;GNU con "
-"Linux&rdquo;."
+#, fuzzy
+#| 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: &ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes say &ldquo;GNU "
+#| "con Linux&rdquo;."
+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: "
+"&ldquo;GNU-Linux.&rdquo; In Spanish, we sometimes say &ldquo;GNU con Linux."
+"&rdquo;"
 msgstr ""
 "Постоје и други начини да се изрази 
„комбинација“. Уколико сматрате да је "
 "знак „плус“ јаснији, користите њега. У 
француском је прикладнија цртица: "
@@ -1960,7 +2151,7 @@
 #| "situation at hand."
 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 "
+"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 ""
 "По правилима енглеског језика, реч „ГНУ“ 
(енг. <em>GNU</em>) у конструкцији "
@@ -2001,8 +2192,13 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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."
 msgid ""
-"However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a "
+"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 ""
@@ -2011,12 +2207,20 @@
 "ГНУ, тиме стварајући утисак да је цео 
систем Линукс."
 
 #. type: Content of: <div><dl><dt>
+#, fuzzy
+#| 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>"
 msgid ""
-"My distro's developers call it &ldquo;Foobar Linux&rdquo;, but that doesn't "
+"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 "
 "whatever they like? <span class=\"anchor-reference-id\">(<a href="
 "\"#distronames0\">#distronames0</a>)</span>"
 msgstr ""
+"Моја дистрибуција се зове „Нештонешто 
Линукс“. Зар то не говори да се ради о "
+"Линуксу? <span class=\"anchor-reference-id\">(<a href=\"#distronames"
+"\">#distronames</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
 msgid ""
@@ -2088,9 +2292,9 @@
 #| "mistake than it was to make the mistake."
 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 "
+"Linux,&rdquo; and call their version of it &ldquo;Foobar Linux,&rdquo; it's "
 "proper for you to correct the misinformation by calling it &ldquo;Foobar GNU/"
-"Linux&rdquo;."
+"Linux.&rdquo;"
 msgstr ""
 "Ако они могу да промене „ГНУ“ у 
„Нештонешто Линукс“, можете и ви тај назив 
"
 "да промените у „Нештонешто(в) ГНУ са 
Линуксом“. Не може бити мање исправно "
@@ -2160,7 +2364,7 @@
 "because the road isn't easy.  You may not have as much 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;."
+"&ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "Ми их не можемо променити, али ми нисмо 
људи који одустају зато што је пред "
 "њима трновит пут. Можда ви не поседујете 
толико утицаја као ИБМ или Ред Хет, "
@@ -2195,13 +2399,12 @@
 msgid ""
 "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 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 nonfree "
-"applications and drivers), or making the system more popular even at the "
-"cost of freedom."
+"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 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 nonfree applications "
+"and drivers), or making the system more popular even at the cost of freedom."
 msgstr ""
 "Раширена пракса додавања неслободног 
софтвера систему ГНУ са Линуксом "
 "представља крупан проблем за нашу 
заједницу. Та пракса поручује корисницима "
@@ -2248,7 +2451,7 @@
 "specifically for the sake of the users' freedom.  With this understanding, "
 "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;."
+"proper and appropriate &ldquo;versions of Linux.&rdquo;"
 msgstr ""
 "Пут ка схватању везе са слободом је управо 
супротан: требало би разгласити "
 "да све те верзије система <em>јесу</em> 
верзије ГНУ-а, и да су све засноване "
@@ -2346,11 +2549,17 @@
 "схватили.)"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and "
+#| "we don't want to act like that."
 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 "
-"and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and we don't want "
-"to act like that."
+"GNU,&rdquo; that would be somewhat like making a version of the GNU system "
+"and labeling it &ldquo;Linux.&rdquo; That wasn't right, and we don't want to "
+"act like that."
 msgstr ""
 "Постоји још један разлог због кога не 
желимо да неку постојећу верзију ГНУ-а "
 "са Линуксом прекрстимо у „ГНУ“: то би у 
неку руку било исто као преименовање "
@@ -2386,11 +2595,21 @@
 "се измене прочисте."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 "
+#| "with the GNU Project because he was a &ldquo;Linux user&rdquo;.  That "
+#| "came as a shock, because the people who ported GNU packages to other "
+#| "systems had generally wanted to work with us to get their changes "
+#| "installed.  Yet these people, developing a system that was primarily "
+#| "based on GNU, were the first (and still practically the only) group that "
+#| "was unwilling to work with us."
 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 "
-"with the GNU Project because he was a &ldquo;Linux user&rdquo;.  That came "
-"as a shock, because the people who ported GNU packages to other systems had "
+"with the GNU Project because he was a &ldquo;Linux user.&rdquo; That came as "
+"a shock, because the people who ported GNU packages to other systems had "
 "generally wanted to work with us to get their changes installed.  Yet these "
 "people, developing a system that was primarily based on GNU, were the first "
 "(and still practically the only) group that was unwilling to work with us."
@@ -2404,9 +2623,16 @@
 "једина) група која није желела да сарађује 
са нама."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 obstructing our work.  Asking you to call the system &ldquo;GNU/"
+#| "Linux&rdquo; is our response to that problem, and to the other problems "
+#| "caused by the &ldquo;Linux&rdquo; misnomer."
 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 "
+"version of the GNU system &ldquo;Linux,&rdquo; and that this confusion was "
 "obstructing our work.  Asking you to call the system &ldquo;GNU/Linux&rdquo; "
 "is our response to that problem, and to the other problems caused by the "
 "&ldquo;Linux&rdquo; misnomer."
@@ -2446,10 +2672,14 @@
 "span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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;."
 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;."
+"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 ""
 "Ми никада не називамо појединачне 
програме користећи образац „ГНУ са "
 "[назив]“ (енг. <em>GNU/</em>[назив]). Уколико је 
програм ГНУ-ов пакет, ми га "
@@ -2562,10 +2792,18 @@
 "из Уникса; све је морало да се наново 
напише."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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.  The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not "
+#| "Unix&rdquo;, is a humorous way of giving credit to Unix for this, "
+#| "following a hacker tradition of recursive acronyms that started in the "
+#| "70s."
 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.  "
-"The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not Unix&rdquo;, "
+"The name &ldquo;GNU,&rdquo; which stands for &ldquo;GNU's Not Unix,&rdquo; "
 "is a humorous way of giving credit to Unix for this, following a hacker "
 "tradition of recursive acronyms that started in the 70s."
 msgstr ""
@@ -2585,10 +2823,10 @@
 #| "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 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 "
+"like &ldquo;<em>somethingorother</em> TECO,&rdquo; he thought of a clever "
 "amusing name.  (That's what hacking means: <a href=\"https://stallman.org/";
 "articles/on-hacking.html\">playful cleverness</a>.)"
 msgstr ""
@@ -2600,13 +2838,21 @@
 "stallman.org/articles/on-hacking.html\">разиграна 
бистрина</a>.)"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 was similar to some existing program (let's imagine its name was "
+#| "&ldquo;Klever&rdquo;), you could give it a recursive acronym name, such "
+#| "as &ldquo;MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same "
+#| "spirit we called our replacement for Unix &ldquo;GNU's Not Unix&rdquo;."
 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 "
 "was similar to some existing program (let's imagine its name was &ldquo;"
 "Klever&rdquo;), you could give it a recursive acronym name, such as &ldquo;"
 "MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same spirit we "
-"called our replacement for Unix &ldquo;GNU's Not Unix&rdquo;."
+"called our replacement for Unix &ldquo;GNU's Not Unix.&rdquo;"
 msgstr ""
 "Другим хакерима се то име свидело толико 
да смо и ми имитирали овај принцип. "
 "Постала је традиција да програму, када 
пишете изнова програм који је сличан "
@@ -2616,13 +2862,21 @@
 "замени за Уникс дали име „ГНУ није 
Уникс“."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 in a system 99% copied from Unix.  AT&amp;T actually threatened "
+#| "to sue anyone giving AT&amp;T credit in that way.  This is why each of "
+#| "the various modified versions of Unix (all proprietary, like Unix) had a "
+#| "completely different name that didn't include &ldquo;Unix&rdquo;."
 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 "
 "in a system 99% copied from Unix.  AT&amp;T actually threatened to sue "
 "anyone giving AT&amp;T credit in that way.  This is why each of the various "
 "modified versions of Unix (all proprietary, like Unix) had a completely "
-"different name that didn't include &ldquo;Unix&rdquo;."
+"different name that didn't include &ldquo;Unix.&rdquo;"
 msgstr ""
 "Историјски, фирма Ејтиенти (енг. 
<em>AT&amp;T</em>), која је развила Уникс, "
 "није желела да јој ико ода признање 
користећи „Уникс“ у називу сличног "
@@ -2703,9 +2957,16 @@
 "са Линуксом“ погодан."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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/"
+#| "kernelofNetBSD&rdquo; would be more accurate, since NetBSD is an entire "
+#| "system, not just the kernel.  This is not a BSD system, since most of the "
+#| "system is the same as the GNU/Linux system."
 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/"
+"call it &ldquo;Debian GNU/NetBSD,&rdquo; but &ldquo;GNU/"
 "kernelofNetBSD&rdquo; would be more accurate, since NetBSD is an entire "
 "system, not just the kernel.  This is not a BSD system, since most of the "
 "system is the same as the GNU/Linux system."
@@ -2726,8 +2987,15 @@
 "\"#othersys\">#othersys</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 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."
 msgid ""
-"Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of "
+"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 "
@@ -2880,7 +3148,7 @@
 
 #. type: Content of: <div><dl><dd><p>
 msgid ""
-"If you call the whole GNU/Linux system &ldquo;Linux&rdquo;, you will find it "
+"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 "
 "Linux, because it doesn't have the usual Linux [sic] libraries and utilities "
 "[meaning the GNU system].&rdquo;"
@@ -2911,7 +3179,7 @@
 #. 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 "
+"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 ""
 
@@ -2919,7 +3187,7 @@
 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;."
+"of the whole system as &ldquo;Linux.&rdquo;"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><p>
@@ -2929,7 +3197,7 @@
 "contain Linux is irrelevant to using them, just as the fact that a car and a "
 "bicycle both have a structure of metal is irrelevant to using those two.  If "
 "you wish to talk about using cars and bikes, you wouldn't speak of &ldquo;"
-"riding metal objects&rdquo; &mdash; not unless you're playing games with the "
+"riding metal objects&rdquo;&mdash;not unless you're playing games with the "
 "reader.  You would say, &ldquo;using cars and bikes.&rdquo; Likewise, the "
 "clear way to talk about using GNU/Linux and Android is to say &ldquo;using "
 "GNU/Linux and Android.&rdquo;"
@@ -3019,11 +3287,17 @@
 "\"anchor-reference-id\">(<a href=\"#claimlinux\">#claimlinux</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 "
+#| "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."
 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 "
-"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."
+"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."
 msgstr ""
 "Било би погрешно, па зато то ми и не радимо. 
Торвалдсово дело је Линукс, "
 "језгро. Ми пазимо да га не припишемо 
Пројекту ГНУ или да га називамо „ГНУ-"
@@ -3047,11 +3321,28 @@
 #| "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=\"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>."
+"He recognized this at the beginning.  The <a href=\"https://ftp.funet.fi/pub/";
+"linux/historical/kernel/old-versions/RELNOTES-0.01\"> earliest Linux release "
+"notes</a> said:"
+msgstr ""
+"Он је ово схватао у почетку. У његовим 
најранијим објавним белешкама је "
+"стајало: <a 
href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-";
+"versions/RELNOTES-0.01\">„Већина алата који се 
користе уз Линукс су ГНУ-ов "
+"софтвер, и они су под ГНУ-овим копилефтом. 
Ти алати нису у дистрибуцији. За "
+"више података се обратите мени или 
ГНУ-у</a>.“"
+
+#. type: Content of: <div><dl><dd><blockquote><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 ""
+"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."
 msgstr ""
 "Он је ово схватао у почетку. У његовим 
најранијим објавним белешкама је "
 "стајало: <a 
href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-";
@@ -3092,11 +3383,19 @@
 "href=\"#lost\">#lost</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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;: 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."
 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;: "
 "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 "
+"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."
 msgstr ""
@@ -3117,13 +3416,23 @@
 "\"#whatgood\">#whatgood</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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;GNU/Linux&rdquo;, you will help others learn the system's true "
+#| "history, origin, and reason for being.  You can't correct the misnomer "
+#| "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."
 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;"
-"GNU/Linux&rdquo;, you will help others learn the system's true history, "
+"GNU/Linux,&rdquo; you will help others learn the system's true history, "
 "origin, and reason for being.  You can't correct the misnomer 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 "
+"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."
 msgstr ""
@@ -3146,22 +3455,37 @@
 "href=\"#explain\">#explain</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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."
 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."
+"the system &ldquo;GNU/Linux,&rdquo; and uses your time inefficiently."
 msgstr ""
 "Уколико нам помажете таквим објашњавањем 
другима, ми ценимо ваш труд, али то "
 "није најбољи начин. То није толико ефектно 
као називање система „ГНУ-ом са "
 "Линуксом“, и неефикасно троши ваше време."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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, and they may learn a correct picture of the system's origin.  "
+#| "But they are unlikely to repeat the explanation to others whenever they "
+#| "talk about the system.  They will probably just call it &ldquo;"
+#| "Linux&rdquo;.  Without particularly intending to, they will help spread "
+#| "the incorrect picture."
 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, "
 "and they may learn a correct picture of the system's origin.  But they are "
 "unlikely to repeat the explanation to others whenever they talk about the "
-"system.  They will probably just call it &ldquo;Linux&rdquo;.  Without "
+"system.  They will probably just call it &ldquo;Linux.&rdquo; Without "
 "particularly intending to, they will help spread the incorrect picture."
 msgstr ""
 "Није ефектно јер може да се не прими, а 
сигурно се неће ширити. Неки од оних "
@@ -3296,9 +3620,13 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#force\">#force</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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."
 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."
+"&ldquo;GNU/Linux,&rdquo; and we ask you to do it too."
 msgstr ""
 "Било би погрешно присиљавати их, и зато то 
ни не покушавамо. Ми називамо "
 "систем „ГНУ-ом са Линуксом“ и молимо вас 
да и ви то радите."
@@ -3389,9 +3717,15 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
+#, fuzzy
+#| 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 "
+#| "complaining now? <span class=\"anchor-reference-id\">(<a href=\"#deserve"
+#| "\">#deserve</a>)</span>"
 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 "
+"the system &ldquo;GNU,&rdquo; you deserve what happened; why are you "
 "complaining now? <span class=\"anchor-reference-id\">(<a href=\"#deserve"
 "\">#deserve</a>)</span>"
 msgstr ""
@@ -3446,8 +3780,13 @@
 "легитиман и прихватљив."
 
 #. type: Content of: <div><dl><dt>
+#, fuzzy
+#| 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>"
 msgid ""
-"Since many people call it &ldquo;Linux&rdquo;, doesn't that make it right? "
+"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 ""
@@ -3469,7 +3808,7 @@
 #. 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 "
+"&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."
 msgstr ""

Index: po/gnu-linux-faq.tr.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.tr.po,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -b -r1.91 -r1.92
--- po/gnu-linux-faq.tr.po      12 Sep 2021 07:34:21 -0000      1.91
+++ po/gnu-linux-faq.tr.po      2 Nov 2021 14:41:51 -0000       1.92
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-linux-faq.html\n"
-"POT-Creation-Date: 2021-08-31 10:27+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2021-09-12 07:32+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-11-02 14:27+0000\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 2.4.2\n"
 
@@ -34,10 +35,15 @@
 msgid "by Richard Stallman"
 msgstr "yazan Richard Stallman"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| 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."
 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.  "
+"that many others call just &ldquo;Linux,&rdquo; they ask many questions.  "
 "Here are common questions, and our answers."
 msgstr ""
 "İnsanlar, pek çok kimsenin &ldquo;Linux&rdquo; olarak adlandırdığı 
sistem "
@@ -254,11 +260,17 @@
 "&ldquo;GNU&rdquo; diye adlandırmak gerçeğe aykırı mı olurdu? </a>"
 
 #. type: Content of: <div><div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#trademarkfee\">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 wrong if I use &ldquo;GNU&rdquo; without "
+#| "&ldquo;Linux&rdquo;, to save the fee?</a>"
 msgid ""
 "<a href=\"#trademarkfee\">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 wrong if I use &ldquo;GNU&rdquo; without "
-"&ldquo;Linux&rdquo;, to save the fee?</a>"
+"&ldquo;GNU/Linux.&rdquo; Is it wrong if I use &ldquo;GNU&rdquo; without "
+"&ldquo;Linux,&rdquo; to save the fee?</a>"
 msgstr ""
 "<a href=\"#trademarkfee\">Eğer, bir ürün isminde &ldquo;Linux&rdquo; "
 "kelimesini kullanırsam karşılığında ücret ödemem gerekir. Bu durum 
&ldquo;"
@@ -348,10 +360,15 @@
 "Linux&rdquo;?</a>"
 
 #. type: Content of: <div><div><ul><li>
-msgid ""
-"<a href=\"#distronames0\">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 whatever they like?</a>"
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#distronames0\">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 whatever they like?</a>"
+msgid ""
+"<a href=\"#distronames0\">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 whatever they like?</a>"
 msgstr ""
 "<a href=\"#distronames0\">Dağıtımımın geliştiricileri buna 
&ldquo;Falanca "
 "Linux&rdquo; diyorlar ancak bu, sistemin nelerden oluştuğu hakkında 
hiçbir "
@@ -608,9 +625,14 @@
 "gerekmiyor mu?</a>"
 
 #. type: Content of: <div><div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#deserve\">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 complaining now?</a>"
 msgid ""
 "<a href=\"#deserve\">Since you failed to put something in the GNU GPL to "
-"require people to call the system &ldquo;GNU&rdquo;, you deserve what "
+"require people to call the system &ldquo;GNU,&rdquo; you deserve what "
 "happened; why are you complaining now?</a>"
 msgstr ""
 "<a href=\"#deserve\">GNU GPL'e, insanların sisteme &ldquo;GNU&rdquo; "
@@ -626,8 +648,12 @@
 "iyi olmaz mıydı?</a>"
 
 #. type: Content of: <div><div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#somanyright\">Since many people call it &ldquo;Linux&rdquo;, "
+#| "doesn't that make it right?</a>"
 msgid ""
-"<a href=\"#somanyright\">Since many people call it &ldquo;Linux&rdquo;, "
+"<a href=\"#somanyright\">Since many people call it &ldquo;Linux,&rdquo; "
 "doesn't that make it right?</a>"
 msgstr ""
 "<a href=\"#somanyright\">Çoğu kimsenin, sistemi &ldquo;Linux&rdquo; olarak "
@@ -798,6 +824,16 @@
 "bu kargaşa iyiden iyiye yayılmıştı."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 it must be right.  The name &ldquo;Linux&rdquo; also spreads a "
+#| "false picture of the system's origin, because people tend to suppose that "
+#| "the system's history was such as to fit that name.  For instance, they "
+#| "often believe its development was started by Linus Torvalds in 1991.  "
+#| "This false picture tends to reinforce the idea that the system should be "
+#| "called &ldquo;Linux&rdquo;."
 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 "
@@ -805,7 +841,7 @@
 "of the system's origin, because people tend to suppose that the system's "
 "history was such as to fit that name.  For instance, they often believe its "
 "development was started by Linus Torvalds in 1991.  This false picture tends "
-"to reinforce the idea that the system should be called &ldquo;Linux&rdquo;."
+"to reinforce the idea that the system should be called &ldquo;Linux.&rdquo;"
 msgstr ""
 "Sistemi &ldquo;Linux&rdquo; olarak adlandıran çoğu kimse, bunun neden 
doğru "
 "bir şey olmadığını hiç duymamıştır. Onlar başkalarının bu ismi 
kullandığını "
@@ -834,22 +870,35 @@
 "\">#always</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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."
 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."
+"you're referring specifically to the kernel, you should call it &ldquo;Linux,"
+"&rdquo; the name its developer chose."
 msgstr ""
 "Her zaman değil, yalnızca bütün sistemden söz ederken. Eğer özellikle "
 "çekirdekten söz ediyorsanız, geliştiricisinin seçtiği 
&ldquo;Linux&rdquo; "
 "adını kullanabilirsiniz."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 kinds of confusion, because only experts can tell whether a "
+#| "statement is about the kernel or the whole system.  By calling the whole "
+#| "system &ldquo;GNU/Linux&rdquo;, and calling the kernel &ldquo;"
+#| "Linux&rdquo;, you avoid the ambiguity."
 msgid ""
-"When people call the whole system &ldquo;Linux&rdquo;, as a consequence they "
+"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 "
 "kinds of confusion, because only experts can tell whether a statement is "
 "about the kernel or the whole system.  By calling the whole system &ldquo;"
-"GNU/Linux&rdquo;, and calling the kernel &ldquo;Linux&rdquo;, you avoid the "
+"GNU/Linux,&rdquo; and calling the kernel &ldquo;Linux,&rdquo; you avoid the "
 "ambiguity."
 msgstr ""
 "İnsanlar bütün sistemi &ldquo;Linux&rdquo; olarak adlandırdığında, 
sonuç "
@@ -920,8 +969,13 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#divide\">#divide</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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."
 msgid ""
-"When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing "
+"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 ""
@@ -978,10 +1032,23 @@
 "Iskalıyor?</a>."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 freedom are more likely to call the system &ldquo;GNU/"
+#| "Linux&rdquo;, and people who learn that the system is &ldquo;GNU/"
+#| "Linux&rdquo; are more likely to pay attention to our philosophical "
+#| "arguments for freedom and community (which is why the choice of name for "
+#| "the system makes a real difference for society).  However, the "
+#| "disagreement would probably exist even if everyone knew the system's real "
+#| "origin and its proper name, because the issue is a real one.  It can only "
+#| "go away if we who value freedom either persuade everyone (which won't be "
+#| "easy) or are defeated entirely (let's hope not)."
 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 "
-"freedom are more likely to call the system &ldquo;GNU/Linux&rdquo;, and "
+"freedom are more likely to call the system &ldquo;GNU/Linux,&rdquo; and "
 "people who learn that the system is &ldquo;GNU/Linux&rdquo; are more likely "
 "to pay attention to our philosophical arguments for freedom and community "
 "(which is why the choice of name for the system makes a real difference for "
@@ -1038,10 +1105,17 @@
 "href=\"#everyoneknows\">#everyoneknows</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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 system do not mention the name &ldquo;GNU&rdquo;, or the ideals that "
+#| "GNU stands for.  <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU "
+#| "Users Who Have Never Heard of GNU</a> explains further."
 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 "
-"system do not mention the name &ldquo;GNU&rdquo;, or the ideals that GNU "
+"system do not mention the name &ldquo;GNU,&rdquo; or the ideals that GNU "
 "stands for.  <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users "
 "Who Have Never Heard of GNU</a> explains further."
 msgstr ""
@@ -1053,11 +1127,17 @@
 "ayrıntılı olarak açıklanmaktadır."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 GNU is.  For instance, many think it is a collection of <a "
+#| "href=\"#tools\">&ldquo;tools&rdquo;</a>, or a project to develop tools."
 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 "
-"GNU is.  For instance, many think it is a collection of <a href=\"#tools"
-"\">&ldquo;tools&rdquo;</a>, or a project to develop tools."
+"GNU is.  For instance, many think it is a collection of &ldquo;<a href="
+"\"#tools\">tools</a>,&rdquo; or a project to develop tools."
 msgstr ""
 "Bunu söyleyen insanlar muhtemelen, bütün bilgisayar kurtlarını (geek) "
 "kendisi gibi zanneden bilgisayar kurtlarıdır. Genellikle bilgisayar 
kurtları "
@@ -1091,11 +1171,18 @@
 "\"#everyoneknows2\">#everyoneknows2</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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;"
+#| "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?"
 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;"
-"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?"
+"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?"
 msgstr ""
 "Eğer kullandığınız kelimeler bilginizi yansıtmıyorsa, başkalarına da 
"
 "öğretemezsiniz. GNU/Linux sistemini duymuş olan çoğu kimse, sistemin 
&ldquo;"
@@ -1154,14 +1241,23 @@
 "class=\"anchor-reference-id\">(<a href=\"#tools\">#tools</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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 "
+#| "that GNU is the name of a collection of programs&mdash;often they say "
+#| "&ldquo;programming tools&rdquo;, since some of our programming tools "
+#| "became popular on their own.  The idea that &ldquo;GNU&rdquo; is the name "
+#| "of an operating system is hard to fit into a conceptual framework in "
+#| "which that operating system is labeled &ldquo;Linux&rdquo;."
 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 "
 "that GNU is the name of a collection of programs&mdash;often they say &ldquo;"
-"programming tools&rdquo;, since some of our programming tools became popular "
+"programming tools,&rdquo; since some of our programming tools became popular "
 "on their own.  The idea that &ldquo;GNU&rdquo; is the name of an operating "
 "system is hard to fit into a conceptual framework in which that operating "
-"system is labeled &ldquo;Linux&rdquo;."
+"system is labeled &ldquo;Linux.&rdquo;"
 msgstr ""
 "Linux'un başlı başına bir işletim sistemi olduğunu düşünen insanlar, 
GNU "
 "hakkında bir şeyler duyduklarında, genellikle GNU'nun ne olduğu ile 
ilgili "
@@ -1228,12 +1324,23 @@
 "aynı zamanda öteki programları başlatma ve durdurma işini de yürütür."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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.  The use of &ldquo;operating system&rdquo; to mean "
+#| "&ldquo;kernel&rdquo; is found in a number of textbooks on system design, "
+#| "going back to the 80s.  At the same time, in the 80s, the &ldquo;Unix "
+#| "operating system&rdquo; was understood to include all the system "
+#| "programs, and Berkeley's version of Unix included even games. Since we "
+#| "intended GNU to be a Unix-like operating system, we use the term &ldquo;"
+#| "operating system&rdquo; in the same way."
 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.  "
-"The use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is "
-"found in a number of textbooks on system design, going back to the 80s.  At "
-"the same time, in the 80s, the &ldquo;Unix operating system&rdquo; was "
+"to mean &ldquo;kernel.&rdquo; Both uses of the term go back many years.  The "
+"use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is found "
+"in a number of textbooks on system design, going back to the 80s.  At the "
+"same time, in the 80s, the &ldquo;Unix operating system&rdquo; was "
 "understood to include all the system programs, and Berkeley's version of "
 "Unix included even games. Since we intended GNU to be a Unix-like operating "
 "system, we use the term &ldquo;operating system&rdquo; in the same way."
@@ -1250,11 +1357,20 @@
 "şekilde kullanıyoruz."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 "
+#| "sense we use: they mean the whole collection of programs.  If that's what "
+#| "you are referring to, please call it &ldquo;GNU/Linux&rdquo;.  If you "
+#| "mean just the kernel, then &ldquo;Linux&rdquo; is the right name for it, "
+#| "but please say &ldquo;kernel&rdquo; also to avoid ambiguity about which "
+#| "body of software you mean."
 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 "
 "sense we use: they mean the whole collection of programs.  If that's what "
-"you are referring to, please call it &ldquo;GNU/Linux&rdquo;.  If you mean "
+"you are referring to, please call it &ldquo;GNU/Linux.&rdquo; If you mean "
 "just the kernel, then &ldquo;Linux&rdquo; is the right name for it, but "
 "please say &ldquo;kernel&rdquo; also to avoid ambiguity about which body of "
 "software you mean."
@@ -1269,10 +1385,16 @@
 "kelimesini kullanınız."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "If you prefer to use some other term such as &ldquo;system "
+#| "distribution&rdquo; for the entire collection of programs, instead of "
+#| "&ldquo;operating system&rdquo;, that's fine.  Then you would talk about "
+#| "GNU/Linux system distributions."
 msgid ""
 "If you prefer to use some other term such as &ldquo;system "
 "distribution&rdquo; for the entire collection of programs, instead of &ldquo;"
-"operating system&rdquo;, that's fine.  Then you would talk about GNU/Linux "
+"operating system,&rdquo; that's fine.  Then you would talk about GNU/Linux "
 "system distributions."
 msgstr ""
 "Eğer eksiksiz programlar bütünü için &ldquo;işletim sistemi&rdquo; 
yerine "
@@ -1368,12 +1490,20 @@
 "reference-id\">(<a href=\"#nokernel\">#nokernel</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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, window systems, libraries, and much more &mdash; hundreds of "
+#| "programs, even to match what BSD systems included in 1983.  Since "
+#| "Torvalds didn't develop any of those, how can the system be &ldquo;"
+#| "Linux&rdquo;?"
 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, "
-"window systems, libraries, and much more &mdash; hundreds of programs, even "
-"to match what BSD systems included in 1983.  Since Torvalds didn't develop "
-"any of those, how can the system be &ldquo;Linux&rdquo;?"
+"window systems, libraries, and much more&mdash;hundreds of programs, even to "
+"match what BSD systems included in 1983.  Since Torvalds didn't develop any "
+"of those, how can the system be &ldquo;Linux&rdquo;?"
 msgstr ""
 "Sistemi &ldquo;Linux&rdquo; olarak adlandırmayı öne süren insanlar çifte 
"
 "standart uyguluyorlar. Bir işletim sisteminin derleyicilere, "
@@ -1411,9 +1541,14 @@
 "\"#notinstallable\">#notinstallable</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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."
 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</a> are available.  None of them is called simply &ldquo;GNU,&rdquo; but "
 "GNU is what they basically are."
 msgstr ""
 "GNU'nun <a href=\"/distros/distros.html\"> paketlenmiş ve kurulabilir "
@@ -1464,9 +1599,14 @@
 "bölümünün yeniden paketlenmesini içerir."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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."
 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 "
+"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 ""
 "GNU paketlemesinin son basamağını GNU adı altında hiçbir zaman atmadık 
ancak "
@@ -1484,13 +1624,21 @@
 "reference-id\">(<a href=\"#afterkernel\">#afterkernel</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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 system is developed as a single unified project, and the "
+#| "developers choose a name for the system as a whole.  The kernel usually "
+#| "does not have a name of its own&mdash;instead, people say &ldquo;the "
+#| "kernel of such-and-such&rdquo; or &ldquo;the such-and-such kernel&rdquo;."
 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 "
+"than the misuse of the name &ldquo;Linux.&rdquo; Normally an operating "
 "system is developed as a single unified project, and the developers choose a "
 "name for the system as a whole.  The kernel usually does not have a name of "
 "its own&mdash;instead, people say &ldquo;the kernel of such-and-such&rdquo; "
-"or &ldquo;the such-and-such kernel&rdquo;."
+"or &ldquo;the such-and-such kernel.&rdquo;"
 msgstr ""
 "Böyle bir uygulama pek rastlanılan bir şey değil; &ldquo;Linux&rdquo; "
 "isminin yanlış kullanımı dışında bu duruma bir örnek bulamadık. 
Normalde bir "
@@ -1547,9 +1695,14 @@
 "\"#long\">#long</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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."
 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.  "
+"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 ""
 "Bir süreliğine &ldquo;GNU&rdquo; ve &ldquo;Linux&rdquo; adlarının 
birleşimi "
@@ -1557,8 +1710,13 @@
 "&ldquo;GNU/Linux&rdquo;u daha çok benimsediler."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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>."
 msgid ""
-"The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but we "
+"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 ""
@@ -1606,8 +1764,13 @@
 "(<a href=\"#long2\">#long2</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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?"
 msgid ""
-"It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you appreciate "
+"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 ""
@@ -1715,10 +1878,16 @@
 "düşünce ayrılığını açık ve onurlu bir biçimde ele alıyoruz."
 
 #. type: Content of: <div><dl><dd><ul><li>
+#, fuzzy
+#| 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 system.  If we say &ldquo;GNU/Linux&rdquo;, they can make a "
+#| "connection to what they have heard about."
 msgid ""
-"Since many people know of the system as &ldquo;Linux&rdquo;, if we say "
+"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 "
-"system.  If we say &ldquo;GNU/Linux&rdquo;, they can make a connection to "
+"system.  If we say &ldquo;GNU/Linux,&rdquo; they can make a connection to "
 "what they have heard about."
 msgstr ""
 "Pek çok kimse sistemi, &ldquo;Linux&rdquo; olarak bildiği için, eğer biz "
@@ -1727,10 +1896,17 @@
 "arasında bağlantı kurabilirler."
 
 #. type: Content of: <div><dl><dt>
+#, fuzzy
+#| 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 wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to save "
+#| "the fee? <span class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
+#| "\">#trademarkfee</a>)</span>"
 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 "
-"wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to save the "
+"product, and that would also apply if I say &ldquo;GNU/Linux.&rdquo; Is it "
+"wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux,&rdquo; to save the "
 "fee? <span class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
 "\">#trademarkfee</a>)</span>"
 msgstr ""
@@ -1753,9 +1929,14 @@
 "bir ödeme yapma zorunluluğunuz yoktur."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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."
 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."
+"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 ""
 "Dolayısıyla eğer sistemi &ldquo;Linux&rdquo; olarak adlandırmanın "
 "karşılığında bir ücret ödemekten kurtulmak için sistemi sadece 
&ldquo;"
@@ -1817,12 +1998,19 @@
 "çizmek isterseniz isteyin, biz buna karşı çıkmayacağız."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 giving credit, not for any possible threshold level, is &ldquo;"
+#| "Linux&rdquo;.  It can't be fair to give all the credit to one secondary "
+#| "contribution (Linux) while omitting the principal contribution (GNU)."
 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 "
-"giving credit, not for any possible threshold level, is &ldquo;"
-"Linux&rdquo;.  It can't be fair to give all the credit to one secondary "
-"contribution (Linux) while omitting the principal contribution (GNU)."
+"giving credit, not for any possible threshold level, is &ldquo;Linux.&rdquo; "
+"It can't be fair to give all the credit to one secondary contribution "
+"(Linux) while omitting the principal contribution (GNU)."
 msgstr ""
 "Farklı sınır çizgileri belirlemek bizi sistem için farklı isimler 
seçmeye "
 "götürür. Fakat sınır çizgisi hangi noktada çekilirse çekilsin, adil 
olma ve "
@@ -1841,11 +2029,18 @@
 "class=\"anchor-reference-id\">(<a href=\"#others\">#others</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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).  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."
 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).  "
 "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."
+"system &ldquo;GNU/systemd/Linux,&rdquo; there is nothing wrong with doing so."
 msgstr ""
 "systemd oldukça önemli bir bileşendir ancak yine de ne çekirdek (Linux) "
 "kadar ne de bir bütün olarak sistemin temeli (GNU) kadar önemlidir. Ancak "
@@ -1896,11 +2091,17 @@
 "\"#allsmall\">#allsmall</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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 the same argument would apply even more strongly to calling it &ldquo;"
+#| "Linux&rdquo;."
 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 "
-"the same argument would apply even more strongly to calling it &ldquo;"
-"Linux&rdquo;."
+"the same argument would apply even more strongly to calling it &ldquo;Linux."
+"&rdquo;"
 msgstr ""
 "2008 yılında gNewSense GNU/Linux dağıtımının &ldquo;ana&rdquo; 
deposunun "
 "%15'ini GNU paketlerinin oluşturduğunu gördük. Linux ise deponun %1.5'ini 
"
@@ -1966,9 +2167,16 @@
 "span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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 either &ldquo;GNU's version of Linux&rdquo; or &ldquo;"
+#| "Linux, which is a GNU package.&rdquo; Neither of those meanings fits the "
+#| "situation at hand."
 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 "
+"the word &ldquo;GNU&rdquo; modifies &ldquo;Linux.&rdquo; This can mean "
 "either &ldquo;GNU's version of Linux&rdquo; or &ldquo;Linux, which is a GNU "
 "package.&rdquo; Neither of those meanings fits the situation at hand."
 msgstr ""
@@ -1990,11 +2198,20 @@
 "&ldquo;bir GNU paketi olan Linux&rdquo; anlamı doğru değildir."
 
 #. 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=\"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."
 msgid ""
 "We're not talking about a distinct GNU version of Linux, the kernel.  The "
 "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 "
+"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."
@@ -2008,11 +2225,18 @@
 "istemezdik, çünkü epey kafa karıştırıcı olurdu."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 &ldquo;combination.&rdquo; (Think of &ldquo;Input/Output&rdquo;.)  "
+#| "This system is the combination of GNU and Linux; hence, &ldquo;GNU/"
+#| "Linux&rdquo;."
 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 "
-"&ldquo;combination.&rdquo; (Think of &ldquo;Input/Output&rdquo;.)  This "
-"system is the combination of GNU and Linux; hence, &ldquo;GNU/Linux&rdquo;."
+"&ldquo;combination.&rdquo; (Think of &ldquo;Input/Output.&rdquo;)  This "
+"system is the combination of GNU and Linux; hence, &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "Çekirdek olarak Linux'u kullanmasıyla ayırt edilen bir GNU işletim 
sistemi "
 "sürümünden söz ediyoruz. Aradaki yatık çizgi durumu ifade edebiliyor, 
çünkü "
@@ -2021,11 +2245,17 @@
 "birleşimidir. Dolayısıyla adı &ldquo;GNU/Linux&rdquo;'tur."
 
 #. 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: "
-"&ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes say &ldquo;GNU con "
-"Linux&rdquo;."
+#, fuzzy
+#| 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: &ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes say &ldquo;GNU "
+#| "con Linux&rdquo;."
+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: "
+"&ldquo;GNU-Linux.&rdquo; In Spanish, we sometimes say &ldquo;GNU con Linux."
+"&rdquo;"
 msgstr ""
 "&ldquo;Birleşimi&rdquo; tarif etmek için başka yollar da vardır. Eğer 
artı "
 "işaretinin daha açık olduğunu düşünüyorsanız, lütfen onu kullanın. 
"
@@ -2062,9 +2292,15 @@
 "</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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."
 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 "
+"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 ""
 "İngilizce kurallarına göre, &ldquo;GNU Emacs&rdquo; yapısında &ldquo;"
@@ -2109,8 +2345,13 @@
 "uyar."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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."
 msgid ""
-"However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a "
+"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 ""
@@ -2120,8 +2361,14 @@
 "iyidir."
 
 #. type: Content of: <div><dl><dt>
+#, fuzzy
+#| 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 whatever they like? <span class=\"anchor-reference-id\">(<a "
+#| "href=\"#distronames0\">#distronames0</a>)</span>"
 msgid ""
-"My distro's developers call it &ldquo;Foobar Linux&rdquo;, but that doesn't "
+"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 "
 "whatever they like? <span class=\"anchor-reference-id\">(<a href="
 "\"#distronames0\">#distronames0</a>)</span>"
@@ -2187,11 +2434,17 @@
 "\"#distronames1\">#distronames1</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 proper for you to correct the misinformation by calling it &ldquo;"
+#| "Foobar GNU/Linux&rdquo;."
 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 "
+"Linux,&rdquo; and call their version of it &ldquo;Foobar Linux,&rdquo; it's "
 "proper for you to correct the misinformation by calling it &ldquo;Foobar GNU/"
-"Linux&rdquo;."
+"Linux.&rdquo;"
 msgstr ""
 "&ldquo;GNU&rdquo;'yu &ldquo;Linux&rdquo;'a değiştirerek yanlış bilgi "
 "yaydılar ve bunun versiyonunu &ldquo;Falanca Linux&rdquo; olarak "
@@ -2231,12 +2484,19 @@
 "Başka bir deyişle, bu şirket için neyin doğru olduğunun önemi yok."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 "
+#| "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;."
 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 "
 "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;."
+"&ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "Biz onların bunu doğru yapmalarını sağlayamayız, fakat biz bu yol kolay 
"
 "değil diye vazgeçecek insanlar da değiliz. IBM veya Red Hat kadar etkileme 
"
@@ -2257,16 +2517,26 @@
 "span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| msgid ""
+#| "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 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 nonfree "
+#| "applications and drivers), or making the system more popular even at the "
+#| "cost of freedom."
 msgid ""
 "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 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 nonfree "
-"applications and drivers), or making the system more popular even at the "
-"cost of freedom."
+"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 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 nonfree applications "
+"and drivers), or making the system more popular even at the cost of freedom."
 msgstr ""
 "GNU/Linux sistemine özgür olmayan yazılımların eklenmesine yönelik 
uygulama "
 "topluluğumuz için büyük bir sorundur. Bu, kullanıcılara, özgür 
olmayan "
@@ -2300,6 +2570,15 @@
 "sistemlerin GNU olduğunu hiç bilmiyorduk ki,&rdquo; olacaktır."
 
 #. 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 "
+#| "nonfree 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> "
@@ -2307,7 +2586,7 @@
 "specifically for the sake of the users' freedom.  With this understanding, "
 "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;."
+"proper and appropriate &ldquo;versions of Linux.&rdquo;"
 msgstr ""
 "Kullanıcıların özgürlük ile olan bağlantıyı görmelerini sağlamak 
için "
 "tutulacak yol bunun tam tersidir: Yani onları bütün bu sistem 
sürümlerinin "
@@ -2405,11 +2684,17 @@
 "olsaydık, bunu yapabilirdik. (Ah! İşte öngörüsüzlük dedikleri...)"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and "
+#| "we don't want to act like that."
 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 "
-"and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and we don't want "
-"to act like that."
+"GNU,&rdquo; that would be somewhat like making a version of the GNU system "
+"and labeling it &ldquo;Linux.&rdquo; That wasn't right, and we don't want to "
+"act like that."
 msgstr ""
 "Eğer GNU/Linux'un var olan bir sürümünü alıp, onu &ldquo;GNU&rdquo; 
olarak "
 "yeniden etiketlemiş olsaydık, GNU sisteminin bir sürümünü yapıp, onu 
&ldquo;"
@@ -2446,11 +2731,21 @@
 "temizlenmeleri gerekiyordu."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 "
+#| "with the GNU Project because he was a &ldquo;Linux user&rdquo;.  That "
+#| "came as a shock, because the people who ported GNU packages to other "
+#| "systems had generally wanted to work with us to get their changes "
+#| "installed.  Yet these people, developing a system that was primarily "
+#| "based on GNU, were the first (and still practically the only) group that "
+#| "was unwilling to work with us."
 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 "
-"with the GNU Project because he was a &ldquo;Linux user&rdquo;.  That came "
-"as a shock, because the people who ported GNU packages to other systems had "
+"with the GNU Project because he was a &ldquo;Linux user.&rdquo; That came as "
+"a shock, because the people who ported GNU packages to other systems had "
 "generally wanted to work with us to get their changes installed.  Yet these "
 "people, developing a system that was primarily based on GNU, were the first "
 "(and still practically the only) group that was unwilling to work with us."
@@ -2465,9 +2760,16 @@
 "istemeyen ilk (hâlâ da neredeyse tek) grup oldu."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 obstructing our work.  Asking you to call the system &ldquo;GNU/"
+#| "Linux&rdquo; is our response to that problem, and to the other problems "
+#| "caused by the &ldquo;Linux&rdquo; misnomer."
 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 "
+"version of the GNU system &ldquo;Linux,&rdquo; and that this confusion was "
 "obstructing our work.  Asking you to call the system &ldquo;GNU/Linux&rdquo; "
 "is our response to that problem, and to the other problems caused by the "
 "&ldquo;Linux&rdquo; misnomer."
@@ -2508,10 +2810,14 @@
 "span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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;."
 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;."
+"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 ""
 "Biz, tek bir programı asla &ldquo;GNU/<i>ad</i>&rdquo; şablonuna göre "
 "adlandırmayız. Eğer bir program GNU paketi ise onu &ldquo;GNU <i>ad</"
@@ -2630,10 +2936,18 @@
 "yazılması gerekiyordu."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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.  The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not "
+#| "Unix&rdquo;, is a humorous way of giving credit to Unix for this, "
+#| "following a hacker tradition of recursive acronyms that started in the "
+#| "70s."
 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.  "
-"The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not Unix&rdquo;, "
+"The name &ldquo;GNU,&rdquo; which stands for &ldquo;GNU's Not Unix,&rdquo; "
 "is a humorous way of giving credit to Unix for this, following a hacker "
 "tradition of recursive acronyms that started in the 70s."
 msgstr ""
@@ -2646,11 +2960,20 @@
 "uygulamasına bağlı kalınmıştır."
 
 #. 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=\"https://stallman.org/articles/on-hacking.html\";>playful "
+#| "cleverness</a>.)"
 msgid ""
-"The first such recursive acronym was TINT, &ldquo;TINT Is Not TECO&rdquo;.  "
+"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 "
+"like &ldquo;<em>somethingorother</em> TECO,&rdquo; he thought of a clever "
 "amusing name.  (That's what hacking means: <a href=\"https://stallman.org/";
 "articles/on-hacking.html\">playful cleverness</a>.)"
 msgstr ""
@@ -2663,13 +2986,21 @@
 "html\">oyunbaz bir zeka</a>.)"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 was similar to some existing program (let's imagine its name was "
+#| "&ldquo;Klever&rdquo;), you could give it a recursive acronym name, such "
+#| "as &ldquo;MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same "
+#| "spirit we called our replacement for Unix &ldquo;GNU's Not Unix&rdquo;."
 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 "
 "was similar to some existing program (let's imagine its name was &ldquo;"
 "Klever&rdquo;), you could give it a recursive acronym name, such as &ldquo;"
 "MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same spirit we "
-"called our replacement for Unix &ldquo;GNU's Not Unix&rdquo;."
+"called our replacement for Unix &ldquo;GNU's Not Unix.&rdquo;"
 msgstr ""
 "Başka &ldquo;hacker&rdquo;lar da bu isme bayıldılar. Öyle ki biz de bu "
 "yaklaşımı taklit ettik. Mevcut başka programlara çok benzeyen bir 
programı "
@@ -2679,13 +3010,21 @@
 "sistemi &ldquo;GNU's Not Unix&rdquo; (GNU Unix Değildir) diye adlandırdık."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 in a system 99% copied from Unix.  AT&amp;T actually threatened "
+#| "to sue anyone giving AT&amp;T credit in that way.  This is why each of "
+#| "the various modified versions of Unix (all proprietary, like Unix) had a "
+#| "completely different name that didn't include &ldquo;Unix&rdquo;."
 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 "
 "in a system 99% copied from Unix.  AT&amp;T actually threatened to sue "
 "anyone giving AT&amp;T credit in that way.  This is why each of the various "
 "modified versions of Unix (all proprietary, like Unix) had a completely "
-"different name that didn't include &ldquo;Unix&rdquo;."
+"different name that didn't include &ldquo;Unix.&rdquo;"
 msgstr ""
 "Tarihsel olarak, Unix'i geliştiren AT&amp;T Unix'e benzeyen bir sistemin "
 "isminde, bu sistem % 99 Unix'ten kopyalanmış bile olsa, &ldquo;Unix&rdquo; "
@@ -2762,9 +3101,16 @@
 "Linux&rdquo; ismi sistemin adı olmaya uygundur."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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/"
+#| "kernelofNetBSD&rdquo; would be more accurate, since NetBSD is an entire "
+#| "system, not just the kernel.  This is not a BSD system, since most of the "
+#| "system is the same as the GNU/Linux system."
 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/"
+"call it &ldquo;Debian GNU/NetBSD,&rdquo; but &ldquo;GNU/"
 "kernelofNetBSD&rdquo; would be more accurate, since NetBSD is an entire "
 "system, not just the kernel.  This is not a BSD system, since most of the "
 "system is the same as the GNU/Linux system."
@@ -2786,8 +3132,15 @@
 "(<a href=\"#othersys\">#othersys</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 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."
 msgid ""
-"Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of "
+"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 "
@@ -2895,8 +3248,14 @@
 "Aslında,ortak olan tek şey Linux'tur."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 Linux, because it doesn't have the usual Linux [sic] libraries and "
+#| "utilities [meaning the GNU system].&rdquo;"
 msgid ""
-"If you call the whole GNU/Linux system &ldquo;Linux&rdquo;, you will find it "
+"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 "
 "Linux, because it doesn't have the usual Linux [sic] libraries and utilities "
 "[meaning the GNU system].&rdquo;"
@@ -2937,9 +3296,15 @@
 "anlamayacaklar."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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."
 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 "
+"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 ""
 "Halk, Android'i &ldquo;Linux&rdquo; olarak kullanmaktan bahsetmeyi çok garip 
"
@@ -2947,23 +3312,39 @@
 "kişinin dolaşım sistemi ile konuştuğunu söylemek gibi."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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;."
 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;."
+"of the whole system as &ldquo;Linux.&rdquo;"
 msgstr ""
 "Halk, Linux'u gerçekte GNU/Linux iken her zamanki yanlış anlama yoluyla "
 "kullanma fikrini anlaya<em>cak</em>tır: Tüm sistemi &ldquo;Linux&rdquo; "
 "olarak düşünmek."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 "
+#| "contain Linux is irrelevant to using them, just as the fact that a car "
+#| "and a bicycle both have a structure of metal is irrelevant to using those "
+#| "two.  If you wish to talk about using cars and bikes, you wouldn't speak "
+#| "of &ldquo;riding metal objects&rdquo; &mdash; not unless you're playing "
+#| "games with the reader.  You would say, &ldquo;using cars and bikes."
+#| "&rdquo; Likewise, the clear way to talk about using GNU/Linux and Android "
+#| "is to say &ldquo;using GNU/Linux and Android.&rdquo;"
 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 "
 "contain Linux is irrelevant to using them, just as the fact that a car and a "
 "bicycle both have a structure of metal is irrelevant to using those two.  If "
 "you wish to talk about using cars and bikes, you wouldn't speak of &ldquo;"
-"riding metal objects&rdquo; &mdash; not unless you're playing games with the "
+"riding metal objects&rdquo;&mdash;not unless you're playing games with the "
 "reader.  You would say, &ldquo;using cars and bikes.&rdquo; Likewise, the "
 "clear way to talk about using GNU/Linux and Android is to say &ldquo;using "
 "GNU/Linux and Android.&rdquo;"
@@ -3056,11 +3437,17 @@
 "</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 "
+#| "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."
 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 "
-"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."
+"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."
 msgstr ""
 "Yanlış olur, dolayısıyla biz öyle nitelendirmiyoruz. Torvalds'ın 
çalışması "
 "Linux'tur (çekirdek). Biz bu çalışmayı GNU Projesi'ne atfetmemeye veya 
bunu "
@@ -3078,12 +3465,36 @@
 "a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
-msgid ""
-"He recognized this at the beginning.  The earliest Linux release notes said, "
-"<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>."
+#, fuzzy
+#| msgid ""
+#| "He recognized this at the beginning.  The earliest Linux release notes "
+#| "said, <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>."
+msgid ""
+"He recognized this at the beginning.  The <a href=\"https://ftp.funet.fi/pub/";
+"linux/historical/kernel/old-versions/RELNOTES-0.01\"> earliest Linux release "
+"notes</a> said:"
+msgstr ""
+"Bunu başlangıçta kabul ediyordu. En eski Linux sürüm notlarında şöyle 
der: "
+"&ldquo;<a href=\"https://ftp.funet.fi/pub/linux/historical/kernel/old-";
+"versions/RELNOTES-0.01\">Linux ile kullanılan araçların büyük bölümü 
GNU "
+"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><dl><dd><blockquote><p>
+#, fuzzy
+#| msgid ""
+#| "He recognized this at the beginning.  The earliest Linux release notes "
+#| "said, <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>."
+msgid ""
+"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."
 msgstr ""
 "Bunu başlangıçta kabul ediyordu. En eski Linux sürüm notlarında şöyle 
der: "
 "&ldquo;<a href=\"https://ftp.funet.fi/pub/linux/historical/kernel/old-";
@@ -3135,11 +3546,19 @@
 "(<a href=\"#lost\">#lost</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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;: 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."
 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;: "
 "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 "
+"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."
 msgstr ""
@@ -3161,13 +3580,23 @@
 "href=\"#whatgood\">#whatgood</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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;GNU/Linux&rdquo;, you will help others learn the system's true "
+#| "history, origin, and reason for being.  You can't correct the misnomer "
+#| "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."
 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;"
-"GNU/Linux&rdquo;, you will help others learn the system's true history, "
+"GNU/Linux,&rdquo; you will help others learn the system's true history, "
 "origin, and reason for being.  You can't correct the misnomer 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 "
+"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."
 msgstr ""
@@ -3192,10 +3621,16 @@
 "reference-id\">(<a href=\"#explain\">#explain</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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."
 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."
+"the system &ldquo;GNU/Linux,&rdquo; and uses your time inefficiently."
 msgstr ""
 "Eğer başkalarına bu yolla açıklama yaparak bize yardım ederseniz, 
çabanızı "
 "takdir ederiz, fakat bu en iyi yöntem olmaz. Bu, sistemi “GNU/Linux” 
olarak "
@@ -3203,12 +3638,21 @@
 "açacaktır."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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, and they may learn a correct picture of the system's origin.  "
+#| "But they are unlikely to repeat the explanation to others whenever they "
+#| "talk about the system.  They will probably just call it &ldquo;"
+#| "Linux&rdquo;.  Without particularly intending to, they will help spread "
+#| "the incorrect picture."
 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, "
 "and they may learn a correct picture of the system's origin.  But they are "
 "unlikely to repeat the explanation to others whenever they talk about the "
-"system.  They will probably just call it &ldquo;Linux&rdquo;.  Without "
+"system.  They will probably just call it &ldquo;Linux.&rdquo; Without "
 "particularly intending to, they will help spread the incorrect picture."
 msgstr ""
 "Etkisizdir, çünkü zihinlere yerleşmez ve tabii ki başkalarına 
iletilemez. "
@@ -3350,9 +3794,13 @@
 "\">#force</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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."
 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."
+"&ldquo;GNU/Linux,&rdquo; and we ask you to do it too."
 msgstr ""
 "İnsanlara bunu dayatmak yanlış olurdu. Zaten biz de böyle bir şeye "
 "kalkışmıyoruz. Biz sisteme &ldquo;GNU/Linux&rdquo; diyoruz ve sizden de "
@@ -3440,9 +3888,15 @@
 "BSD&rdquo; lisansı terimini kullanmayın."
 
 #. type: Content of: <div><dl><dt>
+#, fuzzy
+#| 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 "
+#| "complaining now? <span class=\"anchor-reference-id\">(<a href=\"#deserve"
+#| "\">#deserve</a>)</span>"
 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 "
+"the system &ldquo;GNU,&rdquo; you deserve what happened; why are you "
 "complaining now? <span class=\"anchor-reference-id\">(<a href=\"#deserve"
 "\">#deserve</a>)</span>"
 msgstr ""
@@ -3497,8 +3951,13 @@
 "işletim sistemi geliştiremezdik."
 
 #. type: Content of: <div><dl><dt>
+#, fuzzy
+#| 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>"
 msgid ""
-"Since many people call it &ldquo;Linux&rdquo;, doesn't that make it right? "
+"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 ""
@@ -3523,9 +3982,15 @@
 "span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 add &ldquo;(often erroneously referred to as &lsquo;"
+#| "Linux&rsquo;)&rdquo; once in a while, they will all understand."
 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 "
+"&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."
 msgstr ""

Index: po/gnu-linux-faq.uk-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.uk-diff.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- po/gnu-linux-faq.uk-diff.html       31 Aug 2021 10:37:08 -0000      1.18
+++ po/gnu-linux-faq.uk-diff.html       2 Nov 2021 14:41:52 -0000       1.19
@@ -12,30 +12,35 @@
 <body><pre>
 &lt;!--#include virtual="/server/header.html" --&gt;
 &lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.84</strong></del></span> <span 
class="inserted"><ins><em>1.96 --&gt;
-&lt;!-- This page is derived from 
/server/standards/boilerplate.html</em></ins></span> --&gt;
+&lt;!-- This page is derived from /server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="gnulinux" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</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="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&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"&gt;by</em></ins></span> Richard <span 
class="removed"><del><strong>Stallman&lt;/h2&gt;
+&lt;address class="byline"&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;</em></ins></span>
 
-&lt;div class="announcement"&gt;
+&lt;div <span class="removed"><del><strong>class="announcement"&gt;
   &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 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&gt;</strong></del></span> <span 
class="inserted"><ins><em>class="introduction"&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.
+system that many others call just <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> they ask many 
questions.
 Here are common questions, and our answers.&lt;/p&gt;
+<span class="inserted"><ins><em>&lt;/div&gt;
 
-<span class="inserted"><ins><em>&lt;div class="toc"&gt;
+&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;
@@ -130,8 +135,8 @@
 
 &lt;li&gt;&lt;a href="#trademarkfee"&gt;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
-    wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to
+    that would also apply if I say <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux.&rdquo;</em></ins></span>  Is 
it
+    wrong if I use &ldquo;GNU&rdquo; without <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> to
     save the fee?&lt;/a&gt;&lt;/li&gt;
 
 &lt;li&gt;&lt;a href="#many"&gt;Many other projects contributed to the
@@ -169,7 +174,7 @@
 rather than &ldquo;Linux/GNU&rdquo;?&lt;/a&gt;&lt;/li&gt;
 
 &lt;li&gt;&lt;a href="#distronames0"&gt;My distro's developers call it
-    &ldquo;Foobar Linux&rdquo;, but that doesn't say anything about
+    &ldquo;Foobar <span 
class="removed"><del><strong>Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>Linux,&rdquo;</em></ins></span> but that doesn't say 
anything about
     what the system consists of.  Why shouldn't they call it whatever
     they like?&lt;/a&gt;&lt;/li&gt;
 
@@ -281,14 +286,16 @@
 
 &lt;li&gt;&lt;a href="#deserve"&gt;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
+    <span class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span>
+    <span class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> you 
deserve what happened; why are you
     complaining now?&lt;/a&gt;&lt;/li&gt;
 
 &lt;li&gt;&lt;a href="#contradict"&gt;Wouldn't you be better off
     not contradicting what so many people believe?&lt;/a&gt;&lt;/li&gt;
 
 &lt;li&gt;&lt;a href="#somanyright"&gt;Since many people call it
-    &ldquo;Linux&rdquo;, doesn't that make it right?&lt;/a&gt;&lt;/li&gt;
+    <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span>
+    <span class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> 
doesn't that make it right?&lt;/a&gt;&lt;/li&gt;
 
 &lt;li&gt;&lt;a href="#knownname"&gt;Isn't it better to call the
     system by the name most users already know?&lt;/a&gt;&lt;/li&gt;
@@ -380,7 +387,7 @@
 the system's history was such as to fit that name.  For
 instance, they often believe its development was started by Linus
 Torvalds in 1991.  This false picture tends to reinforce the idea
-that the system should be called &ldquo;Linux&rdquo;.&lt;/p&gt;
+that the system should be called <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.&lt;/p&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;&lt;/p&gt;</em></ins></span>
 &lt;p&gt;
 Many of the questions in this file represent people's attempts to
 justify the name they are accustomed to using.&lt;/p&gt;
@@ -391,14 +398,16 @@
 &lt;dd&gt;
 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.
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> the 
name its developer chose.
 &lt;p&gt;
-When people call the whole system &ldquo;Linux&rdquo;, as a consequence
+When people call the whole system <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> as a 
consequence
 they call the whole system by the same name as the kernel.
 This causes many kinds of confusion, because only experts can tell
 whether a statement is about the kernel or the whole system.
-By calling the whole system &ldquo;GNU/Linux&rdquo;, and calling the kernel
-&ldquo;Linux&rdquo;, you avoid the ambiguity.&lt;/p&gt;
+By calling the whole 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> and 
calling the kernel
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> you 
avoid the ambiguity.&lt;/p&gt;
 &lt;/dd&gt;
 
 &lt;dt id="linuxalone"&gt;Would Linux have
@@ -428,7 +437,7 @@
     community if you did not divide people with this request? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#divide"&gt;#divide&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing people. 
 We
+When we ask people to say <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 
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.
 &lt;p&gt;
@@ -456,7 +465,8 @@
 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 freedom are more likely to call the system
-&ldquo;GNU/Linux&rdquo;, and people who learn that the system is 
&ldquo;GNU/Linux&rdquo; are
+<span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> and 
people who learn that the system is &ldquo;GNU/Linux&rdquo; are
 more likely to pay attention to our philosophical arguments for
 freedom and community (which is why the choice of name for the system
 makes a real difference for society).  However, the disagreement would
@@ -484,7 +494,7 @@
 
 &lt;dd&gt;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 system do not mention the name &ldquo;GNU&rdquo;, or the 
ideals
+articles about the system do not mention the name <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> or the ideals
 that GNU stands for.  &lt;a
 href="/gnu/gnu-users-never-heard-of-gnu.html"&gt;GNU Users Who Have Never
 Heard of GNU&lt;/a&gt; explains further.
@@ -492,7 +502,7 @@
 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 GNU is.  For instance, many think it is a collection
-of &lt;a href="#tools"&gt;&ldquo;tools&rdquo;&lt;/a&gt;, or a project to 
develop tools.&lt;/p&gt;
+of <span class="removed"><del><strong>&lt;a 
href="#tools"&gt;&ldquo;tools&rdquo;&lt;/a&gt;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;&lt;a 
href="#tools"&gt;tools&lt;/a&gt;,&rdquo;</em></ins></span> or a project to 
develop tools.&lt;/p&gt;
 &lt;p&gt;
 The wording of this question, which is typical, illustrates another
 common misconception.  To speak of &ldquo;GNU's role&rdquo; in developing
@@ -508,8 +518,9 @@
 <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
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> that it 
was started by Linus Torvalds, and that
+it was intended to be &ldquo;open <span 
class="removed"><del><strong>source&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>source.&rdquo;</em></ins></span>  If you don't tell
 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;
 
@@ -538,10 +549,10 @@
 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 that GNU is the name of a collection of programs&mdash;often they
-say &ldquo;programming tools&rdquo;, since some of our programming tools became
+say &ldquo;programming <span 
class="removed"><del><strong>tools&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>tools,&rdquo;</em></ins></span> since some of our 
programming tools became
 popular on their own.  The idea that &ldquo;GNU&rdquo; is the name of an 
operating
 system is hard to fit into a conceptual framework in which that
-operating system is labeled &ldquo;Linux&rdquo;.
+operating system is labeled <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>
 &lt;p&gt;
 The GNU Project was named after the GNU operating system&mdash;it's the project
 to develop the GNU system.  (See &lt;a
@@ -570,7 +581,7 @@
 programs.&lt;/p&gt;
 &lt;p&gt;
 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.  The
+mean <span 
class="removed"><del><strong>&ldquo;kernel&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;kernel.&rdquo;</em></ins></span>  Both uses of 
the term go back many years.  The
 use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is found in 
a number of
 textbooks on system design, going back to the 80s.  At the same time,
 in the 80s, the &ldquo;Unix operating system&rdquo; was understood to include 
all
@@ -581,12 +592,12 @@
 Most of the time when people speak of the &ldquo;Linux operating system&rdquo;
 they are using &ldquo;operating system&rdquo; in the same sense we use: they 
mean
 the whole collection of programs.  If that's what you are referring
-to, please call it &ldquo;GNU/Linux&rdquo;.  If you mean just the kernel, then
+to, please call it <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux.&rdquo;</em></ins></span>  If 
you mean just the kernel, then
 &ldquo;Linux&rdquo; is the right name for it, but please say 
&ldquo;kernel&rdquo; also to
 avoid ambiguity about which body of software you mean.&lt;/p&gt;
 &lt;p&gt;
 If you prefer to use some other term such as &ldquo;system distribution&rdquo; 
for
-the entire collection of programs, instead of &ldquo;operating system&rdquo;,
+the entire collection of programs, instead of &ldquo;operating <span 
class="removed"><del><strong>system&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>system,&rdquo;</em></ins></span>
 that's fine.  Then you would talk about GNU/Linux system
 distributions.&lt;/p&gt;
 &lt;/dd&gt;
@@ -638,8 +649,8 @@
 &lt;dd&gt;
 The people who argue that way for calling the system
 &ldquo;Linux&rdquo; are using a double standard.  An operating system
-requires compilers, editors, window systems, libraries, and much more
-&mdash; hundreds of programs, even to match what BSD systems included
+requires compilers, editors, window systems, libraries, and much
+more&mdash;hundreds of programs, even to match what BSD systems included
 in 1983.  Since Torvalds didn't develop any of those, how can the
 system be &ldquo;Linux&rdquo;?
 
@@ -660,7 +671,8 @@
 &lt;dd&gt;
 Many &lt;a href="/distros/distros.html"&gt; packaged and installable
 versions of GNU&lt;/a&gt; are available.  None of them is called simply
-&ldquo;GNU&rdquo;, but GNU is what they basically are.
+<span class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> but GNU 
is what they basically are.
 
 &lt;p&gt;
 We expected to release the GNU system packaged for installation, but
@@ -687,7 +699,8 @@
 
 &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.
+<span class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> but that 
doesn't alter what kind of thing GNU is.
 GNU is an operating system.&lt;/p&gt;
 &lt;/dd&gt;
 
@@ -697,11 +710,11 @@
 
 &lt;dd&gt;
 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 system 
is
+than the misuse of the name <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  Normally an 
operating system is
 developed as a single unified project, and the developers choose a
 name for the system as a whole.  The kernel usually does not have a
 name of its own&mdash;instead, people say &ldquo;the kernel of 
such-and-such&rdquo; or
-&ldquo;the such-and-such kernel&rdquo;.
+&ldquo;the such-and-such <span 
class="removed"><del><strong>kernel&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>kernel.&rdquo;</em></ins></span>
 &lt;p&gt;
 Because those two constructions are used synonymously, the expression
 &ldquo;the Linux kernel&rdquo; can easily be misunderstood as meaning 
&ldquo;the kernel
@@ -726,11 +739,11 @@
     How about recommending a shorter name? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#long"&gt;#long&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-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;
+For a while we tried the name <span 
class="removed"><del><strong>&ldquo;LiGNUx&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;LiGNUx,&rdquo;</em></ins></span> which 
combines the words &ldquo;GNU&rdquo;
+and <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  The reaction 
was very bad.  People accept &ldquo;GNU/Linux&rdquo;
 much better.
 &lt;p&gt;
-The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but
+The shortest legitimate name for this system is <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> but
 we call it &ldquo;GNU/Linux&rdquo; &lt;a href="#justgnu"&gt; for the reasons
 given below&lt;/a&gt;.&lt;/p&gt;
 &lt;/dd&gt;
@@ -755,7 +768,7 @@
     &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#long2"&gt;#long2&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-&lt;p&gt;It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you
+&lt;p&gt;It only takes a second to say or type <span 
class="removed"><del><strong>&ldquo;GNU/&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU/.&rdquo;</em></ins></span>  If you
 appreciate the system that we developed, can't you take one second
 to recognize our work?&lt;/p&gt;
 &lt;/dd&gt;
@@ -806,9 +819,9 @@
 honorably and openly, rather than by trying to cut him out of the
 credit for his contribution to the system.&lt;/li&gt;
 &lt;li&gt;
-Since many people know of the system as &ldquo;Linux&rdquo;, if we say 
&ldquo;GNU&rdquo; they
+Since many people know of the system as <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> if we say 
&ldquo;GNU&rdquo; they
 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
+say <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> they 
can make a connection to what they have heard
 about.&lt;/li&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>
@@ -816,16 +829,16 @@
 
 &lt;dt id="trademarkfee"&gt;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 wrong if I use 
&ldquo;GNU&rdquo;
-    without &ldquo;Linux&rdquo;, to save the fee? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#trademarkfee"&gt;#trademarkfee&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
+    would also apply if I say <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux.&rdquo;</em></ins></span>  Is 
it wrong if I use &ldquo;GNU&rdquo;
+    without <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> to save the 
fee? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#trademarkfee"&gt;#trademarkfee&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 &lt;dd&gt;
 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.
 &lt;p&gt;
-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.&lt;/p&gt;
+So if you want to refer to the system simply as <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> to avoid paying
+the fee for calling it <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> we won't 
criticize you.&lt;/p&gt;
 &lt;/dd&gt;
 
 &lt;dt id="many"&gt;Many other projects contributed to
@@ -855,7 +868,7 @@
 &lt;p&gt;
 Different threshold levels would lead to different choices of name for
 the system.  But one name that cannot result from concerns of fairness
-and giving credit, not for any possible threshold level, is 
&ldquo;Linux&rdquo;.
+and giving credit, not for any possible threshold level, is <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>
 It can't be fair to give all the credit to one secondary contribution
 (Linux) while omitting the principal contribution (GNU).&lt;/p&gt;
 &lt;/dd&gt;
@@ -869,7 +882,7 @@
 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
+by calling the system &ldquo;GNU/systemd/Linux,&rdquo; there is nothing
 wrong with doing so.&lt;/p&gt;
 &lt;/dd&gt;
 
@@ -894,7 +907,7 @@
 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 the same argument would apply even more
-strongly to calling it &ldquo;Linux&rdquo;.
+strongly to calling it <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>
 
 &lt;p&gt;
 GNU is a small fraction of the system nowadays, and Linux is an
@@ -931,7 +944,7 @@
 
 &lt;dd&gt;
 Following the rules of English, in the construction &ldquo;GNU Linux&rdquo; the
-word &ldquo;GNU&rdquo; modifies &ldquo;Linux&rdquo;.  This can mean either 
&ldquo;GNU's version of
+word &ldquo;GNU&rdquo; modifies <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  This can mean 
either &ldquo;GNU's version of
 Linux&rdquo; or &ldquo;Linux, which is a GNU package.&rdquo;  Neither of those 
meanings
 fits the situation at hand.
 &lt;p&gt;
@@ -944,23 +957,24 @@
 The free GNU/Linux distros do have
 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,
+firmware <span 
class="removed"><del><strong>&ldquo;blobs&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;blobs.&rdquo;</em></ins></span>  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;
 &lt;p&gt;
 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 &ldquo;combination.&rdquo; (Think of
-&ldquo;Input/Output&rdquo;.)  This system is the combination of GNU
-and Linux; hence, &ldquo;GNU/Linux&rdquo;.&lt;/p&gt;
+<span 
class="removed"><del><strong>&ldquo;Input/Output&rdquo;.)</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Input/Output.&rdquo;)</em></ins></span> 
 This system is the combination of GNU
+and Linux; hence, <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;
-There are other ways to express &ldquo;combination&rdquo;.  If you
+There are other ways to express <span 
class="removed"><del><strong>&ldquo;combination&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;combination.&rdquo;</em></ins></span>  
If you
 think that a plus-sign is clearer, please use that.  In French, a
-hyphen is clear: &ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes
-say &ldquo;GNU con Linux&rdquo;.&lt;/p&gt;
+hyphen is clear: <span 
class="removed"><del><strong>&ldquo;GNU-Linux&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU-Linux.&rdquo;</em></ins></span>  In 
Spanish, we sometimes
+say &ldquo;GNU con <span 
class="removed"><del><strong>Linux&rdquo;.&lt;/p&gt;</strong></del></span> 
<span class="inserted"><ins><em>Linux.&rdquo;&lt;/p&gt;
 &lt;/dd&gt;
 
-&lt;dt <span class="inserted"><ins><em>id="pronounce"&gt;How is the name 
&ldquo;GNU/Linux&rdquo;
+&lt;dt id="pronounce"&gt;How is the name &ldquo;GNU/Linux&rdquo;
 pronounced? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#pronounce"&gt;#pronounce&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 &lt;dd&gt;
 &lt;p&gt;
@@ -976,16 +990,16 @@
 &lt;dd&gt;
 &lt;p&gt;
 Following the rules of English, in the construction &ldquo;GNU
-Emacs&rdquo; the word &ldquo;GNU&rdquo; modifies &ldquo;Emacs&rdquo;.
+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.&lt;/p&gt;
 &lt;p&gt;
 &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.&lt;/p&gt;
+program, so &ldquo;GNU/Emacs&rdquo; is the wrong way to refer to 
it.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
-&lt;dt</em></ins></span> id="whyorder"&gt;Why &ldquo;GNU/Linux&rdquo; rather
+&lt;dt id="whyorder"&gt;Why &ldquo;GNU/Linux&rdquo; rather
 than &ldquo;Linux/GNU&rdquo;? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#whyorder"&gt;#whyorder&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
@@ -997,13 +1011,13 @@
 In addition, &ldquo;GNU/Linux&rdquo; fits the fact that Linux is the
 lowest level of the system and GNU fills technically higher levels.&lt;/p&gt;
 &lt;p&gt;
-However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a 
lot
+However, if you prefer to call the system <span 
class="removed"><del><strong>&ldquo;Linux/GNU&rdquo;,</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;Linux/GNU,&rdquo;</em></ins></span> 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.&lt;/p&gt;
 &lt;/dd&gt;
 
 &lt;dt id="distronames0"&gt;My distro's developers call it
-    &ldquo;Foobar Linux&rdquo;, but that doesn't say anything about
+    &ldquo;Foobar <span 
class="removed"><del><strong>Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>Linux,&rdquo;</em></ins></span> but that doesn't say 
anything about
     what the system consists of.  Why shouldn't they call it whatever
     they like? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#distronames0"&gt;#distronames0&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 &lt;dd&gt;
@@ -1032,9 +1046,10 @@
     anything but &ldquo;Foobar Linux&rdquo;? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#distronames1"&gt;#distronames1&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;&lt;p&gt;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 proper for you to correct the misinformation by
-calling it &ldquo;Foobar GNU/Linux&rdquo;.&lt;/p&gt;&lt;/dd&gt;
+to <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> and call their 
version of it &ldquo;Foobar
+<span class="removed"><del><strong>Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>Linux,&rdquo;</em></ins></span> it's proper 
for you to correct the misinformation by
+calling it &ldquo;Foobar <span 
class="removed"><del><strong>GNU/Linux&rdquo;.&lt;/p&gt;&lt;/dd&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>GNU/Linux.&rdquo;&lt;/p&gt;&lt;/dd&gt;</em></ins></span>
 
 &lt;dt id="companies"&gt;Wouldn't it be more
     effective to ask companies such as Mandrake, Red Hat and IBM to
@@ -1055,7 +1070,7 @@
 just because the road isn't easy.  You may not have as much 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;.&lt;/p&gt;
+more profit calling it <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;/dd&gt;
 
 &lt;dt id="reserve"&gt;Wouldn't it be better to
@@ -1066,7 +1081,7 @@
 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 <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
+of <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  Many 
&ldquo;Linux&rdquo; User Groups make it part of their mission to
 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 <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span>
@@ -1089,7 +1104,8 @@
 With this understanding, they can start to recognize the distributions
 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;
+<span 
class="removed"><del><strong>Linux&rdquo;.&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>Linux.&rdquo;&lt;/p&gt;</em></ins></span>
 &lt;p&gt;
 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
@@ -1129,8 +1145,9 @@
 GNU Hurd to work, we might have done that.  (Alas, that is hindsight.)
 &lt;p&gt;
 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
-and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and we don't
+<span class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> that 
would be somewhat like making a version of the GNU system
+and labeling it <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  That wasn't 
right, and we don't
 want to act like that.&lt;/p&gt;
 &lt;/dd&gt;
 
@@ -1149,7 +1166,7 @@
 &lt;p&gt;
 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 with the GNU Project because he was a &ldquo;Linux user&rdquo;.
+about working with the GNU Project because he was a &ldquo;Linux <span 
class="removed"><del><strong>user&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>user.&rdquo;</em></ins></span>
 That came as a shock, because the people who ported GNU packages to
 other systems had generally wanted to work with us to get their
 changes installed.  Yet these people, developing a system that was
@@ -1157,7 +1174,7 @@
 only) group that was unwilling to work with us.&lt;/p&gt;
 &lt;p&gt;
 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
+version of the GNU system <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> and that this 
confusion was
 obstructing our work.  Asking you to call the system &ldquo;GNU/Linux&rdquo; is
 our response to that problem, and to the other problems caused by the
 &ldquo;Linux&rdquo; misnomer.&lt;/p&gt;
@@ -1176,8 +1193,8 @@
     convention be applied to all programs that are GPL'ed? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#allgpled"&gt;#allgpled&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-We never refer to individual programs as 
&ldquo;GNU/&lt;i&gt;name&lt;/i&gt;&rdquo;.  When a program
-is a GNU package, we may call it &ldquo;GNU &lt;i&gt;name&lt;/i&gt;&rdquo;.
+We never refer to individual programs as <span 
class="removed"><del><strong>&ldquo;GNU/&lt;i&gt;name&lt;/i&gt;&rdquo;.</strong></del></span>
 <span 
class="inserted"><ins><em>&ldquo;GNU/&lt;i&gt;name&lt;/i&gt;.&rdquo;</em></ins></span>
  When a program
+is a GNU package, we may call it &ldquo;GNU <span 
class="removed"><del><strong>&lt;i&gt;name&lt;/i&gt;&rdquo;.</strong></del></span>
 <span 
class="inserted"><ins><em>&lt;i&gt;name&lt;/i&gt;.&rdquo;</em></ins></span>
 &lt;p&gt;
 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
@@ -1230,15 +1247,17 @@
 &lt;p&gt;
 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.  The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not
-Unix&rdquo;, is a humorous way of giving credit to Unix for this,
+Unix.  The name <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span> which stands for 
&ldquo;GNU's Not
+<span class="removed"><del><strong>Unix&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>Unix,&rdquo;</em></ins></span> is a humorous 
way of giving credit to Unix for this,
 following a hacker tradition of recursive acronyms that started in the
 70s.&lt;/p&gt;
 &lt;p&gt;
 The first such recursive acronym was TINT, &ldquo;TINT Is Not
-TECO&rdquo;.  The author of TINT wrote another implementation of TECO
+<span class="removed"><del><strong>TECO&rdquo;.</strong></del></span>
+<span class="inserted"><ins><em>TECO.&rdquo;</em></ins></span>  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;&lt;em&gt;somethingorother&lt;/em&gt; 
TECO&rdquo;, he
+calling it by a dull name like &ldquo;&lt;em&gt;somethingorother&lt;/em&gt; 
<span class="removed"><del><strong>TECO&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>TECO,&rdquo;</em></ins></span> he
 thought of a clever amusing name.  (That's what hacking
 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;
@@ -1248,7 +1267,7 @@
 program that was similar to some existing program (let's imagine its
 name was &ldquo;Klever&rdquo;), you could give it a recursive acronym name, 
such
 as &ldquo;MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo;  In this same 
spirit we called our
-replacement for Unix &ldquo;GNU's Not Unix&rdquo;.&lt;/p&gt;
+replacement for Unix &ldquo;GNU's Not <span 
class="removed"><del><strong>Unix&rdquo;.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>Unix.&rdquo;&lt;/p&gt;</em></ins></span>
 &lt;p&gt;
 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
@@ -1256,7 +1275,8 @@
 threatened to sue anyone giving AT&amp;T credit in that way.  This is
 why each of the various modified versions of Unix (all proprietary,
 like Unix) had a completely different name that didn't include
-&ldquo;Unix&rdquo;.&lt;/p&gt;
+<span 
class="removed"><del><strong>&ldquo;Unix&rdquo;.&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Unix.&rdquo;&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="bsd"&gt;Should we say &ldquo;GNU/BSD&rdquo;
@@ -1287,7 +1307,7 @@
 why the name &ldquo;GNU/Linux&rdquo; is appropriate for it.&lt;/p&gt;
 &lt;p&gt;
 There is a version of GNU which uses the kernel from NetBSD.  Its
-developers call it &ldquo;Debian GNU/NetBSD&rdquo;, but 
&ldquo;GNU/kernelofNetBSD&rdquo;
+developers call it &ldquo;Debian <span 
class="removed"><del><strong>GNU/NetBSD&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>GNU/NetBSD,&rdquo;</em></ins></span> but 
&ldquo;GNU/kernelofNetBSD&rdquo;
 would be more accurate, since NetBSD is an entire system, not just
 the kernel.  This is not a BSD system, since most of the system
 is the same as the GNU/Linux system.&lt;/p&gt;
@@ -1298,7 +1318,7 @@
 
 &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
+Not in the same sense that we mean by <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux.&rdquo;</em></ins></span>  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,
@@ -1349,7 +1369,7 @@
 the two have very little code in common.  In fact, the only thing they
 have in common is Linux.&lt;/p&gt;
 &lt;p&gt;
-If you call the whole GNU/Linux system &ldquo;Linux&rdquo;,
+If you call the whole GNU/Linux system <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span>
 you will find it necessary to say things like, &ldquo;Android contains
 Linux, but it isn't Linux, because it doesn't have the usual Linux
 [sic] libraries and utilities [meaning the GNU system].&rdquo;&lt;/p&gt;
@@ -1370,7 +1390,7 @@
 people will</em></ins></span> not <span class="inserted"><ins><em>understand 
the intended meaning.
 &lt;p&gt;
 The public will find it very strange to speak of using Android as
-&ldquo;using Linux&rdquo;.  It's like having</em></ins></span> a <span 
class="removed"><del><strong>meaningful question because</strong></del></span> 
<span class="inserted"><ins><em>conversation, then
+&ldquo;using Linux.&rdquo;  It's like having</em></ins></span> a <span 
class="removed"><del><strong>meaningful question because</strong></del></span> 
<span class="inserted"><ins><em>conversation, then
 saying you were conversing with</em></ins></span> the <span 
class="removed"><del><strong>GNU
 system does not have precise boundaries.</strong></del></span> <span 
class="inserted"><ins><em>person's intestines or the
 person's circulatory system.&lt;/p&gt;</em></ins></span>
@@ -1380,7 +1400,7 @@
 Linux&rdquo; when it's really GNU/Linux,</em></ins></span> by <span 
class="removed"><del><strong>a community.  It includes far
 more than just</strong></del></span> <span class="inserted"><ins><em>way 
of</em></ins></span> the <span class="removed"><del><strong>GNU software 
packages (of which we have</strong></del></span> <span 
class="inserted"><ins><em>usual
 misunderstanding: thinking of the whole system as
-&ldquo;Linux&rdquo;.&lt;/p&gt;
+&ldquo;Linux.&rdquo;&lt;/p&gt;
 &lt;p&gt;
 Use of Android and use of GNU/Linux are totally different, as
 different as driving</em></ins></span> a <span 
class="removed"><del><strong>specific
@@ -1390,8 +1410,8 @@
 fact</em></ins></span> that <span class="removed"><del><strong>yields
 GNU/Linux.</strong></del></span> <span class="inserted"><ins><em>a car and a 
bicycle both have a structure of metal is
 irrelevant to using those two.</em></ins></span>  If you <span 
class="removed"><del><strong>use part</strong></del></span> <span 
class="inserted"><ins><em>wish to talk about using cars
-and bikes, you wouldn't speak</em></ins></span> of <span 
class="inserted"><ins><em>&ldquo;riding metal objects&rdquo;
-&mdash; not unless you're playing games with</em></ins></span> the <span 
class="removed"><del><strong>GNU system</strong></del></span> <span 
class="inserted"><ins><em>reader.  You would
+and bikes, you wouldn't speak</em></ins></span> of <span 
class="inserted"><ins><em>&ldquo;riding metal objects&rdquo;&mdash;not
+unless you're playing games with</em></ins></span> the <span 
class="removed"><del><strong>GNU system</strong></del></span> <span 
class="inserted"><ins><em>reader.  You would
 say, &ldquo;using cars</em></ins></span> and <span 
class="removed"><del><strong>omit part, there is
 no meaningful</strong></del></span> <span 
class="inserted"><ins><em>bikes.&rdquo; Likewise, the clear</em></ins></span> 
way to <span class="removed"><del><strong>say &ldquo;how much&rdquo; you 
used.&lt;/p&gt;
 &lt;p&gt;
@@ -1444,7 +1464,7 @@
 <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
+or label it as <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU.&rdquo;</em></ins></span>  When we talk 
about the whole
 system, the name &ldquo;GNU/Linux&rdquo; gives him a share of the
 <span class="removed"><del><strong>credit.</strong></del></span>
 <span class="inserted"><ins><em>credit.&lt;/p&gt;</em></ins></span>
@@ -1455,13 +1475,17 @@
     agree that Linux is just the kernel? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#linusagreed"&gt;#linusagreed&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-&lt;p&gt;He recognized this at the beginning.  The earliest Linux release notes
+&lt;p&gt;He recognized this at the beginning.  The <span 
class="inserted"><ins><em>&lt;a
+href="https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;</em></ins></span>
+earliest Linux release <span class="removed"><del><strong>notes
 said, &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>
-&ldquo;Most of the tools used with linux are GNU software and are under the
+href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;
+&ldquo;Most</strong></del></span> <span 
class="inserted"><ins><em>notes&lt;/a&gt; said:&lt;/p&gt;
+&lt;blockquote&gt;&lt;p&gt;
+Most</em></ins></span> 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;
+for more <span 
class="removed"><del><strong>info&rdquo;&lt;/a&gt;.&lt;/p&gt;</strong></del></span>
 <span class="inserted"><ins><em>info.
+&lt;/p&gt;&lt;/blockquote&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="finishhurd"&gt;Why not finish the GNU Hurd kernel, release the GNU 
system
@@ -1489,7 +1513,7 @@
 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
+name to use.  You can't make others say <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> but
 you can decide to call the system &ldquo;GNU/Linux&rdquo;
 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;
@@ -1502,10 +1526,10 @@
 <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
+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> you 
will help others learn the system's true
 history, origin, and reason for being.  You can't correct the misnomer
 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
+only a few hundred people see you use the term <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> you 
will
 have educated a substantial number of people with very little work.
 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;
@@ -1517,14 +1541,15 @@
 &lt;dd&gt;
 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.
+calling 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> and 
uses your time inefficiently.
 &lt;p&gt;
 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, and they may learn a correct picture of the system's
 origin.  But they are unlikely to repeat the explanation to others
 whenever they talk about the system.  They will probably just call it
-&ldquo;Linux&rdquo;.  Without particularly intending to, they will help spread 
the
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  
Without particularly intending to, they will help spread the
 incorrect picture.&lt;/p&gt;
 &lt;p&gt;
 It is inefficient because it takes a lot more time.  Saying and
@@ -1590,7 +1615,8 @@
 &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 <span 
class="removed"><del><strong>too.</strong></del></span> <span 
class="inserted"><ins><em>too.&lt;/p&gt;</em></ins></span>
+<span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> 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
@@ -1634,7 +1660,7 @@
 &lt;/dd&gt;
 
 &lt;dt id="deserve"&gt;Since you failed to put
-    something in the GNU GPL to require people to call the system 
&ldquo;GNU&rdquo;,
+    something in the GNU GPL to require people to call the system <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;GNU,&rdquo;</em></ins></span>
     you deserve what happened; why are you complaining now? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#deserve"&gt;#deserve&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
@@ -1660,7 +1686,7 @@
 &lt;/dd&gt;
 
 &lt;dt id="somanyright"&gt;Since many people call
-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;
+it <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> 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;
 <span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
@@ -1673,7 +1699,7 @@
 &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
+includes <span 
class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> 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 <span 
class="removed"><del><strong>understand.</strong></del></span> <span 
class="inserted"><ins><em>understand.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
@@ -1754,7 +1780,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/08/31 10:37:08 $
+$Date: 2021/11/02 14:41:52 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: po/gnu-linux-faq.uk.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.uk.po,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- po/gnu-linux-faq.uk.po      31 Aug 2021 10:37:08 -0000      1.49
+++ po/gnu-linux-faq.uk.po      2 Nov 2021 14:41:52 -0000       1.50
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-linux-faq.html\n"
-"POT-Creation-Date: 2021-08-31 10:27+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2018-02-02 17:28+0200\n"
 "Last-Translator: Andriy Bandura <andriykopanytsia@gmail.com>\n"
 "Language-Team: Ukrainian <>\n"
@@ -33,10 +33,15 @@
 msgid "by Richard Stallman"
 msgstr "Річард Столмен"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| 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."
 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.  "
+"that many others call just &ldquo;Linux,&rdquo; they ask many questions.  "
 "Here are common questions, and our answers."
 msgstr ""
 "Коли люди бачать, що ми використовуємо і 
рекомендуємо назву &ldquo;GNU/"
@@ -249,11 +254,17 @@
 "буде неправильно називати систему просто 
&ldquo;GNU&rdquo;?</a>"
 
 #. type: Content of: <div><div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#trademarkfee\">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 wrong if I use &ldquo;GNU&rdquo; without "
+#| "&ldquo;Linux&rdquo;, to save the fee?</a>"
 msgid ""
 "<a href=\"#trademarkfee\">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 wrong if I use &ldquo;GNU&rdquo; without "
-"&ldquo;Linux&rdquo;, to save the fee?</a>"
+"&ldquo;GNU/Linux.&rdquo; Is it wrong if I use &ldquo;GNU&rdquo; without "
+"&ldquo;Linux,&rdquo; to save the fee?</a>"
 msgstr ""
 "<a href=\"#trademarkfee\">Якби я використовував 
&ldquo;Linux&rdquo; у назві "
 "продукту, мені довелося б платити за це; це 
відноситься і до вислову &ldquo;"
@@ -350,10 +361,15 @@
 "GNU&rdquo;?</a>"
 
 #. type: Content of: <div><div><ul><li>
-msgid ""
-"<a href=\"#distronames0\">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 whatever they like?</a>"
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#distronames0\">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 whatever they like?</a>"
+msgid ""
+"<a href=\"#distronames0\">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 whatever they like?</a>"
 msgstr ""
 "<a href=\"#distronames0\">Розробники мого 
дистрибутива називають його &ldquo;"
 "Foobar Linux&rdquo;, але це нічого не говорить про 
те, з чого складається "
@@ -605,9 +621,14 @@
 "систему &ldquo;GNU&rdquo;?</a>"
 
 #. type: Content of: <div><div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#deserve\">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 complaining now?</a>"
 msgid ""
 "<a href=\"#deserve\">Since you failed to put something in the GNU GPL to "
-"require people to call the system &ldquo;GNU&rdquo;, you deserve what "
+"require people to call the system &ldquo;GNU,&rdquo; you deserve what "
 "happened; why are you complaining now?</a>"
 msgstr ""
 "<a href=\"#deserve\">Оскільки ви не внесли у GNU GPL 
вимогу називати систему "
@@ -623,8 +644,12 @@
 "того, у чому переконано так багато 
людей?</a>"
 
 #. type: Content of: <div><div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#somanyright\">Since many people call it &ldquo;Linux&rdquo;, "
+#| "doesn't that make it right?</a>"
 msgid ""
-"<a href=\"#somanyright\">Since many people call it &ldquo;Linux&rdquo;, "
+"<a href=\"#somanyright\">Since many people call it &ldquo;Linux,&rdquo; "
 "doesn't that make it right?</a>"
 msgstr ""
 "<a href=\"#somanyright\">Хіба те, що багато хто 
називає її &ldquo;"
@@ -803,6 +828,16 @@
 "часу ця омана зайшла вже далеко."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 it must be right.  The name &ldquo;Linux&rdquo; also spreads a "
+#| "false picture of the system's origin, because people tend to suppose that "
+#| "the system's history was such as to fit that name.  For instance, they "
+#| "often believe its development was started by Linus Torvalds in 1991.  "
+#| "This false picture tends to reinforce the idea that the system should be "
+#| "called &ldquo;Linux&rdquo;."
 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 "
@@ -810,7 +845,7 @@
 "of the system's origin, because people tend to suppose that the system's "
 "history was such as to fit that name.  For instance, they often believe its "
 "development was started by Linus Torvalds in 1991.  This false picture tends "
-"to reinforce the idea that the system should be called &ldquo;Linux&rdquo;."
+"to reinforce the idea that the system should be called &ldquo;Linux.&rdquo;"
 msgstr ""
 "Більшість людей, які називають цю систему 
&ldquo;Linux&rdquo;, ніколи не "
 "чули про те, що це не правильно. Вони 
бачили, що інші вживають цю назву і "
@@ -838,22 +873,35 @@
 "<span class=\"anchor-reference-id\"><a href=\"#always\">#always</a></span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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."
 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."
+"you're referring specifically to the kernel, you should call it &ldquo;Linux,"
+"&rdquo; the name its developer chose."
 msgstr ""
 "Не завжди&nbsp;&mdash; тільки тоді, коли ви 
говорите про систему в цілому. "
 "Коли ви маєте на увазі саме ядро, вам слід 
називати його &ldquo;Linux&rdquo;"
 "&nbsp;&nbsp; назвою, яку для неї обрав 
розробник."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 kinds of confusion, because only experts can tell whether a "
+#| "statement is about the kernel or the whole system.  By calling the whole "
+#| "system &ldquo;GNU/Linux&rdquo;, and calling the kernel &ldquo;"
+#| "Linux&rdquo;, you avoid the ambiguity."
 msgid ""
-"When people call the whole system &ldquo;Linux&rdquo;, as a consequence they "
+"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 "
 "kinds of confusion, because only experts can tell whether a statement is "
 "about the kernel or the whole system.  By calling the whole system &ldquo;"
-"GNU/Linux&rdquo;, and calling the kernel &ldquo;Linux&rdquo;, you avoid the "
+"GNU/Linux,&rdquo; and calling the kernel &ldquo;Linux,&rdquo; you avoid the "
 "ambiguity."
 msgstr ""
 "Коли люди називають усю систему 
&ldquo;Linux&rdquo;, вони&nbsp;&mdash; як "
@@ -924,8 +972,13 @@
 "a></span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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."
 msgid ""
-"When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing "
+"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 ""
@@ -981,10 +1034,23 @@
 "програма&rsquo;&rdquo;</a>."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 freedom are more likely to call the system &ldquo;GNU/"
+#| "Linux&rdquo;, and people who learn that the system is &ldquo;GNU/"
+#| "Linux&rdquo; are more likely to pay attention to our philosophical "
+#| "arguments for freedom and community (which is why the choice of name for "
+#| "the system makes a real difference for society).  However, the "
+#| "disagreement would probably exist even if everyone knew the system's real "
+#| "origin and its proper name, because the issue is a real one.  It can only "
+#| "go away if we who value freedom either persuade everyone (which won't be "
+#| "easy) or are defeated entirely (let's hope not)."
 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 "
-"freedom are more likely to call the system &ldquo;GNU/Linux&rdquo;, and "
+"freedom are more likely to call the system &ldquo;GNU/Linux,&rdquo; and "
 "people who learn that the system is &ldquo;GNU/Linux&rdquo; are more likely "
 "to pay attention to our philosophical arguments for freedom and community "
 "(which is why the choice of name for the system makes a real difference for "
@@ -1040,10 +1106,17 @@
 "\">(<a href=\"#everyoneknows\">#everyoneknows</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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 system do not mention the name &ldquo;GNU&rdquo;, or the ideals that "
+#| "GNU stands for.  <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU "
+#| "Users Who Have Never Heard of GNU</a> explains further."
 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 "
-"system do not mention the name &ldquo;GNU&rdquo;, or the ideals that GNU "
+"system do not mention the name &ldquo;GNU,&rdquo; or the ideals that GNU "
 "stands for.  <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users "
 "Who Have Never Heard of GNU</a> explains further."
 msgstr ""
@@ -1054,11 +1127,17 @@
 "GNU, які ніколи не чули про GNU&rdquo;</a> 
роз'яснює це питання докладніше."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 GNU is.  For instance, many think it is a collection of <a "
+#| "href=\"#tools\">&ldquo;tools&rdquo;</a>, or a project to develop tools."
 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 "
-"GNU is.  For instance, many think it is a collection of <a href=\"#tools"
-"\">&ldquo;tools&rdquo;</a>, or a project to develop tools."
+"GNU is.  For instance, many think it is a collection of &ldquo;<a href="
+"\"#tools\">tools</a>,&rdquo; or a project to develop tools."
 msgstr ""
 "Люди, які так кажуть, ймовірно, технарі, 
які мають на увазі інших знайомих "
 "технарів. Технарі часто знають про GNU, 
проте багато з них мають абсолютно "
@@ -1091,11 +1170,18 @@
 "\"#everyoneknows2\">#everyoneknows2</a></span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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;"
+#| "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?"
 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;"
-"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?"
+"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?"
 msgstr ""
 "Якщо ваші слова не відображають вашого 
знання, то ви не передаєте його "
 "іншим. Більшість людей, які чули про 
систему GNU/Linux, думають, що це "
@@ -1155,14 +1241,23 @@
 "\">#tools</a></span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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 "
+#| "that GNU is the name of a collection of programs&mdash;often they say "
+#| "&ldquo;programming tools&rdquo;, since some of our programming tools "
+#| "became popular on their own.  The idea that &ldquo;GNU&rdquo; is the name "
+#| "of an operating system is hard to fit into a conceptual framework in "
+#| "which that operating system is labeled &ldquo;Linux&rdquo;."
 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 "
 "that GNU is the name of a collection of programs&mdash;often they say &ldquo;"
-"programming tools&rdquo;, since some of our programming tools became popular "
+"programming tools,&rdquo; since some of our programming tools became popular "
 "on their own.  The idea that &ldquo;GNU&rdquo; is the name of an operating "
 "system is hard to fit into a conceptual framework in which that operating "
-"system is labeled &ldquo;Linux&rdquo;."
+"system is labeled &ldquo;Linux.&rdquo;"
 msgstr ""
 "Люди, які вважають, що Linux&nbsp;&mdash; це вся 
операційна система, якщо "
 "коли-небудь і чують про GNU, то нерідко 
отримують неправильне уявлення про "
@@ -1230,12 +1325,23 @@
 "займається запуском і зупинкою інших 
програм."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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.  The use of &ldquo;operating system&rdquo; to mean "
+#| "&ldquo;kernel&rdquo; is found in a number of textbooks on system design, "
+#| "going back to the 80s.  At the same time, in the 80s, the &ldquo;Unix "
+#| "operating system&rdquo; was understood to include all the system "
+#| "programs, and Berkeley's version of Unix included even games. Since we "
+#| "intended GNU to be a Unix-like operating system, we use the term &ldquo;"
+#| "operating system&rdquo; in the same way."
 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.  "
-"The use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is "
-"found in a number of textbooks on system design, going back to the 80s.  At "
-"the same time, in the 80s, the &ldquo;Unix operating system&rdquo; was "
+"to mean &ldquo;kernel.&rdquo; Both uses of the term go back many years.  The "
+"use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is found "
+"in a number of textbooks on system design, going back to the 80s.  At the "
+"same time, in the 80s, the &ldquo;Unix operating system&rdquo; was "
 "understood to include all the system programs, and Berkeley's version of "
 "Unix included even games. Since we intended GNU to be a Unix-like operating "
 "system, we use the term &ldquo;operating system&rdquo; in the same way."
@@ -1251,11 +1357,20 @@
 "Unix, ми вживаємо термін &ldquo;операційна 
система&rdquo; в тому ж сенсі."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 "
+#| "sense we use: they mean the whole collection of programs.  If that's what "
+#| "you are referring to, please call it &ldquo;GNU/Linux&rdquo;.  If you "
+#| "mean just the kernel, then &ldquo;Linux&rdquo; is the right name for it, "
+#| "but please say &ldquo;kernel&rdquo; also to avoid ambiguity about which "
+#| "body of software you mean."
 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 "
 "sense we use: they mean the whole collection of programs.  If that's what "
-"you are referring to, please call it &ldquo;GNU/Linux&rdquo;.  If you mean "
+"you are referring to, please call it &ldquo;GNU/Linux.&rdquo; If you mean "
 "just the kernel, then &ldquo;Linux&rdquo; is the right name for it, but "
 "please say &ldquo;kernel&rdquo; also to avoid ambiguity about which body of "
 "software you mean."
@@ -1269,10 +1384,16 @@
 "приводу того, яку саме сукупність програм 
ви маєте на увазі."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "If you prefer to use some other term such as &ldquo;system "
+#| "distribution&rdquo; for the entire collection of programs, instead of "
+#| "&ldquo;operating system&rdquo;, that's fine.  Then you would talk about "
+#| "GNU/Linux system distributions."
 msgid ""
 "If you prefer to use some other term such as &ldquo;system "
 "distribution&rdquo; for the entire collection of programs, instead of &ldquo;"
-"operating system&rdquo;, that's fine.  Then you would talk about GNU/Linux "
+"operating system,&rdquo; that's fine.  Then you would talk about GNU/Linux "
 "system distributions."
 msgstr ""
 "Якщо ви віддаєте перевагу вживати інший 
термін, як, наприклад, &ldquo;"
@@ -1367,9 +1488,9 @@
 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, "
-"window systems, libraries, and much more &mdash; hundreds of programs, even "
-"to match what BSD systems included in 1983.  Since Torvalds didn't develop "
-"any of those, how can the system be &ldquo;Linux&rdquo;?"
+"window systems, libraries, and much more&mdash;hundreds of programs, even to "
+"match what BSD systems included in 1983.  Since Torvalds didn't develop any "
+"of those, how can the system be &ldquo;Linux&rdquo;?"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><p>
@@ -1396,9 +1517,14 @@
 "href=\"#notinstallable\">#notinstallable</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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."
 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</a> are available.  None of them is called simply &ldquo;GNU,&rdquo; but "
 "GNU is what they basically are."
 msgstr ""
 "Зараз доступно багато <a href=\"/distros/distros.html\"> 
версій GNU, "
@@ -1449,9 +1575,14 @@
 "перепакування істотної частини системи 
GNU."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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."
 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 "
+"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 ""
 "Ми так і не зробили останнього кроку 
випуску дистрибутиву GNU під назвою "
@@ -1469,13 +1600,21 @@
 "reference-id\"><a href=\"#afterkernel\">#afterkernel</a></span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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 system is developed as a single unified project, and the "
+#| "developers choose a name for the system as a whole.  The kernel usually "
+#| "does not have a name of its own&mdash;instead, people say &ldquo;the "
+#| "kernel of such-and-such&rdquo; or &ldquo;the such-and-such kernel&rdquo;."
 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 "
+"than the misuse of the name &ldquo;Linux.&rdquo; Normally an operating "
 "system is developed as a single unified project, and the developers choose a "
 "name for the system as a whole.  The kernel usually does not have a name of "
 "its own&mdash;instead, people say &ldquo;the kernel of such-and-such&rdquo; "
-"or &ldquo;the such-and-such kernel&rdquo;."
+"or &ldquo;the such-and-such kernel.&rdquo;"
 msgstr ""
 "Така практика дуже рідкісна&nbsp;&mdash; ми не 
знаходимо жодного її "
 "прикладу, крім неправильного вживання 
назви &ldquo;Linux&rdquo;. Зазвичай "
@@ -1531,9 +1670,14 @@
 "href=\"#long\">#long</a></span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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."
 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.  "
+"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 ""
 "Деякий час ми намагалися використовувати 
назву &ldquo;LiGNUx&rdquo;, яке "
@@ -1541,8 +1685,13 @@
 "негативною. Люди набагато краще 
сприймають назву &ldquo;GNU/Linux&rdquo;."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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>."
 msgid ""
-"The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but we "
+"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 ""
@@ -1590,8 +1739,13 @@
 "reference-id\"><a href=\"#long2\">#long2</a></span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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?"
 msgid ""
-"It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you appreciate "
+"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 ""
@@ -1688,10 +1842,16 @@
 "внесок в систему."
 
 #. type: Content of: <div><dl><dd><ul><li>
+#, fuzzy
+#| 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 system.  If we say &ldquo;GNU/Linux&rdquo;, they can make a "
+#| "connection to what they have heard about."
 msgid ""
-"Since many people know of the system as &ldquo;Linux&rdquo;, if we say "
+"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 "
-"system.  If we say &ldquo;GNU/Linux&rdquo;, they can make a connection to "
+"system.  If we say &ldquo;GNU/Linux,&rdquo; they can make a connection to "
 "what they have heard about."
 msgstr ""
 "Оскільки багато людей знають цю систему 
як &ldquo;Linux&rdquo;, якщо ми "
@@ -1700,10 +1860,17 @@
 "зв'язати це з тим, про що вони вже чули."
 
 #. type: Content of: <div><dl><dt>
+#, fuzzy
+#| 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 wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to save "
+#| "the fee? <span class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
+#| "\">#trademarkfee</a>)</span>"
 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 "
-"wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to save the "
+"product, and that would also apply if I say &ldquo;GNU/Linux.&rdquo; Is it "
+"wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux,&rdquo; to save the "
 "fee? <span class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
 "\">#trademarkfee</a>)</span>"
 msgstr ""
@@ -1724,9 +1891,14 @@
 "але ви зовсім не зобов'язані платити за 
право робити це."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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."
 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."
+"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 ""
 "Тому якщо ви захочете назвати систему 
просто &ldquo;GNU&rdquo;, щоб не "
 "платити за те, що називаєте її &ldquo;Linux&rdquo;, 
ми вас не засудимо."
@@ -1788,12 +1960,19 @@
 "не станемо з цим сперечатися."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 giving credit, not for any possible threshold level, is &ldquo;"
+#| "Linux&rdquo;.  It can't be fair to give all the credit to one secondary "
+#| "contribution (Linux) while omitting the principal contribution (GNU)."
 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 "
-"giving credit, not for any possible threshold level, is &ldquo;"
-"Linux&rdquo;.  It can't be fair to give all the credit to one secondary "
-"contribution (Linux) while omitting the principal contribution (GNU)."
+"giving credit, not for any possible threshold level, is &ldquo;Linux.&rdquo; "
+"It can't be fair to give all the credit to one secondary contribution "
+"(Linux) while omitting the principal contribution (GNU)."
 msgstr ""
 "Різні місця для проведення риси 
призводять до різних варіантів назви "
 "системи. Але одна назва не може виникнути 
з міркувань справедливості та "
@@ -1814,7 +1993,7 @@
 "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."
+"system &ldquo;GNU/systemd/Linux,&rdquo; there is nothing wrong with doing so."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
@@ -1861,11 +2040,17 @@
 "\">#allsmall</a></span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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 the same argument would apply even more strongly to calling it &ldquo;"
+#| "Linux&rdquo;."
 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 "
-"the same argument would apply even more strongly to calling it &ldquo;"
-"Linux&rdquo;."
+"the same argument would apply even more strongly to calling it &ldquo;Linux."
+"&rdquo;"
 msgstr ""
 "У 2008 році ми виявили, що пакети GNU 
становили 15% розділу &ldquo;"
 "main&rdquo; дистрибутиву GNU/Linux gNewSense. На частку 
Linux довелося 1,5%. "
@@ -1930,9 +2115,16 @@
 "span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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 either &ldquo;GNU's version of Linux&rdquo; or &ldquo;"
+#| "Linux, which is a GNU package.&rdquo; Neither of those meanings fits the "
+#| "situation at hand."
 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 "
+"the word &ldquo;GNU&rdquo; modifies &ldquo;Linux.&rdquo; This can mean "
 "either &ldquo;GNU's version of Linux&rdquo; or &ldquo;Linux, which is a GNU "
 "package.&rdquo; Neither of those meanings fits the situation at hand."
 msgstr ""
@@ -1967,7 +2159,7 @@
 "We're not talking about a distinct GNU version of Linux, the kernel.  The "
 "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 "
+"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."
@@ -1980,11 +2172,18 @@
 "не хотіли б називати її так, тому що це 
призвело б до великої плутанини."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 &ldquo;combination.&rdquo; (Think of &ldquo;Input/Output&rdquo;.)  "
+#| "This system is the combination of GNU and Linux; hence, &ldquo;GNU/"
+#| "Linux&rdquo;."
 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 "
-"&ldquo;combination.&rdquo; (Think of &ldquo;Input/Output&rdquo;.)  This "
-"system is the combination of GNU and Linux; hence, &ldquo;GNU/Linux&rdquo;."
+"&ldquo;combination.&rdquo; (Think of &ldquo;Input/Output.&rdquo;)  This "
+"system is the combination of GNU and Linux; hence, &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "Ми говоримо про версії операційної 
системи GNU, яка відрізняється наявністю "
 "Linux в якості ядра. Знак &ldquo;дріб&rdquo; підх
одить до даної ситуації, бо "
@@ -1993,11 +2192,17 @@
 "&ldquo;GNU/Linux&rdquo;."
 
 #. 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: "
-"&ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes say &ldquo;GNU con "
-"Linux&rdquo;."
+#, fuzzy
+#| 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: &ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes say &ldquo;GNU "
+#| "con Linux&rdquo;."
+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: "
+"&ldquo;GNU-Linux.&rdquo; In Spanish, we sometimes say &ldquo;GNU con Linux."
+"&rdquo;"
 msgstr ""
 "Наявні інші способи висловити 
&ldquo;комбінацію&rdquo;. Якщо ви вважаєте, що "
 "знак &ldquo;плюс&rdquo; зрозуміліший, будь 
ласка, вживайте його. Французькою "
@@ -2042,7 +2247,7 @@
 #| "situation at hand."
 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 "
+"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 ""
 "Згідно з правилами англійської мови, в 
конструкції &ldquo;GNU Linux&rdquo; "
@@ -2084,8 +2289,13 @@
 "становить найнижчий рівень, а GNU заповнює 
технічно вищі рівіи."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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."
 msgid ""
-"However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a "
+"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 ""
@@ -2094,8 +2304,14 @@
 "повністю ігнорують GNU і створюють 
видимість, що вся система і є Linux."
 
 #. type: Content of: <div><dl><dt>
+#, fuzzy
+#| 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 whatever they like? <span class=\"anchor-reference-id\">(<a "
+#| "href=\"#distronames0\">#distronames0</a>)</span>"
 msgid ""
-"My distro's developers call it &ldquo;Foobar Linux&rdquo;, but that doesn't "
+"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 "
 "whatever they like? <span class=\"anchor-reference-id\">(<a href="
 "\"#distronames0\">#distronames0</a>)</span>"
@@ -2160,11 +2376,17 @@
 "span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 proper for you to correct the misinformation by calling it &ldquo;"
+#| "Foobar GNU/Linux&rdquo;."
 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 "
+"Linux,&rdquo; and call their version of it &ldquo;Foobar Linux,&rdquo; it's "
 "proper for you to correct the misinformation by calling it &ldquo;Foobar GNU/"
-"Linux&rdquo;."
+"Linux.&rdquo;"
 msgstr ""
 "Сказати &ldquo;GNU&rdquo; можна за якусь секунду. 
Якщо ви цінуєте систему, "
 "яку ми розробили, хіба ви не можете 
приділити одну секунду тому, щоб "
@@ -2202,12 +2424,19 @@
 "назва."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 "
+#| "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;."
 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 "
 "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;."
+"&ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "Ми не можемо змусити їх виправити це, але 
ми не з тих, хто здається лише "
 "тому, що дорога важка. У вас може не бути 
такого впливу в своєму середовищі, "
@@ -2241,13 +2470,12 @@
 msgid ""
 "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 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 nonfree "
-"applications and drivers), or making the system more popular even at the "
-"cost of freedom."
+"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 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 nonfree applications "
+"and drivers), or making the system more popular even at the cost of freedom."
 msgstr ""
 "Широко поширена практика додавання 
невільних програм в систему GNU/"
 "Linux&nbsp;&mdash; це серйозна проблема нашого 
співтовариства. Ця практика "
@@ -2296,7 +2524,7 @@
 "specifically for the sake of the users' freedom.  With this understanding, "
 "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;."
+"proper and appropriate &ldquo;versions of Linux.&rdquo;"
 msgstr ""
 "Щоб вказати цим користувачам на зв'язок зі 
свободою, потрібно чинити якраз "
 "навпаки: необхідно поінформувати їх про 
те, що усі ці версії системи "
@@ -2397,11 +2625,17 @@
 "жаль, не повернеш)."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and "
+#| "we don't want to act like that."
 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 "
-"and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and we don't want "
-"to act like that."
+"GNU,&rdquo; that would be somewhat like making a version of the GNU system "
+"and labeling it &ldquo;Linux.&rdquo; That wasn't right, and we don't want to "
+"act like that."
 msgstr ""
 "Якщо б ми взяли існуючу версію GNU/Linux і 
перейменували її в &ldquo;"
 "GNU&rdquo;, це було б приблизно те ж саме, що 
взяти версію системи і GNU "
@@ -2436,11 +2670,21 @@
 "нестерпні; вони вимагали корекції перед 
прийняттям."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 "
+#| "with the GNU Project because he was a &ldquo;Linux user&rdquo;.  That "
+#| "came as a shock, because the people who ported GNU packages to other "
+#| "systems had generally wanted to work with us to get their changes "
+#| "installed.  Yet these people, developing a system that was primarily "
+#| "based on GNU, were the first (and still practically the only) group that "
+#| "was unwilling to work with us."
 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 "
-"with the GNU Project because he was a &ldquo;Linux user&rdquo;.  That came "
-"as a shock, because the people who ported GNU packages to other systems had "
+"with the GNU Project because he was a &ldquo;Linux user.&rdquo; That came as "
+"a shock, because the people who ported GNU packages to other systems had "
 "generally wanted to work with us to get their changes installed.  Yet these "
 "people, developing a system that was primarily based on GNU, were the first "
 "(and still practically the only) group that was unwilling to work with us."
@@ -2454,9 +2698,16 @@
 "групою, що не бажає працювати з нами."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 obstructing our work.  Asking you to call the system &ldquo;GNU/"
+#| "Linux&rdquo; is our response to that problem, and to the other problems "
+#| "caused by the &ldquo;Linux&rdquo; misnomer."
 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 "
+"version of the GNU system &ldquo;Linux,&rdquo; and that this confusion was "
 "obstructing our work.  Asking you to call the system &ldquo;GNU/Linux&rdquo; "
 "is our response to that problem, and to the other problems caused by the "
 "&ldquo;Linux&rdquo; misnomer."
@@ -2498,10 +2749,14 @@
 "\"#allgpled\">#allgpled</a></span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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;."
 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;."
+"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 ""
 "Ми ніколи не згадуємо про окремі програми 
як &ldquo;GNU/[назва]&rdquo;. Якщо "
 "програма є одним з пакунків GNU, то ми 
можемо називати її &ldquo;GNU [назва]"
@@ -2615,10 +2870,18 @@
 "програми або навіть їхні частини з Unix; все 
доводилося писати заново."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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.  The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not "
+#| "Unix&rdquo;, is a humorous way of giving credit to Unix for this, "
+#| "following a hacker tradition of recursive acronyms that started in the "
+#| "70s."
 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.  "
-"The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not Unix&rdquo;, "
+"The name &ldquo;GNU,&rdquo; which stands for &ldquo;GNU's Not Unix,&rdquo; "
 "is a humorous way of giving credit to Unix for this, following a hacker "
 "tradition of recursive acronyms that started in the 70s."
 msgstr ""
@@ -2641,10 +2904,10 @@
 #| "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 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 "
+"like &ldquo;<em>somethingorother</em> TECO,&rdquo; he thought of a clever "
 "amusing name.  (That's what hacking means: <a href=\"https://stallman.org/";
 "articles/on-hacking.html\">playful cleverness</a>.)"
 msgstr ""
@@ -2657,13 +2920,21 @@
 "дотепність</a>.)"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 was similar to some existing program (let's imagine its name was "
+#| "&ldquo;Klever&rdquo;), you could give it a recursive acronym name, such "
+#| "as &ldquo;MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same "
+#| "spirit we called our replacement for Unix &ldquo;GNU's Not Unix&rdquo;."
 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 "
 "was similar to some existing program (let's imagine its name was &ldquo;"
 "Klever&rdquo;), you could give it a recursive acronym name, such as &ldquo;"
 "MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same spirit we "
-"called our replacement for Unix &ldquo;GNU's Not Unix&rdquo;."
+"called our replacement for Unix &ldquo;GNU's Not Unix.&rdquo;"
 msgstr ""
 "Іншим хакерам так сподобалося ця назва, що 
її почали наслідувати. Стало "
 "традицією, що, коли ви писали з нуля 
програму, подібну до деякої існуючій "
@@ -2674,13 +2945,21 @@
 "&mdash; це не Unix&rdquo;."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 in a system 99% copied from Unix.  AT&amp;T actually threatened "
+#| "to sue anyone giving AT&amp;T credit in that way.  This is why each of "
+#| "the various modified versions of Unix (all proprietary, like Unix) had a "
+#| "completely different name that didn't include &ldquo;Unix&rdquo;."
 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 "
 "in a system 99% copied from Unix.  AT&amp;T actually threatened to sue "
 "anyone giving AT&amp;T credit in that way.  This is why each of the various "
 "modified versions of Unix (all proprietary, like Unix) had a completely "
-"different name that didn't include &ldquo;Unix&rdquo;."
+"different name that didn't include &ldquo;Unix.&rdquo;"
 msgstr ""
 "Історично склалося, що AT&amp;T, яка розробила 
Unix, не хотіла, щоб хто-"
 "небудь віддавав їй належне шляхом 
вживання &ldquo;Unix&rdquo; назві подібної "
@@ -2760,9 +3039,16 @@
 "Linux&rdquo; для неї підходить."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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/"
+#| "kernelofNetBSD&rdquo; would be more accurate, since NetBSD is an entire "
+#| "system, not just the kernel.  This is not a BSD system, since most of the "
+#| "system is the same as the GNU/Linux system."
 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/"
+"call it &ldquo;Debian GNU/NetBSD,&rdquo; but &ldquo;GNU/"
 "kernelofNetBSD&rdquo; would be more accurate, since NetBSD is an entire "
 "system, not just the kernel.  This is not a BSD system, since most of the "
 "system is the same as the GNU/Linux system."
@@ -2783,8 +3069,15 @@
 "href=\"#othersys\">#othersys</a></span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 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."
 msgid ""
-"Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of "
+"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 "
@@ -2891,8 +3184,14 @@
 "дуже мало спільного. Насправді спільне в 
них тільки одне: Linux."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 Linux, because it doesn't have the usual Linux [sic] libraries and "
+#| "utilities [meaning the GNU system].&rdquo;"
 msgid ""
-"If you call the whole GNU/Linux system &ldquo;Linux&rdquo;, you will find it "
+"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 "
 "Linux, because it doesn't have the usual Linux [sic] libraries and utilities "
 "[meaning the GNU system].&rdquo;"
@@ -2931,7 +3230,7 @@
 #. 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 "
+"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 ""
 
@@ -2939,7 +3238,7 @@
 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;."
+"of the whole system as &ldquo;Linux.&rdquo;"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><p>
@@ -2949,7 +3248,7 @@
 "contain Linux is irrelevant to using them, just as the fact that a car and a "
 "bicycle both have a structure of metal is irrelevant to using those two.  If "
 "you wish to talk about using cars and bikes, you wouldn't speak of &ldquo;"
-"riding metal objects&rdquo; &mdash; not unless you're playing games with the "
+"riding metal objects&rdquo;&mdash;not unless you're playing games with the "
 "reader.  You would say, &ldquo;using cars and bikes.&rdquo; Likewise, the "
 "clear way to talk about using GNU/Linux and Android is to say &ldquo;using "
 "GNU/Linux and Android.&rdquo;"
@@ -3042,11 +3341,17 @@
 "class=\"anchor-reference-id\"><a href=\"#claimlinux\">#claimlinux</a></span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 "
+#| "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."
 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 "
-"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."
+"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."
 msgstr ""
 "Це було б нечесно, тому ми так не робимо. Р
обота Торвальдса&nbsp;&mdash; "
 "Linux (ядро); ми акуратно намагаємося не 
приписувати цю роботу проектові GNU "
@@ -3071,11 +3376,28 @@
 #| "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=\"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>."
+"He recognized this at the beginning.  The <a href=\"https://ftp.funet.fi/pub/";
+"linux/historical/kernel/old-versions/RELNOTES-0.01\"> earliest Linux release "
+"notes</a> said:"
+msgstr ""
+"Спочатку він визнавав це. У примітках до 
самого раннього випуску Linux "
+"сказано: &ldquo;Більшість інструментів, що 
використовуються з linux, є "
+"програмами GNU і підпорядковані копілефту 
GNU. Ці інструменти не увійшли до "
+"дистрибутив&nbsp;&nbsp; звертайтесь до мене 
(або в GNU) за додатковою "
+"інформацією&rdquo;<a href=\"#ft1\">[1]</a>."
+
+#. type: Content of: <div><dl><dd><blockquote><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 ""
+"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."
 msgstr ""
 "Спочатку він визнавав це. У примітках до 
самого раннього випуску Linux "
 "сказано: &ldquo;Більшість інструментів, що 
використовуються з linux, є "
@@ -3133,11 +3455,19 @@
 "reference-id\"><a href=\"#lost\">#lost</a></span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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;: 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."
 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;: "
 "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 "
+"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."
 msgstr ""
@@ -3159,13 +3489,23 @@
 "\"anchor-reference-id\"><a href=\"#whatgood\">#whatgood</a></span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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;GNU/Linux&rdquo;, you will help others learn the system's true "
+#| "history, origin, and reason for being.  You can't correct the misnomer "
+#| "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."
 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;"
-"GNU/Linux&rdquo;, you will help others learn the system's true history, "
+"GNU/Linux,&rdquo; you will help others learn the system's true history, "
 "origin, and reason for being.  You can't correct the misnomer 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 "
+"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."
 msgstr ""
@@ -3190,10 +3530,16 @@
 "href=\"#explain\">#explain</a></span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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."
 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."
+"the system &ldquo;GNU/Linux,&rdquo; and uses your time inefficiently."
 msgstr ""
 "Якщо ви допомагаєте нам, пояснюючи це 
людям таким чином, ми вдячні вам за цю "
 "роботу, однак це не найкращий метод. Це не 
призводить до таких результатами, "
@@ -3201,12 +3547,21 @@
 "витрачає ваш час."
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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, and they may learn a correct picture of the system's origin.  "
+#| "But they are unlikely to repeat the explanation to others whenever they "
+#| "talk about the system.  They will probably just call it &ldquo;"
+#| "Linux&rdquo;.  Without particularly intending to, they will help spread "
+#| "the incorrect picture."
 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, "
 "and they may learn a correct picture of the system's origin.  But they are "
 "unlikely to repeat the explanation to others whenever they talk about the "
-"system.  They will probably just call it &ldquo;Linux&rdquo;.  Without "
+"system.  They will probably just call it &ldquo;Linux.&rdquo; Without "
 "particularly intending to, they will help spread the incorrect picture."
 msgstr ""
 "Це не приводить до потрібних результатів, 
тому що може не дійти до "
@@ -3346,9 +3701,13 @@
 "class=\"anchor-reference-id\"><a href=\"#force\">#force</a></span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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."
 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."
+"&ldquo;GNU/Linux,&rdquo; and we ask you to do it too."
 msgstr ""
 "Було б нечесно змушувати їх, і ми не 
намагаємося робити це. Ми називаємо "
 "систему &ldquo;GNU/Linux&rdquo; і просимо вас чинити 
так само."
@@ -3443,9 +3802,15 @@
 "виразом &ldquo;ліцензія BSD&rdquo;, не згадуючи 
про те, яка саме це ліцензія."
 
 #. type: Content of: <div><dl><dt>
+#, fuzzy
+#| 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 "
+#| "complaining now? <span class=\"anchor-reference-id\">(<a href=\"#deserve"
+#| "\">#deserve</a>)</span>"
 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 "
+"the system &ldquo;GNU,&rdquo; you deserve what happened; why are you "
 "complaining now? <span class=\"anchor-reference-id\">(<a href=\"#deserve"
 "\">#deserve</a>)</span>"
 msgstr ""
@@ -3498,8 +3863,13 @@
 "програмне забезпечення законне і 
прийнятне."
 
 #. type: Content of: <div><dl><dt>
+#, fuzzy
+#| 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>"
 msgid ""
-"Since many people call it &ldquo;Linux&rdquo;, doesn't that make it right? "
+"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 ""
@@ -3522,9 +3892,15 @@
 "span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 add &ldquo;(often erroneously referred to as &lsquo;"
+#| "Linux&rsquo;)&rdquo; once in a while, they will all understand."
 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 "
+"&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."
 msgstr ""

Index: po/gnu-linux-faq.zh-cn.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.zh-cn.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- po/gnu-linux-faq.zh-cn.po   8 Sep 2021 08:33:18 -0000       1.21
+++ po/gnu-linux-faq.zh-cn.po   2 Nov 2021 14:41:52 -0000       1.22
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-linux-faq.html\n"
-"POT-Creation-Date: 2021-08-31 10:27+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2021-09-08 16:05+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-11-02 14:27+0000\n"
 
 #. type: Content of: <title>
 msgid "GNU/Linux FAQ - GNU Project - Free Software Foundation"
@@ -27,10 +28,15 @@
 msgid "by Richard Stallman"
 msgstr "Richard Stallman 著"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| 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."
 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.  "
+"that many others call just &ldquo;Linux,&rdquo; they ask many questions.  "
 "Here are common questions, and our answers."
 msgstr ""
 "当人们看到我们使用并建议GNU/Linux作为系统名称,而å…
¶ä»–人称之为&ldquo;"
@@ -230,11 +236,17 @@
 "GNU&rdquo;有错吗?</a>"
 
 #. type: Content of: <div><div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#trademarkfee\">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 wrong if I use &ldquo;GNU&rdquo; without "
+#| "&ldquo;Linux&rdquo;, to save the fee?</a>"
 msgid ""
 "<a href=\"#trademarkfee\">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 wrong if I use &ldquo;GNU&rdquo; without "
-"&ldquo;Linux&rdquo;, to save the fee?</a>"
+"&ldquo;GNU/Linux.&rdquo; Is it wrong if I use &ldquo;GNU&rdquo; without "
+"&ldquo;Linux,&rdquo; to save the fee?</a>"
 msgstr ""
 "<a 
href=\"#trademarkfee\">如果产品名称使用&ldquo;Linux&rdquo;要付费,那么使用"
 "&ldquo;GNU/Linux&rdquo;也一æ 
·ä»˜è´¹ã€‚难道使用&ldquo;GNU&rdquo;而不带&ldquo;"
@@ -315,10 +327,15 @@
 "GNU&rdquo;?</a>"
 
 #. type: Content of: <div><div><ul><li>
-msgid ""
-"<a href=\"#distronames0\">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 whatever they like?</a>"
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#distronames0\">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 whatever they like?</a>"
+msgid ""
+"<a href=\"#distronames0\">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 whatever they like?</a>"
 msgstr ""
 "<a href=\"#distronames0\">发行版的开发者叫它&ldquo;Foobar 
Linux&rdquo;,但是"
 "该名字没有å…
³äºŽç³»ç»Ÿç»„成的任何信息。他们为什么不能愿意叫什么就叫什么呢?</a>"
@@ -551,9 +568,14 @@
 "吗?</a>"
 
 #. type: Content of: <div><div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#deserve\">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 complaining now?</a>"
 msgid ""
 "<a href=\"#deserve\">Since you failed to put something in the GNU GPL to "
-"require people to call the system &ldquo;GNU&rdquo;, you deserve what "
+"require people to call the system &ldquo;GNU,&rdquo; you deserve what "
 "happened; why are you complaining now?</a>"
 msgstr ""
 "<a href=\"#deserve\">由于你没有在GNU 
GPL中要求人们称该系统为&ldquo;"
@@ -566,8 +588,12 @@
 msgstr "<a href=\"#contradict\">如果你们不和这么多人作对,情
况不是更好吗?</a>"
 
 #. type: Content of: <div><div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#somanyright\">Since many people call it &ldquo;Linux&rdquo;, "
+#| "doesn't that make it right?</a>"
 msgid ""
-"<a href=\"#somanyright\">Since many people call it &ldquo;Linux&rdquo;, "
+"<a href=\"#somanyright\">Since many people call it &ldquo;Linux,&rdquo; "
 "doesn't that make it right?</a>"
 msgstr ""
 "<a 
href=\"#somanyright\">由于许多人都叫它&ldquo;Linux&rdquo;,不正说明这是正"
@@ -719,6 +745,16 @@
 "题,并请求人们更改。那时,这个混淆已经遥遥领先了。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 it must be right.  The name &ldquo;Linux&rdquo; also spreads a "
+#| "false picture of the system's origin, because people tend to suppose that "
+#| "the system's history was such as to fit that name.  For instance, they "
+#| "often believe its development was started by Linus Torvalds in 1991.  "
+#| "This false picture tends to reinforce the idea that the system should be "
+#| "called &ldquo;Linux&rdquo;."
 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 "
@@ -726,7 +762,7 @@
 "of the system's origin, because people tend to suppose that the system's "
 "history was such as to fit that name.  For instance, they often believe its "
 "development was started by Linus Torvalds in 1991.  This false picture tends "
-"to reinforce the idea that the system should be called &ldquo;Linux&rdquo;."
+"to reinforce the idea that the system should be called &ldquo;Linux.&rdquo;"
 msgstr ""
 
"大多数称该系统为&ldquo;Linux&rdquo;的人从来没有听说过为什么这不对。他们看到å
…¶"
 
"他人这么用,就理所当然地认为这一定是对的。&ldquo;Linux&rdquo;这个名字还ä¼
 æ’­äº†"
@@ -749,21 +785,34 @@
 "class=\"anchor-reference-id\">(<a href=\"#always\">#always</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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."
 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."
+"you're referring specifically to the kernel, you should call it &ldquo;Linux,"
+"&rdquo; the name its developer chose."
 msgstr ""
 "不是总要&mdash;只有当我们在谈论整个系统时。如果你
特指内核,那么你应该说"
 "&ldquo;Linux&rdquo;,其开发者选择的名字。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 kinds of confusion, because only experts can tell whether a "
+#| "statement is about the kernel or the whole system.  By calling the whole "
+#| "system &ldquo;GNU/Linux&rdquo;, and calling the kernel &ldquo;"
+#| "Linux&rdquo;, you avoid the ambiguity."
 msgid ""
-"When people call the whole system &ldquo;Linux&rdquo;, as a consequence they "
+"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 "
 "kinds of confusion, because only experts can tell whether a statement is "
 "about the kernel or the whole system.  By calling the whole system &ldquo;"
-"GNU/Linux&rdquo;, and calling the kernel &ldquo;Linux&rdquo;, you avoid the "
+"GNU/Linux,&rdquo; and calling the kernel &ldquo;Linux,&rdquo; you avoid the "
 "ambiguity."
 msgstr ""
 "当人们称整个系统为&ldquo;Linux&rdquo;时,å…
¶åŽæžœå°±æ˜¯ä»–们用内核的名字来称呼整个"
@@ -825,8 +874,13 @@
 "reference-id\">(<a href=\"#divide\">#divide</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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."
 msgid ""
-"When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing "
+"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 ""
@@ -873,10 +927,23 @@
 "源错失了自由软件的重点</a>。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 freedom are more likely to call the system &ldquo;GNU/"
+#| "Linux&rdquo;, and people who learn that the system is &ldquo;GNU/"
+#| "Linux&rdquo; are more likely to pay attention to our philosophical "
+#| "arguments for freedom and community (which is why the choice of name for "
+#| "the system makes a real difference for society).  However, the "
+#| "disagreement would probably exist even if everyone knew the system's real "
+#| "origin and its proper name, because the issue is a real one.  It can only "
+#| "go away if we who value freedom either persuade everyone (which won't be "
+#| "easy) or are defeated entirely (let's hope not)."
 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 "
-"freedom are more likely to call the system &ldquo;GNU/Linux&rdquo;, and "
+"freedom are more likely to call the system &ldquo;GNU/Linux,&rdquo; and "
 "people who learn that the system is &ldquo;GNU/Linux&rdquo; are more likely "
 "to pay attention to our philosophical arguments for freedom and community "
 "(which is why the choice of name for the system makes a real difference for "
@@ -924,10 +991,17 @@
 "\">#everyoneknows</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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 system do not mention the name &ldquo;GNU&rdquo;, or the ideals that "
+#| "GNU stands for.  <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU "
+#| "Users Who Have Never Heard of GNU</a> explains further."
 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 "
-"system do not mention the name &ldquo;GNU&rdquo;, or the ideals that GNU "
+"system do not mention the name &ldquo;GNU,&rdquo; or the ideals that GNU "
 "stands for.  <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users "
 "Who Have Never Heard of GNU</a> explains further."
 msgstr ""
@@ -937,11 +1011,17 @@
 "解释。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 GNU is.  For instance, many think it is a collection of <a "
+#| "href=\"#tools\">&ldquo;tools&rdquo;</a>, or a project to develop tools."
 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 "
-"GNU is.  For instance, many think it is a collection of <a href=\"#tools"
-"\">&ldquo;tools&rdquo;</a>, or a project to develop tools."
+"GNU is.  For instance, many think it is a collection of &ldquo;<a href="
+"\"#tools\">tools</a>,&rdquo; or a project to develop tools."
 msgstr ""
 "问这个问题的人可能认为他们认识的极客<sup><a 
href=\"#TransNote1\">1</a></sup>"
 "抱有这个想法。极客通常知道GNU,但是很多极客å…
³äºŽGNU的概念是完全错误的。比如,"
@@ -970,11 +1050,18 @@
 "reference-id\">(<a href=\"#everyoneknows2\">#everyoneknows2</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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;"
+#| "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?"
 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;"
-"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?"
+"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?"
 msgstr ""
 "如果你说的话没有表达出你的认识,那么你
不是在教育别人。大多数听到过GNU/Linux系"
 "统的人认为这就是&ldquo;Linux&rdquo;,而它是由Linus 
Torvalds开始的,并且它要做"
@@ -1026,14 +1113,23 @@
 "reference-id\">(<a href=\"#tools\">#tools</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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 "
+#| "that GNU is the name of a collection of programs&mdash;often they say "
+#| "&ldquo;programming tools&rdquo;, since some of our programming tools "
+#| "became popular on their own.  The idea that &ldquo;GNU&rdquo; is the name "
+#| "of an operating system is hard to fit into a conceptual framework in "
+#| "which that operating system is labeled &ldquo;Linux&rdquo;."
 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 "
 "that GNU is the name of a collection of programs&mdash;often they say &ldquo;"
-"programming tools&rdquo;, since some of our programming tools became popular "
+"programming tools,&rdquo; since some of our programming tools became popular "
 "on their own.  The idea that &ldquo;GNU&rdquo; is the name of an operating "
 "system is hard to fit into a conceptual framework in which that operating "
-"system is labeled &ldquo;Linux&rdquo;."
+"system is labeled &ldquo;Linux.&rdquo;"
 msgstr ""
 
"认为Linux就是整个操作系统的人,如果对GNU有所耳闻,对什么是GNU的概念往往是错误"
 
"的。他们或许认为GNU是一个程序集合的名字&mdash;他们常常称之为&ldquo;编程工å
…·"
@@ -1090,12 +1186,23 @@
 "始和终止其他程序。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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.  The use of &ldquo;operating system&rdquo; to mean "
+#| "&ldquo;kernel&rdquo; is found in a number of textbooks on system design, "
+#| "going back to the 80s.  At the same time, in the 80s, the &ldquo;Unix "
+#| "operating system&rdquo; was understood to include all the system "
+#| "programs, and Berkeley's version of Unix included even games. Since we "
+#| "intended GNU to be a Unix-like operating system, we use the term &ldquo;"
+#| "operating system&rdquo; in the same way."
 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.  "
-"The use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is "
-"found in a number of textbooks on system design, going back to the 80s.  At "
-"the same time, in the 80s, the &ldquo;Unix operating system&rdquo; was "
+"to mean &ldquo;kernel.&rdquo; Both uses of the term go back many years.  The "
+"use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is found "
+"in a number of textbooks on system design, going back to the 80s.  At the "
+"same time, in the 80s, the &ldquo;Unix operating system&rdquo; was "
 "understood to include all the system programs, and Berkeley's version of "
 "Unix included even games. Since we intended GNU to be a Unix-like operating "
 "system, we use the term &ldquo;operating system&rdquo; in the same way."
@@ -1108,11 +1215,20 @@
 "&ldquo;操作系统&rdquo;一词时是指和Unix一样的意思。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 "
+#| "sense we use: they mean the whole collection of programs.  If that's what "
+#| "you are referring to, please call it &ldquo;GNU/Linux&rdquo;.  If you "
+#| "mean just the kernel, then &ldquo;Linux&rdquo; is the right name for it, "
+#| "but please say &ldquo;kernel&rdquo; also to avoid ambiguity about which "
+#| "body of software you mean."
 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 "
 "sense we use: they mean the whole collection of programs.  If that's what "
-"you are referring to, please call it &ldquo;GNU/Linux&rdquo;.  If you mean "
+"you are referring to, please call it &ldquo;GNU/Linux.&rdquo; If you mean "
 "just the kernel, then &ldquo;Linux&rdquo; is the right name for it, but "
 "please say &ldquo;kernel&rdquo; also to avoid ambiguity about which body of "
 "software you mean."
@@ -1123,10 +1239,16 @@
 "确的名字,但是请你也加上&ldquo;内核&rdquo;来避免混淆你
要指明的程序。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "If you prefer to use some other term such as &ldquo;system "
+#| "distribution&rdquo; for the entire collection of programs, instead of "
+#| "&ldquo;operating system&rdquo;, that's fine.  Then you would talk about "
+#| "GNU/Linux system distributions."
 msgid ""
 "If you prefer to use some other term such as &ldquo;system "
 "distribution&rdquo; for the entire collection of programs, instead of &ldquo;"
-"operating system&rdquo;, that's fine.  Then you would talk about GNU/Linux "
+"operating system,&rdquo; that's fine.  Then you would talk about GNU/Linux "
 "system distributions."
 msgstr ""
 "如果你
更爱使用诸如&ldquo;系统发行版&rdquo;之类的词来表示整个系统集合,而不用"
@@ -1210,12 +1332,20 @@
 "span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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, window systems, libraries, and much more &mdash; hundreds of "
+#| "programs, even to match what BSD systems included in 1983.  Since "
+#| "Torvalds didn't develop any of those, how can the system be &ldquo;"
+#| "Linux&rdquo;?"
 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, "
-"window systems, libraries, and much more &mdash; hundreds of programs, even "
-"to match what BSD systems included in 1983.  Since Torvalds didn't develop "
-"any of those, how can the system be &ldquo;Linux&rdquo;?"
+"window systems, libraries, and much more&mdash;hundreds of programs, even to "
+"match what BSD systems included in 1983.  Since Torvalds didn't develop any "
+"of those, how can the system be &ldquo;Linux&rdquo;?"
 msgstr ""
 "这样争辩的人把系统称为 &ldquo;Linux&rdquo; 是在使用双重æ 
‡å‡†ã€‚操作系统还需要编"
 
"译器、编辑器、窗口管理系统、系统库以及更多&mdash;&mdash;成百上千的程序,即使"
@@ -1248,9 +1378,14 @@
 "\">#notinstallable</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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."
 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</a> are available.  None of them is called simply &ldquo;GNU,&rdquo; but "
 "GNU is what they basically are."
 msgstr ""
 "有许多<a href=\"/distros/distros.html\">打好包的、可安装
的GNU版本</a>。它们都"
@@ -1296,9 +1431,14 @@
 "重新打包了大量的GNU系统的软件包。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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."
 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 "
+"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 ""
 "我们从来没有踏出最后一步&mdash;用&ldquo;GNU&rdquo;之名打包
GNU,但是这并不改变"
@@ -1314,13 +1454,21 @@
 "\"anchor-reference-id\">(<a href=\"#afterkernel\">#afterkernel</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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 system is developed as a single unified project, and the "
+#| "developers choose a name for the system as a whole.  The kernel usually "
+#| "does not have a name of its own&mdash;instead, people say &ldquo;the "
+#| "kernel of such-and-such&rdquo; or &ldquo;the such-and-such kernel&rdquo;."
 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 "
+"than the misuse of the name &ldquo;Linux.&rdquo; Normally an operating "
 "system is developed as a single unified project, and the developers choose a "
 "name for the system as a whole.  The kernel usually does not have a name of "
 "its own&mdash;instead, people say &ldquo;the kernel of such-and-such&rdquo; "
-"or &ldquo;the such-and-such kernel&rdquo;."
+"or &ldquo;the such-and-such kernel.&rdquo;"
 msgstr ""
 
"这个用法似乎非常罕见&mdash;除了被错用的&ldquo;Linux&rdquo;之外,我们没有找到"
 "å…
¶ä»–的例子。通常,操作系统是作为一个统一的项目开发的,而且å
…¶å¼€å‘人员会为整个"
@@ -1369,17 +1517,27 @@
 "\"anchor-reference-id\">(<a href=\"#long\">#long</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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."
 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.  "
+"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 ""
 
"有段时间,我们用了&ldquo;LiGNUx&rdquo;这个名字,它合并了&ldquo;GNU&rdquo;和"
 
"&ldquo;Linux&rdquo;两个词。反应很不好。人们更接受&ldquo;GNU/Linux&rdquo;。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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>."
 msgid ""
-"The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but we "
+"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 ""
@@ -1424,8 +1582,13 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#long2\">#long2</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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?"
 msgid ""
-"It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you appreciate "
+"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 ""
@@ -1523,10 +1686,16 @@
 "面应得的荣誉。"
 
 #. type: Content of: <div><dl><dd><ul><li>
+#, fuzzy
+#| 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 system.  If we say &ldquo;GNU/Linux&rdquo;, they can make a "
+#| "connection to what they have heard about."
 msgid ""
-"Since many people know of the system as &ldquo;Linux&rdquo;, if we say "
+"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 "
-"system.  If we say &ldquo;GNU/Linux&rdquo;, they can make a connection to "
+"system.  If we say &ldquo;GNU/Linux,&rdquo; they can make a connection to "
 "what they have heard about."
 msgstr ""
 
"由于许多人对该系统的认识是&ldquo;Linux&rdquo;,如果我们说&ldquo;GNU&rdquo;,"
@@ -1534,10 +1703,17 @@
 "们就能够和他们原先听说的系统建立联系。"
 
 #. type: Content of: <div><dl><dt>
+#, fuzzy
+#| 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 wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to save "
+#| "the fee? <span class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
+#| "\">#trademarkfee</a>)</span>"
 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 "
-"wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to save the "
+"product, and that would also apply if I say &ldquo;GNU/Linux.&rdquo; Is it "
+"wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux,&rdquo; to save the "
 "fee? <span class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
 "\">#trademarkfee</a>)</span>"
 msgstr ""
@@ -1556,9 +1732,14 @@
 "Torvalds应得的荣誉也很好,但是你
并没有义务要为此支付费用。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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."
 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."
+"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 ""
 "所以如果你想简单称该系统为&ldquo;GNU&rdquo;,并以此避免因
为叫它&ldquo;"
 "Linux&rdquo;而付费,我们不会指责你。"
@@ -1612,12 +1793,19 @@
 "显的对错,所以无论你怎么做,我们都不会反对。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 giving credit, not for any possible threshold level, is &ldquo;"
+#| "Linux&rdquo;.  It can't be fair to give all the credit to one secondary "
+#| "contribution (Linux) while omitting the principal contribution (GNU)."
 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 "
-"giving credit, not for any possible threshold level, is &ldquo;"
-"Linux&rdquo;.  It can't be fair to give all the credit to one secondary "
-"contribution (Linux) while omitting the principal contribution (GNU)."
+"giving credit, not for any possible threshold level, is &ldquo;Linux.&rdquo; "
+"It can't be fair to give all the credit to one secondary contribution "
+"(Linux) while omitting the principal contribution (GNU)."
 msgstr ""
 "不同的长度会形成不同的系统名称。但是一个名字,无
论怎么样的长度限制,都不会是"
 "因为考虑到å…
¬å¹³å’Œè£èª‰è€Œå‡ºçŽ°çš„,它就是&ldquo;Linux&rdquo;。给予一个次要贡献è€
…"
@@ -1634,11 +1822,18 @@
 "\">#others</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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).  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."
 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).  "
 "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."
+"system &ldquo;GNU/systemd/Linux,&rdquo; there is nothing wrong with doing so."
 msgstr ""
 "Systemd 是一个相当重要的组件,但是它并没有内æ 
¸ï¼ˆLinux)那么重要,也没有整个系"
 "统的基础(GNU)那么重要。不过,如果你强调系统中有 
Systemd 并且称之为 &ldquo;"
@@ -1683,11 +1878,17 @@
 "reference-id\">(<a href=\"#allsmall\">#allsmall</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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 the same argument would apply even more strongly to calling it &ldquo;"
+#| "Linux&rdquo;."
 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 "
-"the same argument would apply even more strongly to calling it &ldquo;"
-"Linux&rdquo;."
+"the same argument would apply even more strongly to calling it &ldquo;Linux."
+"&rdquo;"
 msgstr ""
 "在2008年,我们发现GNU包在gNewSense 
GNU/Linux发行版的&ldquo;主&rdquo;包中占有"
 "15%的份额。Linux占有1.5%的份额。所以,同æ 
·çš„争议对&ldquo;Linux&rdquo;这一名称"
@@ -1744,9 +1945,16 @@
 "class=\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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 either &ldquo;GNU's version of Linux&rdquo; or &ldquo;"
+#| "Linux, which is a GNU package.&rdquo; Neither of those meanings fits the "
+#| "situation at hand."
 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 "
+"the word &ldquo;GNU&rdquo; modifies &ldquo;Linux.&rdquo; This can mean "
 "either &ldquo;GNU's version of Linux&rdquo; or &ldquo;Linux, which is a GNU "
 "package.&rdquo; Neither of those meanings fits the situation at hand."
 msgstr ""
@@ -1766,11 +1974,20 @@
 "Linux,是一个GNU包&rdquo;的说法不对。"
 
 #. 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=\"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."
 msgid ""
 "We're not talking about a distinct GNU version of Linux, the kernel.  The "
 "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 "
+"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."
@@ -1782,22 +1999,35 @@
 "叫,因为这太令人迷惑了。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 &ldquo;combination.&rdquo; (Think of &ldquo;Input/Output&rdquo;.)  "
+#| "This system is the combination of GNU and Linux; hence, &ldquo;GNU/"
+#| "Linux&rdquo;."
 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 "
-"&ldquo;combination.&rdquo; (Think of &ldquo;Input/Output&rdquo;.)  This "
-"system is the combination of GNU and Linux; hence, &ldquo;GNU/Linux&rdquo;."
+"&ldquo;combination.&rdquo; (Think of &ldquo;Input/Output.&rdquo;)  This "
+"system is the combination of GNU and Linux; hence, &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "我们讨论的是GNU操作系统的一个版本,它由于带有Linux内æ 
¸è€ŒåŒºåˆ«äºŽå…¶ä»–GNU版本。斜"
 "杠适合此情况,因
为它表示&ldquo;联合。&rdquo;(类似&ldquo;输入/输出&rdquo;。)"
 "该系统是GNU和Linux的联合;因此,它叫&ldquo;GNU/Linux&rdquo;。"
 
 #. 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: "
-"&ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes say &ldquo;GNU con "
-"Linux&rdquo;."
+#, fuzzy
+#| 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: &ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes say &ldquo;GNU "
+#| "con Linux&rdquo;."
+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: "
+"&ldquo;GNU-Linux.&rdquo; In Spanish, we sometimes say &ldquo;GNU con Linux."
+"&rdquo;"
 msgstr ""
 "还有其他的方法表示&ldquo;联合&rdquo;。如果你认为加号更清
楚,请使用加号。在法"
 "语中,横线就很清
楚:&ldquo;GNU-Linux&rdquo;。在西班牙语中,我们有时说&ldquo;"
@@ -1832,9 +2062,15 @@
 "span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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."
 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 "
+"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 ""
 "根据英语语法规则,在 &ldquo;GNU Emcas&rdquo; 
这个组合中,&ldquo;GNU&rdquo; 一"
@@ -1876,8 +2112,13 @@
 "这一情况也是恰当的。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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."
 msgid ""
-"However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a "
+"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 ""
@@ -1885,8 +2126,14 @@
 "个系统当作Linux要好得多。"
 
 #. type: Content of: <div><dl><dt>
+#, fuzzy
+#| 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 whatever they like? <span class=\"anchor-reference-id\">(<a "
+#| "href=\"#distronames0\">#distronames0</a>)</span>"
 msgid ""
-"My distro's developers call it &ldquo;Foobar Linux&rdquo;, but that doesn't "
+"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 "
 "whatever they like? <span class=\"anchor-reference-id\">(<a href="
 "\"#distronames0\">#distronames0</a>)</span>"
@@ -1945,11 +2192,17 @@
 "\"#distronames1\">#distronames1</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 proper for you to correct the misinformation by calling it &ldquo;"
+#| "Foobar GNU/Linux&rdquo;."
 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 "
+"Linux,&rdquo; and call their version of it &ldquo;Foobar Linux,&rdquo; it's "
 "proper for you to correct the misinformation by calling it &ldquo;Foobar GNU/"
-"Linux&rdquo;."
+"Linux.&rdquo;"
 msgstr ""
 "当有人通过将&ldquo;GNU&rdquo;改为&ldquo;Linux&rdquo;并称å…
¶ç³»ç»Ÿç‰ˆæœ¬ä¸º&ldquo;"
 "Foobar Linux&rdquo;来散布错误信息时,你
通过叫该系统为&ldquo;Foobar GNU/"
@@ -1983,12 +2236,19 @@
 "&rdquo;换句话说,该公司不关心什么是正确的。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 "
+#| "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;."
 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 "
 "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;."
+"&ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "我们不能让它们对此做正确的事,但是我们不会因
为历程艰难而放弃。或许你的影响力"
 "无法和IBM或Red Hat相提并论,但是你
还是可以帮忙的。我们一起可以将事情改变到一"
@@ -2006,16 +2266,26 @@
 "\">#reserve</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| msgid ""
+#| "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 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 nonfree "
+#| "applications and drivers), or making the system more popular even at the "
+#| "cost of freedom."
 msgid ""
 "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 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 nonfree "
-"applications and drivers), or making the system more popular even at the "
-"cost of freedom."
+"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 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 nonfree applications "
+"and drivers), or making the system more popular even at the cost of freedom."
 msgstr ""
 "对我们的社区来说,在 GNU/Linux 系统里添加
非自由软件的普遍做法是一个主要问题。"
 
"它教育用户非自由软件是可以的,而且使用非自由软件是&ldquo;Linux&rdquo;精神的一"
@@ -2041,6 +2311,15 @@
 "们将不能获得应得的信息。他们首å…
ˆåªä¼šååº”出他们从来没想到该系统是GNU。"
 
 #. 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 "
+#| "nonfree 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> "
@@ -2048,7 +2327,7 @@
 "specifically for the sake of the users' freedom.  With this understanding, "
 "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;."
+"proper and appropriate &ldquo;versions of Linux.&rdquo;"
 msgstr ""
 "让这些用户看到该系统和自由的å…
³è”的方法正好相反:告诉他们所有这些系统版本<em>"
 "都是</em> 
GNU,这些系统都是建立在一个特意为用户自由而存在的系统之上的。有了这"
@@ -2132,11 +2411,17 @@
 "炮。)"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and "
+#| "we don't want to act like that."
 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 "
-"and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and we don't want "
-"to act like that."
+"GNU,&rdquo; that would be somewhat like making a version of the GNU system "
+"and labeling it &ldquo;Linux.&rdquo; That wasn't right, and we don't want to "
+"act like that."
 msgstr ""
 "如果我们使用一个现有的GNU/Linux版本并重新冠
名为&ldquo;GNU&rdquo;,那么它差不"
 "多就和使用一个GNU版本并冠以&ldquo;Linux&rdquo;之名一æ 
·ã€‚这不对,而且我们不想"
@@ -2167,11 +2452,21 @@
 "能安装。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 "
+#| "with the GNU Project because he was a &ldquo;Linux user&rdquo;.  That "
+#| "came as a shock, because the people who ported GNU packages to other "
+#| "systems had generally wanted to work with us to get their changes "
+#| "installed.  Yet these people, developing a system that was primarily "
+#| "based on GNU, were the first (and still practically the only) group that "
+#| "was unwilling to work with us."
 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 "
-"with the GNU Project because he was a &ldquo;Linux user&rdquo;.  That came "
-"as a shock, because the people who ported GNU packages to other systems had "
+"with the GNU Project because he was a &ldquo;Linux user.&rdquo; That came as "
+"a shock, because the people who ported GNU packages to other systems had "
 "generally wanted to work with us to get their changes installed.  Yet these "
 "people, developing a system that was primarily based on GNU, were the first "
 "(and still practically the only) group that was unwilling to work with us."
@@ -2183,9 +2478,16 @@
 "我们一起工作的团体。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 obstructing our work.  Asking you to call the system &ldquo;GNU/"
+#| "Linux&rdquo; is our response to that problem, and to the other problems "
+#| "caused by the &ldquo;Linux&rdquo; misnomer."
 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 "
+"version of the GNU system &ldquo;Linux,&rdquo; and that this confusion was "
 "obstructing our work.  Asking you to call the system &ldquo;GNU/Linux&rdquo; "
 "is our response to that problem, and to the other problems caused by the "
 "&ldquo;Linux&rdquo; misnomer."
@@ -2222,10 +2524,14 @@
 "reference-id\">(<a href=\"#allgpled\">#allgpled</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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;."
 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;."
+"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 ""
 
"我们从未使用&ldquo;GNU/<i>name</i>&rdquo;来指代单个的程序。当一个程序是一个"
 "GNU包时,我们也许会叫它&ldquo;GNU <i>name</i>&rdquo;。"
@@ -2326,10 +2632,18 @@
 "不能复制Unix程序,甚至一部分也不行;所有程序必
须重新写起。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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.  The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not "
+#| "Unix&rdquo;, is a humorous way of giving credit to Unix for this, "
+#| "following a hacker tradition of recursive acronyms that started in the "
+#| "70s."
 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.  "
-"The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not Unix&rdquo;, "
+"The name &ldquo;GNU,&rdquo; which stands for &ldquo;GNU's Not Unix,&rdquo; "
 "is a humorous way of giving credit to Unix for this, following a hacker "
 "tradition of recursive acronyms that started in the 70s."
 msgstr ""
@@ -2338,11 +2652,20 @@
 "的幽默方式,这也遵循了70年代黑客使用递归缩写的传统。"
 
 #. 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=\"https://stallman.org/articles/on-hacking.html\";>playful "
+#| "cleverness</a>.)"
 msgid ""
-"The first such recursive acronym was TINT, &ldquo;TINT Is Not TECO&rdquo;.  "
+"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 "
+"like &ldquo;<em>somethingorother</em> TECO,&rdquo; he thought of a clever "
 "amusing name.  (That's what hacking means: <a href=\"https://stallman.org/";
 "articles/on-hacking.html\">playful cleverness</a>.)"
 msgstr ""
@@ -2353,13 +2676,21 @@
 "articles/on-hacking.html\">玩得机灵</a>。)"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 was similar to some existing program (let's imagine its name was "
+#| "&ldquo;Klever&rdquo;), you could give it a recursive acronym name, such "
+#| "as &ldquo;MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same "
+#| "spirit we called our replacement for Unix &ldquo;GNU's Not Unix&rdquo;."
 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 "
 "was similar to some existing program (let's imagine its name was &ldquo;"
 "Klever&rdquo;), you could give it a recursive acronym name, such as &ldquo;"
 "MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo; In this same spirit we "
-"called our replacement for Unix &ldquo;GNU's Not Unix&rdquo;."
+"called our replacement for Unix &ldquo;GNU's Not Unix.&rdquo;"
 msgstr ""
 "å…
¶ä»–黑客非常喜欢这个名字,他们开始模仿这个做法。这成了一个ä¼
 ç»Ÿï¼Œå½“你重新开始"
 
"写一个和现有程序类似的程序时(设想现有程序名字叫&ldquo;Klever&rdquo;),ä½
 å°±"
@@ -2368,13 +2699,21 @@
 "Unix&rdquo;。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 in a system 99% copied from Unix.  AT&amp;T actually threatened "
+#| "to sue anyone giving AT&amp;T credit in that way.  This is why each of "
+#| "the various modified versions of Unix (all proprietary, like Unix) had a "
+#| "completely different name that didn't include &ldquo;Unix&rdquo;."
 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 "
 "in a system 99% copied from Unix.  AT&amp;T actually threatened to sue "
 "anyone giving AT&amp;T credit in that way.  This is why each of the various "
 "modified versions of Unix (all proprietary, like Unix) had a completely "
-"different name that didn't include &ldquo;Unix&rdquo;."
+"different name that didn't include &ldquo;Unix.&rdquo;"
 msgstr ""
 "历史上,开发了Unix的AT&amp;T却不想å…
¶ä»–人在类似的系统上使用&ldquo;Unix&rdquo;"
 
"的名字来向它致意,即使是99%复制Unix的系统也也不行。实际
上,AT&amp;T曾威胁会起"
@@ -2441,9 +2780,16 @@
 "字是合适的。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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/"
+#| "kernelofNetBSD&rdquo; would be more accurate, since NetBSD is an entire "
+#| "system, not just the kernel.  This is not a BSD system, since most of the "
+#| "system is the same as the GNU/Linux system."
 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/"
+"call it &ldquo;Debian GNU/NetBSD,&rdquo; but &ldquo;GNU/"
 "kernelofNetBSD&rdquo; would be more accurate, since NetBSD is an entire "
 "system, not just the kernel.  This is not a BSD system, since most of the "
 "system is the same as the GNU/Linux system."
@@ -2463,8 +2809,15 @@
 "class=\"anchor-reference-id\">(<a href=\"#othersys\">#othersys</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 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."
 msgid ""
-"Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of "
+"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 "
@@ -2559,8 +2912,14 @@
 "唯一的共同点就是Linux。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 Linux, because it doesn't have the usual Linux [sic] libraries and "
+#| "utilities [meaning the GNU system].&rdquo;"
 msgid ""
-"If you call the whole GNU/Linux system &ldquo;Linux&rdquo;, you will find it "
+"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 "
 "Linux, because it doesn't have the usual Linux [sic] libraries and utilities "
 "[meaning the GNU system].&rdquo;"
@@ -2598,31 +2957,53 @@
 msgstr "完全不对。这种用法太牵强,人们是无法知道å…
¶ç¡®åˆ‡çš„意思的。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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."
 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 "
+"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 ""
 "å…
¬ä¼—会觉得用&ldquo;使用Linux&rdquo;来说使用Android非常奇怪。就像ä½
 åœ¨å’Œåˆ«äººè°ˆ"
 "话,但是你说你是在和内脏或循环系统谈话一样。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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;."
 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;."
+"of the whole system as &ldquo;Linux.&rdquo;"
 msgstr ""
 "å…
¬ä¼—<em>会</em>把事实上的使用GNU/Linux理解为&ldquo;使用Linux&rdquo;,这就是常"
 "见的误解:认为整个系统就是&ldquo;Linux&rdquo;。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 "
+#| "contain Linux is irrelevant to using them, just as the fact that a car "
+#| "and a bicycle both have a structure of metal is irrelevant to using those "
+#| "two.  If you wish to talk about using cars and bikes, you wouldn't speak "
+#| "of &ldquo;riding metal objects&rdquo; &mdash; not unless you're playing "
+#| "games with the reader.  You would say, &ldquo;using cars and bikes."
+#| "&rdquo; Likewise, the clear way to talk about using GNU/Linux and Android "
+#| "is to say &ldquo;using GNU/Linux and Android.&rdquo;"
 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 "
 "contain Linux is irrelevant to using them, just as the fact that a car and a "
 "bicycle both have a structure of metal is irrelevant to using those two.  If "
 "you wish to talk about using cars and bikes, you wouldn't speak of &ldquo;"
-"riding metal objects&rdquo; &mdash; not unless you're playing games with the "
+"riding metal objects&rdquo;&mdash;not unless you're playing games with the "
 "reader.  You would say, &ldquo;using cars and bikes.&rdquo; Likewise, the "
 "clear way to talk about using GNU/Linux and Android is to say &ldquo;using "
 "GNU/Linux and Android.&rdquo;"
@@ -2701,11 +3082,17 @@
 "reference-id\">(<a href=\"#claimlinux\">#claimlinux</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 "
+#| "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."
 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 "
-"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."
+"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."
 msgstr ""
 "因为那是错误的,所以我们没有那æ 
·åšã€‚Torvalds的工作是Linux,内核;我们很谨慎,"
 
"并没有把它作为GNU工程的贡献,也没有把它贴上&ldquo;GNU&rdquo;的æ
 ‡ç­¾ã€‚当我们谈"
@@ -2720,12 +3107,35 @@
 "(<a href=\"#linusagreed\">#linusagreed</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
-msgid ""
-"He recognized this at the beginning.  The earliest Linux release notes said, "
-"<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>."
+#, fuzzy
+#| msgid ""
+#| "He recognized this at the beginning.  The earliest Linux release notes "
+#| "said, <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>."
+msgid ""
+"He recognized this at the beginning.  The <a href=\"https://ftp.funet.fi/pub/";
+"linux/historical/kernel/old-versions/RELNOTES-0.01\"> earliest Linux release "
+"notes</a> said:"
+msgstr ""
+"他一开始是这样看的。Linux 最早的发布声明曾说,<a 
href=\"https://ftp.funet.fi/";
+"pub/linux/historical/kernel/old-versions/RELNOTES-0.01\">&ldquo;大多数和 "
+"linux 一起使用的工具是 GNU 软件,是使用 GNU copyleft 
发布的。这些工具不在此发"
+"布之列——请向我(或者是 GNU)咨询详情&rdquo;</a>。"
+
+#. type: Content of: <div><dl><dd><blockquote><p>
+#, fuzzy
+#| msgid ""
+#| "He recognized this at the beginning.  The earliest Linux release notes "
+#| "said, <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>."
+msgid ""
+"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."
 msgstr ""
 "他一开始是这样看的。Linux 最早的发布声明曾说,<a 
href=\"https://ftp.funet.fi/";
 "pub/linux/historical/kernel/old-versions/RELNOTES-0.01\">&ldquo;大多数和 "
@@ -2771,11 +3181,19 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#lost\">#lost</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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;: 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."
 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;: "
 "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 "
+"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."
 msgstr ""
@@ -2795,13 +3213,23 @@
 "</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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;GNU/Linux&rdquo;, you will help others learn the system's true "
+#| "history, origin, and reason for being.  You can't correct the misnomer "
+#| "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."
 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;"
-"GNU/Linux&rdquo;, you will help others learn the system's true history, "
+"GNU/Linux,&rdquo; you will help others learn the system's true history, "
 "origin, and reason for being.  You can't correct the misnomer 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 "
+"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."
 msgstr ""
@@ -2821,21 +3249,36 @@
 "class=\"anchor-reference-id\">(<a href=\"#explain\">#explain</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
+#, fuzzy
+#| 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."
 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."
+"the system &ldquo;GNU/Linux,&rdquo; and uses your time inefficiently."
 msgstr ""
 "如果你帮助我们这样向他人解释,我们感谢你
的努力,但是这并不是最好的方式。它不"
 
"如直接叫系统为&ldquo;GNU/Linux&rdquo;有效,也没有有效地利用ä½
 çš„时间。"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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, and they may learn a correct picture of the system's origin.  "
+#| "But they are unlikely to repeat the explanation to others whenever they "
+#| "talk about the system.  They will probably just call it &ldquo;"
+#| "Linux&rdquo;.  Without particularly intending to, they will help spread "
+#| "the incorrect picture."
 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, "
 "and they may learn a correct picture of the system's origin.  But they are "
 "unlikely to repeat the explanation to others whenever they talk about the "
-"system.  They will probably just call it &ldquo;Linux&rdquo;.  Without "
+"system.  They will probably just call it &ldquo;Linux.&rdquo; Without "
 "particularly intending to, they will help spread the incorrect picture."
 msgstr ""
 "它效果不佳是因为它可能无法打动人心,而且无法广泛传
播。有些听你解释的人会专"
@@ -2954,9 +3397,13 @@
 "reference-id\">(<a href=\"#force\">#force</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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."
 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."
+"&ldquo;GNU/Linux,&rdquo; and we ask you to do it too."
 msgstr ""
 "如果我们是强制,那么我们错了;我们没有那æ 
·ã€‚我们称该系统为&ldquo;GNU/"
 "Linux&rdquo;,并且我们也请求你这么做。"
@@ -3032,9 +3479,15 @@
 
"起见,请不要在没有明确是哪一个许可证时使用&ldquo;BSD许可证&rdquo;一词。"
 
 #. type: Content of: <div><dl><dt>
+#, fuzzy
+#| 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 "
+#| "complaining now? <span class=\"anchor-reference-id\">(<a href=\"#deserve"
+#| "\">#deserve</a>)</span>"
 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 "
+"the system &ldquo;GNU,&rdquo; you deserve what happened; why are you "
 "complaining now? <span class=\"anchor-reference-id\">(<a href=\"#deserve"
 "\">#deserve</a>)</span>"
 msgstr ""
@@ -3083,8 +3536,13 @@
 "永远不能开发出一个自由的操作系统。"
 
 #. type: Content of: <div><dl><dt>
+#, fuzzy
+#| 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>"
 msgid ""
-"Since many people call it &ldquo;Linux&rdquo;, doesn't that make it right? "
+"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 ""
@@ -3105,9 +3563,15 @@
 "reference-id\">(<a href=\"#knownname\">#knownname</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| 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 add &ldquo;(often erroneously referred to as &lsquo;"
+#| "Linux&rsquo;)&rdquo; once in a while, they will all understand."
 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 "
+"&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."
 msgstr ""

Index: po/gnu-structure.es.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-structure.es.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- po/gnu-structure.es.po      2 Nov 2021 12:55:44 -0000       1.6
+++ po/gnu-structure.es.po      2 Nov 2021 14:41:52 -0000       1.7
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-structure.html\n"
-"POT-Creation-Date: 2020-10-06 08:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2020-04-19 00:34+0200\n"
 "Last-Translator: \n"
 "Language-Team: Spanish\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-11-02 14:27+0000\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.0.6\n"
 
@@ -27,28 +28,23 @@
 " La estructura y administración del Proyecto GNU - Proyecto GNU - Free "
 "Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "The Structure and Administration of the GNU Project"
 msgstr "La estructura y administración del Proyecto GNU"
 
-#. type: Content of: <address>
+#. type: Content of: <div><h3>
+# | [-<strong>Version 1.0.1</strong>-]{+Version 1.0.1+}
+#, fuzzy
+#| msgid "<strong>Version 1.0.1</strong>"
+msgid "Version 1.0.1"
+msgstr "<strong>Versión 1.0.1</strong>"
+
+#. type: Content of: <div><address>
 msgid "by Brandon Invergo and Richard Stallman"
 msgstr "por Brandon Invergo y Richard Stallman"
 
-#. type: Content of: <p>
-msgid "<strong>Version 1.0.1</strong>"
-msgstr "<strong>Versión 1.0.1</strong>"
-
 #. type: Content of: <div><p>
 msgid ""
-"An <a href=\"/gnu/gnu-structure.org\">Org version</a> of this document is "
-"also available."
-msgstr ""
-"Este documento también está disponible en el <a 
href=\"/gnu/gnu-structure.org"
-"\">formato Org</a>."
-
-#. type: Content of: <p>
-msgid ""
 "The GNU Project develops and maintains the <a href=\"/gnu/about-gnu.html"
 "\">GNU operating system</a>.  Through this work, and other related "
 "activities, the GNU Project advocates and promotes <a href=\"/philosophy/"
@@ -61,7 +57,29 @@
 "philosophy.html\">libertad del software</a>, filosofía central del "
 "movimiento del software libre."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | An operating system consists of many software components that together
+# | make a computer do useful jobs.  It includes code for low-level
+# | functionality, such as the kernel and drivers, plus system libraries, as
+# | well as the programs (utilities, tools, applications, and games) that
+# | users explicitly run.  The GNU operating system comprises software across
+# | this entire spectrum.  Many of the programs are specifically developed and
+# | released by the GNU Project; these are termed &ldquo;GNU
+# | [-packages&rdquo;.-] {+packages.&rdquo;+} The GNU system also includes
+# | components that are <a href=\"/philosophy/categories.html\">free
+# | programs</a> released by other developers, outside of the GNU Project.
+#, fuzzy
+#| msgid ""
+#| "An operating system consists of many software components that together "
+#| "make a computer do useful jobs.  It includes code for low-level "
+#| "functionality, such as the kernel and drivers, plus system libraries, as "
+#| "well as the programs (utilities, tools, applications, and games) that "
+#| "users explicitly run.  The GNU operating system comprises software across "
+#| "this entire spectrum.  Many of the programs are specifically developed "
+#| "and released by the GNU Project; these are termed &ldquo;GNU "
+#| "packages&rdquo;.  The GNU system also includes components that are <a "
+#| "href=\"/philosophy/categories.html\">free programs</a> released by other "
+#| "developers, outside of the GNU Project."
 msgid ""
 "An operating system consists of many software components that together make "
 "a computer do useful jobs.  It includes code for low-level functionality, "
@@ -69,9 +87,9 @@
 "programs (utilities, tools, applications, and games) that users explicitly "
 "run.  The GNU operating system comprises software across this entire "
 "spectrum.  Many of the programs are specifically developed and released by "
-"the GNU Project; these are termed &ldquo;GNU packages&rdquo;.  The GNU "
-"system also includes components that are <a href=\"/philosophy/categories."
-"html\">free programs</a> released by other developers, outside of the GNU "
+"the GNU Project; these are termed &ldquo;GNU packages.&rdquo; The GNU system "
+"also includes components that are <a href=\"/philosophy/categories.html"
+"\">free programs</a> released by other developers, outside of the GNU "
 "Project."
 msgstr ""
 "Un sistema operativo está formado por muchos componentes de software que, "
@@ -86,7 +104,7 @@
 "categories.html\">programas libres</a> publicados por otros desarrolladores "
 "fuera del Proyecto GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Just as the programs composing an operating system must work together "
 "coherently, the GNU Project must operate coherently.  Most of the work "
@@ -105,7 +123,7 @@
 "Nada de esto es nuevo, pero es la primera vez que reunimos toda la "
 "información en un solo documento."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The Free Software Foundation provides many kinds of support (facilities, "
 "services) to the GNU Project.  How that works is outside the scope of this "
@@ -115,11 +133,11 @@
 "maneras (instalaciones, servicios). Los pormenores de esta asistencia quedan "
 "fuera del ámbito de este documento."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Software Development Structure"
 msgstr "Estructura del desarrollo del software"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Most of the GNU Project's activity consists of development of software "
 "packages.  Here is how GNU software development is structured."
@@ -128,13 +146,13 @@
 "paquetes de software. A continuación veremos cómo se estructura el "
 "desarrollo del software de GNU."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "The Chief GNUisance"
 msgstr ""
 "El Jefe GNUisance<a href=\"#TransNote1\" id=\"TransNote1-rev\"><sup>[1]</"
 "sup></a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The GNU Project is led by the Chief GNUisance, Richard Stallman, the founder "
 "of the project.  The Chief GNUisance is responsible in principle for all "
@@ -150,7 +168,7 @@
 "paquetes de software como paquetes de GNU, o los excluye cuando es "
 "necesario, además de designar a sus mantenedores."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In practice, the Chief GNUisance delegates many of these decisions and most "
 "of the tasks to others, and only rarely intervenes in the specifics of "
@@ -161,14 +179,36 @@
 "detalles concretos del desarrollo de un paquete de GNU, cosa que suele hacer "
 "mediante sugerencias."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Assistant GNUisances"
 msgstr "Los Asistentes GNUisance"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | This team, residing at <a
+# | [-href=\"mailto:maintainers@gnu.org\";>maintainers@gnu.org</a>,-]
+# | {+href=\"mailto:maintainers@gnu.org\";>&lt;maintainers@gnu.org&gt;</a>,+}
+# | is available as a first point-of-contact for maintainers of GNU Software. 
+# | They keep track of development activity across the entire project,
+# | ensuring timely releases, checking that the maintainers follow GNU's <a
+# | href=\"/philosophy/\">philosophy</a> and guidelines, and resolving any
+# | conflicts that might arise.  They also handle cases when a maintainer
+# | steps down or when a new volunteer steps up to maintain an existing
+# | package (in which case they can appoint a new maintainer on behalf of the
+# | Chief GNUisance).
+#, fuzzy
+#| msgid ""
+#| "This team, residing at <a href=\"mailto:maintainers@gnu.org";
+#| "\">maintainers@gnu.org</a>, is available as a first point-of-contact for "
+#| "maintainers of GNU Software.  They keep track of development activity "
+#| "across the entire project, ensuring timely releases, checking that the "
+#| "maintainers follow GNU's <a href=\"/philosophy/\">philosophy</a> and "
+#| "guidelines, and resolving any conflicts that might arise.  They also "
+#| "handle cases when a maintainer steps down or when a new volunteer steps "
+#| "up to maintain an existing package (in which case they can appoint a new "
+#| "maintainer on behalf of the Chief GNUisance)."
 msgid ""
-"This team, residing at <a href=\"mailto:maintainers@gnu.org";
-"\">maintainers@gnu.org</a>, is available as a first point-of-contact for "
+"This team, residing at <a href=\"mailto:maintainers@gnu.org\";>&lt;"
+"maintainers@gnu.org&gt;</a>, is available as a first point-of-contact for "
 "maintainers of GNU Software.  They keep track of development activity across "
 "the entire project, ensuring timely releases, checking that the maintainers "
 "follow GNU's <a href=\"/philosophy/\">philosophy</a> and guidelines, and "
@@ -188,7 +228,7 @@
 "paquete vigente (en cuyo caso pueden designar a un nuevo mantenedor en "
 "nombre del Jefe GNUisance)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "New members are recruited from existing GNU volunteers when needed.  "
 "However, help is often welcome for specific tasks and interested GNU "
@@ -199,11 +239,11 @@
 "específicas. Invitamos a los voluntarios de GNU interesados en ello a que se 
"
 "pongan en contacto con nosotros."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Package maintainers"
 msgstr "Los mantenedores de paquetes"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Each GNU software package has specific maintainers, appointed by the Chief "
 "GNUisance or the assistant GNUisances.  The package maintainers are "
@@ -218,7 +258,7 @@
 "destituidos. Ellos se encargan del desarrollo de sus propios paquetes en "
 "nombre del Proyecto GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The initial appointment of maintainers is done when a program is <a href=\"/"
 "help/evaluation.html\">accepted as a GNU package</a>.  These are normally "
@@ -229,7 +269,7 @@
 "a>. Normalmente, los mantenedores son algunos de los principales "
 "desarrolladores que acordaron convertir ese programa en paquete de GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Over time, maintainers occasionally step down.  In some cases, the sole "
 "maintainer steps down from the role, leaving the package unmaintained.  The "
@@ -248,7 +288,7 @@
 "recomienden a nuevos encargados del mantenimiento. Por nuestra parte, "
 "agradecemos y tenemos en cuenta dichas sugerencias."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The maintainers of a package often recruit others to contribute to its "
 "development, and delegate some technical decisions to them.  However, the "
@@ -260,7 +300,7 @@
 "obstante, los mantenedores conservan la autoridad sobre la totalidad del "
 "paquete y así pueden cumplir con su responsabilidad para con el Proyecto 
GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A maintainer's primary responsibility is to do a good, practical job of "
 "developing and maintaining the program in accord with the GNU Project's "
@@ -279,7 +319,7 @@
 "mantenedores y sobre lo que significa que un programa sea un paquete de GNU</"
 "a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In general, maintainers determine the technical directions that the software "
 "packages take and thus they make the day-to-day decisions for the packages.  "
@@ -298,7 +338,7 @@
 "casos, los mantenedores de los paquetes afectados deberán ejecutar esa "
 "decisión en nombre del Proyecto GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "More complete information about the specific responsibilities of maintainers "
 "and technical guidance for maintaining GNU software can be found in the <a "
@@ -311,7 +351,7 @@
 "para mantenedores del software de GNU</a> y <a href=\"/prep/standards"
 "\">Normas de programación de GNU</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We do not require that GNU package maintainers agree with our philosophy, or "
 "approve of our policies&mdash;only to follow them.  Maintainers and "
@@ -324,11 +364,11 @@
 "nuestras políticas y ocasionales decisiones específicas durante el 
desempeño "
 "de su trabajo en el software de GNU."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Support for GNU Package Development"
 msgstr "Apoyo al desarrollo de los paquetes de GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Several teams provide various kinds of support to the development and "
 "management of GNU packages.  Most of these teams have a coordinator to "
@@ -343,14 +383,27 @@
 "caso de duda, puede ponerse en contacto con los <a href=\"mailto:gvc@gnu.org";
 "\">coordinadores de los voluntarios de GNU</a> para solicitar asesoramiento."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Software Evaluation"
 msgstr "Evaluación del software"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The software evaluation team at <a
+# | [-href=\"mailto:gnueval@gnu.org\";>gnueval@gnu.org</a>-]
+# | {+href=\"mailto:gnueval@gnu.org\";>&lt;gnueval@gnu.org&gt;</a>+} evaluates
+# | software packages proposed as GNU packages.  This involves a careful
+# | assessment of the software's functionality as well as pertinent issues
+# | related to software freedom and how the program fits with the GNU system.
+#, fuzzy
+#| msgid ""
+#| "The software evaluation team at <a href=\"mailto:gnueval@gnu.org";
+#| "\">gnueval@gnu.org</a> evaluates software packages proposed as GNU "
+#| "packages.  This involves a careful assessment of the software's "
+#| "functionality as well as pertinent issues related to software freedom and "
+#| "how the program fits with the GNU system."
 msgid ""
-"The software evaluation team at <a href=\"mailto:gnueval@gnu.org";
-"\">gnueval@gnu.org</a> evaluates software packages proposed as GNU "
+"The software evaluation team at <a href=\"mailto:gnueval@gnu.org\";>&lt;"
+"gnueval@gnu.org&gt;</a> evaluates software packages proposed as GNU "
 "packages.  This involves a careful assessment of the software's "
 "functionality as well as pertinent issues related to software freedom and "
 "how the program fits with the GNU system."
@@ -362,7 +415,7 @@
 "con la libertad del software y con la integración el programa en el sistema "
 "GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "New members are recruited from existing GNU volunteers when needed.  Prior "
 "experience with non-GNU software evaluation on Savannah is preferable."
@@ -371,33 +424,44 @@
 "GNU, con preferencia por quienes posean experiencia previa en la evaluación "
 "de software que no es de GNU en Savannah."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Software Security Evaluation"
 msgstr "Evaluación de la seguridad del software"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The software security evaluation team at <a
+# | [-href=\"mailto:gnueval-security@gnu.org\";>gnueval-security@gnu.org</a>-]
+# | 
{+href=\"mailto:gnueval-security@gnu.org\";>&lt;gnueval-security@gnu.org&gt;</a>+}
+# | works with the software evaluation team.  They determine whether there are
+# | any security concerns in software that has been offered to GNU.
+#, fuzzy
+#| msgid ""
+#| "The software security evaluation team at <a href=\"mailto:gnueval-";
+#| "security@gnu.org\">gnueval-security@gnu.org</a> works with the software "
+#| "evaluation team.  They determine whether there are any security concerns "
+#| "in software that has been offered to GNU."
 msgid ""
 "The software security evaluation team at <a href=\"mailto:gnueval-";
-"security@gnu.org\">gnueval-security@gnu.org</a> works with the software "
-"evaluation team.  They determine whether there are any security concerns in "
-"software that has been offered to GNU."
+"security@gnu.org\">&lt;gnueval-security@gnu.org&gt;</a> works with the "
+"software evaluation team.  They determine whether there are any security "
+"concerns in software that has been offered to GNU."
 msgstr ""
 "El equipo de evaluación de la seguridad del software, disponible en <a href="
 "\"mailto:gnueval-security@gnu.org\";>gnueval-security@gnu.org</a>, trabaja "
 "con el equipo de evaluación del software. Ellos comprueban si hay algún "
 "problema de seguridad en el software que se haya ofrecido a GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "New members are recruited from existing GNU volunteers when needed."
 msgstr ""
 "Cuando es necesario, se recluta a nuevos miembros entre los voluntarios de "
 "GNU."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Security Team"
 msgstr "El equipo de seguridad"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"mailto:security@gnu.org\";>Security Team</a> helps to resolve "
 "security bugs in a timely fashion.  If the maintainer of a GNU package fails "
@@ -414,11 +478,11 @@
 "paquete. Los mantenedores también pueden pedir consejo al equipo de "
 "seguridad sobre cómo hacer que sus paquetes sean seguros."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Platform Testers"
 msgstr "Los probadores de plataformas"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Volunteers behind the <a href=\"//lists.gnu.org/mailman/listinfo/platform-"
 "testers\">platform-testers@gnu.org</a> mailing list test GNU software pre-"
@@ -430,48 +494,65 @@
 "versiones preliminares del software de GNU en diferentes plataformas de "
 "hardware para asegurarse de que funcionen correctamente."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "New volunteers are welcome."
 msgstr "Se aceptan nuevos voluntarios."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Mentors"
 msgstr "Los mentores"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The GNU Mentors [-(<a
+# | href=\"mailto:mentors@gnu.org\";>mentors@gnu.org</a>)-] {+at <a
+# | href=\"mailto:mentors@gnu.org\";>&lt;mentors@gnu.org&gt;</a>+} volunteer to
+# | provide guidance for new software maintainers.
+#, fuzzy
+#| msgid ""
+#| "The GNU Mentors (<a href=\"mailto:mentors@gnu.org\";>mentors@gnu.org</a>) "
+#| "volunteer to provide guidance for new software maintainers."
 msgid ""
-"The GNU Mentors (<a href=\"mailto:mentors@gnu.org\";>mentors@gnu.org</a>) "
-"volunteer to provide guidance for new software maintainers."
+"The GNU Mentors at <a href=\"mailto:mentors@gnu.org\";>&lt;mentors@gnu.org&gt;"
+"</a> volunteer to provide guidance for new software maintainers."
 msgstr ""
 "Los mentores de GNU (<a href=\"mailto:mentors@gnu.org\";>mentors@gnu.org</"
 "a>)  ofrecen, de forma voluntaria, orientación a los nuevos mantenedores de "
 "software."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "We ask long-time GNU maintainers to volunteer."
 msgstr ""
 "Pedimos a los mantenedores veteranos de GNU que se presenten voluntarios."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Proofreaders"
 msgstr "Los correctores"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The proofreaders list is available to help GNU package maintainers by
+# | proofreading English text.  To request proofreading, write to <a
+# | [-href=\"mailto:proofreaders@gnu.org\";>proofreaders@gnu.org</a>.-]
+# | {+href=\"mailto:proofreaders@gnu.org\";>&lt;proofreaders@gnu.org&gt;</a>.+}
+#, fuzzy
+#| msgid ""
+#| "The proofreaders list is available to help GNU package maintainers by "
+#| "proofreading English text.  To request proofreading, write to <a href="
+#| "\"mailto:proofreaders@gnu.org\";>proofreaders@gnu.org</a>."
 msgid ""
 "The proofreaders list is available to help GNU package maintainers by "
 "proofreading English text.  To request proofreading, write to <a href="
-"\"mailto:proofreaders@gnu.org\";>proofreaders@gnu.org</a>."
+"\"mailto:proofreaders@gnu.org\";>&lt;proofreaders@gnu.org&gt;</a>."
 msgstr ""
 "La lista de correctores está disponible para ayudar a los mantenedores de "
 "los paquetes de GNU mediante la corrección de sus textos en inglés. Para "
 "solicitar una corrección, escriba a <a href=\"mailto:proofreaders@gnu.org";
 "\">proofreaders@gnu.org</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Other Teams and Services"
 msgstr "Otros equipos y servicios"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Several other teams facilitate or manage the day-to-day operations within "
 "the GNU Project, or advance specific goals of the project."
@@ -480,11 +561,11 @@
 "diarias dentro del Proyecto GNU, o que promueven objetivos específicos del "
 "proyecto."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "GNU Advisory Committee"
 msgstr "El Comité Consultivo de GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/contact/gnu-advisory.html\">GNU Advisory Committee</a> (GAC) "
 "exists to provide advice to the Chief GNUisance.  Members of the Advisory "
@@ -498,11 +579,11 @@
 "general, el comité supervisa el estado del Proyecto GNU en nombre del Jefe "
 "GNUisance y plantea posibles problemas para su deliberación."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Savannah Hackers"
 msgstr "Los hackers de Savannah"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "<a href=\"//savannah.gnu.org\">Savannah</a> is the GNU Project's software "
 "forge.  It hosts code repositories, bug reporting tools, mailing list "
@@ -521,11 +602,11 @@
 "adecuadamente el software de GNU, los hackers de Savannah también evalúan 
el "
 "software que, sin ser de GNU, solicita alojamiento en la forja."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Webmasters"
 msgstr "Los webmasters"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/people/webmeisters.html\">GNU Webmasters</a> maintain and "
 "update the web pages at <a href=\"/\">https://www.gnu.org</a>."
@@ -534,7 +615,7 @@
 "del mantenimiento y la actualización de las páginas web del sitio <a 
href=\"/"
 "\">https://www.gnu.org</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Webmasters also answer various kinds of questions sent by the public, "
 "regarding topics such as free software and licenses (when the answer is "
@@ -548,7 +629,7 @@
 "peticiones de evaluación de las distros, evalúan a las personas que desean "
 "convertirse en webmasters y actualizan la lista de espejos."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The GNU Webmaster Group is led by the&nbsp;<a href=\"mailto:chief-";
 "webmaster@gnu.org\">Chief Webmaster</a> who reports to&nbsp; the Chief "
@@ -561,11 +642,11 @@
 "quiz.html\">el cuestionario para administradores voluntarios del sitio web</"
 "a>."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Web Translators"
 msgstr "Los traductores del sitio web"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Each language has a translation team, directed by a team coordinator.  See "
 "<a href=\"/server/standards/README.translations.html\">the Guide to "
@@ -580,11 +661,11 @@
 "translators@gnu.org\">administrador de traducciones de GNU</a>, quien, a su "
 "vez,&nbsp;responde ante el Jefe GNUisance."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "List Helpers"
 msgstr "Los ayudantes de las listas"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "<a href=\"//savannah.gnu.org/maintenance/ListHelperAntiSpam/\">Listhelper</"
 "a> is a system for semi-automatically managing spam sent to GNU mailing "
@@ -597,20 +678,30 @@
 "filtros de spam, pero los moderadores humanos también tienen la posibilidad "
 "de administrar la cola de mensajes que presuntamente no son spam."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "GNU Volunteer Coordinators"
 msgstr "Los coordinadores de voluntarios de GNU"
 
-#. type: Content of: <p>
-msgid ""
-"The GNU Volunteer Coordinators (<a href=\"mailto:gvc@gnu.org\";>gvc@gnu.org</"
-"a>) help to guide new volunteers towards suitable jobs within the GNU Project"
+#. type: Content of: <div><p>
+# | The GNU Volunteer Coordinators [-(<a
+# | href=\"mailto:gvc@gnu.org\";>gvc@gnu.org</a>)-] {+at <a
+# | href=\"mailto:gvc@gnu.org\";>&lt;gvc@gnu.org&gt;</a>+} help to guide new
+# | volunteers towards suitable jobs within the GNU Project
+#, fuzzy
+#| msgid ""
+#| "The GNU Volunteer Coordinators (<a href=\"mailto:gvc@gnu.org\";>gvc@gnu."
+#| "org</a>) help to guide new volunteers towards suitable jobs within the "
+#| "GNU Project"
+msgid ""
+"The GNU Volunteer Coordinators at <a href=\"mailto:gvc@gnu.org\";>&lt;gvc@gnu."
+"org&gt;</a> help to guide new volunteers towards suitable jobs within the "
+"GNU Project"
 msgstr ""
 "Los coordinadores de voluntarios de GNU (<a href=\"mailto:gvc@gnu.org";
 "\">gvc@gnu.org</a>) ayudan a los nuevos voluntarios en la elección de las "
 "tareas más adecuadas para cada uno."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "New GVC volunteers are welcome, but prior experience volunteering within GNU "
 "(and thus broad knowledge of the GNU Project) is highly recommended."
@@ -619,11 +710,11 @@
 "experiencia previa dentro de GNU (y, por lo tanto, con amplios conocimientos "
 "sobre el Proyecto GNU)."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "GNU Education Team"
 msgstr "El equipo de educación de GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/education/\">GNU Education Team</a> promotes the adoption of "
 "the GNU Operating System in educational environments.  It also evaluates "
@@ -633,11 +724,11 @@
 "adopción del sistema operativo GNU en el ámbito educativo. También evalúa 
a "
 "las escuelas y habla con los administradores de los centros educativos."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "GNU Standards Group"
 msgstr "El grupo de normas de GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The GNU Standards Group evaluates proposals to update the GNU coding "
 "standards.  Anyone can submit a proposal via the <a href=\"//lists.gnu.org/"
@@ -657,17 +748,17 @@
 "final. El grupo también se encarga de introducir las modificaciones en el "
 "documento y de actualizarlo en la web."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "New volunteers are recruited from existing GNU volunteers when needed."
 msgstr ""
 "Cuando es necesario, se recluta a nuevos miembros entre los voluntarios de "
 "GNU."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Correcting Errors"
 msgstr "Corrección de errores"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If we find errors or omissions in this description of the existing "
 "structure, which are possible since it previously had no centralized "
@@ -685,11 +776,11 @@
 "la versión. Las versiones anteriores quedarán disponibles en un <a href=\"/"
 "gnu/old-gnu-structure/\">subdirectorio</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Future Changes in Administrative Structure"
 msgstr "Futuros cambios en la estructura administrativa"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Changes in the GNU Project administrative structure are decided on by the "
 "Chief GNUisance after starting consultations with GNU contributors, usually "
@@ -704,7 +795,7 @@
 "negativos que podrían tener los cambios, para así tomar la decisión más "
 "acertada."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To report changes that are adopted, we will update this document, both the "
 "Org version and the HTML version (see previous section), advancing the first "
@@ -714,6 +805,14 @@
 "en los formatos Org y HTML (véase la sección anterior), incrementando la "
 "primera y/o segunda cifra de la versión."
 
+#. type: Content of: <div><div><p>
+msgid ""
+"An <a href=\"/gnu/gnu-structure.org\">Org version</a> of this document is "
+"also available."
+msgstr ""
+"Este documento también está disponible en el <a 
href=\"/gnu/gnu-structure.org"
+"\">formato Org</a>."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -738,7 +837,6 @@
 "proponer otras correcciones o sugerencias, diríjase a <a href=\"mailto:";
 "webmasters@gnu.org\">&lt;webmasters@gnu.org&gt;</a>."
 
-#
 #.  TRANSLATORS: Ignore the original text in this paragraph,
 #.         replace it with the translation of these two:
 #.         We work hard and do our best to provide accurate, good quality
@@ -746,14 +844,14 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "El equipo de traductores al español se esfuerza por ofrecer traducciones "
@@ -765,8 +863,8 @@
 "coordinación y el envío de traducciones de las páginas de este sitio web."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2020 Brandon Invergo and Richard Stallman"
-msgstr "Copyright &copy; 2020 Brandon Invergo and Richard Stallman"
+msgid "Copyright &copy; 2020, 2021 Brandon Invergo and Richard Stallman"
+msgstr "Copyright &copy; 2020, 2021 Brandon Invergo and Richard Stallman"
 
 #. type: Content of: <div><p>
 msgid ""
@@ -789,6 +887,5 @@
 msgid "Updated:"
 msgstr "Última actualización:"
 
-#. type: Content of: <div><p>
-msgid "Copyright &copy; 2020, 2021 Brandon Invergo and Richard Stallman"
-msgstr "Copyright &copy; 2020, 2021 Brandon Invergo and Richard Stallman"
+#~ msgid "Copyright &copy; 2020 Brandon Invergo and Richard Stallman"
+#~ msgstr "Copyright &copy; 2020 Brandon Invergo and Richard Stallman"

Index: po/gnu-structure.fr.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-structure.fr.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- po/gnu-structure.fr.po      2 Nov 2021 12:55:44 -0000       1.6
+++ po/gnu-structure.fr.po      2 Nov 2021 14:41:52 -0000       1.7
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-structure.html\n"
-"POT-Creation-Date: 2020-10-06 08:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2020-03-17 15:31+0100\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-11-02 14:27+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -26,28 +27,23 @@
 "Structure et administration du projet GNU - Projet GNU - Free Software "
 "Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "The Structure and Administration of the GNU Project"
 msgstr "Structure et administration du projet GNU"
 
-#. type: Content of: <address>
+#. type: Content of: <div><h3>
+# | [-<strong>Version 1.0.1</strong>-]{+Version 1.0.1+}
+#, fuzzy
+#| msgid "<strong>Version 1.0.1</strong>"
+msgid "Version 1.0.1"
+msgstr "<strong>Version 1.0.1</strong>"
+
+#. type: Content of: <div><address>
 msgid "by Brandon Invergo and Richard Stallman"
 msgstr "par Brandon Invergo et Richard Stallman"
 
-#. type: Content of: <p>
-msgid "<strong>Version 1.0.1</strong>"
-msgstr "<strong>Version 1.0.1</strong>"
-
 #. type: Content of: <div><p>
 msgid ""
-"An <a href=\"/gnu/gnu-structure.org\">Org version</a> of this document is "
-"also available."
-msgstr ""
-"Une version de ce document au <a href=\"/gnu/gnu-structure.org\">format  "
-"Org</a> est également disponible."
-
-#. type: Content of: <p>
-msgid ""
 "The GNU Project develops and maintains the <a href=\"/gnu/about-gnu.html"
 "\">GNU operating system</a>.  Through this work, and other related "
 "activities, the GNU Project advocates and promotes <a href=\"/philosophy/"
@@ -60,7 +56,29 @@
 "\">liberté du logiciel</a>, fondement philosophique du mouvement du logiciel 
"
 "libre."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | An operating system consists of many software components that together
+# | make a computer do useful jobs.  It includes code for low-level
+# | functionality, such as the kernel and drivers, plus system libraries, as
+# | well as the programs (utilities, tools, applications, and games) that
+# | users explicitly run.  The GNU operating system comprises software across
+# | this entire spectrum.  Many of the programs are specifically developed and
+# | released by the GNU Project; these are termed &ldquo;GNU
+# | [-packages&rdquo;.-] {+packages.&rdquo;+} The GNU system also includes
+# | components that are <a href=\"/philosophy/categories.html\">free
+# | programs</a> released by other developers, outside of the GNU Project.
+#, fuzzy
+#| msgid ""
+#| "An operating system consists of many software components that together "
+#| "make a computer do useful jobs.  It includes code for low-level "
+#| "functionality, such as the kernel and drivers, plus system libraries, as "
+#| "well as the programs (utilities, tools, applications, and games) that "
+#| "users explicitly run.  The GNU operating system comprises software across "
+#| "this entire spectrum.  Many of the programs are specifically developed "
+#| "and released by the GNU Project; these are termed &ldquo;GNU "
+#| "packages&rdquo;.  The GNU system also includes components that are <a "
+#| "href=\"/philosophy/categories.html\">free programs</a> released by other "
+#| "developers, outside of the GNU Project."
 msgid ""
 "An operating system consists of many software components that together make "
 "a computer do useful jobs.  It includes code for low-level functionality, "
@@ -68,9 +86,9 @@
 "programs (utilities, tools, applications, and games) that users explicitly "
 "run.  The GNU operating system comprises software across this entire "
 "spectrum.  Many of the programs are specifically developed and released by "
-"the GNU Project; these are termed &ldquo;GNU packages&rdquo;.  The GNU "
-"system also includes components that are <a href=\"/philosophy/categories."
-"html\">free programs</a> released by other developers, outside of the GNU "
+"the GNU Project; these are termed &ldquo;GNU packages.&rdquo; The GNU system "
+"also includes components that are <a href=\"/philosophy/categories.html"
+"\">free programs</a> released by other developers, outside of the GNU "
 "Project."
 msgstr ""
 "Un système d'exploitation est fait de nombreux composants logiciels qui, "
@@ -85,7 +103,7 @@
 "\">programmes libres</a> publiés par d'autres développeurs, à l'extérieur 
du "
 "projet GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Just as the programs composing an operating system must work together "
 "coherently, the GNU Project must operate coherently.  Most of the work "
@@ -105,7 +123,7 @@
 "nouveau, mais c'est la première fois que nous rassemblons tous ces "
 "renseignements en un seul endroit."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The Free Software Foundation provides many kinds of support (facilities, "
 "services) to the GNU Project.  How that works is outside the scope of this "
@@ -115,11 +133,11 @@
 "nombreux domaines (infrastructure, services). Leur fonctionnement sort du "
 "cadre de ce document."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Software Development Structure"
 msgstr "Structure du développement logiciel"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Most of the GNU Project's activity consists of development of software "
 "packages.  Here is how GNU software development is structured."
@@ -127,11 +145,11 @@
 "L'essentiel de l'activité du projet GNU consiste à développer des 
logiciels. "
 "Voici comment ce développement est structuré."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "The Chief GNUisance"
 msgstr "Le Chef GNUisance"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The GNU Project is led by the Chief GNUisance, Richard Stallman, the founder "
 "of the project.  The Chief GNUisance is responsible in principle for all "
@@ -148,7 +166,7 @@
 "logiciels GNU, ou parfois en déclasse un quand cela est nécessaire. Il 
nomme "
 "également leurs mainteneurs."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In practice, the Chief GNUisance delegates many of these decisions and most "
 "of the tasks to others, and only rarely intervenes in the specifics of "
@@ -159,14 +177,36 @@
 "du développement d'un logiciel GNU, et dans la plupart des cas il s'agit "
 "d'une suggestion."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Assistant GNUisances"
 msgstr "Assistants GNUisances"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | This team, residing at <a
+# | [-href=\"mailto:maintainers@gnu.org\";>maintainers@gnu.org</a>,-]
+# | {+href=\"mailto:maintainers@gnu.org\";>&lt;maintainers@gnu.org&gt;</a>,+}
+# | is available as a first point-of-contact for maintainers of GNU Software. 
+# | They keep track of development activity across the entire project,
+# | ensuring timely releases, checking that the maintainers follow GNU's <a
+# | href=\"/philosophy/\">philosophy</a> and guidelines, and resolving any
+# | conflicts that might arise.  They also handle cases when a maintainer
+# | steps down or when a new volunteer steps up to maintain an existing
+# | package (in which case they can appoint a new maintainer on behalf of the
+# | Chief GNUisance).
+#, fuzzy
+#| msgid ""
+#| "This team, residing at <a href=\"mailto:maintainers@gnu.org";
+#| "\">maintainers@gnu.org</a>, is available as a first point-of-contact for "
+#| "maintainers of GNU Software.  They keep track of development activity "
+#| "across the entire project, ensuring timely releases, checking that the "
+#| "maintainers follow GNU's <a href=\"/philosophy/\">philosophy</a> and "
+#| "guidelines, and resolving any conflicts that might arise.  They also "
+#| "handle cases when a maintainer steps down or when a new volunteer steps "
+#| "up to maintain an existing package (in which case they can appoint a new "
+#| "maintainer on behalf of the Chief GNUisance)."
 msgid ""
-"This team, residing at <a href=\"mailto:maintainers@gnu.org";
-"\">maintainers@gnu.org</a>, is available as a first point-of-contact for "
+"This team, residing at <a href=\"mailto:maintainers@gnu.org\";>&lt;"
+"maintainers@gnu.org&gt;</a>, is available as a first point-of-contact for "
 "maintainers of GNU Software.  They keep track of development activity across "
 "the entire project, ensuring timely releases, checking that the maintainers "
 "follow GNU's <a href=\"/philosophy/\">philosophy</a> and guidelines, and "
@@ -185,7 +225,7 @@
 "bénévole se présente pour reprendre un logiciel existant (auquel cas elle "
 "peut nommer le nouveau mainteneur au nom du Chef GNUisance)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "New members are recruited from existing GNU volunteers when needed.  "
 "However, help is often welcome for specific tasks and interested GNU "
@@ -196,11 +236,11 @@
 "spécifiques ; les bénévoles de GNU que cela intéresse sont invités à 
nous "
 "contacter."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Package maintainers"
 msgstr "Mainteneurs de logiciels"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Each GNU software package has specific maintainers, appointed by the Chief "
 "GNUisance or the assistant GNUisances.  The package maintainers are "
@@ -214,7 +254,7 @@
 "renvoyés ; ils sont chargés de développer leurs logiciels pour le compte 
du "
 "projet GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The initial appointment of maintainers is done when a program is <a href=\"/"
 "help/evaluation.html\">accepted as a GNU package</a>.  These are normally "
@@ -225,7 +265,7 @@
 "normalement partie des développeurs principaux qui ont accepté d'en faire 
un "
 "logiciel GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Over time, maintainers occasionally step down.  In some cases, the sole "
 "maintainer steps down from the role, leaving the package unmaintained.  The "
@@ -244,7 +284,7 @@
 "susceptibles de leur succéder et nous examinons favorablement ces "
 "suggestions."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The maintainers of a package often recruit others to contribute to its "
 "development, and delegate some technical decisions to them.  However, the "
@@ -257,7 +297,7 @@
 "logiciel pour rester en mesure d'exercer leurs responsabilités vis-à-vis du 
"
 "projet GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A maintainer's primary responsibility is to do a good, practical job of "
 "developing and maintaining the program in accord with the GNU Project's "
@@ -275,7 +315,7 @@
 "<a href=\"/help/evaluation.html#whatmeans\">les devoirs de base d'un "
 "mainteneur et les spécificités des programmes GNU</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In general, maintainers determine the technical directions that the software "
 "packages take and thus they make the day-to-day decisions for the packages.  "
@@ -294,7 +334,7 @@
 "paquets GNU. Les mainteneurs de ces logiciels ont la responsabilité de "
 "mettre en œuvre la décision pour le compte du projet GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "More complete information about the specific responsibilities of maintainers "
 "and technical guidance for maintaining GNU software can be found in the <a "
@@ -308,7 +348,7 @@
 "logiciels GNU) et <a href=\"/prep/standards\">GNU Coding Standards</a> "
 "(Standards GNU de codage)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We do not require that GNU package maintainers agree with our philosophy, or "
 "approve of our policies&mdash;only to follow them.  Maintainers and "
@@ -321,11 +361,11 @@
 "philosophie, nos politiques et, occasionnellement, certaines décisions "
 "particulières, dans leur travail avec les logiciels GNU."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Support for GNU Package Development"
 msgstr "Assistance au développement des logiciels GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Several teams provide various kinds of support to the development and "
 "management of GNU packages.  Most of these teams have a coordinator to "
@@ -340,14 +380,27 @@
 "auprès des <a href=\"mailto:gvc@gnu.org\";>coordinateurs des bénévoles de "
 "GNU</a>."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Software Evaluation"
 msgstr "Évaluation des logiciels"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The software evaluation team at <a
+# | [-href=\"mailto:gnueval@gnu.org\";>gnueval@gnu.org</a>-]
+# | {+href=\"mailto:gnueval@gnu.org\";>&lt;gnueval@gnu.org&gt;</a>+} evaluates
+# | software packages proposed as GNU packages.  This involves a careful
+# | assessment of the software's functionality as well as pertinent issues
+# | related to software freedom and how the program fits with the GNU system.
+#, fuzzy
+#| msgid ""
+#| "The software evaluation team at <a href=\"mailto:gnueval@gnu.org";
+#| "\">gnueval@gnu.org</a> evaluates software packages proposed as GNU "
+#| "packages.  This involves a careful assessment of the software's "
+#| "functionality as well as pertinent issues related to software freedom and "
+#| "how the program fits with the GNU system."
 msgid ""
-"The software evaluation team at <a href=\"mailto:gnueval@gnu.org";
-"\">gnueval@gnu.org</a> evaluates software packages proposed as GNU "
+"The software evaluation team at <a href=\"mailto:gnueval@gnu.org\";>&lt;"
+"gnueval@gnu.org&gt;</a> evaluates software packages proposed as GNU "
 "packages.  This involves a careful assessment of the software's "
 "functionality as well as pertinent issues related to software freedom and "
 "how the program fits with the GNU system."
@@ -358,7 +411,7 @@
 "questions pertinentes ayant trait à la liberté du logiciel et à "
 "l'intégration du programme à l'ensemble du projet GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "New members are recruited from existing GNU volunteers when needed.  Prior "
 "experience with non-GNU software evaluation on Savannah is preferable."
@@ -367,33 +420,44 @@
 "GNU. Une expérience préalable de l'évaluation des logiciels non GNU sur "
 "Savannah est préférable."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Software Security Evaluation"
 msgstr "Évaluation de la sécurité des logiciels"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The software security evaluation team at <a
+# | [-href=\"mailto:gnueval-security@gnu.org\";>gnueval-security@gnu.org</a>-]
+# | 
{+href=\"mailto:gnueval-security@gnu.org\";>&lt;gnueval-security@gnu.org&gt;</a>+}
+# | works with the software evaluation team.  They determine whether there are
+# | any security concerns in software that has been offered to GNU.
+#, fuzzy
+#| msgid ""
+#| "The software security evaluation team at <a href=\"mailto:gnueval-";
+#| "security@gnu.org\">gnueval-security@gnu.org</a> works with the software "
+#| "evaluation team.  They determine whether there are any security concerns "
+#| "in software that has been offered to GNU."
 msgid ""
 "The software security evaluation team at <a href=\"mailto:gnueval-";
-"security@gnu.org\">gnueval-security@gnu.org</a> works with the software "
-"evaluation team.  They determine whether there are any security concerns in "
-"software that has been offered to GNU."
+"security@gnu.org\">&lt;gnueval-security@gnu.org&gt;</a> works with the "
+"software evaluation team.  They determine whether there are any security "
+"concerns in software that has been offered to GNU."
 msgstr ""
 "L'équipe d'évaluation de la sécurité des logiciels, à l'adresse <a href="
 "\"mailto:gnueval-security@gnu.org\";>gnueval-security@gnu.org</a>, travaille "
 "avec l'équipe d'évaluation des logiciels. Elle détermine si la sécurité 
des "
 "logiciels proposés à GNU pose problème."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "New members are recruited from existing GNU volunteers when needed."
 msgstr ""
 "Les nouveaux membres sont recrutés en cas de besoin parmi les bénévoles de 
"
 "GNU."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Security Team"
 msgstr "Équipe de sécurité"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"mailto:security@gnu.org\";>Security Team</a> helps to resolve "
 "security bugs in a timely fashion.  If the maintainer of a GNU package fails "
@@ -411,11 +475,11 @@
 "mainteneurs peuvent aussi demander conseil à cette équipe sur la "
 "sécurisation de leurs logiciels."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Platform Testers"
 msgstr "Testeurs de plateformes"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Volunteers behind the <a href=\"//lists.gnu.org/mailman/listinfo/platform-"
 "testers\">platform-testers@gnu.org</a> mailing list test GNU software pre-"
@@ -427,46 +491,63 @@
 "logiciels GNU sur différentes plateformes matérielles pour s'assurer qu'ils 
"
 "fonctionnent correctement."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "New volunteers are welcome."
 msgstr "Les nouveaux bénévoles sont les bienvenus."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Mentors"
 msgstr "Mentors"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The GNU Mentors [-(<a
+# | href=\"mailto:mentors@gnu.org\";>mentors@gnu.org</a>)-] {+at <a
+# | href=\"mailto:mentors@gnu.org\";>&lt;mentors@gnu.org&gt;</a>+} volunteer to
+# | provide guidance for new software maintainers.
+#, fuzzy
+#| msgid ""
+#| "The GNU Mentors (<a href=\"mailto:mentors@gnu.org\";>mentors@gnu.org</a>) "
+#| "volunteer to provide guidance for new software maintainers."
 msgid ""
-"The GNU Mentors (<a href=\"mailto:mentors@gnu.org\";>mentors@gnu.org</a>) "
-"volunteer to provide guidance for new software maintainers."
+"The GNU Mentors at <a href=\"mailto:mentors@gnu.org\";>&lt;mentors@gnu.org&gt;"
+"</a> volunteer to provide guidance for new software maintainers."
 msgstr ""
 "Les mentors GNU (<a href=\"mailto:mentors@gnu.org\";>mentors@gnu.org</a>) "
 "proposent des conseils aux nouveaux mainteneurs de logiciels."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "We ask long-time GNU maintainers to volunteer."
 msgstr "Nous demandons à des mainteneurs GNU chevronnés de les rejoindre."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Proofreaders"
 msgstr "Relecteurs"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The proofreaders list is available to help GNU package maintainers by
+# | proofreading English text.  To request proofreading, write to <a
+# | [-href=\"mailto:proofreaders@gnu.org\";>proofreaders@gnu.org</a>.-]
+# | {+href=\"mailto:proofreaders@gnu.org\";>&lt;proofreaders@gnu.org&gt;</a>.+}
+#, fuzzy
+#| msgid ""
+#| "The proofreaders list is available to help GNU package maintainers by "
+#| "proofreading English text.  To request proofreading, write to <a href="
+#| "\"mailto:proofreaders@gnu.org\";>proofreaders@gnu.org</a>."
 msgid ""
 "The proofreaders list is available to help GNU package maintainers by "
 "proofreading English text.  To request proofreading, write to <a href="
-"\"mailto:proofreaders@gnu.org\";>proofreaders@gnu.org</a>."
+"\"mailto:proofreaders@gnu.org\";>&lt;proofreaders@gnu.org&gt;</a>."
 msgstr ""
 "Il existe une liste de relecteurs susceptibles d'aider les mainteneurs de "
 "logiciels GNU à relire leurs textes en anglais. Pour solliciter une "
 "relecture, écrivez à <a href=\"mailto:proofreaders@gnu.org";
 "\">proofreaders@gnu.org</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Other Teams and Services"
 msgstr "Autres équipes et services"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Several other teams facilitate or manage the day-to-day operations within "
 "the GNU Project, or advance specific goals of the project."
@@ -474,11 +555,11 @@
 "Plusieurs autres équipes facilitent ou gèrent les opérations quotidiennes 
au "
 "sein du projet GNU, ou poursuivent des objectifs particulier du projet."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "GNU Advisory Committee"
 msgstr "Comité consultatif de GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/contact/gnu-advisory.html\">GNU Advisory Committee</a> (GAC) "
 "exists to provide advice to the Chief GNUisance.  Members of the Advisory "
@@ -491,11 +572,11 @@
 "membres. Le comité consultatif contrôle la santé du projet GNU au nom du "
 "Chef GNUisance et soumet les problèmes potentiels à discussion."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Savannah Hackers"
 msgstr "Savannah Hackers"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "<a href=\"//savannah.gnu.org\">Savannah</a> is the GNU Project's software "
 "forge.  It hosts code repositories, bug reporting tools, mailing list "
@@ -513,11 +594,11 @@
 "et l'hébergement approprié des logiciels GNU sur ce service, et évaluent 
les "
 "logiciels non GNU qui demandent à y être hébergés."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Webmasters"
 msgstr "Webmestres"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/people/webmeisters.html\">GNU Webmasters</a> maintain and "
 "update the web pages at <a href=\"/\">https://www.gnu.org</a>."
@@ -526,7 +607,7 @@
 "l'entretien et la mise à jour des pages web hébergées à <a href=\"/"
 "\">https://www.gnu.org</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Webmasters also answer various kinds of questions sent by the public, "
 "regarding topics such as free software and licenses (when the answer is "
@@ -540,7 +621,7 @@
 "distributions, évaluent les personnes qui voudraient devenir webmestres et "
 "mettent à jour la liste des miroirs."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The GNU Webmaster Group is led by the&nbsp;<a href=\"mailto:chief-";
 "webmaster@gnu.org\">Chief Webmaster</a> who reports to&nbsp; the Chief "
@@ -552,11 +633,11 @@
 "GNUisance. Les nouveaux bénévoles sont les bienvenus. Voir le <a href=\"/"
 "server/standards/webmaster-quiz.html\">Quiz des webmestres bénévoles</a>."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Web Translators"
 msgstr "Traducteurs web"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Each language has a translation team, directed by a team coordinator.  See "
 "<a href=\"/server/standards/README.translations.html\">the Guide to "
@@ -571,11 +652,11 @@
 "translators@gnu.org\">responsable des traductions de GNU</a> qui, lui, rend "
 "compte au Chef GNUisance."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "List Helpers"
 msgstr "Nettoyeurs de liste"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "<a href=\"//savannah.gnu.org/maintenance/ListHelperAntiSpam/\">Listhelper</"
 "a> is a system for semi-automatically managing spam sent to GNU mailing "
@@ -588,20 +669,30 @@
 "modérateurs humains sont également disponibles pour contrôler la file de "
 "messages censés ne pas être des pourriels."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "GNU Volunteer Coordinators"
 msgstr "Coordinateurs des bénévoles de GNU"
 
-#. type: Content of: <p>
-msgid ""
-"The GNU Volunteer Coordinators (<a href=\"mailto:gvc@gnu.org\";>gvc@gnu.org</"
-"a>) help to guide new volunteers towards suitable jobs within the GNU Project"
+#. type: Content of: <div><p>
+# | The GNU Volunteer Coordinators [-(<a
+# | href=\"mailto:gvc@gnu.org\";>gvc@gnu.org</a>)-] {+at <a
+# | href=\"mailto:gvc@gnu.org\";>&lt;gvc@gnu.org&gt;</a>+} help to guide new
+# | volunteers towards suitable jobs within the GNU Project
+#, fuzzy
+#| msgid ""
+#| "The GNU Volunteer Coordinators (<a href=\"mailto:gvc@gnu.org\";>gvc@gnu."
+#| "org</a>) help to guide new volunteers towards suitable jobs within the "
+#| "GNU Project"
+msgid ""
+"The GNU Volunteer Coordinators at <a href=\"mailto:gvc@gnu.org\";>&lt;gvc@gnu."
+"org&gt;</a> help to guide new volunteers towards suitable jobs within the "
+"GNU Project"
 msgstr ""
 "Les coordinateurs des bénévoles de GNU (<a href=\"mailto:gvc@gnu.org";
 "\">gvc@gnu.org</a>) aident les nouveaux bénévoles à s'orienter dans le "
 "projet GNU vers des activités qui leur conviennent."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "New GVC volunteers are welcome, but prior experience volunteering within GNU "
 "(and thus broad knowledge of the GNU Project) is highly recommended."
@@ -610,11 +701,11 @@
 "de bénévolat au sein du projet GNU (et donc une connaissance étendue du "
 "projet) est vivement recommandée."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "GNU Education Team"
 msgstr "Équipe Éducation de GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/education/\">GNU Education Team</a> promotes the adoption of "
 "the GNU Operating System in educational environments.  It also evaluates "
@@ -624,11 +715,11 @@
 "système d'exploitation GNU en environnement éducatif. Elle évalue 
également "
 "les écoles et s'entretient avec les administrateurs scolaires."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "GNU Standards Group"
 msgstr "Groupe des standards GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The GNU Standards Group evaluates proposals to update the GNU coding "
 "standards.  Anyone can submit a proposal via the <a href=\"//lists.gnu.org/"
@@ -648,17 +739,17 @@
 "l'installation des modifications dans le document ainsi que de sa mise à "
 "jour sur le web."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "New volunteers are recruited from existing GNU volunteers when needed."
 msgstr ""
 "De nouveaux membres sont recrutés en cas de besoin parmi les bénévoles de "
 "GNU."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Correcting Errors"
 msgstr "Correction des erreurs"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If we find errors or omissions in this description of the existing "
 "structure, which are possible since it previously had no centralized "
@@ -676,11 +767,11 @@
 "troisième chiffre du numéro de version. Les versions anciennes seront "
 "conservées dans un <a href=\"/gnu/old-gnu-structure/\">sous-dossier</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Future Changes in Administrative Structure"
 msgstr "Modifications futures de la structure administrative"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Changes in the GNU Project administrative structure are decided on by the "
 "Chief GNUisance after starting consultations with GNU contributors, usually "
@@ -695,7 +786,7 @@
 "les effets positifs ou négatifs que ces modifications pourraient avoir, de "
 "manière à prendre des décisions judicieuses."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To report changes that are adopted, we will update this document, both the "
 "Org version and the HTML version (see previous section), advancing the first "
@@ -705,6 +796,14 @@
 "bien dans sa version Org que sa version HTML (voir section précédente), en "
 "incrémentant le premier ou le second chiffre du numéro de version."
 
+#. type: Content of: <div><div><p>
+msgid ""
+"An <a href=\"/gnu/gnu-structure.org\">Org version</a> of this document is "
+"also available."
+msgstr ""
+"Une version de ce document au <a href=\"/gnu/gnu-structure.org\">format  "
+"Org</a> est également disponible."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -731,14 +830,14 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Merci d'adresser vos commentaires sur les pages en français à &lt;<a href="
@@ -749,8 +848,8 @@
 "traduction</a> les infos nécessaires."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2020 Brandon Invergo and Richard Stallman"
-msgstr "Copyright &copy; 2020 Brandon Invergo et Richard Stallman"
+msgid "Copyright &copy; 2020, 2021 Brandon Invergo and Richard Stallman"
+msgstr "Copyright &copy; 2020, 2021 Brandon Invergo et Richard Stallman"
 
 #. type: Content of: <div><p>
 msgid ""
@@ -776,6 +875,5 @@
 msgid "Updated:"
 msgstr "Dernière mise à jour :"
 
-#. type: Content of: <div><p>
-msgid "Copyright &copy; 2020, 2021 Brandon Invergo and Richard Stallman"
-msgstr "Copyright &copy; 2020, 2021 Brandon Invergo et Richard Stallman"
+#~ msgid "Copyright &copy; 2020 Brandon Invergo and Richard Stallman"
+#~ msgstr "Copyright &copy; 2020 Brandon Invergo et Richard Stallman"

Index: po/gnu-structure.pot
===================================================================
RCS file: /web/www/www/gnu/po/gnu-structure.pot,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- po/gnu-structure.pot        6 Oct 2020 08:42:03 -0000       1.2
+++ po/gnu-structure.pot        2 Nov 2021 14:41:52 -0000       1.3
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-structure.html\n"
-"POT-Creation-Date: 2020-10-06 08:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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,26 +22,20 @@
 "Software Foundation"
 msgstr ""
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "The Structure and Administration of the GNU Project"
 msgstr ""
 
-#. type: Content of: <address>
-msgid "by Brandon Invergo and Richard Stallman"
+#. type: Content of: <div><h3>
+msgid "Version 1.0.1"
 msgstr ""
 
-#. type: Content of: <p>
-msgid "<strong>Version 1.0.1</strong>"
+#. type: Content of: <div><address>
+msgid "by Brandon Invergo and Richard Stallman"
 msgstr ""
 
 #. type: Content of: <div><p>
 msgid ""
-"An <a href=\"/gnu/gnu-structure.org\">Org version</a> of this document is "
-"also available."
-msgstr ""
-
-#. type: Content of: <p>
-msgid ""
 "The GNU Project develops and maintains the <a "
 "href=\"/gnu/about-gnu.html\">GNU operating system</a>.  Through this work, "
 "and other related activities, the GNU Project advocates and promotes <a "
@@ -49,7 +43,7 @@
 "philosophy of the free software movement."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "An operating system consists of many software components that together make "
 "a computer do useful jobs.  It includes code for low-level functionality, "
@@ -57,13 +51,13 @@
 "programs (utilities, tools, applications, and games) that users explicitly "
 "run.  The GNU operating system comprises software across this entire "
 "spectrum.  Many of the programs are specifically developed and released by "
-"the GNU Project; these are termed &ldquo;GNU packages&rdquo;.  The GNU "
-"system also includes components that are <a "
+"the GNU Project; these are termed &ldquo;GNU packages.&rdquo; The GNU system "
+"also includes components that are <a "
 "href=\"/philosophy/categories.html\">free programs</a> released by other "
 "developers, outside of the GNU Project."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Just as the programs composing an operating system must work together "
 "coherently, the GNU Project must operate coherently.  Most of the work "
@@ -74,28 +68,28 @@
 "first time we have documented all of it in one place."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The Free Software Foundation provides many kinds of support (facilities, "
 "services) to the GNU Project.  How that works is outside the scope of this "
 "document."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Software Development Structure"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Most of the GNU Project's activity consists of development of software "
 "packages.  Here is how GNU software development is structured."
 msgstr ""
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "The Chief GNUisance"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The GNU Project is led by the Chief GNUisance, Richard Stallman, the founder "
 "of the project.  The Chief GNUisance is responsible in principle for all "
@@ -105,24 +99,24 @@
 "their maintainers."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In practice, the Chief GNUisance delegates many of these decisions and most "
 "of the tasks to others, and only rarely intervenes in the specifics of "
 "development of a GNU package&mdash;and usually that is with a suggestion."
 msgstr ""
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Assistant GNUisances"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This team, residing at <a "
-"href=\"mailto:maintainers@gnu.org\";>maintainers@gnu.org</a>, is available as "
-"a first point-of-contact for maintainers of GNU Software.  They keep track "
-"of development activity across the entire project, ensuring timely releases, "
-"checking that the maintainers follow GNU's <a "
+"href=\"mailto:maintainers@gnu.org\";>&lt;maintainers@gnu.org&gt;</a>, is "
+"available as a first point-of-contact for maintainers of GNU Software.  They "
+"keep track of development activity across the entire project, ensuring "
+"timely releases, checking that the maintainers follow GNU's <a "
 "href=\"/philosophy/\">philosophy</a> and guidelines, and resolving any "
 "conflicts that might arise.  They also handle cases when a maintainer steps "
 "down or when a new volunteer steps up to maintain an existing package (in "
@@ -130,18 +124,18 @@
 "GNUisance)."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "New members are recruited from existing GNU volunteers when needed.  "
 "However, help is often welcome for specific tasks and interested GNU "
 "volunteers are welcome to get in touch."
 msgstr ""
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Package maintainers"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Each GNU software package has specific maintainers, appointed by the Chief "
 "GNUisance or the assistant GNUisances.  The package maintainers are "
@@ -150,7 +144,7 @@
 "packages on behalf of the GNU Project."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The initial appointment of maintainers is done when a program is <a "
 "href=\"/help/evaluation.html\">accepted as a GNU package</a>.  These are "
@@ -158,7 +152,7 @@
 "package."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Over time, maintainers occasionally step down.  In some cases, the sole "
 "maintainer steps down from the role, leaving the package unmaintained.  The "
@@ -169,7 +163,7 @@
 "appreciatively."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The maintainers of a package often recruit others to contribute to its "
 "development, and delegate some technical decisions to them.  However, the "
@@ -177,7 +171,7 @@
 "out their responsibility to the GNU Project."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A maintainer's primary responsibility is to do a good, practical job of "
 "developing and maintaining the program in accord with the GNU Project's "
@@ -188,7 +182,7 @@
 "package</a>."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In general, maintainers determine the technical directions that the software "
 "packages take and thus they make the day-to-day decisions for the packages.  "
@@ -199,7 +193,7 @@
 "to execute the decision on behalf of the GNU Project."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "More complete information about the specific responsibilities of maintainers "
 "and technical guidance for maintaining GNU software can be found in the <a "
@@ -207,7 +201,7 @@
 "<a href=\"/prep/standards\">GNU Coding Standards</a> documents."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We do not require that GNU package maintainers agree with our philosophy, or "
 "approve of our policies&mdash;only to follow them.  Maintainers and "
@@ -215,11 +209,11 @@
 "decisions in their work on GNU software."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Support for GNU Package Development"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Several teams provide various kinds of support to the development and "
 "management of GNU packages.  Most of these teams have a coordinator to "
@@ -228,46 +222,46 @@
 "href=\"mailto:gvc@gnu.org\";>GNU Volunteer Coordinators</a> for advice."
 msgstr ""
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Software Evaluation"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The software evaluation team at <a "
-"href=\"mailto:gnueval@gnu.org\";>gnueval@gnu.org</a> evaluates software "
-"packages proposed as GNU packages.  This involves a careful assessment of "
-"the software's functionality as well as pertinent issues related to software "
-"freedom and how the program fits with the GNU system."
+"href=\"mailto:gnueval@gnu.org\";>&lt;gnueval@gnu.org&gt;</a> evaluates "
+"software packages proposed as GNU packages.  This involves a careful "
+"assessment of the software's functionality as well as pertinent issues "
+"related to software freedom and how the program fits with the GNU system."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "New members are recruited from existing GNU volunteers when needed.  Prior "
 "experience with non-GNU software evaluation on Savannah is preferable."
 msgstr ""
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Software Security Evaluation"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The software security evaluation team at <a "
-"href=\"mailto:gnueval-security@gnu.org\";>gnueval-security@gnu.org</a> works "
-"with the software evaluation team.  They determine whether there are any "
-"security concerns in software that has been offered to GNU."
+"href=\"mailto:gnueval-security@gnu.org\";>&lt;gnueval-security@gnu.org&gt;</a> 
"
+"works with the software evaluation team.  They determine whether there are "
+"any security concerns in software that has been offered to GNU."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "New members are recruited from existing GNU volunteers when needed."
 msgstr ""
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Security Team"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"mailto:security@gnu.org\";>Security Team</a> helps to resolve "
 "security bugs in a timely fashion.  If the maintainer of a GNU package fails "
@@ -277,11 +271,11 @@
 "also ask the security team for advice in securing their packages."
 msgstr ""
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Platform Testers"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Volunteers behind the <a "
 
"href=\"//lists.gnu.org/mailman/listinfo/platform-testers\">platform-testers@gnu.org</a>
 "
@@ -289,50 +283,51 @@
 "to ensure that it functions correctly."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "New volunteers are welcome."
 msgstr ""
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Mentors"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"The GNU Mentors (<a href=\"mailto:mentors@gnu.org\";>mentors@gnu.org</a>) "
-"volunteer to provide guidance for new software maintainers."
+"The GNU Mentors at <a "
+"href=\"mailto:mentors@gnu.org\";>&lt;mentors@gnu.org&gt;</a> volunteer to "
+"provide guidance for new software maintainers."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "We ask long-time GNU maintainers to volunteer."
 msgstr ""
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Proofreaders"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The proofreaders list is available to help GNU package maintainers by "
 "proofreading English text.  To request proofreading, write to <a "
-"href=\"mailto:proofreaders@gnu.org\";>proofreaders@gnu.org</a>."
+"href=\"mailto:proofreaders@gnu.org\";>&lt;proofreaders@gnu.org&gt;</a>."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Other Teams and Services"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Several other teams facilitate or manage the day-to-day operations within "
 "the GNU Project, or advance specific goals of the project."
 msgstr ""
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "GNU Advisory Committee"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/contact/gnu-advisory.html\">GNU Advisory Committee</a> (GAC) "
 "exists to provide advice to the Chief GNUisance.  Members of the Advisory "
@@ -341,11 +336,11 @@
 "GNUisance and they raise potential issues for discussion."
 msgstr ""
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Savannah Hackers"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "<a href=\"//savannah.gnu.org\">Savannah</a> is the GNU Project's software "
 "forge.  It hosts code repositories, bug reporting tools, mailing list "
@@ -356,17 +351,17 @@
 "evaluate non-GNU software that applies to be hosted on the forge."
 msgstr ""
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Webmasters"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/people/webmeisters.html\">GNU Webmasters</a> maintain and "
 "update the web pages at <a href=\"/\">https://www.gnu.org</a>."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Webmasters also answer various kinds of questions sent by the public, "
 "regarding topics such as free software and licenses (when the answer is "
@@ -375,7 +370,7 @@
 "mirrors."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The GNU Webmaster Group is led by the&nbsp;<a "
 "href=\"mailto:chief-webmaster@gnu.org\";>Chief Webmaster</a> who reports "
@@ -384,11 +379,11 @@
 "Quiz</a>."
 msgstr ""
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Web Translators"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Each language has a translation team, directed by a team coordinator.  See "
 "<a href=\"/server/standards/README.translations.html\">the Guide to "
@@ -398,11 +393,11 @@
 "who&nbsp;reports to the Chief GNUisance."
 msgstr ""
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "List Helpers"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "<a "
 "href=\"//savannah.gnu.org/maintenance/ListHelperAntiSpam/\">Listhelper</a> "
@@ -411,39 +406,39 @@
 "to manage the queue of messages predicted not to be spam."
 msgstr ""
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "GNU Volunteer Coordinators"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"The GNU Volunteer Coordinators (<a "
-"href=\"mailto:gvc@gnu.org\";>gvc@gnu.org</a>) help to guide new volunteers "
-"towards suitable jobs within the GNU Project"
+"The GNU Volunteer Coordinators at <a "
+"href=\"mailto:gvc@gnu.org\";>&lt;gvc@gnu.org&gt;</a> help to guide new "
+"volunteers towards suitable jobs within the GNU Project"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "New GVC volunteers are welcome, but prior experience volunteering within GNU "
 "(and thus broad knowledge of the GNU Project) is highly recommended."
 msgstr ""
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "GNU Education Team"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/education/\">GNU Education Team</a> promotes the adoption of "
 "the GNU Operating System in educational environments.  It also evaluates "
 "schools and speaks to school administrators."
 msgstr ""
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "GNU Standards Group"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The GNU Standards Group evaluates proposals to update the GNU coding "
 "standards.  Anyone can submit a proposal via the <a "
@@ -455,15 +450,15 @@
 "the document on the web."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "New volunteers are recruited from existing GNU volunteers when needed."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Correcting Errors"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If we find errors or omissions in this description of the existing "
 "structure, which are possible since it previously had no centralized "
@@ -474,11 +469,11 @@
 "href=\"/gnu/old-gnu-structure/\">a subdirectory</a>."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Future Changes in Administrative Structure"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Changes in the GNU Project administrative structure are decided on by the "
 "Chief GNUisance after starting consultations with GNU contributors, usually "
@@ -487,13 +482,19 @@
 "effects they would have, so as to make a wise decision."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To report changes that are adopted, we will update this document, both the "
 "Org version and the HTML version (see previous section), advancing the first "
 "and/or second version number."
 msgstr ""
 
+#. type: Content of: <div><div><p>
+msgid ""
+"An <a href=\"/gnu/gnu-structure.org\">Org version</a> of this document is "
+"also available."
+msgstr ""
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -518,7 +519,7 @@
 #
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
 #
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
@@ -526,11 +527,12 @@
 msgid ""
 "Please see the <a "
 "href=\"/server/standards/README.translations.html\">Translations README</a> "
-"for information on coordinating and submitting translations of this article."
+"for information on coordinating and contributing translations of this "
+"article."
 msgstr ""
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2020 Brandon Invergo and Richard Stallman"
+msgid "Copyright &copy; 2020, 2021 Brandon Invergo and Richard Stallman"
 msgstr ""
 
 #. type: Content of: <div><p>

Index: po/gnu-structure.pt-br.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-structure.pt-br.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- po/gnu-structure.pt-br.po   2 Nov 2021 12:55:44 -0000       1.2
+++ po/gnu-structure.pt-br.po   2 Nov 2021 14:41:52 -0000       1.3
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-structure.html\n"
-"POT-Creation-Date: 2020-10-06 08:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2021-01-02 22:51-0300\n"
 "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
 "Language-Team: Brazilian Portuguese <www-pt-br-general@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-11-02 14:27+0000\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "X-Generator: Gtranslator 3.38.0\n"
 
@@ -25,28 +26,22 @@
 "A estrutura e administração do Projeto GNU - Projeto GNU - Free Software "
 "Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "The Structure and Administration of the GNU Project"
 msgstr "A estrutura e administração do Projeto GNU"
 
-#. type: Content of: <address>
+#. type: Content of: <div><h3>
+#, fuzzy
+#| msgid "<strong>Version 1.0.1</strong>"
+msgid "Version 1.0.1"
+msgstr "<strong>Versão 1.0.1</strong>"
+
+#. type: Content of: <div><address>
 msgid "by Brandon Invergo and Richard Stallman"
 msgstr "por Brandon Invergo e Richard Stallman"
 
-#. type: Content of: <p>
-msgid "<strong>Version 1.0.1</strong>"
-msgstr "<strong>Versão 1.0.1</strong>"
-
 #. type: Content of: <div><p>
 msgid ""
-"An <a href=\"/gnu/gnu-structure.org\">Org version</a> of this document is "
-"also available."
-msgstr ""
-"Uma <a href=\"/gnu/gnu-structure.org\">versão Org</a> deste documento 
também "
-"está disponível."
-
-#. type: Content of: <p>
-msgid ""
 "The GNU Project develops and maintains the <a href=\"/gnu/about-gnu.html"
 "\">GNU operating system</a>.  Through this work, and other related "
 "activities, the GNU Project advocates and promotes <a href=\"/philosophy/"
@@ -59,7 +54,19 @@
 "philosophy.html\">liberdade do software</a>, a filosofia central do "
 "movimento do software livre."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "An operating system consists of many software components that together "
+#| "make a computer do useful jobs.  It includes code for low-level "
+#| "functionality, such as the kernel and drivers, plus system libraries, as "
+#| "well as the programs (utilities, tools, applications, and games) that "
+#| "users explicitly run.  The GNU operating system comprises software across "
+#| "this entire spectrum.  Many of the programs are specifically developed "
+#| "and released by the GNU Project; these are termed &ldquo;GNU "
+#| "packages&rdquo;.  The GNU system also includes components that are <a "
+#| "href=\"/philosophy/categories.html\">free programs</a> released by other "
+#| "developers, outside of the GNU Project."
 msgid ""
 "An operating system consists of many software components that together make "
 "a computer do useful jobs.  It includes code for low-level functionality, "
@@ -67,9 +74,9 @@
 "programs (utilities, tools, applications, and games) that users explicitly "
 "run.  The GNU operating system comprises software across this entire "
 "spectrum.  Many of the programs are specifically developed and released by "
-"the GNU Project; these are termed &ldquo;GNU packages&rdquo;.  The GNU "
-"system also includes components that are <a href=\"/philosophy/categories."
-"html\">free programs</a> released by other developers, outside of the GNU "
+"the GNU Project; these are termed &ldquo;GNU packages.&rdquo; The GNU system "
+"also includes components that are <a href=\"/philosophy/categories.html"
+"\">free programs</a> released by other developers, outside of the GNU "
 "Project."
 msgstr ""
 "Um sistema operacional consiste em muitos componentes de software que, "
@@ -83,7 +90,7 @@
 "que são <a href=\"/philosophy/categories.html\">programas livres</a> "
 "lançados por outros desenvolvedores, fora do Projeto GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Just as the programs composing an operating system must work together "
 "coherently, the GNU Project must operate coherently.  Most of the work "
@@ -101,7 +108,7 @@
 "longo de décadas, desenvolvemos estrutura para o projeto. Nada disso é 
novo, "
 "mas esta é a primeira vez que documentamos tudo em um só lugar."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The Free Software Foundation provides many kinds of support (facilities, "
 "services) to the GNU Project.  How that works is outside the scope of this "
@@ -111,11 +118,11 @@
 "serviços) para o Projeto GNU. Como isso funciona está fora do escopo deste "
 "documento."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Software Development Structure"
 msgstr "Estrutura de desenvolvimento de software"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Most of the GNU Project's activity consists of development of software "
 "packages.  Here is how GNU software development is structured."
@@ -124,11 +131,11 @@
 "pacotes de software. Aqui está como o desenvolvimento de software GNU é "
 "estruturado."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "The Chief GNUisance"
 msgstr "O Chefe GNUisance"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The GNU Project is led by the Chief GNUisance, Richard Stallman, the founder "
 "of the project.  The Chief GNUisance is responsible in principle for all "
@@ -144,7 +151,7 @@
 "pacotes GNU, ou descomissiona um quando necessário, e indica seus "
 "mantenedores."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In practice, the Chief GNUisance delegates many of these decisions and most "
 "of the tasks to others, and only rarely intervenes in the specifics of "
@@ -154,14 +161,25 @@
 "tarefas a outros, e apenas raramente intervém nas especificidades do "
 "desenvolvimento de um pacote GNU – e normalmente isso é com uma sugestão."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Assistant GNUisances"
 msgstr "Assistentes GNUisance"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "This team, residing at <a href=\"mailto:maintainers@gnu.org";
+#| "\">maintainers@gnu.org</a>, is available as a first point-of-contact for "
+#| "maintainers of GNU Software.  They keep track of development activity "
+#| "across the entire project, ensuring timely releases, checking that the "
+#| "maintainers follow GNU's <a href=\"/philosophy/\">philosophy</a> and "
+#| "guidelines, and resolving any conflicts that might arise.  They also "
+#| "handle cases when a maintainer steps down or when a new volunteer steps "
+#| "up to maintain an existing package (in which case they can appoint a new "
+#| "maintainer on behalf of the Chief GNUisance)."
 msgid ""
-"This team, residing at <a href=\"mailto:maintainers@gnu.org";
-"\">maintainers@gnu.org</a>, is available as a first point-of-contact for "
+"This team, residing at <a href=\"mailto:maintainers@gnu.org\";>&lt;"
+"maintainers@gnu.org&gt;</a>, is available as a first point-of-contact for "
 "maintainers of GNU Software.  They keep track of development activity across "
 "the entire project, ensuring timely releases, checking that the maintainers "
 "follow GNU's <a href=\"/philosophy/\">philosophy</a> and guidelines, and "
@@ -180,7 +198,7 @@
 "novo voluntário sobe para manter um pacote existente (nesse caso, eles podem 
"
 "indicar um novo mantenedor em nome do Chefe GNUisance)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "New members are recruited from existing GNU volunteers when needed.  "
 "However, help is often welcome for specific tasks and interested GNU "
@@ -191,11 +209,11 @@
 "específicas e voluntários GNU interessados são bem-vindos para entrar em "
 "contato."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Package maintainers"
 msgstr "Mantenedores de pacote"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Each GNU software package has specific maintainers, appointed by the Chief "
 "GNUisance or the assistant GNUisances.  The package maintainers are "
@@ -209,7 +227,7 @@
 "nomeados e em raras ocasiões dispensados, e são responsáveis pelo "
 "desenvolvimento de seus pacotes em nome do Projeto GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The initial appointment of maintainers is done when a program is <a href=\"/"
 "help/evaluation.html\">accepted as a GNU package</a>.  These are normally "
@@ -220,7 +238,7 @@
 "alguns dos principais desenvolvedores que concordaram em fazer do programa "
 "um pacote GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Over time, maintainers occasionally step down.  In some cases, the sole "
 "maintainer steps down from the role, leaving the package unmaintained.  The "
@@ -237,7 +255,7 @@
 "pacotes não mantidos atualmente</a>. Pedimos aos antigos mantenedores que "
 "recomendem novos mantenedores, e consideramos essas sugestões com gratidão."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The maintainers of a package often recruit others to contribute to its "
 "development, and delegate some technical decisions to them.  However, the "
@@ -249,7 +267,7 @@
 "entanto, os mantenedores detêm autoridade sobre todo o pacote para que "
 "possam cumprir suas responsabilidades com o Projeto GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A maintainer's primary responsibility is to do a good, practical job of "
 "developing and maintaining the program in accord with the GNU Project's "
@@ -267,7 +285,7 @@
 "deveres básicos dos mantenedores e o que significa um programa ser um pacote 
"
 "GNU</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In general, maintainers determine the technical directions that the software "
 "packages take and thus they make the day-to-day decisions for the packages.  "
@@ -285,7 +303,7 @@
 "que afeta diretamente um ou mais pacotes GNU. Os mantenedores dos pacotes "
 "afetados têm a responsabilidade de executar a decisão em nome do Projeto 
GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "More complete information about the specific responsibilities of maintainers "
 "and technical guidance for maintaining GNU software can be found in the <a "
@@ -299,7 +317,7 @@
 "dos <a href=\"/prep/standards\">GNU Coding Standards</a> (padrões de "
 "codificação GNU)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We do not require that GNU package maintainers agree with our philosophy, or "
 "approve of our policies&mdash;only to follow them.  Maintainers and "
@@ -311,11 +329,11 @@
 "contribuidores devem cumprir nossa filosofia, políticas e decisões "
 "específicas ocasionais em seu trabalho no software GNU."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Support for GNU Package Development"
 msgstr "Suporte ao desenvolvimento de pacote GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Several teams provide various kinds of support to the development and "
 "management of GNU packages.  Most of these teams have a coordinator to "
@@ -330,14 +348,21 @@
 "dúvida, você pode entrar em contato com os <a href=\"mailto:gvc@gnu.org";
 "\">Coordenadores de Voluntários do GNU</a> para obter conselhos."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Software Evaluation"
 msgstr "Avaliação de software"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The software evaluation team at <a href=\"mailto:gnueval@gnu.org";
+#| "\">gnueval@gnu.org</a> evaluates software packages proposed as GNU "
+#| "packages.  This involves a careful assessment of the software's "
+#| "functionality as well as pertinent issues related to software freedom and "
+#| "how the program fits with the GNU system."
 msgid ""
-"The software evaluation team at <a href=\"mailto:gnueval@gnu.org";
-"\">gnueval@gnu.org</a> evaluates software packages proposed as GNU "
+"The software evaluation team at <a href=\"mailto:gnueval@gnu.org\";>&lt;"
+"gnueval@gnu.org&gt;</a> evaluates software packages proposed as GNU "
 "packages.  This involves a careful assessment of the software's "
 "functionality as well as pertinent issues related to software freedom and "
 "how the program fits with the GNU system."
@@ -348,7 +373,7 @@
 "como questões pertinentes relacionadas à liberdade do software e como o "
 "programa se encaixa no sistema GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "New members are recruited from existing GNU volunteers when needed.  Prior "
 "experience with non-GNU software evaluation on Savannah is preferable."
@@ -357,32 +382,38 @@
 "necessário. Experiência anterior com avaliação de software não GNU no "
 "Savannah é preferível."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Software Security Evaluation"
 msgstr "Avaliação de segurança de software"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The software security evaluation team at <a href=\"mailto:gnueval-";
+#| "security@gnu.org\">gnueval-security@gnu.org</a> works with the software "
+#| "evaluation team.  They determine whether there are any security concerns "
+#| "in software that has been offered to GNU."
 msgid ""
 "The software security evaluation team at <a href=\"mailto:gnueval-";
-"security@gnu.org\">gnueval-security@gnu.org</a> works with the software "
-"evaluation team.  They determine whether there are any security concerns in "
-"software that has been offered to GNU."
+"security@gnu.org\">&lt;gnueval-security@gnu.org&gt;</a> works with the "
+"software evaluation team.  They determine whether there are any security "
+"concerns in software that has been offered to GNU."
 msgstr ""
 "A equipe de avaliação de segurança de software em <a 
href=\"mailto:gnueval-";
 "security@gnu.org\">gnueval-security@gnu.org</a> trabalha com a equipe de "
 "avaliação de software. Eles determinam se há alguma preocupação com a "
 "segurança no software que foi oferecido ao GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "New members are recruited from existing GNU volunteers when needed."
 msgstr ""
 "Novos membros são recrutados de voluntários GNU existentes quando 
necessário."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Security Team"
 msgstr "Equipe de Segurança"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"mailto:security@gnu.org\";>Security Team</a> helps to resolve "
 "security bugs in a timely fashion.  If the maintainer of a GNU package fails "
@@ -399,11 +430,11 @@
 "corrigida do pacote. Os mantenedores também podem pedir conselhos à equipe "
 "de segurança sobre como proteger seus pacotes."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Platform Testers"
 msgstr "Testadores de plataforma"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Volunteers behind the <a href=\"//lists.gnu.org/mailman/listinfo/platform-"
 "testers\">platform-testers@gnu.org</a> mailing list test GNU software pre-"
@@ -415,46 +446,55 @@
 "lançamentos de software GNU em diferentes plataformas de hardware para "
 "garantir que funciona corretamente."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "New volunteers are welcome."
 msgstr "Novos voluntários são bem-vindos."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Mentors"
 msgstr "Mentores"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The GNU Mentors (<a href=\"mailto:mentors@gnu.org\";>mentors@gnu.org</a>) "
+#| "volunteer to provide guidance for new software maintainers."
 msgid ""
-"The GNU Mentors (<a href=\"mailto:mentors@gnu.org\";>mentors@gnu.org</a>) "
-"volunteer to provide guidance for new software maintainers."
+"The GNU Mentors at <a href=\"mailto:mentors@gnu.org\";>&lt;mentors@gnu.org&gt;"
+"</a> volunteer to provide guidance for new software maintainers."
 msgstr ""
 "Os mentores do GNU (<a href=\"mailto:mentors@gnu.org\";>mentors@gnu.org</a>) "
 "se oferecem como voluntários para fornecer orientação para novos "
 "mantenedores de software."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "We ask long-time GNU maintainers to volunteer."
 msgstr "Pedimos aos mantenedores GNU de longa data que sejam voluntários."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Proofreaders"
 msgstr "Revisores"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The proofreaders list is available to help GNU package maintainers by "
+#| "proofreading English text.  To request proofreading, write to <a href="
+#| "\"mailto:proofreaders@gnu.org\";>proofreaders@gnu.org</a>."
 msgid ""
 "The proofreaders list is available to help GNU package maintainers by "
 "proofreading English text.  To request proofreading, write to <a href="
-"\"mailto:proofreaders@gnu.org\";>proofreaders@gnu.org</a>."
+"\"mailto:proofreaders@gnu.org\";>&lt;proofreaders@gnu.org&gt;</a>."
 msgstr ""
 "A lista de revisores está disponível para ajudar os mantenedores de pacotes 
"
 "GNU revisando o texto em inglês. Para solicitar revisão, escreva para <a "
 "href=\"mailto:proofreaders@gnu.org\";>proofreaders@gnu.org</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Other Teams and Services"
 msgstr "Outras equipes e serviços"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Several other teams facilitate or manage the day-to-day operations within "
 "the GNU Project, or advance specific goals of the project."
@@ -462,11 +502,11 @@
 "Várias outras equipes facilitam ou gerenciam as operações do dia a dia "
 "dentro do Projeto GNU ou promovem objetivos específicos do projeto."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "GNU Advisory Committee"
 msgstr "Comitê Consultivo do GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/contact/gnu-advisory.html\">GNU Advisory Committee</a> (GAC) "
 "exists to provide advice to the Chief GNUisance.  Members of the Advisory "
@@ -480,11 +520,11 @@
 "monitora a saúde do Projeto GNU em nome do Chefe GNUisance e levanta "
 "questões potenciais para discussão."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Savannah Hackers"
 msgstr "Hackers do Savannah"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "<a href=\"//savannah.gnu.org\">Savannah</a> is the GNU Project's software "
 "forge.  It hosts code repositories, bug reporting tools, mailing list "
@@ -502,11 +542,11 @@
 "software GNU seja hospedado corretamente no serviço, os Hackers do Savannah "
 "também avaliam software não GNU que se aplica para ser hospedado na forja."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Webmasters"
 msgstr "Webmasters"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/people/webmeisters.html\">GNU Webmasters</a> maintain and "
 "update the web pages at <a href=\"/\">https://www.gnu.org</a>."
@@ -514,7 +554,7 @@
 "Os <a href=\"/people/webmeisters.html\">Webmasters do GNU</a> mantêm e "
 "atualizam as páginas web em <a href=\"/\">https://www.gnu.org</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Webmasters also answer various kinds of questions sent by the public, "
 "regarding topics such as free software and licenses (when the answer is "
@@ -528,7 +568,7 @@
 "distribuição, avaliam as pessoas que gostariam de se tornar webmasters e "
 "atualizam a lista de espelhos."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The GNU Webmaster Group is led by the&nbsp;<a href=\"mailto:chief-";
 "webmaster@gnu.org\">Chief Webmaster</a> who reports to&nbsp; the Chief "
@@ -540,11 +580,11 @@
 "Novos voluntários são bem-vindos. Consulte o <a href=\"/server/standards/"
 "webmaster-quiz.html\">Questionário de Voluntário a Webmaster</a>."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Web Translators"
 msgstr "Tradutores web"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Each language has a translation team, directed by a team coordinator.  See "
 "<a href=\"/server/standards/README.translations.html\">the Guide to "
@@ -559,11 +599,11 @@
 "translators@gnu.org\">Gerente de Traduções do GNU</a>, que se reporta ao "
 "Chefe GNUisance."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "List Helpers"
 msgstr "Auxiliares de lista"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "<a href=\"//savannah.gnu.org/maintenance/ListHelperAntiSpam/\">Listhelper</"
 "a> is a system for semi-automatically managing spam sent to GNU mailing "
@@ -576,20 +616,26 @@
 "spam, mas moderadores humanos também estão disponíveis para gerenciar a 
fila "
 "de mensagens que se prevê que não sejam spam."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "GNU Volunteer Coordinators"
 msgstr "Coordenadores de Voluntários do GNU"
 
-#. type: Content of: <p>
-msgid ""
-"The GNU Volunteer Coordinators (<a href=\"mailto:gvc@gnu.org\";>gvc@gnu.org</"
-"a>) help to guide new volunteers towards suitable jobs within the GNU Project"
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The GNU Volunteer Coordinators (<a href=\"mailto:gvc@gnu.org\";>gvc@gnu."
+#| "org</a>) help to guide new volunteers towards suitable jobs within the "
+#| "GNU Project"
+msgid ""
+"The GNU Volunteer Coordinators at <a href=\"mailto:gvc@gnu.org\";>&lt;gvc@gnu."
+"org&gt;</a> help to guide new volunteers towards suitable jobs within the "
+"GNU Project"
 msgstr ""
 "Os Coordenadores de Voluntários do GNU (<a href=\"mailto:gvc@gnu.org";
 "\">gvc@gnu.org</a>) ajudam a orientar novos voluntários para trabalhos "
 "adequados dentro do Projeto GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "New GVC volunteers are welcome, but prior experience volunteering within GNU "
 "(and thus broad knowledge of the GNU Project) is highly recommended."
@@ -598,11 +644,11 @@
 "voluntariado no GNU (e, portanto, amplo conhecimento do Projeto GNU) é "
 "altamente recomendado."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "GNU Education Team"
 msgstr "Equipe de Educação do GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/education/\">GNU Education Team</a> promotes the adoption of "
 "the GNU Operating System in educational environments.  It also evaluates "
@@ -612,11 +658,11 @@
 "sistema operacional GNU em ambientes educacionais. Também avalia escolas e "
 "fala com administradores escolares."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "GNU Standards Group"
 msgstr "Grupo de Padrões do GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The GNU Standards Group evaluates proposals to update the GNU coding "
 "standards.  Anyone can submit a proposal via the <a href=\"//lists.gnu.org/"
@@ -636,17 +682,17 @@
 "responsável por instalar as alterações no documento, bem como atualizar o "
 "documento web."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "New volunteers are recruited from existing GNU volunteers when needed."
 msgstr ""
 "Novos voluntários são recrutados de voluntários GNU existentes quando "
 "necessário."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Correcting Errors"
 msgstr "Corrigindo erros"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If we find errors or omissions in this description of the existing "
 "structure, which are possible since it previously had no centralized "
@@ -663,11 +709,11 @@
 "avançando o terceiro número de versão. Manteremos as versões anteriores "
 "disponíveis em <a href=\"/gnu/old-gnu-structure/\">um subdiretório</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Future Changes in Administrative Structure"
 msgstr "Mudanças futuras na estrutura administrativa"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Changes in the GNU Project administrative structure are decided on by the "
 "Chief GNUisance after starting consultations with GNU contributors, usually "
@@ -681,7 +727,7 @@
 "é considerar as alternativas possíveis e antecipar os efeitos bons e ruins "
 "que elas teriam, para tomar uma decisão acertada."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To report changes that are adopted, we will update this document, both the "
 "Org version and the HTML version (see previous section), advancing the first "
@@ -691,6 +737,14 @@
 "versão Org quanto a versão HTML (ver seção anterior), avançando o 
número da "
 "primeira e/ou segunda versão."
 
+#. type: Content of: <div><div><p>
+msgid ""
+"An <a href=\"/gnu/gnu-structure.org\">Org version</a> of this document is "
+"also available."
+msgstr ""
+"Uma <a href=\"/gnu/gnu-structure.org\">versão Org</a> deste documento 
também "
+"está disponível."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -717,14 +771,14 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "A equipe de traduções para o português brasileiro se esforça para 
oferecer "
@@ -732,12 +786,12 @@
 "favor, envie seus comentários e sugestões em geral sobre as traduções 
para "
 "<a href=\"mailto:web-translators@gnu.org\";>&lt;web-translators@gnu.org&gt;</"
 "a>. </p><p>Consulte o <a href=\"/server/standards/README.translations.html"
-"\">Guia para as traduções</a> para mais informações sobre a coordenação 
e o "
-"envio de traduções das páginas deste site."
+"\">Guia para as traduções</a> para mais informações sobre a coordenação 
e a "
+"contribuição com traduções das páginas deste site."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2020 Brandon Invergo and Richard Stallman"
-msgstr "Copyright &copy; 2020 Brandon Invergo e Richard Stallman"
+msgid "Copyright &copy; 2020, 2021 Brandon Invergo and Richard Stallman"
+msgstr "Copyright &copy; 2020, 2021 Brandon Invergo e Richard Stallman"
 
 #. type: Content of: <div><p>
 msgid ""
@@ -761,6 +815,5 @@
 msgid "Updated:"
 msgstr "Última atualização:"
 
-#. type: Content of: <div><p>
-msgid "Copyright &copy; 2020, 2021 Brandon Invergo and Richard Stallman"
-msgstr "Copyright &copy; 2020, 2021 Brandon Invergo e Richard Stallman"
+#~ msgid "Copyright &copy; 2020 Brandon Invergo and Richard Stallman"
+#~ msgstr "Copyright &copy; 2020 Brandon Invergo e Richard Stallman"

Index: po/gnu-structure.ru.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-structure.ru.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- po/gnu-structure.ru.po      2 Nov 2021 12:55:42 -0000       1.4
+++ po/gnu-structure.ru.po      2 Nov 2021 14:41:52 -0000       1.5
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-structure.html\n"
-"POT-Creation-Date: 2020-10-06 08:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2020-07-30 08:12+0000\n"
 "Last-Translator: Ineiev <ineiev@gnu.org>\n"
 "Language-Team: Russian <www-ru-list@gnu.org>\n"
@@ -16,6 +16,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-11-02 14:27+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -25,29 +26,24 @@
 "Структура и администрация проекта GNU - 
Проект GNU - Фонд свободного "
 "программного обеспечения"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "The Structure and Administration of the GNU Project"
 msgstr "Структура и администрация проекта GNU"
 
+#. type: Content of: <div><h3>
+# | [-<strong>Version 1.0.1</strong>-]{+Version 1.0.1+}
+#, fuzzy
+#| msgid "<strong>Version 1.0.1</strong>"
+msgid "Version 1.0.1"
+msgstr "<strong>Версия 1.0.1</strong>"
+
 # type: Content of: <p>
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by Brandon Invergo and Richard Stallman"
 msgstr "Брендон Инверго и Ричард Столмен"
 
-#. type: Content of: <p>
-msgid "<strong>Version 1.0.1</strong>"
-msgstr "<strong>Версия 1.0.1</strong>"
-
 #. type: Content of: <div><p>
 msgid ""
-"An <a href=\"/gnu/gnu-structure.org\">Org version</a> of this document is "
-"also available."
-msgstr ""
-"Есть также версия оригинала этого 
документа <a href=\"/gnu/gnu-structure.org"
-"\">в формате Org</a>."
-
-#. type: Content of: <p>
-msgid ""
 "The GNU Project develops and maintains the <a href=\"/gnu/about-gnu.html"
 "\">GNU operating system</a>.  Through this work, and other related "
 "activities, the GNU Project advocates and promotes <a href=\"/philosophy/"
@@ -60,7 +56,29 @@
 "philosophy/philosophy.html\">свободе программ</a>, 
центральной философии "
 "движения за свободные программы."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | An operating system consists of many software components that together
+# | make a computer do useful jobs.  It includes code for low-level
+# | functionality, such as the kernel and drivers, plus system libraries, as
+# | well as the programs (utilities, tools, applications, and games) that
+# | users explicitly run.  The GNU operating system comprises software across
+# | this entire spectrum.  Many of the programs are specifically developed and
+# | released by the GNU Project; these are termed &ldquo;GNU
+# | [-packages&rdquo;.-] {+packages.&rdquo;+} The GNU system also includes
+# | components that are <a href=\"/philosophy/categories.html\">free
+# | programs</a> released by other developers, outside of the GNU Project.
+#, fuzzy
+#| msgid ""
+#| "An operating system consists of many software components that together "
+#| "make a computer do useful jobs.  It includes code for low-level "
+#| "functionality, such as the kernel and drivers, plus system libraries, as "
+#| "well as the programs (utilities, tools, applications, and games) that "
+#| "users explicitly run.  The GNU operating system comprises software across "
+#| "this entire spectrum.  Many of the programs are specifically developed "
+#| "and released by the GNU Project; these are termed &ldquo;GNU "
+#| "packages&rdquo;.  The GNU system also includes components that are <a "
+#| "href=\"/philosophy/categories.html\">free programs</a> released by other "
+#| "developers, outside of the GNU Project."
 msgid ""
 "An operating system consists of many software components that together make "
 "a computer do useful jobs.  It includes code for low-level functionality, "
@@ -68,9 +86,9 @@
 "programs (utilities, tools, applications, and games) that users explicitly "
 "run.  The GNU operating system comprises software across this entire "
 "spectrum.  Many of the programs are specifically developed and released by "
-"the GNU Project; these are termed &ldquo;GNU packages&rdquo;.  The GNU "
-"system also includes components that are <a href=\"/philosophy/categories."
-"html\">free programs</a> released by other developers, outside of the GNU "
+"the GNU Project; these are termed &ldquo;GNU packages.&rdquo; The GNU system "
+"also includes components that are <a href=\"/philosophy/categories.html"
+"\">free programs</a> released by other developers, outside of the GNU "
 "Project."
 msgstr ""
 "Операционная система состоит из 
множества программных компонентов, 
которые "
@@ -84,7 +102,7 @@
 "представляют собой <a 
href=\"/philosophy/categories.html\">свободные "
 "программы</a>, выпускаемые другими 
разработчиками, вне проекта GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Just as the programs composing an operating system must work together "
 "coherently, the GNU Project must operate coherently.  Most of the work "
@@ -102,7 +120,7 @@
 "образом, на протяжении десятилетий мы 
выработали структуру проекта. Ничто из "
 "этого не ново, но здесь мы впервые 
задокументировали все это в одном месте."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The Free Software Foundation provides many kinds of support (facilities, "
 "services) to the GNU Project.  How that works is outside the scope of this "
@@ -112,11 +130,11 @@
 "поддержку (ресурсы и службы) проекту GNU. 
Описание этой работы выходит за "
 "рамки этого документа."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Software Development Structure"
 msgstr "Структура разработки программ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Most of the GNU Project's activity consists of development of software "
 "packages.  Here is how GNU software development is structured."
@@ -124,11 +142,11 @@
 "Большая часть деятельности проекта GNU 
состоит из разработки пакетов "
 "программ. Здесь представлена структура 
программной разработки GNU."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "The Chief GNUisance"
 msgstr "Главный GNUзотер"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The GNU Project is led by the Chief GNUisance, Richard Stallman, the founder "
 "of the project.  The Chief GNUisance is responsible in principle for all "
@@ -144,7 +162,7 @@
 "GNU, списывает их по мере необходимости и 
назначает для них ответственных "
 "разработчиков."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In practice, the Chief GNUisance delegates many of these decisions and most "
 "of the tasks to others, and only rarely intervenes in the specifics of "
@@ -155,14 +173,36 @@
 "разработки пакетов GNU&nbsp;&mdash; обычно в этом 
случае он вносит какое-то "
 "предложение."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Assistant GNUisances"
 msgstr "Заместители GNUзотера"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | This team, residing at <a
+# | [-href=\"mailto:maintainers@gnu.org\";>maintainers@gnu.org</a>,-]
+# | {+href=\"mailto:maintainers@gnu.org\";>&lt;maintainers@gnu.org&gt;</a>,+}
+# | is available as a first point-of-contact for maintainers of GNU Software. 
+# | They keep track of development activity across the entire project,
+# | ensuring timely releases, checking that the maintainers follow GNU's <a
+# | href=\"/philosophy/\">philosophy</a> and guidelines, and resolving any
+# | conflicts that might arise.  They also handle cases when a maintainer
+# | steps down or when a new volunteer steps up to maintain an existing
+# | package (in which case they can appoint a new maintainer on behalf of the
+# | Chief GNUisance).
+#, fuzzy
+#| msgid ""
+#| "This team, residing at <a href=\"mailto:maintainers@gnu.org";
+#| "\">maintainers@gnu.org</a>, is available as a first point-of-contact for "
+#| "maintainers of GNU Software.  They keep track of development activity "
+#| "across the entire project, ensuring timely releases, checking that the "
+#| "maintainers follow GNU's <a href=\"/philosophy/\">philosophy</a> and "
+#| "guidelines, and resolving any conflicts that might arise.  They also "
+#| "handle cases when a maintainer steps down or when a new volunteer steps "
+#| "up to maintain an existing package (in which case they can appoint a new "
+#| "maintainer on behalf of the Chief GNUisance)."
 msgid ""
-"This team, residing at <a href=\"mailto:maintainers@gnu.org";
-"\">maintainers@gnu.org</a>, is available as a first point-of-contact for "
+"This team, residing at <a href=\"mailto:maintainers@gnu.org\";>&lt;"
+"maintainers@gnu.org&gt;</a>, is available as a first point-of-contact for "
 "maintainers of GNU Software.  They keep track of development activity across "
 "the entire project, ensuring timely releases, checking that the maintainers "
 "follow GNU's <a href=\"/philosophy/\">philosophy</a> and guidelines, and "
@@ -182,7 +222,7 @@
 "новый доброволец (в этом случае они могут 
назначать нового разработчика от "
 "имени главного GNUзотера)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "New members are recruited from existing GNU volunteers when needed.  "
 "However, help is often welcome for specific tasks and interested GNU "
@@ -192,11 +232,11 @@
 "добровольцев GNU. Однако часто для 
определенных работ требуется помощь, и "
 "заинтересованные добровольцы GNU 
приглашаются подключиться к работе."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Package maintainers"
 msgstr "Ответственные разработчики"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Each GNU software package has specific maintainers, appointed by the Chief "
 "GNUisance or the assistant GNUisances.  The package maintainers are "
@@ -209,7 +249,7 @@
 "GNUзотеру, властью которого они 
назначаются и в редких случаях снимаются. "
 "Разработчики отвечают за развитие своих 
пакетов от лица проекта GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The initial appointment of maintainers is done when a program is <a href=\"/"
 "help/evaluation.html\">accepted as a GNU package</a>.  These are normally "
@@ -220,7 +260,7 @@
 "правило, это кто-то из главных 
разработчиков, согласившихся сделать "
 "программу пакетом GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Over time, maintainers occasionally step down.  In some cases, the sole "
 "maintainer steps down from the role, leaving the package unmaintained.  The "
@@ -238,7 +278,7 @@
 "сопровождения</a>. Мы просим старых 
разработчиков рекомендовать себе замену "
 "и с благодарностью рассматриваем их 
предложения."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The maintainers of a package often recruit others to contribute to its "
 "development, and delegate some technical decisions to them.  However, the "
@@ -250,7 +290,7 @@
 "разработчики продолжают осуществлять 
руководство всем пакетом, чтобы у них "
 "была возможность отвечать за пакет перед 
проектом GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A maintainer's primary responsibility is to do a good, practical job of "
 "developing and maintaining the program in accord with the GNU Project's "
@@ -268,7 +308,7 @@
 "обязанностях разработчиков и о том, что 
для программы значит быть пакетом "
 "GNU</a> описаны на странице оценки новых 
пакетов."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In general, maintainers determine the technical directions that the software "
 "packages take and thus they make the day-to-day decisions for the packages.  "
@@ -286,7 +326,7 @@
 "затрагивает непосредственно один или 
более пакетов GNU. Разработчики "
 "соответствующих пакетов обязаны 
исполнять решение от лица проекта GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "More complete information about the specific responsibilities of maintainers "
 "and technical guidance for maintaining GNU software can be found in the <a "
@@ -298,7 +338,7 @@
 "prep/maintain\">Информация для разработчиков 
программ GNU</a> и <a href=\"/"
 "prep/standards\">Стандарты программирования GNU</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We do not require that GNU package maintainers agree with our philosophy, or "
 "approve of our policies&mdash;only to follow them.  Maintainers and "
@@ -311,11 +351,11 @@
 "философию, политику и отдельные 
конкретные решения в своей работе над "
 "программами GNU."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Support for GNU Package Development"
 msgstr "Поддержка разработки пакетов GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Several teams provide various kinds of support to the development and "
 "management of GNU packages.  Most of these teams have a coordinator to "
@@ -330,14 +370,27 @@
 "связаться с <a 
href=\"mailto:gvc@gnu.org\";>координаторами 
добровольцев GNU</"
 "a> для консультации."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Software Evaluation"
 msgstr "Оценка программ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The software evaluation team at <a
+# | [-href=\"mailto:gnueval@gnu.org\";>gnueval@gnu.org</a>-]
+# | {+href=\"mailto:gnueval@gnu.org\";>&lt;gnueval@gnu.org&gt;</a>+} evaluates
+# | software packages proposed as GNU packages.  This involves a careful
+# | assessment of the software's functionality as well as pertinent issues
+# | related to software freedom and how the program fits with the GNU system.
+#, fuzzy
+#| msgid ""
+#| "The software evaluation team at <a href=\"mailto:gnueval@gnu.org";
+#| "\">gnueval@gnu.org</a> evaluates software packages proposed as GNU "
+#| "packages.  This involves a careful assessment of the software's "
+#| "functionality as well as pertinent issues related to software freedom and "
+#| "how the program fits with the GNU system."
 msgid ""
-"The software evaluation team at <a href=\"mailto:gnueval@gnu.org";
-"\">gnueval@gnu.org</a> evaluates software packages proposed as GNU "
+"The software evaluation team at <a href=\"mailto:gnueval@gnu.org\";>&lt;"
+"gnueval@gnu.org&gt;</a> evaluates software packages proposed as GNU "
 "packages.  This involves a careful assessment of the software's "
 "functionality as well as pertinent issues related to software freedom and "
 "how the program fits with the GNU system."
@@ -348,7 +401,7 @@
 "проблем, связанных со свободой программ и 
тем, как программа укладывается в "
 "систему GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "New members are recruited from existing GNU volunteers when needed.  Prior "
 "experience with non-GNU software evaluation on Savannah is preferable."
@@ -357,33 +410,44 @@
 "необходимости. Наличие опыта оценки 
программ, не входящих в GNU, размещаемых "
 "в Саванне, предпочтительно."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Software Security Evaluation"
 msgstr "Оценка защищенности программ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The software security evaluation team at <a
+# | [-href=\"mailto:gnueval-security@gnu.org\";>gnueval-security@gnu.org</a>-]
+# | 
{+href=\"mailto:gnueval-security@gnu.org\";>&lt;gnueval-security@gnu.org&gt;</a>+}
+# | works with the software evaluation team.  They determine whether there are
+# | any security concerns in software that has been offered to GNU.
+#, fuzzy
+#| msgid ""
+#| "The software security evaluation team at <a href=\"mailto:gnueval-";
+#| "security@gnu.org\">gnueval-security@gnu.org</a> works with the software "
+#| "evaluation team.  They determine whether there are any security concerns "
+#| "in software that has been offered to GNU."
 msgid ""
 "The software security evaluation team at <a href=\"mailto:gnueval-";
-"security@gnu.org\">gnueval-security@gnu.org</a> works with the software "
-"evaluation team.  They determine whether there are any security concerns in "
-"software that has been offered to GNU."
+"security@gnu.org\">&lt;gnueval-security@gnu.org&gt;</a> works with the "
+"software evaluation team.  They determine whether there are any security "
+"concerns in software that has been offered to GNU."
 msgstr ""
 "Команда оценки защищенности программ на <a 
href=\"mailto:gnueval-";
 "security@gnu.org\">gnueval-security@gnu.org</a> работает с 
командой оценки "
 "программ. Они определяют, есть ли 
какие-либо проблемы безопасности в "
 "программах, предложенных GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "New members are recruited from existing GNU volunteers when needed."
 msgstr ""
 "Новые члены набираются из существующих 
добровольцев GNU по мере "
 "необходимости."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Security Team"
 msgstr "Команда безопасности"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"mailto:security@gnu.org\";>Security Team</a> helps to resolve "
 "security bugs in a timely fashion.  If the maintainer of a GNU package fails "
@@ -400,11 +464,11 @@
 "Разработчики могут также 
консультироваться с командой безопасности 
по защите "
 "своих пакетов."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Platform Testers"
 msgstr "Испытатели на платформах"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Volunteers behind the <a href=\"//lists.gnu.org/mailman/listinfo/platform-"
 "testers\">platform-testers@gnu.org</a> mailing list test GNU software pre-"
@@ -416,45 +480,62 @@
 "выпуски программ GNU на различных 
аппаратных платформах, чтобы "
 "гарантировать, что программы работают 
правильно."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "New volunteers are welcome."
 msgstr "Новые добровольцы приветствуются."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Mentors"
 msgstr "Наставники"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The GNU Mentors [-(<a
+# | href=\"mailto:mentors@gnu.org\";>mentors@gnu.org</a>)-] {+at <a
+# | href=\"mailto:mentors@gnu.org\";>&lt;mentors@gnu.org&gt;</a>+} volunteer to
+# | provide guidance for new software maintainers.
+#, fuzzy
+#| msgid ""
+#| "The GNU Mentors (<a href=\"mailto:mentors@gnu.org\";>mentors@gnu.org</a>) "
+#| "volunteer to provide guidance for new software maintainers."
 msgid ""
-"The GNU Mentors (<a href=\"mailto:mentors@gnu.org\";>mentors@gnu.org</a>) "
-"volunteer to provide guidance for new software maintainers."
+"The GNU Mentors at <a href=\"mailto:mentors@gnu.org\";>&lt;mentors@gnu.org&gt;"
+"</a> volunteer to provide guidance for new software maintainers."
 msgstr ""
 "Наставники GNU (<a 
href=\"mailto:mentors@gnu.org\";>mentors@gnu.org</a>) "
 "предоставляют консультации новым 
разработчикам программ."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "We ask long-time GNU maintainers to volunteer."
 msgstr "Мы просим присоединяться 
разработчиков GNU с большим опытом."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Proofreaders"
 msgstr "Корректоры"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The proofreaders list is available to help GNU package maintainers by
+# | proofreading English text.  To request proofreading, write to <a
+# | [-href=\"mailto:proofreaders@gnu.org\";>proofreaders@gnu.org</a>.-]
+# | {+href=\"mailto:proofreaders@gnu.org\";>&lt;proofreaders@gnu.org&gt;</a>.+}
+#, fuzzy
+#| msgid ""
+#| "The proofreaders list is available to help GNU package maintainers by "
+#| "proofreading English text.  To request proofreading, write to <a href="
+#| "\"mailto:proofreaders@gnu.org\";>proofreaders@gnu.org</a>."
 msgid ""
 "The proofreaders list is available to help GNU package maintainers by "
 "proofreading English text.  To request proofreading, write to <a href="
-"\"mailto:proofreaders@gnu.org\";>proofreaders@gnu.org</a>."
+"\"mailto:proofreaders@gnu.org\";>&lt;proofreaders@gnu.org&gt;</a>."
 msgstr ""
 "Список рассылки корректоров предлагает 
помощь разработчикам пакетов GNU в "
 "вычитке английского текста. Чтобы 
запросить проверку, пишите на <a href="
 "\"mailto:proofreaders@gnu.org\";>proofreaders@gnu.org</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Other Teams and Services"
 msgstr "Другие команды и службы"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Several other teams facilitate or manage the day-to-day operations within "
 "the GNU Project, or advance specific goals of the project."
@@ -462,11 +543,11 @@
 "Несколько других команд облегчают или 
проводят текущие работы внутри проекта "
 "GNU либо содействуют достижению конкретных 
целей проекта."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "GNU Advisory Committee"
 msgstr "Консультационный комитет GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/contact/gnu-advisory.html\">GNU Advisory Committee</a> (GAC) "
 "exists to provide advice to the Chief GNUisance.  Members of the Advisory "
@@ -480,11 +561,11 @@
 "консультационный комитет наблюдает за 
здоровьем проекта GNU от лица главного "
 "GNUзотера и поднимает в обсуждениях 
потенциальные проблемы."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Savannah Hackers"
 msgstr "Хакеры Саванны"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "<a href=\"//savannah.gnu.org\">Savannah</a> is the GNU Project's software "
 "forge.  It hosts code repositories, bug reporting tools, mailing list "
@@ -503,11 +584,11 @@
 "программы, не входящие в состав пакетов GNU, 
которые запрашивают размещение "
 "в кузнице."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Webmasters"
 msgstr "Вебмастеры"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/people/webmeisters.html\">GNU Webmasters</a> maintain and "
 "update the web pages at <a href=\"/\">https://www.gnu.org</a>."
@@ -515,7 +596,7 @@
 "<a href=\"/people/webmeisters.html\">Вебмастеры GNU</a> 
сопровождают и "
 "обновляют страницы сайта <a 
href=\"/\">https://www.gnu.org</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Webmasters also answer various kinds of questions sent by the public, "
 "regarding topics such as free software and licenses (when the answer is "
@@ -529,7 +610,7 @@
 "дистрибутива, оценивают людей, которые х
отели бы стать вебмастерами, и "
 "обновляют список зеркал."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The GNU Webmaster Group is led by the&nbsp;<a href=\"mailto:chief-";
 "webmaster@gnu.org\">Chief Webmaster</a> who reports to&nbsp; the Chief "
@@ -541,11 +622,11 @@
 "приветствуются. См. <a 
href=\"/server/standards/webmaster-quiz.html"
 "\">Опросник добровольца-вебмастера</a>."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Web Translators"
 msgstr "Переводчики сайта"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Each language has a translation team, directed by a team coordinator.  See "
 "<a href=\"/server/standards/README.translations.html\">the Guide to "
@@ -559,11 +640,11 @@
 "подотчетны <a 
href=\"mailto:web-translators@gnu.org\";>заведующим 
переводами "
 "GNU</a>, которые подотчетны главному 
GNUзотеру."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "List Helpers"
 msgstr "Помощники рассылок"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "<a href=\"//savannah.gnu.org/maintenance/ListHelperAntiSpam/\">Listhelper</"
 "a> is a system for semi-automatically managing spam sent to GNU mailing "
@@ -576,20 +657,30 @@
 "также модераторы-люди для обработки 
очереди сообщений, не отфильтрованных "
 "как спам."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "GNU Volunteer Coordinators"
 msgstr "Координаторы добровольцев GNU"
 
-#. type: Content of: <p>
-msgid ""
-"The GNU Volunteer Coordinators (<a href=\"mailto:gvc@gnu.org\";>gvc@gnu.org</"
-"a>) help to guide new volunteers towards suitable jobs within the GNU Project"
+#. type: Content of: <div><p>
+# | The GNU Volunteer Coordinators [-(<a
+# | href=\"mailto:gvc@gnu.org\";>gvc@gnu.org</a>)-] {+at <a
+# | href=\"mailto:gvc@gnu.org\";>&lt;gvc@gnu.org&gt;</a>+} help to guide new
+# | volunteers towards suitable jobs within the GNU Project
+#, fuzzy
+#| msgid ""
+#| "The GNU Volunteer Coordinators (<a href=\"mailto:gvc@gnu.org\";>gvc@gnu."
+#| "org</a>) help to guide new volunteers towards suitable jobs within the "
+#| "GNU Project"
+msgid ""
+"The GNU Volunteer Coordinators at <a href=\"mailto:gvc@gnu.org\";>&lt;gvc@gnu."
+"org&gt;</a> help to guide new volunteers towards suitable jobs within the "
+"GNU Project"
 msgstr ""
 "Координаторы добровольцев GNU (<a 
href=\"mailto:gvc@gnu.org\";>gvc@gnu.org</"
 "a>) помогают новым добровольцам 
определиться с работами, которые имеются в "
 "проекте GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "New GVC volunteers are welcome, but prior experience volunteering within GNU "
 "(and thus broad knowledge of the GNU Project) is highly recommended."
@@ -598,11 +689,11 @@
 "иметь предварительный опыт работы в GNU (и 
тем самым обширные знания проекта "
 "GNU)."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "GNU Education Team"
 msgstr "Образовательная команда GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/education/\">GNU Education Team</a> promotes the adoption of "
 "the GNU Operating System in educational environments.  It also evaluates "
@@ -612,11 +703,11 @@
 "операционной системы GNU в сфере 
образования. Она также оценивает "
 "образовательные учреждения и ведет 
переговоры с их руководством."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "GNU Standards Group"
 msgstr "Группа стандартов GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The GNU Standards Group evaluates proposals to update the GNU coding "
 "standards.  Anyone can submit a proposal via the <a href=\"//lists.gnu.org/"
@@ -635,17 +726,17 @@
 "GNUзотеру. Группа также отвечает за 
внесение изменений в документ и "
 "обновление документа на сайте."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "New volunteers are recruited from existing GNU volunteers when needed."
 msgstr ""
 "Новые добровольцы набираются из 
существующих добровольцев GNU по мере "
 "необходимости."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Correcting Errors"
 msgstr "Исправление ошибок"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If we find errors or omissions in this description of the existing "
 "structure, which are possible since it previously had no centralized "
@@ -662,11 +753,11 @@
 "HTML</a>, увеличив третий номер версии. Мы 
будем сохранять старые версии в "
 "<a href=\"/gnu/old-gnu-structure/\">подкаталоге</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Future Changes in Administrative Structure"
 msgstr "Будущие изменения в административной 
структуре"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Changes in the GNU Project administrative structure are decided on by the "
 "Chief GNUisance after starting consultations with GNU contributors, usually "
@@ -681,7 +772,7 @@
 "какие хорошие и плохие последствия они 
будут иметь, чтобы принять мудрое "
 "решение."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To report changes that are adopted, we will update this document, both the "
 "Org version and the HTML version (see previous section), advancing the first "
@@ -691,6 +782,14 @@
 "документ, как в формате Org, так и в формате 
HTML (см. предыдущий раздел), "
 "увеличивая первый или второй номер 
версии."
 
+#. type: Content of: <div><div><p>
+msgid ""
+"An <a href=\"/gnu/gnu-structure.org\">Org version</a> of this document is "
+"also available."
+msgstr ""
+"Есть также версия оригинала этого 
документа <a href=\"/gnu/gnu-structure.org"
+"\">в формате Org</a>."
+
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
@@ -718,14 +817,20 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Мы старались сделать этот перевод точным 
и качественным, но исключить "
@@ -737,10 +842,10 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2020 Brandon Invergo and Richard Stallman"
+msgid "Copyright &copy; 2020, 2021 Brandon Invergo and Richard Stallman"
 msgstr ""
-"Copyright &copy; 2020 Brandon Invergo and Richard Stallman<br />Copyright "
-"&copy; 2020 Free Software Foundation, Inc. (translation)"
+"Copyright &copy; 2020, 2021 Brandon Invergo and Richard Stallman<br /"
+">Copyright &copy; 2020, 2021 Free Software Foundation, Inc. (translation)"
 
 #. type: Content of: <div><p>
 msgid ""
@@ -769,8 +874,7 @@
 msgstr "Обновлено:"
 
 # type: Content of: <div><p>
-#. type: Content of: <div><p>
-msgid "Copyright &copy; 2020, 2021 Brandon Invergo and Richard Stallman"
-msgstr ""
-"Copyright &copy; 2020, 2021 Brandon Invergo and Richard Stallman<br /"
-">Copyright &copy; 2020, 2021 Free Software Foundation, Inc. (translation)"
+#~ msgid "Copyright &copy; 2020 Brandon Invergo and Richard Stallman"
+#~ msgstr ""
+#~ "Copyright &copy; 2020 Brandon Invergo and Richard Stallman<br />Copyright "
+#~ "&copy; 2020 Free Software Foundation, Inc. (translation)"

Index: po/gnu-structure.tr.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-structure.tr.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- po/gnu-structure.tr.po      2 Nov 2021 12:55:44 -0000       1.4
+++ po/gnu-structure.tr.po      2 Nov 2021 14:41:52 -0000       1.5
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-structure.html\n"
-"POT-Creation-Date: 2020-10-06 08:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2020-05-03 08:55+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-11-02 14:27+0000\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Poedit 2.3\n"
 
@@ -23,28 +24,22 @@
 "Software Foundation"
 msgstr "GNU Projesi'nin Yapısı ve Yönetimi - GNU Projesi - Özgür 
Yazılım Vakfı"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "The Structure and Administration of the GNU Project"
 msgstr "GNU Projesi'nin Yapısı ve Yönetimi"
 
-#. type: Content of: <address>
+#. type: Content of: <div><h3>
+#, fuzzy
+#| msgid "<strong>Version 1.0.1</strong>"
+msgid "Version 1.0.1"
+msgstr "<strong>Sürüm 1.0.1</strong>"
+
+#. type: Content of: <div><address>
 msgid "by Brandon Invergo and Richard Stallman"
 msgstr "yazanlar Brandon Invergo ve Richard Stallman"
 
-#. type: Content of: <p>
-msgid "<strong>Version 1.0.1</strong>"
-msgstr "<strong>Sürüm 1.0.1</strong>"
-
 #. type: Content of: <div><p>
 msgid ""
-"An <a href=\"/gnu/gnu-structure.org\">Org version</a> of this document is "
-"also available."
-msgstr ""
-"Bu belgenin bir <a href=\"/gnu/gnu-structure.org\">Org sürümü</a> de "
-"mevcuttur."
-
-#. type: Content of: <p>
-msgid ""
 "The GNU Project develops and maintains the <a href=\"/gnu/about-gnu.html"
 "\">GNU operating system</a>.  Through this work, and other related "
 "activities, the GNU Project advocates and promotes <a href=\"/philosophy/"
@@ -56,7 +51,19 @@
 "yoluyla özgür yazılım hareketinin temel felsefesi olan <a 
href=\"/philosophy/"
 "philosophy.html\">yazılım özgürlüğünü</a> destekler ve teşvik eder."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "An operating system consists of many software components that together "
+#| "make a computer do useful jobs.  It includes code for low-level "
+#| "functionality, such as the kernel and drivers, plus system libraries, as "
+#| "well as the programs (utilities, tools, applications, and games) that "
+#| "users explicitly run.  The GNU operating system comprises software across "
+#| "this entire spectrum.  Many of the programs are specifically developed "
+#| "and released by the GNU Project; these are termed &ldquo;GNU "
+#| "packages&rdquo;.  The GNU system also includes components that are <a "
+#| "href=\"/philosophy/categories.html\">free programs</a> released by other "
+#| "developers, outside of the GNU Project."
 msgid ""
 "An operating system consists of many software components that together make "
 "a computer do useful jobs.  It includes code for low-level functionality, "
@@ -64,9 +71,9 @@
 "programs (utilities, tools, applications, and games) that users explicitly "
 "run.  The GNU operating system comprises software across this entire "
 "spectrum.  Many of the programs are specifically developed and released by "
-"the GNU Project; these are termed &ldquo;GNU packages&rdquo;.  The GNU "
-"system also includes components that are <a href=\"/philosophy/categories."
-"html\">free programs</a> released by other developers, outside of the GNU "
+"the GNU Project; these are termed &ldquo;GNU packages.&rdquo; The GNU system "
+"also includes components that are <a href=\"/philosophy/categories.html"
+"\">free programs</a> released by other developers, outside of the GNU "
 "Project."
 msgstr ""
 "Bir işletim sistemi, bir bilgisayarın yararlı işler yapmasını sağlayan 
"
@@ -80,7 +87,7 @@
 "<a href=\"/philosophy/categories.html\">özgür program</a> olan bileşenler 
de "
 "içerir."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Just as the programs composing an operating system must work together "
 "coherently, the GNU Project must operate coherently.  Most of the work "
@@ -98,7 +105,7 @@
 "bir yapı geliştirdik. Hiçbiri yeni değil ama ilk kez hepsini tek bir 
yerde "
 "belgeliyoruz."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The Free Software Foundation provides many kinds of support (facilities, "
 "services) to the GNU Project.  How that works is outside the scope of this "
@@ -108,11 +115,11 @@
 "hizmetler) sağlar. Bu desteklerin nasıl işlediği bu belgenin kapsamı "
 "dışındadır."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Software Development Structure"
 msgstr "Yazılım Geliştirme Yapısı"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Most of the GNU Project's activity consists of development of software "
 "packages.  Here is how GNU software development is structured."
@@ -120,11 +127,11 @@
 "GNU Projesi'nin etkinliklerinin çoğu yazılım paketlerinin 
geliştirilmesinden "
 "oluşmaktadır. GNU'nun yazılım geliştirmesi şu şekilde 
yapılandırılmıştır."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "The Chief GNUisance"
 msgstr "Baş GNUisance"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The GNU Project is led by the Chief GNUisance, Richard Stallman, the founder "
 "of the project.  The Chief GNUisance is responsible in principle for all "
@@ -140,7 +147,7 @@
 "paketlerini GNU paketi olarak adlandırır veya gerektiğinde hizmetten 
çıkarır "
 "ve bakımcıları görevlendirir."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In practice, the Chief GNUisance delegates many of these decisions and most "
 "of the tasks to others, and only rarely intervenes in the specifics of "
@@ -150,14 +157,25 @@
 "başkalarına devreder ve bir GNU paketinin geliştirme özelliklerine 
nadiren "
 "müdahale eder, ve bu genellikle sadece öneri şeklindedir."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Assistant GNUisances"
 msgstr "Yardımcı GNUisance'ler"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "This team, residing at <a href=\"mailto:maintainers@gnu.org";
+#| "\">maintainers@gnu.org</a>, is available as a first point-of-contact for "
+#| "maintainers of GNU Software.  They keep track of development activity "
+#| "across the entire project, ensuring timely releases, checking that the "
+#| "maintainers follow GNU's <a href=\"/philosophy/\">philosophy</a> and "
+#| "guidelines, and resolving any conflicts that might arise.  They also "
+#| "handle cases when a maintainer steps down or when a new volunteer steps "
+#| "up to maintain an existing package (in which case they can appoint a new "
+#| "maintainer on behalf of the Chief GNUisance)."
 msgid ""
-"This team, residing at <a href=\"mailto:maintainers@gnu.org";
-"\">maintainers@gnu.org</a>, is available as a first point-of-contact for "
+"This team, residing at <a href=\"mailto:maintainers@gnu.org\";>&lt;"
+"maintainers@gnu.org&gt;</a>, is available as a first point-of-contact for "
 "maintainers of GNU Software.  They keep track of development activity across "
 "the entire project, ensuring timely releases, checking that the maintainers "
 "follow GNU's <a href=\"/philosophy/\">philosophy</a> and guidelines, and "
@@ -176,7 +194,7 @@
 "geçtiği durumları (bu durumda Baş GNUisance adına yeni bir bakımcı "
 "görevlendirebilirler) da ele alırlar."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "New members are recruited from existing GNU volunteers when needed.  "
 "However, help is often welcome for specific tasks and interested GNU "
@@ -186,11 +204,11 @@
 "birlikte belirli görevler için yardım genellikle kabul edilir ve ilgili 
GNU "
 "gönüllüleri temasa geçebilirler."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Package maintainers"
 msgstr "Paket bakımcıları"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Each GNU software package has specific maintainers, appointed by the Chief "
 "GNUisance or the assistant GNUisances.  The package maintainers are "
@@ -204,7 +222,7 @@
 "GNUisance'ye karşı sorumludur ve GNU Projesi adına üstlendikleri 
paketleri "
 "geliştirmekle yükümlüdürler."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The initial appointment of maintainers is done when a program is <a href=\"/"
 "help/evaluation.html\">accepted as a GNU package</a>.  These are normally "
@@ -214,7 +232,7 @@
 "html\">GNU paketi olarak kabul edildiğinde</a> yapılır. Bunlar normalde "
 "programı bir GNU paketi yapmayı kabul eden ana geliştiricilerden 
bazılarıdır."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Over time, maintainers occasionally step down.  In some cases, the sole "
 "maintainer steps down from the role, leaving the package unmaintained.  The "
@@ -231,7 +249,7 @@
 "paketlerin listesine bakabilirsiniz</a>. Eski bakımcılardan yeni 
bakımcılar "
 "önermelerini istiyoruz ve bu önerileri dikkatle değerlendiriyoruz."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The maintainers of a package often recruit others to contribute to its "
 "development, and delegate some technical decisions to them.  However, the "
@@ -243,7 +261,7 @@
 "bakımcılar, GNU Projesi'ne karşı sorumluluklarını yerine 
getirebilmeleri "
 "için paketin tamamı üzerinde yetki sahibi olurlar."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A maintainer's primary responsibility is to do a good, practical job of "
 "developing and maintaining the program in accord with the GNU Project's "
@@ -261,7 +279,7 @@
 "görevleri ve bir programın GNU paketi olmasının ne anlama geldiğini "
 "okuyabilirsiniz</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In general, maintainers determine the technical directions that the software "
 "packages take and thus they make the day-to-day decisions for the packages.  "
@@ -279,7 +297,7 @@
 "verir. Etkilenen paketlerin sahipleri GNU Projesi adına kararı yürütmekle 
"
 "sorumludur."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "More complete information about the specific responsibilities of maintainers "
 "and technical guidance for maintaining GNU software can be found in the <a "
@@ -291,7 +309,7 @@
 "\">GNU Yazılımı Bakımcıları İçin Bilgiler</a> ve <a 
href=\"/prep/standards"
 "\">GNU Kodlama Standartları</a> belgelerinde bulunabilir."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We do not require that GNU package maintainers agree with our philosophy, or "
 "approve of our policies&mdash;only to follow them.  Maintainers and "
@@ -303,11 +321,11 @@
 "bulunanlar; GNU yazılımı üzerinde yaptıkları çalışmalarda 
felsefemizi, "
 "politikalarımızı ve ara sıra belirli kararlarımızı uygulamalıdır."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Support for GNU Package Development"
 msgstr "GNU Paket Geliştirme için Destek"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Several teams provide various kinds of support to the development and "
 "management of GNU packages.  Most of these teams have a coordinator to "
@@ -321,14 +339,21 @@
 "Baş GNUisance'ye rapor verir. Kuşkuya düşerseniz öneri için <a 
href=\"mailto:";
 "gvc@gnu.org\">GNU Gönüllü Koordinatörleri</a> ile iletişime 
geçebilirsiniz."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Software Evaluation"
 msgstr "Yazılım Değerlendirme"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The software evaluation team at <a href=\"mailto:gnueval@gnu.org";
+#| "\">gnueval@gnu.org</a> evaluates software packages proposed as GNU "
+#| "packages.  This involves a careful assessment of the software's "
+#| "functionality as well as pertinent issues related to software freedom and "
+#| "how the program fits with the GNU system."
 msgid ""
-"The software evaluation team at <a href=\"mailto:gnueval@gnu.org";
-"\">gnueval@gnu.org</a> evaluates software packages proposed as GNU "
+"The software evaluation team at <a href=\"mailto:gnueval@gnu.org\";>&lt;"
+"gnueval@gnu.org&gt;</a> evaluates software packages proposed as GNU "
 "packages.  This involves a careful assessment of the software's "
 "functionality as well as pertinent issues related to software freedom and "
 "how the program fits with the GNU system."
@@ -339,7 +364,7 @@
 "programın GNU sistemine nasıl uyduğu ile ilgili konuların dikkatle "
 "değerlendirilmesini içerir."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "New members are recruited from existing GNU volunteers when needed.  Prior "
 "experience with non-GNU software evaluation on Savannah is preferable."
@@ -348,31 +373,37 @@
 "üzerinde GNU olmayan yazılım değerlendirmesi ile ilgili önceden deneyim "
 "tercih sebebidir."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Software Security Evaluation"
 msgstr "Yazılım Güvenliği Değerlendirmesi"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The software security evaluation team at <a href=\"mailto:gnueval-";
+#| "security@gnu.org\">gnueval-security@gnu.org</a> works with the software "
+#| "evaluation team.  They determine whether there are any security concerns "
+#| "in software that has been offered to GNU."
 msgid ""
 "The software security evaluation team at <a href=\"mailto:gnueval-";
-"security@gnu.org\">gnueval-security@gnu.org</a> works with the software "
-"evaluation team.  They determine whether there are any security concerns in "
-"software that has been offered to GNU."
+"security@gnu.org\">&lt;gnueval-security@gnu.org&gt;</a> works with the "
+"software evaluation team.  They determine whether there are any security "
+"concerns in software that has been offered to GNU."
 msgstr ""
 "<a href=\"mailto:gnueval-security@gnu.org\";>gnueval-security@gnu.org</a> "
 "adresindeki yazılım güvenliği değerlendirme ekibi, yazılım 
değerlendirme "
 "ekibiyle birlikte çalışır. GNU'ya sunulan yazılımda herhangi bir 
güvenlik "
 "sorunu olup olmadığını belirler."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "New members are recruited from existing GNU volunteers when needed."
 msgstr "Gerektiğinde, mevcut GNU gönüllülerinden yeni üyeler alınır."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Security Team"
 msgstr "Güvenlik Ekibi"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"mailto:security@gnu.org\";>Security Team</a> helps to resolve "
 "security bugs in a timely fashion.  If the maintainer of a GNU package fails "
@@ -388,11 +419,11 @@
 "ve paketin onarılmış bir sürümü yayımlanabilir. Bakımcılar ayrıca 
güvenlik "
 "ekibinden paketlerinin güvenliğini sağlama konusunda öneri 
isteyebilirler."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Platform Testers"
 msgstr "Platform Sınayıcıları"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Volunteers behind the <a href=\"//lists.gnu.org/mailman/listinfo/platform-"
 "testers\">platform-testers@gnu.org</a> mailing list test GNU software pre-"
@@ -404,45 +435,54 @@
 "çalıştığından emin olmak için GNU yazılımının farklı donanım "
 "platformlarındaki ön sürümlerini sınarlar."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "New volunteers are welcome."
 msgstr "Yeni gönüllüler bekliyoruz."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Mentors"
 msgstr "Danışmanlar"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The GNU Mentors (<a href=\"mailto:mentors@gnu.org\";>mentors@gnu.org</a>) "
+#| "volunteer to provide guidance for new software maintainers."
 msgid ""
-"The GNU Mentors (<a href=\"mailto:mentors@gnu.org\";>mentors@gnu.org</a>) "
-"volunteer to provide guidance for new software maintainers."
+"The GNU Mentors at <a href=\"mailto:mentors@gnu.org\";>&lt;mentors@gnu.org&gt;"
+"</a> volunteer to provide guidance for new software maintainers."
 msgstr ""
 "GNU Danışmanları (<a href=\"mailto:mentors@gnu.org\";>mentors@gnu.org</a>) "
 "yeni yazılım bakımcılarına kılavuzluk etmeye gönüllüdür."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "We ask long-time GNU maintainers to volunteer."
 msgstr "Uzun süredir GNU bakımcılarından gönüllü olmalarını 
istiyoruz."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Proofreaders"
 msgstr "Düzeltmenler"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The proofreaders list is available to help GNU package maintainers by "
+#| "proofreading English text.  To request proofreading, write to <a href="
+#| "\"mailto:proofreaders@gnu.org\";>proofreaders@gnu.org</a>."
 msgid ""
 "The proofreaders list is available to help GNU package maintainers by "
 "proofreading English text.  To request proofreading, write to <a href="
-"\"mailto:proofreaders@gnu.org\";>proofreaders@gnu.org</a>."
+"\"mailto:proofreaders@gnu.org\";>&lt;proofreaders@gnu.org&gt;</a>."
 msgstr ""
 "Düzeltmenler listesi, İngilizce metinleri düzelterek GNU paketi "
 "bakımcılarına yardımcı olmak için kullanılabilir. Düzeltme istemek 
için <a "
 "href=\"mailto:proofreaders@gnu.org\";>proofreaders@gnu.org</a> adresine 
yazın."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Other Teams and Services"
 msgstr "Diğer Ekipler ve Hizmetler"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Several other teams facilitate or manage the day-to-day operations within "
 "the GNU Project, or advance specific goals of the project."
@@ -450,11 +490,11 @@
 "Diğer birkaç ekip GNU Projesi içindeki günlük işleyişi 
kolaylaştırır, "
 "yönetir veya projenin belirli hedeflerini geliştirir."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "GNU Advisory Committee"
 msgstr "GNU Danışma Kurulu"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/contact/gnu-advisory.html\">GNU Advisory Committee</a> (GAC) "
 "exists to provide advice to the Chief GNUisance.  Members of the Advisory "
@@ -468,11 +508,11 @@
 "Danışma Kurulu genel olarak GNU Projesi adına GNU Projesi'nin 
sağlığını "
 "izler ve olası tartışma konularını gündeme taşır."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Savannah Hackers"
 msgstr "Savannah Hacker'leri"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "<a href=\"//savannah.gnu.org\">Savannah</a> is the GNU Project's software "
 "forge.  It hosts code repositories, bug reporting tools, mailing list "
@@ -491,11 +531,11 @@
 "yanı sıra, yazılım işbirliği platformunda barındırılmak üzere GNU 
olmayan "
 "yazılım başvurularını da değerlendirir."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Webmasters"
 msgstr "Web Yöneticileri"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/people/webmeisters.html\">GNU Webmasters</a> maintain and "
 "update the web pages at <a href=\"/\">https://www.gnu.org</a>."
@@ -504,7 +544,7 @@
 "\">https://www.gnu.org</a> adresindeki web sayfalarının bakımından ve "
 "güncellenmesinden sorumludur."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Webmasters also answer various kinds of questions sent by the public, "
 "regarding topics such as free software and licenses (when the answer is "
@@ -518,7 +558,7 @@
 "değerlendirmek ve yansı listesini güncellemek için isteklerin ilk "
 "filtrelemesini yaparlar."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The GNU Webmaster Group is led by the&nbsp;<a href=\"mailto:chief-";
 "webmaster@gnu.org\">Chief Webmaster</a> who reports to&nbsp; the Chief "
@@ -530,11 +570,11 @@
 "Yeni gönüllüler bekliyoruz. <a 
href=\"/server/standards/webmaster-quiz.html"
 "\">Gönüllü Web Yöneticisi Sınavı</a>'na bakın."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Web Translators"
 msgstr "Web Çevirmenleri"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Each language has a translation team, directed by a team coordinator.  See "
 "<a href=\"/server/standards/README.translations.html\">the Guide to "
@@ -549,11 +589,11 @@
 "veren&nbsp;<a href=\"mailto:web-translators@gnu.org\";>GNU Çevirileri "
 "Yöneticisi</a>'ne&nbsp;rapor verir."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "List Helpers"
 msgstr "Liste Yardımcıları"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "<a href=\"//savannah.gnu.org/maintenance/ListHelperAntiSpam/\">Listhelper</"
 "a> is a system for semi-automatically managing spam sent to GNU mailing "
@@ -566,20 +606,26 @@
 "spam olmadığı tahmin edilen iletilerin kuyruğunu yönetmek için insan "
 "denetleticiler de mevcuttur."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "GNU Volunteer Coordinators"
 msgstr "GNU Gönüllü Koordinatörleri"
 
-#. type: Content of: <p>
-msgid ""
-"The GNU Volunteer Coordinators (<a href=\"mailto:gvc@gnu.org\";>gvc@gnu.org</"
-"a>) help to guide new volunteers towards suitable jobs within the GNU Project"
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The GNU Volunteer Coordinators (<a href=\"mailto:gvc@gnu.org\";>gvc@gnu."
+#| "org</a>) help to guide new volunteers towards suitable jobs within the "
+#| "GNU Project"
+msgid ""
+"The GNU Volunteer Coordinators at <a href=\"mailto:gvc@gnu.org\";>&lt;gvc@gnu."
+"org&gt;</a> help to guide new volunteers towards suitable jobs within the "
+"GNU Project"
 msgstr ""
 "GNU Gönüllü Koordinatörleri (<a href=\"mailto:gvc@gnu.org\";>gvc@gnu.org</"
 "a>), yeni gönüllüleri GNU Projesi içinde uygun işlere yönlendirmeye 
yardımcı "
 "olmaktadır"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "New GVC volunteers are welcome, but prior experience volunteering within GNU "
 "(and thus broad knowledge of the GNU Project) is highly recommended."
@@ -588,11 +634,11 @@
 "bekliyoruz ancak önceden GNU içinde gönüllülük deneyimi olması (ve 
böylece "
 "GNU Projesi hakkında çok geniş bilgi) oldukça önerilir."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "GNU Education Team"
 msgstr "GNU Eğitim Ekibi"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/education/\">GNU Education Team</a> promotes the adoption of "
 "the GNU Operating System in educational environments.  It also evaluates "
@@ -602,11 +648,11 @@
 "İşletim Sistemi'nin benimsenmesini teşvik eder. Ayrıca okulları "
 "değerlendirir ve okul yöneticileriyle konuşur."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "GNU Standards Group"
 msgstr "GNU Standartları Grubu"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The GNU Standards Group evaluates proposals to update the GNU coding "
 "standards.  Anyone can submit a proposal via the <a href=\"//lists.gnu.org/"
@@ -625,15 +671,15 @@
 "bir öneri şeklinde sunarlar. Grup ayrıca belgede değişiklik yapmanın 
yanı "
 "sıra belgeyi web'de güncellemekten de sorumludur."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "New volunteers are recruited from existing GNU volunteers when needed."
 msgstr "Gerektiğinde, mevcut GNU gönüllülerinden yeni üyeler alınır."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Correcting Errors"
 msgstr "Hataları Düzeltme"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If we find errors or omissions in this description of the existing "
 "structure, which are possible since it previously had no centralized "
@@ -650,11 +696,11 @@
 "Eski sürümleri <a href=\"/gnu/old-gnu-structure/\">bir alt dizinde</a> "
 "saklayacağız."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Future Changes in Administrative Structure"
 msgstr "Yönetsel Yapıda Gelecekteki Değişiklikler"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Changes in the GNU Project administrative structure are decided on by the "
 "Chief GNUisance after starting consultations with GNU contributors, usually "
@@ -668,7 +714,7 @@
 "amacı; akıllıca bir karar vermek için olası alternatifleri düşünmek 
ve ne "
 "gibi iyi ve kötü etkileri olacağını öngörmektir."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To report changes that are adopted, we will update this document, both the "
 "Org version and the HTML version (see previous section), advancing the first "
@@ -679,6 +725,14 @@
 "ikinci sürüm numarasını ilerleteceğiz. Eski sürümleri bir alt dizinde "
 "saklayacağız."
 
+#. type: Content of: <div><div><p>
+msgid ""
+"An <a href=\"/gnu/gnu-structure.org\">Org version</a> of this document is "
+"also available."
+msgstr ""
+"Bu belgenin bir <a href=\"/gnu/gnu-structure.org\">Org sürümü</a> de "
+"mevcuttur."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -709,14 +763,19 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Çevirilerimizde bulmuş olabileceğiniz hataları, aklınızdaki soru ve "
@@ -730,8 +789,8 @@
 "\">çalışma&nbsp;sayfamızı</a> ziyaret edebilirsiniz."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2020 Brandon Invergo and Richard Stallman"
-msgstr "Copyright &copy; 2020 Brandon Invergo and Richard Stallman"
+msgid "Copyright &copy; 2020, 2021 Brandon Invergo and Richard Stallman"
+msgstr "Copyright &copy; 2020, 2021 Brandon Invergo and Richard Stallman"
 
 #. type: Content of: <div><p>
 msgid ""
@@ -758,6 +817,5 @@
 msgid "Updated:"
 msgstr "Son Güncelleme:"
 
-#. type: Content of: <div><p>
-msgid "Copyright &copy; 2020, 2021 Brandon Invergo and Richard Stallman"
-msgstr "Copyright &copy; 2020, 2021 Brandon Invergo and Richard Stallman"
+#~ msgid "Copyright &copy; 2020 Brandon Invergo and Richard Stallman"
+#~ msgstr "Copyright &copy; 2020 Brandon Invergo and Richard Stallman"

Index: po/gnu-structure.zh-cn.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-structure.zh-cn.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- po/gnu-structure.zh-cn.po   2 Nov 2021 12:55:44 -0000       1.4
+++ po/gnu-structure.zh-cn.po   2 Nov 2021 14:41:52 -0000       1.5
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-structure.html\n"
-"POT-Creation-Date: 2020-10-06 08:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2020-03-28 22:11+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-11-02 14:27+0000\n"
 "X-Generator: Poedit 1.8.7.1\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
@@ -24,26 +25,22 @@
 "Software Foundation"
 msgstr "GNU 工程的结构和管理 - GNU 工程 - 自由软件基金会"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "The Structure and Administration of the GNU Project"
 msgstr "GNU 工程的结构和管理"
 
-#. type: Content of: <address>
+#. type: Content of: <div><h3>
+#, fuzzy
+#| msgid "<strong>Version 1.0.1</strong>"
+msgid "Version 1.0.1"
+msgstr "<strong>Version 1.0.1</strong>"
+
+#. type: Content of: <div><address>
 msgid "by Brandon Invergo and Richard Stallman"
 msgstr "布兰登·因弗戈与理查德·斯托曼 著"
 
-#. type: Content of: <p>
-msgid "<strong>Version 1.0.1</strong>"
-msgstr "<strong>Version 1.0.1</strong>"
-
 #. type: Content of: <div><p>
 msgid ""
-"An <a href=\"/gnu/gnu-structure.org\">Org version</a> of this document is "
-"also available."
-msgstr "此文件还有一个 <a href=\"/gnu/gnu-structure.org\">旧版</a>。"
-
-#. type: Content of: <p>
-msgid ""
 "The GNU Project develops and maintains the <a href=\"/gnu/about-gnu.html"
 "\">GNU operating system</a>.  Through this work, and other related "
 "activities, the GNU Project advocates and promotes <a href=\"/philosophy/"
@@ -55,7 +52,19 @@
 "软件自由</a>,这也是自由软件运动的核心理念。"
 
 # 这里把 package 翻译成 软件包,可能会好一点。
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "An operating system consists of many software components that together "
+#| "make a computer do useful jobs.  It includes code for low-level "
+#| "functionality, such as the kernel and drivers, plus system libraries, as "
+#| "well as the programs (utilities, tools, applications, and games) that "
+#| "users explicitly run.  The GNU operating system comprises software across "
+#| "this entire spectrum.  Many of the programs are specifically developed "
+#| "and released by the GNU Project; these are termed &ldquo;GNU "
+#| "packages&rdquo;.  The GNU system also includes components that are <a "
+#| "href=\"/philosophy/categories.html\">free programs</a> released by other "
+#| "developers, outside of the GNU Project."
 msgid ""
 "An operating system consists of many software components that together make "
 "a computer do useful jobs.  It includes code for low-level functionality, "
@@ -63,9 +72,9 @@
 "programs (utilities, tools, applications, and games) that users explicitly "
 "run.  The GNU operating system comprises software across this entire "
 "spectrum.  Many of the programs are specifically developed and released by "
-"the GNU Project; these are termed &ldquo;GNU packages&rdquo;.  The GNU "
-"system also includes components that are <a href=\"/philosophy/categories."
-"html\">free programs</a> released by other developers, outside of the GNU "
+"the GNU Project; these are termed &ldquo;GNU packages.&rdquo; The GNU system "
+"also includes components that are <a href=\"/philosophy/categories.html"
+"\">free programs</a> released by other developers, outside of the GNU "
 "Project."
 msgstr ""
 "操作系统由许多软件组件组成,这些组件使计算机å…
±åŒå®Œæˆæœ‰ç”¨çš„工作。它包含用于底"
@@ -73,7 +82,7 @@
 "具、应用程序和游戏)。GNU 操作系统包括全部这个范围内
的软件。许多程序是由 GNU "
 "工程专门开发和发布的;这些被称为“GNU 包”。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Just as the programs composing an operating system must work together "
 "coherently, the GNU Project must operate coherently.  Most of the work "
@@ -88,7 +97,7 @@
 "起,以构成我们希望的 GNU 系统。因此,在过去的几
十年中,我们已经开发了该项目的"
 "结构。此处所列并不是新创造
,而是我们第一次在统一的位置记录下这一切。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The Free Software Foundation provides many kinds of support (facilities, "
 "services) to the GNU Project.  How that works is outside the scope of this "
@@ -97,22 +106,22 @@
 "自由软件基金会为 GNU 
工程提供许多种支持(设施、服务)。å…
¶ä¸­çš„工作方式不在本文"
 "的范围之内。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Software Development Structure"
 msgstr "软件开发结构"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Most of the GNU Project's activity consists of development of software "
 "packages.  Here is how GNU software development is structured."
 msgstr ""
 "GNU 工程的大部分活动都由括软件包的开发构成。下面是 GNU 
软件开发的结构。"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "The Chief GNUisance"
 msgstr "首席 GNUisance"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The GNU Project is led by the Chief GNUisance, Richard Stallman, the founder "
 "of the project.  The Chief GNUisance is responsible in principle for all "
@@ -125,7 +134,7 @@
 "原则上负责所有重大决定,包括总体理念和æ 
‡å‡†ï¼Œå¹¶æŒ‡å¯¼é¡¹ç›®æ¥å®žçŽ°å®ƒä»¬ã€‚首席 "
 "GNUisance 把软件包戏称为 GNU 包,或在必
要时退役并任命他们的维护者。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In practice, the Chief GNUisance delegates many of these decisions and most "
 "of the tasks to others, and only rarely intervenes in the specifics of "
@@ -134,14 +143,25 @@
 "在实践中,首席 GNUisance 
会将许多此类决定和大多数任务委托给他人,并且很少干"
 "预 GNU 软件包的开发细节&mdash;&mdash;通常只是一个建议。"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Assistant GNUisances"
 msgstr "助理 GNUisances"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "This team, residing at <a href=\"mailto:maintainers@gnu.org";
+#| "\">maintainers@gnu.org</a>, is available as a first point-of-contact for "
+#| "maintainers of GNU Software.  They keep track of development activity "
+#| "across the entire project, ensuring timely releases, checking that the "
+#| "maintainers follow GNU's <a href=\"/philosophy/\">philosophy</a> and "
+#| "guidelines, and resolving any conflicts that might arise.  They also "
+#| "handle cases when a maintainer steps down or when a new volunteer steps "
+#| "up to maintain an existing package (in which case they can appoint a new "
+#| "maintainer on behalf of the Chief GNUisance)."
 msgid ""
-"This team, residing at <a href=\"mailto:maintainers@gnu.org";
-"\">maintainers@gnu.org</a>, is available as a first point-of-contact for "
+"This team, residing at <a href=\"mailto:maintainers@gnu.org\";>&lt;"
+"maintainers@gnu.org&gt;</a>, is available as a first point-of-contact for "
 "maintainers of GNU Software.  They keep track of development activity across "
 "the entire project, ensuring timely releases, checking that the maintainers "
 "follow GNU's <a href=\"/philosophy/\">philosophy</a> and guidelines, and "
@@ -156,7 +176,7 @@
 "能出现的任何冲突。他们也处理维护者卸任或新志愿者
自愿维护现有包的情况(在这种"
 "情况下,他们可以代表首席 GNUisance 任命新的维护者)。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "New members are recruited from existing GNU volunteers when needed.  "
 "However, help is often welcome for specific tasks and interested GNU "
@@ -165,11 +185,11 @@
 "新成员在需要时从现有的 GNU 志愿者
中招募。但是,为特定任务提供帮助也是欢迎的,"
 "有兴趣的 GNU 志愿者联系请联系我们。"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Package maintainers"
 msgstr "包维护者"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Each GNU software package has specific maintainers, appointed by the Chief "
 "GNUisance or the assistant GNUisances.  The package maintainers are "
@@ -181,7 +201,7 @@
 "者是对首席 GNUisance 负责的,在å…
¶ç®¡è¾–下被任命并在极少数情况下被解除,他们代"
 "表 GNU 项目负责开发软件包。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The initial appointment of maintainers is done when a program is <a href=\"/"
 "help/evaluation.html\">accepted as a GNU package</a>.  These are normally "
@@ -190,7 +210,7 @@
 "当一个程序被 <a href=\"/help/evaluation.html\">接受为 GNU 包</a> 
时,维护人员"
 "的初始任命就完成了。他们通常是那些同意使该程序成为 
GNU 软件包的主要开发人员。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Over time, maintainers occasionally step down.  In some cases, the sole "
 "maintainer steps down from the role, leaving the package unmaintained.  The "
@@ -205,7 +225,7 @@
 "护者。<a href=\"/server/takeaction.html#unmaint\">请查看当前无
人维护的软件包"
 "列表</a>。我们会让原来的维护者推荐新维护者
,并感谢他们的建议。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The maintainers of a package often recruit others to contribute to its "
 "development, and delegate some technical decisions to them.  However, the "
@@ -216,7 +236,7 @@
 "给他们。但是,维护者保留对整个程序包的主导全,这æ 
·ä»–们就能够履行对 GNU 工程的"
 "责任。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A maintainer's primary responsibility is to do a good, practical job of "
 "developing and maintaining the program in accord with the GNU Project's "
@@ -231,7 +251,7 @@
 "息,<a 
href=\"/help/evaluation.html#whatmeans\">请了解维护人员的基本职责以及"
 "将程序作为 GNU 软件包的含义</a>。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In general, maintainers determine the technical directions that the software "
 "packages take and thus they make the day-to-day decisions for the packages.  "
@@ -246,7 +266,7 @@
 "样做。在少数情况下,首席 GNUisance 
会做出直接影响一个或多个GNU软件包的决定。"
 "受到影响的软件包维护者有义务以 GNU 
工程的名义执行这些决定。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "More complete information about the specific responsibilities of maintainers "
 "and technical guidance for maintaining GNU software can be found in the <a "
@@ -257,7 +277,7 @@
 "href=\"/prep/maintain\">GNU 软件维护者须知</a> 和 <a 
href=\"/prep/standards"
 "\">GNU 代码规范</a> 等文档。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We do not require that GNU package maintainers agree with our philosophy, or "
 "approve of our policies&mdash;only to follow them.  Maintainers and "
@@ -267,11 +287,11 @@
 "我们不要求 GNU 软件包维护者
同意我们的理念或批准我们的政策——只需遵守它们。维护"
 "者和贡献者在为 GNU 软件工作时必
须执行我们的理念、政策和具体决定。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Support for GNU Package Development"
 msgstr "支持 GNU 包的开发"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Several teams provide various kinds of support to the development and "
 "management of GNU packages.  Most of these teams have a coordinator to "
@@ -283,14 +303,21 @@
 "他们;在大多数情
况下,除非另有说明,协调员直接向首席 GNUisance 
汇报。如有疑"
 "问,你可以联系 <a href=\"mailto:gvc@gnu.org\";>GNU 志愿协调员</a> 
来获得建议。"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Software Evaluation"
 msgstr "软件评估"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The software evaluation team at <a href=\"mailto:gnueval@gnu.org";
+#| "\">gnueval@gnu.org</a> evaluates software packages proposed as GNU "
+#| "packages.  This involves a careful assessment of the software's "
+#| "functionality as well as pertinent issues related to software freedom and "
+#| "how the program fits with the GNU system."
 msgid ""
-"The software evaluation team at <a href=\"mailto:gnueval@gnu.org";
-"\">gnueval@gnu.org</a> evaluates software packages proposed as GNU "
+"The software evaluation team at <a href=\"mailto:gnueval@gnu.org\";>&lt;"
+"gnueval@gnu.org&gt;</a> evaluates software packages proposed as GNU "
 "packages.  This involves a careful assessment of the software's "
 "functionality as well as pertinent issues related to software freedom and "
 "how the program fits with the GNU system."
@@ -299,7 +326,7 @@
 "为 GNU 软件包
的软件进行评估。这涉及对该软件的功能、软件自由相å…
³é—®é¢˜ä»¥åŠå®ƒå¦‚何"
 "与 GNU 系统整体适应等方面的认真评价。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "New members are recruited from existing GNU volunteers when needed.  Prior "
 "experience with non-GNU software evaluation on Savannah is preferable."
@@ -307,30 +334,36 @@
 "需要时会从现有的 GNU 志愿者中招募新成员。最好具有在 
Savannah 上进行非 GNU 软"
 "件评估的经验。"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Software Security Evaluation"
 msgstr "软件安全性评估"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The software security evaluation team at <a href=\"mailto:gnueval-";
+#| "security@gnu.org\">gnueval-security@gnu.org</a> works with the software "
+#| "evaluation team.  They determine whether there are any security concerns "
+#| "in software that has been offered to GNU."
 msgid ""
 "The software security evaluation team at <a href=\"mailto:gnueval-";
-"security@gnu.org\">gnueval-security@gnu.org</a> works with the software "
-"evaluation team.  They determine whether there are any security concerns in "
-"software that has been offered to GNU."
+"security@gnu.org\">&lt;gnueval-security@gnu.org&gt;</a> works with the "
+"software evaluation team.  They determine whether there are any security "
+"concerns in software that has been offered to GNU."
 msgstr ""
 "<a href=\"mailto:gnueval-security@gnu.org\";>gnueval-security@gnu.org</a> 
软件"
 "安å…
¨æ€§è¯„估小组和软件评估小组一起工作。他们判断提供给 GNU 
的软件是否存在安全问"
 "题。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "New members are recruited from existing GNU volunteers when needed."
 msgstr "需要时从现有的 GNU 志愿者中招募新成员。"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Security Team"
 msgstr "安全小组"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"mailto:security@gnu.org\";>Security Team</a> helps to resolve "
 "security bugs in a timely fashion.  If the maintainer of a GNU package fails "
@@ -344,11 +377,11 @@
 
"团队。如果它确定问题很紧急,则可以开发补丁程序并发布修复版本。维护è€
…还可以要"
 "求安全团队提供保护其软件包的建议。"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Platform Testers"
 msgstr "平台测试"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Volunteers behind the <a href=\"//lists.gnu.org/mailman/listinfo/platform-"
 "testers\">platform-testers@gnu.org</a> mailing list test GNU software pre-"
@@ -359,54 +392,63 @@
 "testers@gnu.org</a> 邮件列表的志愿者
们在不同的硬件平台上测试 GNU 软件预发行"
 "版,以确保其正常运行。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "New volunteers are welcome."
 msgstr "欢迎新的志愿者。"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Mentors"
 msgstr "导师"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The GNU Mentors (<a href=\"mailto:mentors@gnu.org\";>mentors@gnu.org</a>) "
+#| "volunteer to provide guidance for new software maintainers."
 msgid ""
-"The GNU Mentors (<a href=\"mailto:mentors@gnu.org\";>mentors@gnu.org</a>) "
-"volunteer to provide guidance for new software maintainers."
+"The GNU Mentors at <a href=\"mailto:mentors@gnu.org\";>&lt;mentors@gnu.org&gt;"
+"</a> volunteer to provide guidance for new software maintainers."
 msgstr ""
 "GNU 导师(<a 
href=\"mailto:mentors@gnu.org\";>mentors@gnu.org</a>)自愿为新软"
 "件维护者提供指导。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "We ask long-time GNU maintainers to volunteer."
 msgstr "我们要求 GNU 的长期维护者自愿参加。"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Proofreaders"
 msgstr "校对员"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The proofreaders list is available to help GNU package maintainers by "
+#| "proofreading English text.  To request proofreading, write to <a href="
+#| "\"mailto:proofreaders@gnu.org\";>proofreaders@gnu.org</a>."
 msgid ""
 "The proofreaders list is available to help GNU package maintainers by "
 "proofreading English text.  To request proofreading, write to <a href="
-"\"mailto:proofreaders@gnu.org\";>proofreaders@gnu.org</a>."
+"\"mailto:proofreaders@gnu.org\";>&lt;proofreaders@gnu.org&gt;</a>."
 msgstr ""
 "校对者列表可通过校对英文文本来帮助 GNU 软件包维护者
。请写信给 <a href="
 "\"mailto:proofreaders@gnu.org\";>proofreaders@gnu.org</a> 来请求校对。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Other Teams and Services"
 msgstr "其他小组和服务"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Several other teams facilitate or manage the day-to-day operations within "
 "the GNU Project, or advance specific goals of the project."
 msgstr "其他几个团队支持或管理 GNU 
工程中的日常运作或推进项目的特定目标。"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "GNU Advisory Committee"
 msgstr "GNU 咨询委员会"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/contact/gnu-advisory.html\">GNU Advisory Committee</a> (GAC) "
 "exists to provide advice to the Chief GNUisance.  Members of the Advisory "
@@ -418,11 +460,11 @@
 "首席 GNUisance 提供建议。咨询委员会委员由首席 GNUisance 
任命。咨询委员会通常"
 "代表首席 GNUisance 监视 GNU 
工程的运行状况,并提出潜在的问题进行讨论。"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Savannah Hackers"
 msgstr "Savannah 黑客"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "<a href=\"//savannah.gnu.org\">Savannah</a> is the GNU Project's software "
 "forge.  It hosts code repositories, bug reporting tools, mailing list "
@@ -438,11 +480,11 @@
 "了确保 GNU 软件的正常托管服务之外,Savannah 
黑客还会评估申请托管的非 GNU 软"
 "件。"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Webmasters"
 msgstr "网站管理员"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/people/webmeisters.html\">GNU Webmasters</a> maintain and "
 "update the web pages at <a href=\"/\">https://www.gnu.org</a>."
@@ -450,7 +492,7 @@
 "<a href=\"/people/webmeisters.html\">GNU 网站管理员</a> 维护并更新 
<a href="
 "\"/\">https://www.gnu.org</a> 网页。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Webmasters also answer various kinds of questions sent by the public, "
 "regarding topics such as free software and licenses (when the answer is "
@@ -462,7 +504,7 @@
 "时)。他们对发行版评估的请求进行初步筛选,审æ 
¸æƒ³è¦æˆä¸ºç½‘站管理员的人员,并更"
 "新镜像列表。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The GNU Webmaster Group is led by the&nbsp;<a href=\"mailto:chief-";
 "webmaster@gnu.org\">Chief Webmaster</a> who reports to&nbsp; the Chief "
@@ -473,11 +515,11 @@
 "webmaster@gnu.org\">首席网管</a> 领导。欢迎新的志愿者
。请查看 <a href=\"/"
 "server/standards/webmaster-quiz.html\">网管志愿者测试</a>。"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Web Translators"
 msgstr "网页翻译"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Each language has a translation team, directed by a team coordinator.  See "
 "<a href=\"/server/standards/README.translations.html\">the Guide to "
@@ -490,11 +532,11 @@
 "更多信息。团队协调员报告给向首席 GNUisance 报告的 <a 
href=\"mailto:web-";
 "translators@gnu.org\">GNU 翻译经理</a>。"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "List Helpers"
 msgstr "列表助手"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "<a href=\"//savannah.gnu.org/maintenance/ListHelperAntiSpam/\">Listhelper</"
 "a> is a system for semi-automatically managing spam sent to GNU mailing "
@@ -505,19 +547,25 @@
 "(列表助手)是一个过滤 GNU 
邮件列表中的垃圾邮件的半自动系统。该过滤器会捕获大"
 "部分垃圾邮件,但是还需要人工来处理剩下的邮件队列。"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "GNU Volunteer Coordinators"
 msgstr "GNU 志愿协调员"
 
-#. type: Content of: <p>
-msgid ""
-"The GNU Volunteer Coordinators (<a href=\"mailto:gvc@gnu.org\";>gvc@gnu.org</"
-"a>) help to guide new volunteers towards suitable jobs within the GNU Project"
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The GNU Volunteer Coordinators (<a href=\"mailto:gvc@gnu.org\";>gvc@gnu."
+#| "org</a>) help to guide new volunteers towards suitable jobs within the "
+#| "GNU Project"
+msgid ""
+"The GNU Volunteer Coordinators at <a href=\"mailto:gvc@gnu.org\";>&lt;gvc@gnu."
+"org&gt;</a> help to guide new volunteers towards suitable jobs within the "
+"GNU Project"
 msgstr ""
 "GNU 志愿协调员(<a 
href=\"mailto:gvc@gnu.org\";>gvc@gnu.org</a>)帮助指导新志"
 "愿者在 GNU 工程中从事合适的工作"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "New GVC volunteers are welcome, but prior experience volunteering within GNU "
 "(and thus broad knowledge of the GNU Project) is highly recommended."
@@ -525,11 +573,11 @@
 "欢迎新的 GVC 志愿者,但是强烈建议有 GNU 志愿者
经验的人(因此对 GNU 工程有广泛"
 "了解)担当。"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "GNU Education Team"
 msgstr "GNU 教育小组"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/education/\">GNU Education Team</a> promotes the adoption of "
 "the GNU Operating System in educational environments.  It also evaluates "
@@ -538,11 +586,11 @@
 "<a href=\"/education/\">GNU 教育小组</a> 促进在教育环境中采用 
GNU 操作系统。"
 "它还会评估学校并与学校管理人员对话。"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "GNU Standards Group"
 msgstr "GNU 标准组"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The GNU Standards Group evaluates proposals to update the GNU coding "
 "standards.  Anyone can submit a proposal via the <a href=\"//lists.gnu.org/"
@@ -558,15 +606,15 @@
 "然后,小组讨论并评估该建议,以澄清
所有细节和含义。然后,他们将建议提交给首席 "
 
"GNUisance,由他做出决定。该小组还负责对文档实施更改以及更新网站文档。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "New volunteers are recruited from existing GNU volunteers when needed."
 msgstr "需要时,从现有 GNU 志愿者中招募。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Correcting Errors"
 msgstr "更正错误"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If we find errors or omissions in this description of the existing "
 "structure, which are possible since it previously had no centralized "
@@ -581,11 +629,11 @@
 "<a href=\"/gnu/gnu-structure.html\">HTML 
版本</a>,并提高第三位版本号。老版本"
 "也会放到 <a href=\"/gnu/old-gnu-structure/\">此文件夹</a>。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Future Changes in Administrative Structure"
 msgstr "行政结构的未来变化"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Changes in the GNU Project administrative structure are decided on by the "
 "Chief GNUisance after starting consultations with GNU contributors, usually "
@@ -597,7 +645,7 @@
 "由首席 GNUisance 
做出决定。这些磋商的目的是考虑可能的替代方案,并预测它们可能"
 "带来的好与坏的影响,从而做出明智的决定。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To report changes that are adopted, we will update this document, both the "
 "Org version and the HTML version (see previous section), advancing the first "
@@ -606,6 +654,12 @@
 "我们将通过更新此文档来报告更改是否被采纳,Org 
版文档和 HTML 版文档(参看以"
 "上)都会更新,并提高第一和/或第二位版本号。"
 
+#. type: Content of: <div><div><p>
+msgid ""
+"An <a href=\"/gnu/gnu-structure.org\">Org version</a> of this document is "
+"also available."
+msgstr "此文件还有一个 <a href=\"/gnu/gnu-structure.org\">旧版</a>。"
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -624,9 +678,7 @@
 "联系方法</a> 联系自由软件基金会(FSF)。有关失效链接或å…
¶ä»–错误和建议,请发送邮"
 "件到 <a 
href=\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>。"
 
-#
-#
-#
+# TODO: submitting -> contributing.
 #.  TRANSLATORS: Ignore the original text in this paragraph,
 #.         replace it with the translation of these two:
 #.         We work hard and do our best to provide accurate, good quality
@@ -634,25 +686,27 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
-"我们尽最大努力来提供精准和高质量的翻译,但难å…
ä¼šå­˜åœ¨é”™è¯¯å’Œä¸è¶³ã€‚如果您在这方"
-"面有评论或一般性的建议,请发送至 <a 
href=\"mailto:web-translators@gnu.org";
-"\">&lt;web-translators@gnu.org&gt;</a>。</p><p>å…
³äºŽè¿›è¡Œåè°ƒä¸Žæäº¤ç¿»è¯‘的更多信"
-"息参见 <a href=\"/server/standards/README.translators.html\">《译者
指南》</"
-"a>。"
+"请参考 <a 
href=\"/server/standards/README.translations.html\">翻译说明</a> 了"
+"解有关协调和提交文章翻译的信息。"
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2020 Brandon Invergo and Richard Stallman"
-msgstr "Copyright &copy; 2020 Brandon Invergo and Richard Stallman"
+msgid "Copyright &copy; 2020, 2021 Brandon Invergo and Richard Stallman"
+msgstr "Copyright &copy; 2020, 2021 Brandon Invergo and Richard Stallman"
 
 #. type: Content of: <div><p>
 msgid ""
@@ -678,6 +732,19 @@
 msgid "Updated:"
 msgstr " 最后更新:"
 
-#. type: Content of: <div><p>
-msgid "Copyright &copy; 2020, 2021 Brandon Invergo and Richard Stallman"
-msgstr "Copyright &copy; 2020, 2021 Brandon Invergo and Richard Stallman"
+#
+#
+#
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "我们尽最大努力来提供精准和高质量的翻译,但难å…
ä¼šå­˜åœ¨é”™è¯¯å’Œä¸è¶³ã€‚如果您在这"
+#~ "方面有评论或一般性的建议,请发送至 <a 
href=\"mailto:web-translators@gnu.";
+#~ "org\">&lt;web-translators@gnu.org&gt;</a>。</p><p>å…
³äºŽè¿›è¡Œåè°ƒä¸Žæäº¤ç¿»è¯‘çš„"
+#~ "更多信息参见 <a 
href=\"/server/standards/README.translators.html\">《译者"
+#~ "指南》</a>。"
+
+#~ msgid "Copyright &copy; 2020 Brandon Invergo and Richard Stallman"
+#~ msgstr "Copyright &copy; 2020 Brandon Invergo and Richard Stallman"

Index: 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.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- po/gnu-users-never-heard-of-gnu.ar-diff.html        30 Aug 2021 13:34:53 
-0000      1.11
+++ po/gnu-users-never-heard-of-gnu.ar-diff.html        2 Nov 2021 14:41:52 
-0000       1.12
@@ -12,23 +12,28 @@
 <body><pre>
 &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
+&lt;!-- This page is derived from /server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="gnulinux" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</em></ins></span> --&gt;
+&lt;title&gt;GNU Users Who Have Never Heard <span 
class="removed"><del><strong>of GNU</strong></del></span> <span 
class="inserted"><ins><em>of&nbsp;GNU</em></ins></span>
 - 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="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&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 &lt;a href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;
 
 &lt;div class="announcement"&gt;
   &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</strong></del></span> <span 
class="inserted"><ins><em>of&nbsp;GNU&lt;/h2&gt;
+our</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;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;, 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;.
 &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>
@@ -59,9 +64,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 the first time in
+&lt;p&gt;A person seeing the name &ldquo;GNU&rdquo; for</strong></del></span> 
the <span class="removed"><del><strong>first time in
 &ldquo;GNU/Linux&rdquo; won't immediately associate it with anything.
-However, when people know that</strong></del></span> the <span 
class="removed"><del><strong>system is basically GNU, that brings
+However, when people know that 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.&lt;/p&gt;</strong></del></span> <span class="inserted"><ins><em>ideas GNU 
stands for.&lt;/p&gt;</em></ins></span>
 
@@ -90,10 +95,9 @@
 &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;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</em></ins></span> and <span 
class="removed"><del><strong>community.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>the GNU System&lt;/a&gt;.
 &lt;/p&gt;
-&lt;hr class="no-display" /&gt;
 &lt;/div&gt;
 &lt;/div&gt;</em></ins></span>
 
@@ -156,7 +160,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/08/30 13:34:53 $
+$Date: 2021/11/02 14:41:52 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: 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.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- po/gnu-users-never-heard-of-gnu.ar.po       30 Aug 2021 13:34:53 -0000      
1.39
+++ po/gnu-users-never-heard-of-gnu.ar.po       2 Nov 2021 14:41:52 -0000       
1.40
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-users-never-heard-of-gnu.html\n"
-"POT-Creation-Date: 2021-08-30 13:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2009-09-02 23:02+0200\n"
 "Last-Translator: Hossam Hossny <hossam@gnu.org>\n"
 "Language-Team: Arabic\n"
@@ -24,8 +24,14 @@
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
 #. type: Content of: <title>
+# | GNU Users Who Have Never Heard [-of GNU-] {+of&nbsp;GNU+} - GNU Project -
+# | Free Software Foundation
+#, fuzzy
+#| msgid ""
+#| "GNU Users Who Have Never Heard of GNU - GNU Project - Free Software "
+#| "Foundation"
 msgid ""
-"GNU Users Who Have Never Heard of GNU - GNU Project - Free Software "
+"GNU Users Who Have Never Heard of&nbsp;GNU - GNU Project - Free Software "
 "Foundation"
 msgstr ""
 "مستخدمو غنو الذين لم يسمعوا عنه أبدًا - م
شروع غنو - مؤسسة البرمجيات الحرة"

Index: 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.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- po/gnu-users-never-heard-of-gnu.bg-diff.html        30 Aug 2021 13:34:53 
-0000      1.9
+++ po/gnu-users-never-heard-of-gnu.bg-diff.html        2 Nov 2021 14:41:52 
-0000       1.10
@@ -12,23 +12,28 @@
 <body><pre>
 &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
+&lt;!-- This page is derived from /server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="gnulinux" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</em></ins></span> --&gt;
+&lt;title&gt;GNU Users Who Have Never Heard <span 
class="removed"><del><strong>of GNU</strong></del></span> <span 
class="inserted"><ins><em>of&nbsp;GNU</em></ins></span>
 - 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="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&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 &lt;a href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;
 
 &lt;div class="announcement"&gt;
   &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</strong></del></span> <span 
class="inserted"><ins><em>of&nbsp;GNU&lt;/h2&gt;
+our</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;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;, 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;.
 &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>
@@ -59,9 +64,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 the first time in
+&lt;p&gt;A person seeing the name &ldquo;GNU&rdquo; for</strong></del></span> 
the <span class="removed"><del><strong>first time in
 &ldquo;GNU/Linux&rdquo; won't immediately associate it with anything.
-However, when people know that</strong></del></span> the <span 
class="removed"><del><strong>system is basically GNU, that brings
+However, when people know that 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.&lt;/p&gt;</strong></del></span> <span class="inserted"><ins><em>ideas GNU 
stands for.&lt;/p&gt;</em></ins></span>
 
@@ -90,10 +95,9 @@
 &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;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</em></ins></span> and <span 
class="removed"><del><strong>community.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>the GNU System&lt;/a&gt;.
 &lt;/p&gt;
-&lt;hr class="no-display" /&gt;
 &lt;/div&gt;
 &lt;/div&gt;</em></ins></span>
 
@@ -156,7 +160,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/08/30 13:34:53 $
+$Date: 2021/11/02 14:41:52 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: 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.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- po/gnu-users-never-heard-of-gnu.bg.po       30 Aug 2021 13:34:53 -0000      
1.26
+++ po/gnu-users-never-heard-of-gnu.bg.po       2 Nov 2021 14:41:52 -0000       
1.27
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-users-never-heard-of-gnu.html\n"
-"POT-Creation-Date: 2021-08-30 13:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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"
@@ -19,8 +19,14 @@
 "X-Outdated-Since: 2015-06-02 12:25+0000\n"
 
 #. type: Content of: <title>
+# | GNU Users Who Have Never Heard [-of GNU-] {+of&nbsp;GNU+} - GNU Project -
+# | Free Software Foundation
+#, fuzzy
+#| msgid ""
+#| "GNU Users Who Have Never Heard of GNU - GNU Project - Free Software "
+#| "Foundation"
 msgid ""
-"GNU Users Who Have Never Heard of GNU - GNU Project - Free Software "
+"GNU Users Who Have Never Heard of&nbsp;GNU - GNU Project - Free Software "
 "Foundation"
 msgstr ""
 "Потребители на GNU, които никога не са 
чували за GNU - Проектът GNU - "

Index: po/gnu-users-never-heard-of-gnu.ca-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-users-never-heard-of-gnu.ca-diff.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- po/gnu-users-never-heard-of-gnu.ca-diff.html        29 Oct 2021 13:32:43 
-0000      1.7
+++ po/gnu-users-never-heard-of-gnu.ca-diff.html        2 Nov 2021 14:41:52 
-0000       1.8
@@ -12,13 +12,18 @@
 <body><pre>
 &lt;!--#include <span 
class="removed"><del><strong>virtual="/server/html5-header.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/header.html"</em></ins></span> --&gt;
 &lt;!-- Parent-Version: 1.96 --&gt;
-<span class="inserted"><ins><em>&lt;!-- This page is derived from 
/server/standards/boilerplate.html --&gt;</em></ins></span>
-&lt;title&gt;GNU Users Who Have Never Heard of GNU
+<span class="inserted"><ins><em>&lt;!-- This page is derived from 
/server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="gnulinux" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes" --&gt;</em></ins></span>
+&lt;title&gt;GNU Users Who Have Never Heard <span 
class="removed"><del><strong>of GNU</strong></del></span> <span 
class="inserted"><ins><em>of&nbsp;GNU</em></ins></span>
 - 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 
class="c"&gt;GNU</strong></del></span>
-<span class="inserted"><ins><em>&lt;div class="article reduced-width"&gt;
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&lt;div class="article reduced-width"&gt;
 &lt;h2&gt;GNU</em></ins></span> Users Who Have Never Heard 
of&nbsp;GNU&lt;/h2&gt;
 
 &lt;address <span class="removed"><del><strong>class="byline 
c"&gt;by</strong></del></span> <span 
class="inserted"><ins><em>class="byline"&gt;by</em></ins></span> &lt;a
@@ -83,8 +88,7 @@
 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 
System&lt;/a&gt;.
-&lt;/p&gt;
-&lt;hr class="no-display" /&gt;</em></ins></span>
+&lt;/p&gt;</em></ins></span>
 &lt;/div&gt;
 &lt;/div&gt;
 
@@ -146,7 +150,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/10/29 13:32:43 $
+$Date: 2021/11/02 14:41:52 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: 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.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- po/gnu-users-never-heard-of-gnu.ca.po       30 Aug 2021 13:34:53 -0000      
1.33
+++ po/gnu-users-never-heard-of-gnu.ca.po       2 Nov 2021 14:41:52 -0000       
1.34
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnu-users-never-heard-of-gnu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-30 13:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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"
@@ -19,8 +19,14 @@
 "X-Outdated-Since: 2021-08-30 13:26+0000\n"
 
 #. type: Content of: <title>
+# | GNU Users Who Have Never Heard [-of GNU-] {+of&nbsp;GNU+} - GNU Project -
+# | Free Software Foundation
+#, fuzzy
+#| msgid ""
+#| "GNU Users Who Have Never Heard of GNU - GNU Project - Free Software "
+#| "Foundation"
 msgid ""
-"GNU Users Who Have Never Heard of GNU - GNU Project - Free Software "
+"GNU Users Who Have Never Heard of&nbsp;GNU - GNU Project - Free Software "
 "Foundation"
 msgstr ""
 "Usuaris de GNU que mai no han sentit parlar de GNU - Projecte GNU - Free "

Index: 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.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- po/gnu-users-never-heard-of-gnu.cs-diff.html        30 Aug 2021 13:34:53 
-0000      1.16
+++ po/gnu-users-never-heard-of-gnu.cs-diff.html        2 Nov 2021 14:41:52 
-0000       1.17
@@ -12,23 +12,28 @@
 <body><pre>
 &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
+&lt;!-- This page is derived from /server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="gnulinux" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</em></ins></span> --&gt;
+&lt;title&gt;GNU Users Who Have Never Heard <span 
class="removed"><del><strong>of GNU</strong></del></span> <span 
class="inserted"><ins><em>of&nbsp;GNU</em></ins></span>
 - 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="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&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 &lt;a href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;
 
 &lt;div class="announcement"&gt;
   &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</strong></del></span> <span 
class="inserted"><ins><em>of&nbsp;GNU&lt;/h2&gt;
+our</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;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;, 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;.
 &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>
@@ -59,9 +64,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 the first time in
+&lt;p&gt;A person seeing the name &ldquo;GNU&rdquo; for</strong></del></span> 
the <span class="removed"><del><strong>first time in
 &ldquo;GNU/Linux&rdquo; won't immediately associate it with anything.
-However, when people know that</strong></del></span> the <span 
class="removed"><del><strong>system is basically GNU, that brings
+However, when people know that 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.&lt;/p&gt;</strong></del></span> <span class="inserted"><ins><em>ideas GNU 
stands for.&lt;/p&gt;</em></ins></span>
 
@@ -90,10 +95,9 @@
 &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;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</em></ins></span> and <span 
class="removed"><del><strong>community.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>the GNU System&lt;/a&gt;.
 &lt;/p&gt;
-&lt;hr class="no-display" /&gt;
 &lt;/div&gt;
 &lt;/div&gt;</em></ins></span>
 
@@ -156,7 +160,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/08/30 13:34:53 $
+$Date: 2021/11/02 14:41:52 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: 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.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- po/gnu-users-never-heard-of-gnu.cs.po       30 Aug 2021 13:34:53 -0000      
1.16
+++ po/gnu-users-never-heard-of-gnu.cs.po       2 Nov 2021 14:41:52 -0000       
1.17
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-users-never-heard-of-gnu.html\n"
-"POT-Creation-Date: 2021-08-30 13:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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"
@@ -23,8 +23,14 @@
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. type: Content of: <title>
+# | GNU Users Who Have Never Heard [-of GNU-] {+of&nbsp;GNU+} - GNU Project -
+# | Free Software Foundation
+#, fuzzy
+#| msgid ""
+#| "GNU Users Who Have Never Heard of GNU - GNU Project - Free Software "
+#| "Foundation"
 msgid ""
-"GNU Users Who Have Never Heard of GNU - GNU Project - Free Software "
+"GNU Users Who Have Never Heard of&nbsp;GNU - GNU Project - Free Software "
 "Foundation"
 msgstr ""
 "Uživatelé GNU, kteří nikdy neslyšeli o GNU – Projekt GNU – Nadace 
pro "

Index: po/gnu-users-never-heard-of-gnu.de-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-users-never-heard-of-gnu.de-diff.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- po/gnu-users-never-heard-of-gnu.de-diff.html        29 Oct 2021 13:32:43 
-0000      1.4
+++ po/gnu-users-never-heard-of-gnu.de-diff.html        2 Nov 2021 14:41:52 
-0000       1.5
@@ -12,13 +12,18 @@
 <body><pre>
 &lt;!--#include <span 
class="removed"><del><strong>virtual="/server/html5-header.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/header.html"</em></ins></span> --&gt;
 &lt;!-- Parent-Version: 1.96 --&gt;
-<span class="inserted"><ins><em>&lt;!-- This page is derived from 
/server/standards/boilerplate.html --&gt;</em></ins></span>
-&lt;title&gt;GNU Users Who Have Never Heard of GNU
+<span class="inserted"><ins><em>&lt;!-- This page is derived from 
/server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="gnulinux" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes" --&gt;</em></ins></span>
+&lt;title&gt;GNU Users Who Have Never Heard <span 
class="removed"><del><strong>of GNU</strong></del></span> <span 
class="inserted"><ins><em>of&nbsp;GNU</em></ins></span>
 - 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 
class="c"&gt;GNU</strong></del></span>
-<span class="inserted"><ins><em>&lt;div class="article reduced-width"&gt;
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&lt;div class="article reduced-width"&gt;
 &lt;h2&gt;GNU</em></ins></span> Users Who Have Never Heard 
of&nbsp;GNU&lt;/h2&gt;
 
 &lt;address <span class="removed"><del><strong>class="byline 
c"&gt;by</strong></del></span> <span 
class="inserted"><ins><em>class="byline"&gt;by</em></ins></span> &lt;a
@@ -83,8 +88,7 @@
 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 
System&lt;/a&gt;.
-&lt;/p&gt;
-&lt;hr class="no-display" /&gt;</em></ins></span>
+&lt;/p&gt;</em></ins></span>
 &lt;/div&gt;
 &lt;/div&gt;
 
@@ -146,7 +150,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/10/29 13:32:43 $
+$Date: 2021/11/02 14:41:52 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: 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.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- po/gnu-users-never-heard-of-gnu.de.po       30 Aug 2021 13:34:53 -0000      
1.42
+++ po/gnu-users-never-heard-of-gnu.de.po       2 Nov 2021 14:41:52 -0000       
1.43
@@ -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-08-30 13:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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"
@@ -20,8 +20,14 @@
 "X-Outdated-Since: 2021-08-30 13:26+0000\n"
 
 #. type: Content of: <title>
+# | GNU Users Who Have Never Heard [-of GNU-] {+of&nbsp;GNU+} - GNU Project -
+# | Free Software Foundation
+#, fuzzy
+#| msgid ""
+#| "GNU Users Who Have Never Heard of GNU - GNU Project - Free Software "
+#| "Foundation"
 msgid ""
-"GNU Users Who Have Never Heard of GNU - GNU Project - Free Software "
+"GNU Users Who Have Never Heard of&nbsp;GNU - GNU Project - Free Software "
 "Foundation"
 msgstr ""
 "GNU-Benutzer, die noch nie von GNU gehört haben - GNU-Projekt - Free "

Index: 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.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- po/gnu-users-never-heard-of-gnu.es.po       31 Aug 2021 11:35:28 -0000      
1.49
+++ po/gnu-users-never-heard-of-gnu.es.po       2 Nov 2021 14:41:52 -0000       
1.50
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-users-never-heard-of-gnu\n"
-"POT-Creation-Date: 2021-08-30 13:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2021-08-31 12:55+0200\n"
 "Last-Translator: Javier Fdez. Retenaga <jfrtnaga@gnu.org>\n"
 "Language-Team: Spanish <www-es-general@gnu.org>\n"
@@ -17,12 +17,19 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-11-02 14:27+0000\n"
 "X-Generator: Poedit 2.2.1\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
+# | GNU Users Who Have Never Heard [-of GNU-] {+of&nbsp;GNU+} - GNU Project -
+# | Free Software Foundation
+#, fuzzy
+#| msgid ""
+#| "GNU Users Who Have Never Heard of GNU - GNU Project - Free Software "
+#| "Foundation"
 msgid ""
-"GNU Users Who Have Never Heard of GNU - GNU Project - Free Software "
+"GNU Users Who Have Never Heard of&nbsp;GNU - GNU Project - Free Software "
 "Foundation"
 msgstr ""
 "Usuarios de GNU que nunca han oído hablar de GNU - Proyecto GNU - Free "

Index: 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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- po/gnu-users-never-heard-of-gnu.fa-diff.html        30 Aug 2021 13:34:53 
-0000      1.8
+++ po/gnu-users-never-heard-of-gnu.fa-diff.html        2 Nov 2021 14:41:52 
-0000       1.9
@@ -12,23 +12,28 @@
 <body><pre>
 &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
+&lt;!-- This page is derived from /server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="gnulinux" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</em></ins></span> --&gt;
+&lt;title&gt;GNU Users Who Have Never Heard <span 
class="removed"><del><strong>of GNU</strong></del></span> <span 
class="inserted"><ins><em>of&nbsp;GNU</em></ins></span>
 - 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="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&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 &lt;a href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;
 
 &lt;div class="announcement"&gt;
   &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</strong></del></span> <span 
class="inserted"><ins><em>of&nbsp;GNU&lt;/h2&gt;
+our</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;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;, 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;.
 &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>
@@ -59,9 +64,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 the first time in
+&lt;p&gt;A person seeing the name &ldquo;GNU&rdquo; for</strong></del></span> 
the <span class="removed"><del><strong>first time in
 &ldquo;GNU/Linux&rdquo; won't immediately associate it with anything.
-However, when people know that</strong></del></span> the <span 
class="removed"><del><strong>system is basically GNU, that brings
+However, when people know that 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.&lt;/p&gt;</strong></del></span> <span class="inserted"><ins><em>ideas GNU 
stands for.&lt;/p&gt;</em></ins></span>
 
@@ -90,10 +95,9 @@
 &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;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</em></ins></span> and <span 
class="removed"><del><strong>community.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>the GNU System&lt;/a&gt;.
 &lt;/p&gt;
-&lt;hr class="no-display" /&gt;
 &lt;/div&gt;
 &lt;/div&gt;</em></ins></span>
 
@@ -156,7 +160,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/08/30 13:34:53 $
+$Date: 2021/11/02 14:41:52 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: 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.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- po/gnu-users-never-heard-of-gnu.fa.po       30 Aug 2021 13:34:53 -0000      
1.25
+++ po/gnu-users-never-heard-of-gnu.fa.po       2 Nov 2021 14:41:52 -0000       
1.26
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-users-never-heard-of-gnu.html\n"
-"POT-Creation-Date: 2021-08-30 13:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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"
@@ -18,8 +18,12 @@
 "X-Outdated-Since: 2015-06-02 12:25+0000\n"
 
 #. type: Content of: <title>
+#, fuzzy
+#| msgid ""
+#| "GNU Users Who Have Never Heard of GNU - GNU Project - Free Software "
+#| "Foundation"
 msgid ""
-"GNU Users Who Have Never Heard of GNU - GNU Project - Free Software "
+"GNU Users Who Have Never Heard of&nbsp;GNU - GNU Project - Free Software "
 "Foundation"
 msgstr ""
 "کاربران گنو که هرگز چیزی درباره گنو 
نشنیده‌اند - پروژه گنو - بنیاد "

Index: 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.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- po/gnu-users-never-heard-of-gnu.fr.po       30 Aug 2021 13:48:23 -0000      
1.48
+++ po/gnu-users-never-heard-of-gnu.fr.po       2 Nov 2021 14:41:52 -0000       
1.49
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-users-never-heard-of-gnu.html\n"
-"POT-Creation-Date: 2021-08-30 13:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2021-08-30 15:48+0200\n"
 "Last-Translator: Sogal <sogal AT member.fsf.org>\n"
 "Language-Team: French <trad-gnu@april.org>\n"
@@ -16,11 +16,18 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-11-02 14:27+0000\n"
 "Plural-Forms: \n"
 
 #. type: Content of: <title>
+# | GNU Users Who Have Never Heard [-of GNU-] {+of&nbsp;GNU+} - GNU Project -
+# | Free Software Foundation
+#, fuzzy
+#| msgid ""
+#| "GNU Users Who Have Never Heard of GNU - GNU Project - Free Software "
+#| "Foundation"
 msgid ""
-"GNU Users Who Have Never Heard of GNU - GNU Project - Free Software "
+"GNU Users Who Have Never Heard of&nbsp;GNU - GNU Project - Free Software "
 "Foundation"
 msgstr ""
 "Les utilisateurs de GNU qui n'ont jamais entendu parler de GNU - Projet GNU "

Index: 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.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- po/gnu-users-never-heard-of-gnu.hr-diff.html        30 Aug 2021 13:34:53 
-0000      1.10
+++ po/gnu-users-never-heard-of-gnu.hr-diff.html        2 Nov 2021 14:41:52 
-0000       1.11
@@ -12,23 +12,28 @@
 <body><pre>
 &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
+&lt;!-- This page is derived from /server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="gnulinux" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</em></ins></span> --&gt;
+&lt;title&gt;GNU Users Who Have Never Heard <span 
class="removed"><del><strong>of GNU</strong></del></span> <span 
class="inserted"><ins><em>of&nbsp;GNU</em></ins></span>
 - 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="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&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 &lt;a href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;
 
 &lt;div class="announcement"&gt;
   &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</strong></del></span> <span 
class="inserted"><ins><em>of&nbsp;GNU&lt;/h2&gt;
+our</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;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;, 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;.
 &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>
@@ -59,9 +64,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 the first time in
+&lt;p&gt;A person seeing the name &ldquo;GNU&rdquo; for</strong></del></span> 
the <span class="removed"><del><strong>first time in
 &ldquo;GNU/Linux&rdquo; won't immediately associate it with anything.
-However, when people know that</strong></del></span> the <span 
class="removed"><del><strong>system is basically GNU, that brings
+However, when people know that 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.&lt;/p&gt;</strong></del></span> <span class="inserted"><ins><em>ideas GNU 
stands for.&lt;/p&gt;</em></ins></span>
 
@@ -90,10 +95,9 @@
 &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;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</em></ins></span> and <span 
class="removed"><del><strong>community.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>the GNU System&lt;/a&gt;.
 &lt;/p&gt;
-&lt;hr class="no-display" /&gt;
 &lt;/div&gt;
 &lt;/div&gt;</em></ins></span>
 
@@ -158,7 +162,7 @@
 
 <span class="inserted"><ins><em>&lt;p</em></ins></span> 
class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/08/30 13:34:53 $
+$Date: 2021/11/02 14:41:52 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: 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.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- po/gnu-users-never-heard-of-gnu.hr.po       30 Aug 2021 13:34:53 -0000      
1.15
+++ po/gnu-users-never-heard-of-gnu.hr.po       2 Nov 2021 14:41:52 -0000       
1.16
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-users-never-heard-of-gnu.html\n"
-"POT-Creation-Date: 2021-08-30 13:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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"
@@ -20,8 +20,14 @@
 "X-Generator: Poedit 1.5.4\n"
 
 #. type: Content of: <title>
+# | GNU Users Who Have Never Heard [-of GNU-] {+of&nbsp;GNU+} - GNU Project -
+# | Free Software Foundation
+#, fuzzy
+#| msgid ""
+#| "GNU Users Who Have Never Heard of GNU - GNU Project - Free Software "
+#| "Foundation"
 msgid ""
-"GNU Users Who Have Never Heard of GNU - GNU Project - Free Software "
+"GNU Users Who Have Never Heard of&nbsp;GNU - GNU Project - Free Software "
 "Foundation"
 msgstr ""
 "Korisnici GNU-a koji nisu nikada čuli za GNU - Projekt GNU - Zaklada za "

Index: po/gnu-users-never-heard-of-gnu.it-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-users-never-heard-of-gnu.it-diff.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- po/gnu-users-never-heard-of-gnu.it-diff.html        29 Oct 2021 13:32:43 
-0000      1.2
+++ po/gnu-users-never-heard-of-gnu.it-diff.html        2 Nov 2021 14:41:52 
-0000       1.3
@@ -12,13 +12,18 @@
 <body><pre>
 &lt;!--#include <span 
class="removed"><del><strong>virtual="/server/html5-header.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/header.html"</em></ins></span> --&gt;
 &lt;!-- Parent-Version: 1.96 --&gt;
-<span class="inserted"><ins><em>&lt;!-- This page is derived from 
/server/standards/boilerplate.html --&gt;</em></ins></span>
-&lt;title&gt;GNU Users Who Have Never Heard of GNU
+<span class="inserted"><ins><em>&lt;!-- This page is derived from 
/server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="gnulinux" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes" --&gt;</em></ins></span>
+&lt;title&gt;GNU Users Who Have Never Heard <span 
class="removed"><del><strong>of GNU</strong></del></span> <span 
class="inserted"><ins><em>of&nbsp;GNU</em></ins></span>
 - 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 
class="c"&gt;GNU</strong></del></span>
-<span class="inserted"><ins><em>&lt;div class="article reduced-width"&gt;
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&lt;div class="article reduced-width"&gt;
 &lt;h2&gt;GNU</em></ins></span> Users Who Have Never Heard 
of&nbsp;GNU&lt;/h2&gt;
 
 &lt;address <span class="removed"><del><strong>class="byline 
c"&gt;by</strong></del></span> <span 
class="inserted"><ins><em>class="byline"&gt;by</em></ins></span> &lt;a
@@ -83,8 +88,7 @@
 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 
System&lt;/a&gt;.
-&lt;/p&gt;
-&lt;hr class="no-display" /&gt;</em></ins></span>
+&lt;/p&gt;</em></ins></span>
 &lt;/div&gt;
 &lt;/div&gt;
 
@@ -146,7 +150,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/10/29 13:32:43 $
+$Date: 2021/11/02 14:41:52 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: 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.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- po/gnu-users-never-heard-of-gnu.it.po       30 Aug 2021 13:34:53 -0000      
1.24
+++ po/gnu-users-never-heard-of-gnu.it.po       2 Nov 2021 14:41:52 -0000       
1.25
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-users-never-heard-of-gnu.html\n"
-"POT-Creation-Date: 2021-08-30 13:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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"
@@ -20,8 +20,14 @@
 "X-Generator: Poedit 2.0.3\n"
 
 #. type: Content of: <title>
+# | GNU Users Who Have Never Heard [-of GNU-] {+of&nbsp;GNU+} - GNU Project -
+# | Free Software Foundation
+#, fuzzy
+#| msgid ""
+#| "GNU Users Who Have Never Heard of GNU - GNU Project - Free Software "
+#| "Foundation"
 msgid ""
-"GNU Users Who Have Never Heard of GNU - GNU Project - Free Software "
+"GNU Users Who Have Never Heard of&nbsp;GNU - GNU Project - Free Software "
 "Foundation"
 msgstr ""
 "Utenti GNU che non hanno mai sentito parlare di GNU - Progetto GNU - Free "

Index: 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.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- po/gnu-users-never-heard-of-gnu.ja.po       31 Aug 2021 02:39:09 -0000      
1.29
+++ po/gnu-users-never-heard-of-gnu.ja.po       2 Nov 2021 14:41:52 -0000       
1.30
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-users-never-heard-of-gnu.html\n"
-"POT-Creation-Date: 2021-08-30 13:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2021-08-31 10:09+0900\n"
 "Last-Translator: NIIBE Yutaka <gniibe@fsij.org>\n"
 "Language-Team: Japanese <web-translators-ja@gnu.org>\n"
@@ -15,10 +15,15 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-11-02 14:27+0000\n"
 
 #. type: Content of: <title>
+#, fuzzy
+#| msgid ""
+#| "GNU Users Who Have Never Heard of GNU - GNU Project - Free Software "
+#| "Foundation"
 msgid ""
-"GNU Users Who Have Never Heard of GNU - GNU Project - Free Software "
+"GNU Users Who Have Never Heard of&nbsp;GNU - GNU Project - Free Software "
 "Foundation"
 msgstr ""
 "GNUについてまったく聞いたことのないGNUユーザ - 
GNUプロジェクト - フリーソフト"

Index: 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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- po/gnu-users-never-heard-of-gnu.ml-diff.html        30 Aug 2021 13:34:53 
-0000      1.8
+++ po/gnu-users-never-heard-of-gnu.ml-diff.html        2 Nov 2021 14:41:52 
-0000       1.9
@@ -12,23 +12,28 @@
 <body><pre>
 &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
+&lt;!-- This page is derived from /server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="gnulinux" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</em></ins></span> --&gt;
+&lt;title&gt;GNU Users Who Have Never Heard <span 
class="removed"><del><strong>of GNU</strong></del></span> <span 
class="inserted"><ins><em>of&nbsp;GNU</em></ins></span>
 - 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="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&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 &lt;a href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;
 
 &lt;div class="announcement"&gt;
   &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</strong></del></span> <span 
class="inserted"><ins><em>of&nbsp;GNU&lt;/h2&gt;
+our</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;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;, 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;.
 &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>
@@ -59,9 +64,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 the first time in
+&lt;p&gt;A person seeing the name &ldquo;GNU&rdquo; for</strong></del></span> 
the <span class="removed"><del><strong>first time in
 &ldquo;GNU/Linux&rdquo; won't immediately associate it with anything.
-However, when people know that</strong></del></span> the <span 
class="removed"><del><strong>system is basically GNU, that brings
+However, when people know that 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.&lt;/p&gt;</strong></del></span> <span class="inserted"><ins><em>ideas GNU 
stands for.&lt;/p&gt;</em></ins></span>
 
@@ -90,10 +95,9 @@
 &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;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</em></ins></span> and <span 
class="removed"><del><strong>community.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>the GNU System&lt;/a&gt;.
 &lt;/p&gt;
-&lt;hr class="no-display" /&gt;
 &lt;/div&gt;
 &lt;/div&gt;</em></ins></span>
 
@@ -156,7 +160,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/08/30 13:34:53 $
+$Date: 2021/11/02 14:41:52 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: 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.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- po/gnu-users-never-heard-of-gnu.ml.po       30 Aug 2021 13:34:54 -0000      
1.31
+++ po/gnu-users-never-heard-of-gnu.ml.po       2 Nov 2021 14:41:52 -0000       
1.32
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-users-never-heard-of-gnu.html\n"
-"POT-Creation-Date: 2021-08-30 13:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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"
@@ -20,8 +20,14 @@
 "X-Outdated-Since: 2015-06-02 12:25+0000\n"
 
 #. type: Content of: <title>
+# | GNU Users Who Have Never Heard [-of GNU-] {+of&nbsp;GNU+} - GNU Project -
+# | Free Software Foundation
+#, fuzzy
+#| msgid ""
+#| "GNU Users Who Have Never Heard of GNU - GNU Project - Free Software "
+#| "Foundation"
 msgid ""
-"GNU Users Who Have Never Heard of GNU - GNU Project - Free Software "
+"GNU Users Who Have Never Heard of&nbsp;GNU - GNU Project - Free Software "
 "Foundation"
 msgstr ""
 "ഗ്നുവിനെപ്പറ്റി 
കേള്‍ക്കാത്ത ഗ്നു 
ഉപയോക്താക്കള്‍ - ഗ്നു സംരംഭം - 
സ്വതന്ത്രസോഫ്റ്റ്‌വെയര്‍ 
പ്രസ്ഥാനം"

Index: po/gnu-users-never-heard-of-gnu.nl-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-users-never-heard-of-gnu.nl-diff.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- po/gnu-users-never-heard-of-gnu.nl-diff.html        29 Oct 2021 13:32:43 
-0000      1.11
+++ po/gnu-users-never-heard-of-gnu.nl-diff.html        2 Nov 2021 14:41:52 
-0000       1.12
@@ -12,13 +12,18 @@
 <body><pre>
 &lt;!--#include <span 
class="removed"><del><strong>virtual="/server/html5-header.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/header.html"</em></ins></span> --&gt;
 &lt;!-- Parent-Version: 1.96 --&gt;
-<span class="inserted"><ins><em>&lt;!-- This page is derived from 
/server/standards/boilerplate.html --&gt;</em></ins></span>
-&lt;title&gt;GNU Users Who Have Never Heard of GNU
+<span class="inserted"><ins><em>&lt;!-- This page is derived from 
/server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="gnulinux" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes" --&gt;</em></ins></span>
+&lt;title&gt;GNU Users Who Have Never Heard <span 
class="removed"><del><strong>of GNU</strong></del></span> <span 
class="inserted"><ins><em>of&nbsp;GNU</em></ins></span>
 - 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 
class="c"&gt;GNU</strong></del></span>
-<span class="inserted"><ins><em>&lt;div class="article reduced-width"&gt;
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&lt;div class="article reduced-width"&gt;
 &lt;h2&gt;GNU</em></ins></span> Users Who Have Never Heard 
of&nbsp;GNU&lt;/h2&gt;
 
 &lt;address <span class="removed"><del><strong>class="byline 
c"&gt;by</strong></del></span> <span 
class="inserted"><ins><em>class="byline"&gt;by</em></ins></span> &lt;a
@@ -83,8 +88,7 @@
 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 
System&lt;/a&gt;.
-&lt;/p&gt;
-&lt;hr class="no-display" /&gt;</em></ins></span>
+&lt;/p&gt;</em></ins></span>
 &lt;/div&gt;
 &lt;/div&gt;
 
@@ -146,7 +150,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/10/29 13:32:43 $
+$Date: 2021/11/02 14:41:52 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: 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.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- po/gnu-users-never-heard-of-gnu.nl.po       30 Aug 2021 13:34:54 -0000      
1.23
+++ po/gnu-users-never-heard-of-gnu.nl.po       2 Nov 2021 14:41:52 -0000       
1.24
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-users-never-heard-of-gnu.html\n"
-"POT-Creation-Date: 2021-08-30 13:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Justin van Steijn <jvs@fsfe.org>\n"
 "Language-Team: Dutch\n"
@@ -20,8 +20,14 @@
 "X-Generator: Poedit 1.8.11\n"
 
 #. type: Content of: <title>
+# | GNU Users Who Have Never Heard [-of GNU-] {+of&nbsp;GNU+} - GNU Project -
+# | Free Software Foundation
+#, fuzzy
+#| msgid ""
+#| "GNU Users Who Have Never Heard of GNU - GNU Project - Free Software "
+#| "Foundation"
 msgid ""
-"GNU Users Who Have Never Heard of GNU - GNU Project - Free Software "
+"GNU Users Who Have Never Heard of&nbsp;GNU - GNU Project - Free Software "
 "Foundation"
 msgstr ""
 "GNU-gebruikers die nog nooit van GNU gehoord hebben - GNU-project - Free "

Index: po/gnu-users-never-heard-of-gnu.pl-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-users-never-heard-of-gnu.pl-diff.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- po/gnu-users-never-heard-of-gnu.pl-diff.html        29 Oct 2021 13:32:43 
-0000      1.4
+++ po/gnu-users-never-heard-of-gnu.pl-diff.html        2 Nov 2021 14:41:52 
-0000       1.5
@@ -12,13 +12,18 @@
 <body><pre>
 &lt;!--#include <span 
class="removed"><del><strong>virtual="/server/html5-header.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/header.html"</em></ins></span> --&gt;
 &lt;!-- Parent-Version: 1.96 --&gt;
-<span class="inserted"><ins><em>&lt;!-- This page is derived from 
/server/standards/boilerplate.html --&gt;</em></ins></span>
-&lt;title&gt;GNU Users Who Have Never Heard of GNU
+<span class="inserted"><ins><em>&lt;!-- This page is derived from 
/server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="gnulinux" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes" --&gt;</em></ins></span>
+&lt;title&gt;GNU Users Who Have Never Heard <span 
class="removed"><del><strong>of GNU</strong></del></span> <span 
class="inserted"><ins><em>of&nbsp;GNU</em></ins></span>
 - 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 
class="c"&gt;GNU</strong></del></span>
-<span class="inserted"><ins><em>&lt;div class="article reduced-width"&gt;
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&lt;div class="article reduced-width"&gt;
 &lt;h2&gt;GNU</em></ins></span> Users Who Have Never Heard 
of&nbsp;GNU&lt;/h2&gt;
 
 &lt;address <span class="removed"><del><strong>class="byline 
c"&gt;by</strong></del></span> <span 
class="inserted"><ins><em>class="byline"&gt;by</em></ins></span> &lt;a
@@ -83,8 +88,7 @@
 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 
System&lt;/a&gt;.
-&lt;/p&gt;
-&lt;hr class="no-display" /&gt;</em></ins></span>
+&lt;/p&gt;</em></ins></span>
 &lt;/div&gt;
 &lt;/div&gt;
 
@@ -146,7 +150,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/10/29 13:32:43 $
+$Date: 2021/11/02 14:41:52 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: 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.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- po/gnu-users-never-heard-of-gnu.pl.po       30 Aug 2021 13:34:54 -0000      
1.30
+++ po/gnu-users-never-heard-of-gnu.pl.po       2 Nov 2021 14:41:52 -0000       
1.31
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-30 13:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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"
@@ -23,8 +23,14 @@
 "X-Generator: Virtaal 0.7.1\n"
 
 #. type: Content of: <title>
+# | GNU Users Who Have Never Heard [-of GNU-] {+of&nbsp;GNU+} - GNU Project -
+# | Free Software Foundation
+#, fuzzy
+#| msgid ""
+#| "GNU Users Who Have Never Heard of GNU - GNU Project - Free Software "
+#| "Foundation"
 msgid ""
-"GNU Users Who Have Never Heard of GNU - GNU Project - Free Software "
+"GNU Users Who Have Never Heard of&nbsp;GNU - GNU Project - Free Software "
 "Foundation"
 msgstr ""
 "Użytkownicy GNU, którzy nigdy o GNU nie słyszeli - Projekt GNU - Fundacja "

Index: 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.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- po/gnu-users-never-heard-of-gnu.pot 30 Aug 2021 13:34:54 -0000      1.20
+++ po/gnu-users-never-heard-of-gnu.pot 2 Nov 2021 14:41:52 -0000       1.21
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-users-never-heard-of-gnu.html\n"
-"POT-Creation-Date: 2021-08-30 13:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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"
@@ -18,7 +18,7 @@
 
 #. type: Content of: <title>
 msgid ""
-"GNU Users Who Have Never Heard of GNU - GNU Project - Free Software "
+"GNU Users Who Have Never Heard of&nbsp;GNU - GNU Project - Free Software "
 "Foundation"
 msgstr ""
 

Index: 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.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- po/gnu-users-never-heard-of-gnu.pt-br.po    5 Sep 2021 15:33:44 -0000       
1.21
+++ po/gnu-users-never-heard-of-gnu.pt-br.po    2 Nov 2021 14:41:52 -0000       
1.22
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-users-never-heard-of-gnu.html\n"
-"POT-Creation-Date: 2021-08-30 13:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2021-09-05 12:04-0300\n"
 "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
 "Language-Team: Brazilian Portuguese <www-pt-br-general@gnu.org>\n"
@@ -16,12 +16,17 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-11-02 14:27+0000\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "X-Generator: Gtranslator 40.0\n"
 
 #. type: Content of: <title>
+#, fuzzy
+#| msgid ""
+#| "GNU Users Who Have Never Heard of GNU - GNU Project - Free Software "
+#| "Foundation"
 msgid ""
-"GNU Users Who Have Never Heard of GNU - GNU Project - Free Software "
+"GNU Users Who Have Never Heard of&nbsp;GNU - GNU Project - Free Software "
 "Foundation"
 msgstr ""
 "Usuários do GNU que nunca ouviram falar do GNU - Projeto GNU - Free Software 
"

Index: 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.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- po/gnu-users-never-heard-of-gnu.ru.po       30 Aug 2021 14:04:42 -0000      
1.39
+++ po/gnu-users-never-heard-of-gnu.ru.po       2 Nov 2021 14:41:52 -0000       
1.40
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-users-never-heard-of-gnu\n"
-"POT-Creation-Date: 2021-08-30 13:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2021-08-30 17:17+0000\n"
 "Last-Translator: Ineiev <ineiev@gnu.org>\n"
 "Language-Team: Russian <www-ru-list@gnu.org>\n"
@@ -14,12 +14,19 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-11-02 14:27+0000\n"
 "X-Poedit-Language: Russian\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
+# | GNU Users Who Have Never Heard [-of GNU-] {+of&nbsp;GNU+} - GNU Project -
+# | Free Software Foundation
+#, fuzzy
+#| msgid ""
+#| "GNU Users Who Have Never Heard of GNU - GNU Project - Free Software "
+#| "Foundation"
 msgid ""
-"GNU Users Who Have Never Heard of GNU - GNU Project - Free Software "
+"GNU Users Who Have Never Heard of&nbsp;GNU - GNU Project - Free Software "
 "Foundation"
 msgstr ""
 "Пользователи GNU, которые никогда не 
слышали о GNU - Проект GNU - Фонд "

Index: 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.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- po/gnu-users-never-heard-of-gnu.sq.po       5 Sep 2021 12:01:36 -0000       
1.53
+++ po/gnu-users-never-heard-of-gnu.sq.po       2 Nov 2021 14:41:52 -0000       
1.54
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2021-08-30 13:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2021-09-05 14:48+0300\n"
 "Last-Translator: Besnik Bleta <besnik@programeshqip.org>\n"
 "Language-Team: Shqip <besnik@programeshqip.org>\n"
@@ -14,12 +14,17 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-11-02 14:27+0000\n"
 "X-Generator: Poedit 2.4.2\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
+#, fuzzy
+#| msgid ""
+#| "GNU Users Who Have Never Heard of GNU - GNU Project - Free Software "
+#| "Foundation"
 msgid ""
-"GNU Users Who Have Never Heard of GNU - GNU Project - Free Software "
+"GNU Users Who Have Never Heard of&nbsp;GNU - GNU Project - Free Software "
 "Foundation"
 msgstr ""
 "Përdorues të GNU-së Që Nuk Kanë Dëgjuar Kurrë për GNU-në - Projekti 
GNU - "

Index: 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.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- po/gnu-users-never-heard-of-gnu.sr-diff.html        30 Aug 2021 13:34:54 
-0000      1.11
+++ po/gnu-users-never-heard-of-gnu.sr-diff.html        2 Nov 2021 14:41:52 
-0000       1.12
@@ -12,23 +12,28 @@
 <body><pre>
 &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
+&lt;!-- This page is derived from /server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="gnulinux" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</em></ins></span> --&gt;
+&lt;title&gt;GNU Users Who Have Never Heard <span 
class="removed"><del><strong>of GNU</strong></del></span> <span 
class="inserted"><ins><em>of&nbsp;GNU</em></ins></span>
 - 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="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&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 &lt;a href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;
 
 &lt;div class="announcement"&gt;
   &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</strong></del></span> <span 
class="inserted"><ins><em>of&nbsp;GNU&lt;/h2&gt;
+our</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;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;, 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;.
 &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>
@@ -59,9 +64,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 the first time in
+&lt;p&gt;A person seeing the name &ldquo;GNU&rdquo; for</strong></del></span> 
the <span class="removed"><del><strong>first time in
 &ldquo;GNU/Linux&rdquo; won't immediately associate it with anything.
-However, when people know that</strong></del></span> the <span 
class="removed"><del><strong>system is basically GNU, that brings
+However, when people know that 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.&lt;/p&gt;</strong></del></span> <span class="inserted"><ins><em>ideas GNU 
stands for.&lt;/p&gt;</em></ins></span>
 
@@ -90,10 +95,9 @@
 &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;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</em></ins></span> and <span 
class="removed"><del><strong>community.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>the GNU System&lt;/a&gt;.
 &lt;/p&gt;
-&lt;hr class="no-display" /&gt;
 &lt;/div&gt;
 &lt;/div&gt;</em></ins></span>
 
@@ -156,7 +160,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/08/30 13:34:54 $
+$Date: 2021/11/02 14:41:52 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: 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.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- po/gnu-users-never-heard-of-gnu.sr.po       30 Aug 2021 13:34:54 -0000      
1.28
+++ po/gnu-users-never-heard-of-gnu.sr.po       2 Nov 2021 14:41:52 -0000       
1.29
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-users-never-heard-of-gnu.html\n"
-"POT-Creation-Date: 2021-08-30 13:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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"
@@ -21,8 +21,12 @@
 "Outdated-Since: 2015-02-02 12:23+0000\n"
 
 #. type: Content of: <title>
+#, fuzzy
+#| msgid ""
+#| "GNU Users Who Have Never Heard of GNU - GNU Project - Free Software "
+#| "Foundation"
 msgid ""
-"GNU Users Who Have Never Heard of GNU - GNU Project - Free Software "
+"GNU Users Who Have Never Heard of&nbsp;GNU - GNU Project - Free Software "
 "Foundation"
 msgstr ""
 "ГНУ корисници који никада нису чули о ГНУ 
— Пројекат ГНУ — Задужбина за "

Index: 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.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- po/gnu-users-never-heard-of-gnu.tr.po       12 Sep 2021 06:55:10 -0000      
1.40
+++ po/gnu-users-never-heard-of-gnu.tr.po       2 Nov 2021 14:41:52 -0000       
1.41
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-users-never-heard-of-gnu.html\n"
-"POT-Creation-Date: 2021-08-30 13:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2021-09-12 07:33+0200\n"
 "Last-Translator: T. E. Kalayci <tekrei@member.fsf.org>\n"
 "Language-Team: Turkish <www-tr-comm@gnu.org>\n"
@@ -19,12 +19,17 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-11-02 14:27+0000\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 2.4.2\n"
 
 #. type: Content of: <title>
+#, fuzzy
+#| msgid ""
+#| "GNU Users Who Have Never Heard of GNU - GNU Project - Free Software "
+#| "Foundation"
 msgid ""
-"GNU Users Who Have Never Heard of GNU - GNU Project - Free Software "
+"GNU Users Who Have Never Heard of&nbsp;GNU - GNU Project - Free Software "
 "Foundation"
 msgstr ""
 "GNU'yu hiç duymamış olan GNU kullanıcıları - GNU Projesi - Özgür 
Yazılım "

Index: po/gnu-users-never-heard-of-gnu.uk-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-users-never-heard-of-gnu.uk-diff.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- po/gnu-users-never-heard-of-gnu.uk-diff.html        29 Oct 2021 13:32:43 
-0000      1.5
+++ po/gnu-users-never-heard-of-gnu.uk-diff.html        2 Nov 2021 14:41:52 
-0000       1.6
@@ -12,13 +12,18 @@
 <body><pre>
 &lt;!--#include <span 
class="removed"><del><strong>virtual="/server/html5-header.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/header.html"</em></ins></span> --&gt;
 &lt;!-- Parent-Version: 1.96 --&gt;
-<span class="inserted"><ins><em>&lt;!-- This page is derived from 
/server/standards/boilerplate.html --&gt;</em></ins></span>
-&lt;title&gt;GNU Users Who Have Never Heard of GNU
+<span class="inserted"><ins><em>&lt;!-- This page is derived from 
/server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="gnulinux" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes" --&gt;</em></ins></span>
+&lt;title&gt;GNU Users Who Have Never Heard <span 
class="removed"><del><strong>of GNU</strong></del></span> <span 
class="inserted"><ins><em>of&nbsp;GNU</em></ins></span>
 - 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 
class="c"&gt;GNU</strong></del></span>
-<span class="inserted"><ins><em>&lt;div class="article reduced-width"&gt;
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&lt;div class="article reduced-width"&gt;
 &lt;h2&gt;GNU</em></ins></span> Users Who Have Never Heard 
of&nbsp;GNU&lt;/h2&gt;
 
 &lt;address <span class="removed"><del><strong>class="byline 
c"&gt;by</strong></del></span> <span 
class="inserted"><ins><em>class="byline"&gt;by</em></ins></span> &lt;a
@@ -83,8 +88,7 @@
 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 
System&lt;/a&gt;.
-&lt;/p&gt;
-&lt;hr class="no-display" /&gt;</em></ins></span>
+&lt;/p&gt;</em></ins></span>
 &lt;/div&gt;
 &lt;/div&gt;
 
@@ -146,7 +150,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/10/29 13:32:43 $
+$Date: 2021/11/02 14:41:52 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: 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.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- po/gnu-users-never-heard-of-gnu.uk.po       30 Aug 2021 13:34:54 -0000      
1.19
+++ po/gnu-users-never-heard-of-gnu.uk.po       2 Nov 2021 14:41:52 -0000       
1.20
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-users-never-heard-of-gnu.html\n"
-"POT-Creation-Date: 2021-08-30 13:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2017-12-10 14:52+0200\n"
 "Last-Translator: Andriy Bandura <andriykopanytsia@gmail.com>\n"
 "Language-Team: Ukrainian <>\n"
@@ -22,8 +22,12 @@
 "X-Generator: Lokalize 2.0\n"
 
 #. type: Content of: <title>
+#, fuzzy
+#| msgid ""
+#| "GNU Users Who Have Never Heard of GNU - GNU Project - Free Software "
+#| "Foundation"
 msgid ""
-"GNU Users Who Have Never Heard of GNU - GNU Project - Free Software "
+"GNU Users Who Have Never Heard of&nbsp;GNU - GNU Project - Free Software "
 "Foundation"
 msgstr ""
 "Користувачі GNU, які ніколи не чули про GNU - 
Проект GNU - Фонд вільного "

Index: 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.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- po/gnu-users-never-heard-of-gnu.zh-cn.po    8 Sep 2021 09:03:53 -0000       
1.10
+++ po/gnu-users-never-heard-of-gnu.zh-cn.po    2 Nov 2021 14:41:52 -0000       
1.11
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-users-never-heard-of-gnu.html\n"
-"POT-Creation-Date: 2021-08-30 13:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2021-09-08 16:22+0800\n"
 "Last-Translator: Wensheng Xie <wxie@member.fsf.org>\n"
 "Language-Team: Chinese <www-zh-cn-translators@gnu.org>\n"
@@ -14,10 +14,15 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-11-02 14:27+0000\n"
 
 #. type: Content of: <title>
+#, fuzzy
+#| msgid ""
+#| "GNU Users Who Have Never Heard of GNU - GNU Project - Free Software "
+#| "Foundation"
 msgid ""
-"GNU Users Who Have Never Heard of GNU - GNU Project - Free Software "
+"GNU Users Who Have Never Heard of&nbsp;GNU - GNU Project - Free Software "
 "Foundation"
 msgstr "从未听说过 GNU 的 GNU 用户 - GNU 工程 - 
自由软件基金会"
 

Index: po/incorrect-quotation.fr.po
===================================================================
RCS file: /web/www/www/gnu/po/incorrect-quotation.fr.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- po/incorrect-quotation.fr.po        2 Nov 2021 13:25:56 -0000       1.6
+++ po/incorrect-quotation.fr.po        2 Nov 2021 14:41:52 -0000       1.7
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: incorrect-quotation.html\n"
-"POT-Creation-Date: 2018-01-10 15:56+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2018-11-12 17:59+0100\n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <trad-gnu@april.org>\n"
@@ -14,16 +14,24 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-11-02 14:27+0000\n"
 
 #. type: Content of: <title>
 msgid "Incorrect Quotation - GNU Project - Free Software Foundation"
 msgstr "Citation erronée - Projet GNU - Free Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Incorrect Quotation"
 msgstr "Citation erronée"
 
-#. type: Content of: <p>
+#. 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 "par Richard Stallman"
+
+#. type: Content of: <div><p>
 msgid ""
 "A quotation circulates on the Internet, attributed to me, but it wasn't "
 "written by me."
@@ -31,7 +39,7 @@
 "Une citation qui m'est attribuée circule sur Internet, mais elle n'a pas 
été "
 "écrite par moi."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Here's the text that is circulating.  Most of it was copied from statements "
 "I have made, but the part italicized here is not from me.  It makes points "
@@ -41,7 +49,7 @@
 "déclarations que j'ai faites, mais les parties que j'ai mises en italique ne 
"
 "sont pas de moi. Ce texte énonce des arguments inexacts ou confus."
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "I'd just like to interject for a moment.  What you're referring to as Linux, "
 "is in fact, GNU/Linux, or as I've recently taken to calling it, GNU plus "
@@ -71,7 +79,7 @@
 "développé par le projet GNU. Il existe bien un Linux que ces personnes "
 "utilisent, mais c'est juste une partie du système qu'elles utilisent."
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "Linux is the kernel: the program in the system that allocates the machine's "
 "resources to the other programs that you run.  The kernel is an essential "
@@ -90,7 +98,7 @@
 "auquel on a ajouté Linux, c'est-à-dire GNU/Linux. Toutes les distributions "
 "appelées « Linux » sont en réalité des distributions de GNU/Linux."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The main error is that Linux is <em>not</em> strictly speaking part of the "
 "GNU system&mdash;whose kernel is GNU Hurd.  The version with Linux, we call "
@@ -104,7 +112,7 @@
 "« GNU » quand vous voulez faire très court, mais c'est mieux de 
l'appeler "
 "« GNU/Linux » pour reconnaître la contribution de Torvalds."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We don't use the term &ldquo;corelibs,&rdquo; and I am not sure what that "
 "would mean, but GNU is much more than the specific packages we developed for "
@@ -119,7 +127,7 @@
 "nécessitait de développer les logiciels importants que nous ne pouvions "
 "trouver ailleurs, quels qu'ils soient."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "See <a href=\"/gnu/linux-and-gnu.html\">Linux and GNU</a> and <a href=\"/gnu/"
 "gnu-linux-faq.html\">GNU/Linux FAQ</a>, plus the history in <a href=\"/gnu/"
@@ -155,14 +163,14 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Merci d'adresser vos commentaires sur les pages en français à &lt;<a href="
@@ -173,8 +181,8 @@
 "traduction</a> les infos nécessaires."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2018 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2018 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2018, 2021 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2018, 2021 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -200,6 +208,5 @@
 msgid "Updated:"
 msgstr "Dernière mise à jour :"
 
-#. type: Content of: <div><p>
-msgid "Copyright &copy; 2018, 2021 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2018, 2021 Free Software Foundation, Inc."
+#~ msgid "Copyright &copy; 2018 Free Software Foundation, Inc."
+#~ msgstr "Copyright &copy; 2018 Free Software Foundation, Inc."

Index: po/incorrect-quotation.pot
===================================================================
RCS file: /web/www/www/gnu/po/incorrect-quotation.pot,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/incorrect-quotation.pot  10 Jan 2018 16:03:22 -0000      1.1
+++ po/incorrect-quotation.pot  2 Nov 2021 14:41:52 -0000       1.2
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: incorrect-quotation.html\n"
-"POT-Creation-Date: 2018-01-10 15:56+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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,24 +20,28 @@
 msgid "Incorrect Quotation - GNU Project - Free Software Foundation"
 msgstr ""
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Incorrect Quotation"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
+msgid "by Richard Stallman"
+msgstr ""
+
+#. type: Content of: <div><p>
 msgid ""
 "A quotation circulates on the Internet, attributed to me, but it wasn't "
 "written by me."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Here's the text that is circulating.  Most of it was copied from statements "
 "I have made, but the part italicized here is not from me.  It makes points "
 "that are mistaken or confused."
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "I'd just like to interject for a moment.  What you're referring to as Linux, "
 "is in fact, GNU/Linux, or as I've recently taken to calling it, GNU plus "
@@ -53,7 +57,7 @@
 "they use."
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "Linux is the kernel: the program in the system that allocates the machine's "
 "resources to the other programs that you run.  The kernel is an essential "
@@ -64,7 +68,7 @@
 "distributions are really distributions of GNU/Linux."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The main error is that Linux is <em>not</em> strictly speaking part of the "
 "GNU system&mdash;whose kernel is GNU Hurd.  The version with Linux, we call "
@@ -73,7 +77,7 @@
 "as to give Torvalds some credit."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We don't use the term &ldquo;corelibs,&rdquo; and I am not sure what that "
 "would mean, but GNU is much more than the specific packages we developed for "
@@ -82,7 +86,7 @@
 "elsewhere."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "See <a href=\"/gnu/linux-and-gnu.html\">Linux and GNU</a> and <a "
 "href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, plus the history in <a "
@@ -113,7 +117,7 @@
 #
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
 #
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
@@ -121,11 +125,12 @@
 msgid ""
 "Please see the <a "
 "href=\"/server/standards/README.translations.html\">Translations README</a> "
-"for information on coordinating and submitting translations of this article."
+"for information on coordinating and contributing translations of this "
+"article."
 msgstr ""
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2018 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2018, 2021 Free Software Foundation, Inc."
 msgstr ""
 
 #. type: Content of: <div><p>

Index: po/incorrect-quotation.pt-br-en.html
===================================================================
RCS file: /web/www/www/gnu/po/incorrect-quotation.pt-br-en.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- po/incorrect-quotation.pt-br-en.html        15 Dec 2018 14:46:09 -0000      
1.3
+++ po/incorrect-quotation.pt-br-en.html        2 Nov 2021 14:41:52 -0000       
1.4
@@ -1,12 +1,20 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="gnulinux" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>Incorrect Quotation
 - GNU Project - Free Software Foundation</title>
  <!--#include virtual="/gnu/po/incorrect-quotation.translist" -->
 <!--#include virtual="/server/banner.html" -->
-
+<!--#include virtual="/gnu/gnu-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="article reduced-width">
 <h2>Incorrect Quotation</h2>
 
+<address class="byline">by Richard Stallman</address>
+
 <p>A quotation circulates on the Internet, attributed to me, but it
 wasn't written by me.</p>
 
@@ -54,10 +62,11 @@
 <p>See <a href="/gnu/linux-and-gnu.html">Linux and GNU</a> and
 <a href="/gnu/gnu-linux-faq.html">GNU/Linux FAQ</a>, plus the history
 in <a href="/gnu/thegnuproject.html">The GNU Project</a>.</p>
+</div>
 
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Please send general FSF &amp; GNU inquiries to
@@ -75,13 +84,13 @@
         to <a href="mailto:web-translators@gnu.org";>
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
 Please see the <a
 href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting translations
+README</a> for information on coordinating and contributing translations
 of this article.</p>
 </div>
 
@@ -102,7 +111,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2018 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2018, 2021 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -112,7 +121,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2018/12/15 14:46:09 $
+$Date: 2021/11/02 14:41:52 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/incorrect-quotation.pt-br.po
===================================================================
RCS file: /web/www/www/gnu/po/incorrect-quotation.pt-br.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- po/incorrect-quotation.pt-br.po     2 Nov 2021 13:25:56 -0000       1.6
+++ po/incorrect-quotation.pt-br.po     2 Nov 2021 14:41:52 -0000       1.7
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: incorrect-quotation.html\n"
-"POT-Creation-Date: 2018-01-10 15:56+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2018-12-12 23:43-0200\n"
 "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
 "Language-Team: Brazilian Portuguese <www-pt-br-general@gnu.org>\n"
@@ -20,11 +20,15 @@
 msgid "Incorrect Quotation - GNU Project - Free Software Foundation"
 msgstr "Citação incorreta - Projeto GNU - Free Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Incorrect Quotation"
 msgstr "Citação incorreta"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
+msgid "by Richard Stallman"
+msgstr "por Richard Stallman"
+
+#. type: Content of: <div><p>
 msgid ""
 "A quotation circulates on the Internet, attributed to me, but it wasn't "
 "written by me."
@@ -32,7 +36,7 @@
 "Uma citação circula na Internet, atribuída a mim, mas não foi escrita por 
"
 "mim."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Here's the text that is circulating.  Most of it was copied from statements "
 "I have made, but the part italicized here is not from me.  It makes points "
@@ -42,7 +46,7 @@
 "declarações que fiz, mas a parte em itálico aqui não é minha. Ele 
contém "
 "pontos que estão errados ou confusos."
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "I'd just like to interject for a moment.  What you're referring to as Linux, "
 "is in fact, GNU/Linux, or as I've recently taken to calling it, GNU plus "
@@ -71,7 +75,7 @@
 "Projeto GNU. Existe realmente um Linux, e essas pessoas estão usando, mas é 
"
 "apenas uma parte do sistema que eles usam."
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "Linux is the kernel: the program in the system that allocates the machine's "
 "resources to the other programs that you run.  The kernel is an essential "
@@ -89,7 +93,7 @@
 "com Linux adicionado, ou GNU/Linux. Todas as chamadas distribuições 
“Linux” "
 "são, na verdade, distribuições do GNU/Linux."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The main error is that Linux is <em>not</em> strictly speaking part of the "
 "GNU system&mdash;whose kernel is GNU Hurd.  The version with Linux, we call "
@@ -103,7 +107,7 @@
 "realmente breve, mas é melhor chamá-lo de “GNU/Linux” de modo a dar ao "
 "Torvalds algum crédito."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We don't use the term &ldquo;corelibs,&rdquo; and I am not sure what that "
 "would mean, but GNU is much more than the specific packages we developed for "
@@ -117,7 +121,7 @@
 "operacional, chamando-o de GNU, e esse trabalho exigia o desenvolvimento de "
 "pacotes importantes que não pudéssemos encontrar em outro lugar."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "See <a href=\"/gnu/linux-and-gnu.html\">Linux and GNU</a> and <a href=\"/gnu/"
 "gnu-linux-faq.html\">GNU/Linux FAQ</a>, plus the history in <a href=\"/gnu/"
@@ -153,14 +157,14 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "A equipe de traduções para o português brasileiro se esforça para 
oferecer "
@@ -168,12 +172,12 @@
 "favor, envie seus comentários e sugestões em geral sobre as traduções 
para "
 "<a href=\"mailto:web-translators@gnu.org\";>&lt;web-translators@gnu.org&gt;</"
 "a>. </p><p>Consulte o <a href=\"/server/standards/README.translations.html"
-"\">Guia para as traduções</a> para mais informações sobre a coordenação 
e o "
-"envio de traduções das páginas deste site."
+"\">Guia para as traduções</a> para mais informações sobre a coordenação 
e a "
+"contribuição com traduções das páginas deste site."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2018 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2018 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2018, 2021 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2018, 2021 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -197,6 +201,5 @@
 msgid "Updated:"
 msgstr "Última atualização:"
 
-#. type: Content of: <div><p>
-msgid "Copyright &copy; 2018, 2021 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2018, 2021 Free Software Foundation, Inc."
+#~ msgid "Copyright &copy; 2018 Free Software Foundation, Inc."
+#~ msgstr "Copyright &copy; 2018 Free Software Foundation, Inc."

Index: po/incorrect-quotation.ru.po
===================================================================
RCS file: /web/www/www/gnu/po/incorrect-quotation.ru.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- po/incorrect-quotation.ru.po        2 Nov 2021 13:25:56 -0000       1.2
+++ po/incorrect-quotation.ru.po        2 Nov 2021 14:41:52 -0000       1.3
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: incorrect-quotation.html\n"
-"POT-Creation-Date: 2018-01-10 15:56+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2018-08-29 06:26+0000\n"
 "Last-Translator: Ineiev <ineiev@gnu.org>\n"
 "Language-Team: Russian <www-ru-list@gnu.org>\n"
@@ -15,24 +15,33 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-11-02 14:27+0000\n"
 
 #. type: Content of: <title>
 msgid "Incorrect Quotation - GNU Project - Free Software Foundation"
 msgstr ""
 "Неверная цитата - Проект GNU - Фонд 
свободного программного обеспечения"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Incorrect Quotation"
 msgstr "Неверная цитата"
 
-#. type: Content of: <p>
+# type: Content of: <p>
+#. 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 "Ричард Столмен"
+
+#. type: Content of: <div><p>
 msgid ""
 "A quotation circulates on the Internet, attributed to me, but it wasn't "
 "written by me."
 msgstr ""
 "По Интернету циркулирует цитата, ее 
приписывают мне, но я этого не писал."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Here's the text that is circulating.  Most of it was copied from statements "
 "I have made, but the part italicized here is not from me.  It makes points "
@@ -42,7 +51,7 @@
 "которые я сделал, но часть, выделенная 
курсивом, не моя. Кое-что в ней "
 "ошибочно или перепутано."
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "I'd just like to interject for a moment.  What you're referring to as Linux, "
 "is in fact, GNU/Linux, or as I've recently taken to calling it, GNU plus "
@@ -70,7 +79,7 @@
 "система GNU, разработанная проектом GNU. В 
ней действительно есть Linux, и "
 "люди им пользуются, но это только часть 
системы, которой они пользуются."
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "Linux is the kernel: the program in the system that allocates the machine's "
 "resources to the other programs that you run.  The kernel is an essential "
@@ -89,7 +98,7 @@
 "называемые дистрибутивы &ldquo;Linux&rdquo; на 
самом деле представляют собой "
 "дистрибутивы GNU/Linux."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The main error is that Linux is <em>not</em> strictly speaking part of the "
 "GNU system&mdash;whose kernel is GNU Hurd.  The version with Linux, we call "
@@ -103,7 +112,7 @@
 "вы хотите быть очень кратким, но лучше 
называть ее &ldquo;GNU/Linux&rdquo;, "
 "чтобы как-то отдать должное Торвальдсу."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We don't use the term &ldquo;corelibs,&rdquo; and I am not sure what that "
 "would mean, but GNU is much more than the specific packages we developed for "
@@ -118,7 +127,7 @@
 "требовала разработки любых важных 
пакетов, которые мы нигде еще не могли "
 "найти."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "See <a href=\"/gnu/linux-and-gnu.html\">Linux and GNU</a> and <a href=\"/gnu/"
 "gnu-linux-faq.html\">GNU/Linux FAQ</a>, plus the history in <a href=\"/gnu/"
@@ -155,14 +164,20 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Мы старались сделать этот перевод точным 
и качественным, но исключить "
@@ -173,8 +188,8 @@
 "translations.html\">&ldquo;Руководстве по 
переводам&rdquo;</a>."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2018 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2018 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2018, 2021 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2018, 2021 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -202,6 +217,5 @@
 msgid "Updated:"
 msgstr "Обновлено:"
 
-#. type: Content of: <div><p>
-msgid "Copyright &copy; 2018, 2021 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2018, 2021 Free Software Foundation, Inc."
+#~ msgid "Copyright &copy; 2018 Free Software Foundation, Inc."
+#~ msgstr "Copyright &copy; 2018 Free Software Foundation, Inc."

Index: po/incorrect-quotation.zh-cn.po
===================================================================
RCS file: /web/www/www/gnu/po/incorrect-quotation.zh-cn.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- po/incorrect-quotation.zh-cn.po     2 Nov 2021 13:25:56 -0000       1.2
+++ po/incorrect-quotation.zh-cn.po     2 Nov 2021 14:41:52 -0000       1.3
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: incorrect-quotation.html\n"
-"POT-Creation-Date: 2018-01-10 15:56+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2018-10-12 21:04+0800\n"
 "Last-Translator: Wensheng Xie <wxie@member.fsf.org>\n"
 "Language-Team: Chinese <www-zh-cn-translators@gnu.org>\n"
@@ -14,22 +14,29 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-11-02 14:27+0000\n"
 
 #. type: Content of: <title>
 msgid "Incorrect Quotation - GNU Project - Free Software Foundation"
 msgstr "错误的语录 - GNU工程 - 自由软件基金会"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Incorrect Quotation"
 msgstr "错误的语录"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
+#, fuzzy
+#| msgid "by <strong>Richard Stallman</strong>"
+msgid "by Richard Stallman"
+msgstr "<strong>Richard Stallman</strong> 著"
+
+#. type: Content of: <div><p>
 msgid ""
 "A quotation circulates on the Internet, attributed to me, but it wasn't "
 "written by me."
 msgstr "网络上流传
着一个语录,说是我的贡献,但是我不曾写过。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Here's the text that is circulating.  Most of it was copied from statements "
 "I have made, but the part italicized here is not from me.  It makes points "
@@ -38,7 +45,7 @@
 "下面就是这段话。其中大部分来自我做过的陈述,但是å…
¶æ–œä½“部分不是我的。其观点是"
 "错误的或者说是令人迷惑的。"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "I'd just like to interject for a moment.  What you're referring to as Linux, "
 "is in fact, GNU/Linux, or as I've recently taken to calling it, GNU plus "
@@ -62,7 +69,7 @@
 
"是由GNU工程开发的。确实有一个Linux,人们也在使用,但是它只是整个系统的一部"
 "分。"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "Linux is the kernel: the program in the system that allocates the machine's "
 "resources to the other programs that you run.  The kernel is an essential "
@@ -77,7 +84,7 @@
 "GNU操作系统联合起来使用:整个系统就是GNU加上Linux,或者
叫GNU/Linux。所有被称"
 "为&ldquo;Linux&rdquo;的发行版其实都是GNU/Linux。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The main error is that Linux is <em>not</em> strictly speaking part of the "
 "GNU system&mdash;whose kernel is GNU Hurd.  The version with Linux, we call "
@@ -90,7 +97,7 @@
 "想简短的话,叫它&ldquo;GNU&rdquo;也没å…
³ç³»ï¼Œä½†æ˜¯æœ€å¥½ç§°ä¹‹ä¸º&ldquo;GNU/"
 "Linux&rdquo;,这样就能给Torvalds一些荣誉。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We don't use the term &ldquo;corelibs,&rdquo; and I am not sure what that "
 "would mean, but GNU is much more than the specific packages we developed for "
@@ -102,7 +109,7 @@
 "超过我们为之开发的软件包
。我在1983年着手开发一个操作系统,称之为GNU,它要求开"
 "发所有我们没法找来用的软件包。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "See <a href=\"/gnu/linux-and-gnu.html\">Linux and GNU</a> and <a href=\"/gnu/"
 "gnu-linux-faq.html\">GNU/Linux FAQ</a>, plus the history in <a href=\"/gnu/"
@@ -130,9 +137,7 @@
 "系方法</a>联系自由软件基金会(FSF)。请将无效链接,å…
¶ä»–错误或建议发送给<a href="
 "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>。"
 
-#
-#
-#
+# TODO: submitting -> contributing.
 #.  TRANSLATORS: Ignore the original text in this paragraph,
 #.         replace it with the translation of these two:
 #.         We work hard and do our best to provide accurate, good quality
@@ -140,22 +145,27 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
-"若您想翻译本文,请参看<a 
href=\"/server/standards/README.translations.html\">"
-"翻译须知</a>。"
+"请参考 <a 
href=\"/server/standards/README.translations.html\">翻译说明</a> 了"
+"解有关协调和提交文章翻译的信息。"
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2018 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2018 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2018, 2021 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2018, 2021 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -179,6 +189,16 @@
 msgid "Updated:"
 msgstr "最后更新:"
 
-#. type: Content of: <div><p>
-msgid "Copyright &copy; 2018, 2021 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2018, 2021 Free Software Foundation, Inc."
+#
+#
+#
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "若您想翻译本文,请参看<a 
href=\"/server/standards/README.translations.html"
+#~ "\">翻译须知</a>。"
+
+#~ msgid "Copyright &copy; 2018 Free Software Foundation, Inc."
+#~ msgstr "Copyright &copy; 2018 Free Software Foundation, Inc."

Index: po/initial-announcement.ar.po
===================================================================
RCS file: /web/www/www/gnu/po/initial-announcement.ar.po,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- po/initial-announcement.ar.po       30 May 2021 18:01:56 -0000      1.31
+++ po/initial-announcement.ar.po       2 Nov 2021 14:41:52 -0000       1.32
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: initial-announcement.html\n"
-"POT-Creation-Date: 2014-04-04 23:59+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2009-09-02 22:03+0200\n"
 "Last-Translator: Hossam Hossny <hossam@gnu.org>\n"
 "Language-Team: Arabic <>\n"
@@ -26,26 +26,26 @@
 msgid "Initial Announcement - GNU Project - Free Software Foundation"
 msgstr "البيان الأولي - مشروع غنو - مؤسسة البرم
جيات الحرة"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Initial Announcement"
 msgstr "البيان الأولي"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 # | This is the original announcement of the GNU Project, [-written-]
-# | {+posted+} by <a href=\"http://www.stallman.org/\";>Richard Stallman</a> on
-# | September 27, 1983.
+# | {+posted+} by <a href=\"http{+s+}://www.stallman.org/\">Richard
+# | Stallman</a> on September 27, 1983.
 #, fuzzy
 #| msgid ""
 #| "This is the original announcement of the GNU Project, written by <a href="
 #| "\"http://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
 msgid ""
 "This is the original announcement of the GNU Project, posted by <a href="
-"\"http://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
+"\"https://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
 msgstr ""
 "هذا هو الإعلاني الأصلي لمشروع غنو، كتبه <a 
href=\"http://www.stallman.org/";
 "\">ريتشارد ستولمن</a> في السابع والعشرين من 
سبتمبر 1983."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 # | The {+actual+} history of the GNU Project [-is-] {+differs+} in many ways
 # | [-different-] from this initial plan. For example, the beginning was
 # | delayed until [-January, 1984 and several-] {+January 1984. Several+} of
@@ -68,22 +68,33 @@
 "تاريخ البدء إلى يناير 1984 ولم تكن تقاصيل 
عديدة تتعلق  <a href=\"/philosophy/"
 "free-sw.html\">بالبرمجيات الحرة</a> قد أوضحت."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Free Unix!"
 msgstr "يونكس حر!"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Starting this Thanksgiving I am going to write a complete Unix-compatible
+# | software system called GNU (for Gnu's Not Unix), and give it away [-free<a
+# | href=\"#f1\">(1)</a>-] {+free&#8239;<a class=\"ftn\"
+# | href=\"#f1\">[1]</a>+} to everyone who can use it.  Contributions of time,
+# | money, programs and equipment are greatly needed.
+#, fuzzy
+#| msgid ""
+#| "Starting this Thanksgiving I am going to write a complete Unix-compatible "
+#| "software system called GNU (for Gnu's Not Unix), and give it away free<a "
+#| "href=\"#f1\">(1)</a> to everyone who can use it.  Contributions of time, "
+#| "money, programs and equipment are greatly needed."
 msgid ""
 "Starting this Thanksgiving I am going to write a complete Unix-compatible "
-"software system called GNU (for Gnu's Not Unix), and give it away free<a "
-"href=\"#f1\">(1)</a> to everyone who can use it.  Contributions of time, "
-"money, programs and equipment are greatly needed."
+"software system called GNU (for Gnu's Not Unix), and give it away free&#8239;"
+"<a class=\"ftn\" href=\"#f1\">[1]</a> to everyone who can use it.  "
+"Contributions of time, money, programs and equipment are greatly needed."
 msgstr ""
 "ابتداءً من عيد الشكر هذا سوف أقوم بكتابة 
نظام برمجي كامل متوافق مع يونكس يُدعى "
 "غنو (استنادًا إلى غنو ليس يونكس)، وسأوزعه 
بالمجان<a href=\"#f1\">(1)</a> لأي "
 "شخص يستطيع استخدامه. نحن بأمس الحاجة إلى 
المساهمة بالمال والبرامج والمعدات."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To begin with, GNU will be a kernel plus all the utilities needed to write "
 "and run C programs: editor, shell, C compiler, linker, assembler, and a few "
@@ -98,7 +109,7 @@
 "شيء مفيد يأتي عادة مع نظام يونكس، وأي شيء 
آخر مفيد، بما في ذلك توثيق بهيئة "
 "إلكترونية ومطبوعة."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU will be able to run Unix programs, but will not be identical to Unix.  "
 "We will make all improvements that are convenient, based on our experience "
@@ -119,11 +130,11 @@
 "سوف تكون C  و Lisp لغتي برمجة النظام. سوف نبني 
برمجيات شبكة على ميفاق MIT "
 "chaosnet تتفوق بكثير على UUCP. قد نوفر شيئًا م
توافقًا مع UUCP."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Who Am I?"
 msgstr "من أنا؟"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am Richard Stallman, inventor of the original much-imitated EMACS editor, "
 "now at the Artificial Intelligence Lab at MIT.  I have worked extensively on "
@@ -138,11 +149,11 @@
 "من أضاف دعم العرض الطرفي المستقل إلى ITS. 
نفّذت أيضًا نظام ملفات مضاد للانهيار "
 "ونظامي نوفذة لأجهزة Lisp."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why I Must Write GNU"
 msgstr "لماذا تتحتم علي كتابة غنو؟"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I consider that the golden rule requires that if I like a program I must "
 "share it with other people who like it.  I cannot in good conscience sign a "
@@ -151,7 +162,7 @@
 "أرى أن القاعدة الذهبية أنه إذا أعجبني 
برنامج فيجب أن أشاركه مع من يحبونه. لا "
 "ينبغي علي -بضمير حي- أن أوقع اتفاقية سرية 
أو اتفاقية ترخيص برمجية."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So that I can continue to use computers without violating my principles, I "
 "have decided to put together a sufficient body of free software so that I "
@@ -160,11 +171,11 @@
 "ولأتمكن من المضي قدمًا في استخدام 
الحواسيب بدون خرق مبادئي، فلقد قررت أن أضع "
 "كيانًا كافيًا للبرمجيات الحرة لأتمكن من 
المضي بدون أي برمجيات غير حرة."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How You Can Contribute"
 msgstr "كيف تستطيع المساهمة"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am asking computer manufacturers for donations of machines and money.  I'm "
 "asking individuals for donations of programs and work."
@@ -172,7 +183,7 @@
 "إنني أطلب من مصانع الحواسيب أن تتبرع 
بالأجهزة والمال؛ وإني أطلب من الأفراد "
 "أن يتبرعوا بالبرامج والجهد."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One computer manufacturer has already offered to provide a machine.  But we "
 "could use more.  One consequence you can expect if you donate machines is "
@@ -184,7 +195,7 @@
 "تستطيعون توقعها إذا تبرعتم بالأجهزة أن 
غنو سيعمل في موعد أقرب. يفضل أن يكون "
 "الجهاز قادرًا على العمل في منطقة سكنية ولا 
يحتاج تبريدًا أو طاقة مكلفة."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Individual programmers can contribute by writing a compatible duplicate of "
 "some Unix utility and giving it to me.  For most projects, such part-time "
@@ -200,7 +211,7 @@
 "المشكلة، فمعظم تفاصيل الواجهة سوف تتقيد 
بيونكس.  إذا عَمِلت كل مساهمة مع بقية "
 "أجزاء يونكس، فسوف تعمل على الأرجح مع بقية 
أجزاء غنو."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If I get donations of money, I may be able to hire a few people full or part "
 "time.  The salary won't be high, but I'm looking for people for whom knowing "
@@ -213,78 +224,223 @@
 "أهمية عن المال. إنني أعتبر هذه طريقة 
لإيجاد أناس يكرسون كل طاقتهم للعمل على "
 "غنو بدون الحاجة إلى طريقة أخرى لجني المال."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "For more information, contact me."
 msgstr "اتصل بي لمزيد من المعلومات."
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Arpanet mail:"
 msgstr "</p><p dir=\"ltr\" style=\"text-align:left\">بريد Arpanet:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "RMS@MIT-MC.ARPA"
 msgstr "RMS@MIT-MC.ARPA"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Usenet:"
 msgstr "</p><p dir=\"ltr\" style=\"text-align:left\">Usenet:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "...!mit-eddie!RMS@OZ"
 msgstr "...!mit-eddie!RMS@OZ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "...!mit-vax!RMS@OZ"
 msgstr "...!mit-vax!RMS@OZ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "US Snail:"
 msgstr "</p><p dir=\"ltr\" style=\"text-align:left\">US Snail:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Richard Stallman"
 msgstr "Richard Stallman"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "166 Prospect St"
 msgstr "166 Prospect St"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Cambridge, MA 02139"
 msgstr "Cambridge, MA 02139"
 
-#. type: Content of: <h4>
-msgid "Poor choice of wording around &ldquo;free&rdquo;"
-msgstr "اختيار سيء لكلمة &rdquo;free&ldquo; في النص 
الأصلي"
-
-#. type: Content of: <p>
-msgid ""
-"The wording here was careless.  The intention was that nobody would have to "
-"pay for <b>permission</b> to use the GNU system.  But the words don't make "
-"this clear, and people often interpret them as saying that copies of GNU "
-"should always be distributed at little or no charge.  That was never the "
-"intent."
-msgstr ""
-"لم تكن الصياغة واضحة. كان القصد أنه لن يضطر 
أحد للدفع مقابل <b>إذن</b> "
-"باستخدام نظام غنو. لكن العبارة لا توضّح 
هذا الأمر، والناس يُفسرونها عادة على "
-"أن نسخ غنو يجب أن توزع دائمًا بمقابل قليل 
أو بدون مقابل. لم يكن هذا أبدًا "
-"المقصد."
-
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Original message"
 msgstr "الرسالة الأصلية"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "For completeness, the original email is reproduced here, in its original "
 "form."
 msgstr "البريد الأصلي مسرود أدناه بصورته 
الأصلية للإكمال."
 
 #. TRANSLATORS: Don't translate anything except the headers.
-#. type: Content of: <div><pre>
-#, no-wrap
+#. type: Content of: <div><div><pre>
+# | [-\\nFrom-]{+From+}
+# | 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\\nFrom:
+# | RMS%MIT-OZ@mit-eddie\\nNewsgroups: net.unix-wizards,net.usoft\\nSubject:
+# | new Unix implementation\\nDate: Tue, 27-Sep-83 12:35:59
+# | EST\\nOrganization: MIT AI Lab, Cambridge, MA\\n\\nFree
+# | Unix!\\n\\nStarting this Thanksgiving I am going to write a
+# | complete\\nUnix-compatible software system called GNU (for Gnu's Not
+# | Unix), and\\ngive it away [-free<a href=\"#f1\">(1)</a>-] {+free&#8239;<a
+# | href=\"#f1\">[1]</a>+} to everyone who can use it.\\nContributions of
+# | time, money, programs and equipment are greatly\\nneeded.\\n\\nTo begin
+# | with, GNU will be a kernel plus all the utilities needed to\\nwrite and
+# | run C programs: editor, shell, C compiler, linker,\\nassembler, and a few
+# | other things.  After this we will add a text\\nformatter, a YACC, an
+# | Empire game, a spreadsheet, and hundreds of\\nother things.  We hope to
+# | supply, eventually, everything useful that\\nnormally comes with a Unix
+# | system, and anything else useful, including\\non-line and hardcopy
+# | documentation.\\n\\nGNU will be able to run Unix programs, but will not be
+# | identical\\nto Unix.  We will make all improvements that are convenient,
+# | based\\non our experience with other operating systems.  In
+# | particular,\\nwe plan to have longer filenames, file version numbers, a
+# | crashproof\\nfile system, filename completion perhaps,
+# | terminal-independent\\ndisplay support, and eventually a Lisp-based window
+# | system through\\nwhich several Lisp programs and ordinary Unix programs
+# | can share a screen.\\nBoth C and Lisp will be available as system
+# | programming languages.\\nWe will have network software based on MIT's
+# | chaosnet protocol,\\nfar superior to UUCP.  We may also have something
+# | compatible\\nwith UUCP.\\n\\n\\nWho Am I?\\n\\nI am Richard Stallman,
+# | inventor of the original much-imitated EMACS\\neditor, now at the
+# | Artificial Intelligence Lab at MIT.  I have worked\\nextensively on
+# | compilers, editors, debuggers, command interpreters, the\\nIncompatible
+# | Timesharing System and the Lisp Machine operating system.\\nI pioneered
+# | terminal-independent display support in ITS.  In addition I\\nhave
+# | implemented one crashproof file system and two window systems for\\nLisp
+# | machines.\\n\\n\\nWhy I Must Write GNU\\n\\nI consider that the golden
+# | rule requires that if I like a program I\\nmust share it with other people
+# | who like it.  I cannot in good\\nconscience sign a nondisclosure agreement
+# | or a software license\\nagreement.\\n\\nSo that I can continue to use
+# | computers without violating my principles,\\nI have decided to put
+# | together a sufficient body of free software so that\\nI will be able to
+# | get along without any software that is not free.\\n\\n\\nHow You Can
+# | Contribute\\n\\nI am asking computer manufacturers for donations of
+# | machines and money.\\nI'm asking individuals for donations of programs and
+# | work.\\n\\nOne computer manufacturer has already offered to provide a
+# | machine.  But\\nwe could use more.  One consequence you can expect if you
+# | donate\\nmachines is that GNU will run on them at an early date.  The
+# | machine had\\nbetter be able to operate in a residential area, and not
+# | require\\nsophisticated cooling or power.\\n\\nIndividual programmers can
+# | contribute by writing a compatible duplicate\\nof some Unix utility and
+# | giving it to me.  For most projects, such\\npart-time distributed work
+# | would be very hard to coordinate; the\\nindependently-written parts would
+# | not work together.  But for the\\nparticular task of replacing Unix, this
+# | problem is absent.  Most\\ninterface specifications are fixed by Unix
+# | compatibility.  If each\\ncontribution works with the rest of Unix, it
+# | will probably work\\nwith the rest of GNU.\\n\\nIf I get donations of
+# | money, I may be able to hire a few people full or\\npart time.  The salary
+# | won't be high, but I'm looking for people for\\nwhom knowing they are
+# | helping humanity is as important as money.  I view\\nthis as a way of
+# | enabling dedicated people to devote their full energies to\\nworking on
+# | GNU by sparing them the need to make a living in another way.\\n\\n\\nFor
+# | more information, contact me.\\nArpanet mail:\\n 
+# | RMS@MIT-MC.ARPA\\n\\nUsenet:\\n  ...!mit-eddie!RMS@OZ\\n 
+# | ...!mit-vax!RMS@OZ\\n\\nUS Snail:\\n  Richard Stallman\\n  166 Prospect
+# | St\\n  Cambridge, MA 02139\\n
+#, fuzzy, no-wrap
+#| msgid ""
+#| "\n"
+#| "From 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\n"
+#| "From: RMS%MIT-OZ@mit-eddie\n"
+#| "Newsgroups: net.unix-wizards,net.usoft\n"
+#| "Subject: new Unix implementation\n"
+#| "Date: Tue, 27-Sep-83 12:35:59 EST\n"
+#| "Organization: MIT AI Lab, Cambridge, MA\n"
+#| "\n"
+#| "Free Unix!\n"
+#| "\n"
+#| "Starting this Thanksgiving I am going to write a complete\n"
+#| "Unix-compatible software system called GNU (for Gnu's Not Unix), and\n"
+#| "give it away free<a href=\"#f1\">(1)</a> to everyone who can use it.\n"
+#| "Contributions of time, money, programs and equipment are greatly\n"
+#| "needed.\n"
+#| "\n"
+#| "To begin with, GNU will be a kernel plus all the utilities needed to\n"
+#| "write and run C programs: editor, shell, C compiler, linker,\n"
+#| "assembler, and a few other things.  After this we will add a text\n"
+#| "formatter, a YACC, an Empire game, a spreadsheet, and hundreds of\n"
+#| "other things.  We hope to supply, eventually, everything useful that\n"
+#| "normally comes with a Unix system, and anything else useful, including\n"
+#| "on-line and hardcopy documentation.\n"
+#| "\n"
+#| "GNU will be able to run Unix programs, but will not be identical\n"
+#| "to Unix.  We will make all improvements that are convenient, based\n"
+#| "on our experience with other operating systems.  In particular,\n"
+#| "we plan to have longer filenames, file version numbers, a crashproof\n"
+#| "file system, filename completion perhaps, terminal-independent\n"
+#| "display support, and eventually a Lisp-based window system through\n"
+#| "which several Lisp programs and ordinary Unix programs can share a 
screen.\n"
+#| "Both C and Lisp will be available as system programming languages.\n"
+#| "We will have network software based on MIT's chaosnet protocol,\n"
+#| "far superior to UUCP.  We may also have something compatible\n"
+#| "with UUCP.\n"
+#| "\n"
+#| "\n"
+#| "Who Am I?\n"
+#| "\n"
+#| "I am Richard Stallman, inventor of the original much-imitated EMACS\n"
+#| "editor, now at the Artificial Intelligence Lab at MIT.  I have worked\n"
+#| "extensively on compilers, editors, debuggers, command interpreters, the\n"
+#| "Incompatible Timesharing System and the Lisp Machine operating system.\n"
+#| "I pioneered terminal-independent display support in ITS.  In addition I\n"
+#| "have implemented one crashproof file system and two window systems for\n"
+#| "Lisp machines.\n"
+#| "\n"
+#| "\n"
+#| "Why I Must Write GNU\n"
+#| "\n"
+#| "I consider that the golden rule requires that if I like a program I\n"
+#| "must share it with other people who like it.  I cannot in good\n"
+#| "conscience sign a nondisclosure agreement or a software license\n"
+#| "agreement.\n"
+#| "\n"
+#| "So that I can continue to use computers without violating my principles,\n"
+#| "I have decided to put together a sufficient body of free software so 
that\n"
+#| "I will be able to get along without any software that is not free.\n"
+#| "\n"
+#| "\n"
+#| "How You Can Contribute\n"
+#| "\n"
+#| "I am asking computer manufacturers for donations of machines and money.\n"
+#| "I'm asking individuals for donations of programs and work.\n"
+#| "\n"
+#| "One computer manufacturer has already offered to provide a machine.  But\n"
+#| "we could use more.  One consequence you can expect if you donate\n"
+#| "machines is that GNU will run on them at an early date.  The machine had\n"
+#| "better be able to operate in a residential area, and not require\n"
+#| "sophisticated cooling or power.\n"
+#| "\n"
+#| "Individual programmers can contribute by writing a compatible duplicate\n"
+#| "of some Unix utility and giving it to me.  For most projects, such\n"
+#| "part-time distributed work would be very hard to coordinate; the\n"
+#| "independently-written parts would not work together.  But for the\n"
+#| "particular task of replacing Unix, this problem is absent.  Most\n"
+#| "interface specifications are fixed by Unix compatibility.  If each\n"
+#| "contribution works with the rest of Unix, it will probably work\n"
+#| "with the rest of GNU.\n"
+#| "\n"
+#| "If I get donations of money, I may be able to hire a few people full or\n"
+#| "part time.  The salary won't be high, but I'm looking for people for\n"
+#| "whom knowing they are helping humanity is as important as money.  I view\n"
+#| "this as a way of enabling dedicated people to devote their full energies 
to\n"
+#| "working on GNU by sparing them the need to make a living in another way.\n"
+#| "\n"
+#| "\n"
+#| "For more information, contact me.\n"
+#| "Arpanet mail:\n"
+#| "  RMS@MIT-MC.ARPA\n"
+#| "\n"
+#| "Usenet:\n"
+#| "  ...!mit-eddie!RMS@OZ\n"
+#| "  ...!mit-vax!RMS@OZ\n"
+#| "\n"
+#| "US Snail:\n"
+#| "  Richard Stallman\n"
+#| "  166 Prospect St\n"
+#| "  Cambridge, MA 02139\n"
 msgid ""
-"\n"
 "From 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\n"
 "From: RMS%MIT-OZ@mit-eddie\n"
 "Newsgroups: net.unix-wizards,net.usoft\n"
@@ -296,7 +452,7 @@
 "\n"
 "Starting this Thanksgiving I am going to write a complete\n"
 "Unix-compatible software system called GNU (for Gnu's Not Unix), and\n"
-"give it away free<a href=\"#f1\">(1)</a> to everyone who can use it.\n"
+"give it away free&#8239;<a href=\"#f1\">[1]</a> to everyone who can use it.\n"
 "Contributions of time, money, programs and equipment are greatly\n"
 "needed.\n"
 "\n"
@@ -484,6 +640,38 @@
 "  166 Prospect St\n"
 "  Cambridge, MA 02139\n"
 
+#. type: Content of: <div><h3>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Footnote"
+msgid "Footnote"
+msgstr "هوامش"
+
+#. type: Content of: <div><ol><li>
+# | [-The-]{+<em>The+} wording here was [-careless.-] {+careless.</em>+} The
+# | intention was that nobody would have to pay for <b>permission</b> to use
+# | the GNU system.  But the words don't make this clear, and people often
+# | interpret them as saying that copies of GNU should always be distributed
+# | at little or no charge.  That was never the intent.
+#, fuzzy
+#| msgid ""
+#| "The wording here was careless.  The intention was that nobody would have "
+#| "to pay for <b>permission</b> to use the GNU system.  But the words don't "
+#| "make this clear, and people often interpret them as saying that copies of "
+#| "GNU should always be distributed at little or no charge.  That was never "
+#| "the intent."
+msgid ""
+"<em>The wording here was careless.</em> The intention was that nobody would "
+"have to pay for <b>permission</b> to use the GNU system.  But the words "
+"don't make this clear, and people often interpret them as saying that copies "
+"of GNU should always be distributed at little or no charge.  That was never "
+"the intent."
+msgstr ""
+"لم تكن الصياغة واضحة. كان القصد أنه لن يضطر 
أحد للدفع مقابل <b>إذن</b> "
+"باستخدام نظام غنو. لكن العبارة لا توضّح 
هذا الأمر، والناس يُفسرونها عادة على "
+"أن نسخ غنو يجب أن توزع دائمًا بمقابل قليل 
أو بدون مقابل. لم يكن هذا أبدًا "
+"المقصد."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -503,6 +691,7 @@
 "يرجى إرسال الوصلات المنقطعة وأي تصحيحات 
أو اقتراحات إلى <a href=\"mailto:";
 "webmasters@gnu.org\">&lt;webmasters@gnu.org&gt;</a>."
 
+# TODO: submitting -> contributing.
 #.  TRANSLATORS: Ignore the original text in this paragraph,
 #.         replace it with the translation of these two:
 #.         We work hard and do our best to provide accurate, good quality
@@ -510,14 +699,20 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "رغم بذلنا قصارى جهدنا لتوفير ترجمات دقيقة 
ذات جودة عالية، فإننا لا ندعي كمال "
@@ -528,28 +723,33 @@
 "href=\"/server/standards/README.translations.html\">دليل الترجم
Ø©</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 1983, 1999, 2007, [-2008-] {+2008, 2009, 2013, 2014+}
-# | Free Software Foundation, Inc.
+# | Copyright &copy; 1983, 1999, 2007, [-2008-] {+2009, 2021+} Free Software
+# | Foundation, Inc.
 #, fuzzy
 #| msgid ""
 #| "Copyright &copy; 1983, 1999, 2007, 2008 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
-"Foundation, Inc."
+"Copyright &copy; 1983, 1999, 2007, 2009, 2021 Free Software Foundation, Inc."
 msgstr ""
 "حقوق النشر:</p><p style=\"direction: ltr\">\n"
 "Copyright &copy; 1983, 1999, 2007, 2008 Free Software Foundation, Inc. "
 "(مؤسسة البرمجيات الحرة)"
 
 #. type: Content of: <div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+#| "NoDerivatives 4.0 International License</a>."
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
 "هذا المُصنَّف مرخص بموجب <a rel=\"license\" 
href=\"http://creativecommons.org/";
-"licenses/by-nd/3.0/us/deed.ar\">رخصة المشاع الإبداعي نسب 
المصنف - منع "
-"الاشتقاق 3.0 الولايات المتحدة</a>."
+"licenses/by-nd/4.0/deed.ar\">رخصة المشاع الإبداعي نسب 
المصنف - منع الاشتقاق "
+"4.0 دولي</a>."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>
@@ -562,3 +762,28 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "حُدّثت:"
+
+#~ msgid "Poor choice of wording around &ldquo;free&rdquo;"
+#~ msgstr "اختيار سيء لكلمة &rdquo;free&ldquo; في النص 
الأصلي"
+
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "رغم بذلنا قصارى جهدنا لتوفير ترجمات 
دقيقة ذات جودة عالية، فإننا لا ندعي "
+#~ "كمال النصوص وخلوها من الأخطاء. يرجي 
إرسال التعليقات والمقترحات المتعلقة "
+#~ "بهذا الشأن إلى عنوان البريد الإلكتروني <a 
href=\"mailto:web-";
+#~ "translators@gnu.org\"> &lt;web-translators@gnu.org&gt;</a>.</p> 
<p>للحصول "
+#~ "على أي معلومات بشأن تنسيق وتقديم ترجمات م
وقعنا الإلكتروني، يرجى الاطلاع "
+#~ "على الرابط التالي <a 
href=\"/server/standards/README.translations.html"
+#~ "\">دليل الترجمة</a>."
+
+#~ msgid ""
+#~ "This page is licensed under a <a rel=\"license\" href=\"http://";
+#~ "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#~ "NoDerivs 3.0 United States License</a>."
+#~ msgstr ""
+#~ "هذا المُصنَّف مرخص بموجب <a rel=\"license\" 
href=\"http://creativecommons.";
+#~ "org/licenses/by-nd/3.0/us/deed.ar\">رخصة المشاع الإبداعي 
نسب المصنف - منع "
+#~ "الاشتقاق 3.0 الولايات المتحدة</a>."

Index: po/initial-announcement.bg.po
===================================================================
RCS file: /web/www/www/gnu/po/initial-announcement.bg.po,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- po/initial-announcement.bg.po       30 May 2021 18:30:21 -0000      1.27
+++ po/initial-announcement.bg.po       2 Nov 2021 14:41:52 -0000       1.28
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: initial-announcement.html\n"
-"POT-Creation-Date: 2014-04-04 23:59+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2009-10-28 11:37+0200\n"
 "Last-Translator: Yavor Doganov <yavor@gnu.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -25,19 +25,26 @@
 msgid "Initial Announcement - GNU Project - Free Software Foundation"
 msgstr "Първоначално обявление - Проектът GNU - 
Фондация за свободен софтуер"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Initial Announcement"
 msgstr "Първоначално обявление"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
+# | This is the original announcement of the GNU Project, posted by <a
+# | href=\"http{+s+}://www.stallman.org/\">Richard Stallman</a> on September
+# | 27, 1983.
+#, fuzzy
+#| msgid ""
+#| "This is the original announcement of the GNU Project, posted by <a href="
+#| "\"http://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
 msgid ""
 "This is the original announcement of the GNU Project, posted by <a href="
-"\"http://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
+"\"https://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
 msgstr ""
 "Това е оригиналното обявление на проекта 
GNU, изпратено от <a href=\"http://";
 "www.stallman.org/\">Ричард Столман</a> на 27 
септември 1983 г."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 # | The {+actual+} history of the GNU Project [-is-] {+differs+} in many ways
 # | [-different-] from this initial plan. For example, the beginning was
 # | delayed until [-January, 1984 and several-] {+January 1984. Several+} of
@@ -61,16 +68,27 @@
 "относно понятието <a 
href=\"/philosophy/free-sw.html\">свободен софтуер</a> "
 "не са били уточнени."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Free Unix!"
 msgstr "Свободен „Юникс“!"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Starting this Thanksgiving I am going to write a complete Unix-compatible
+# | software system called GNU (for Gnu's Not Unix), and give it away [-free<a
+# | href=\"#f1\">(1)</a>-] {+free&#8239;<a class=\"ftn\"
+# | href=\"#f1\">[1]</a>+} to everyone who can use it.  Contributions of time,
+# | money, programs and equipment are greatly needed.
+#, fuzzy
+#| msgid ""
+#| "Starting this Thanksgiving I am going to write a complete Unix-compatible "
+#| "software system called GNU (for Gnu's Not Unix), and give it away free<a "
+#| "href=\"#f1\">(1)</a> to everyone who can use it.  Contributions of time, "
+#| "money, programs and equipment are greatly needed."
 msgid ""
 "Starting this Thanksgiving I am going to write a complete Unix-compatible "
-"software system called GNU (for Gnu's Not Unix), and give it away free<a "
-"href=\"#f1\">(1)</a> to everyone who can use it.  Contributions of time, "
-"money, programs and equipment are greatly needed."
+"software system called GNU (for Gnu's Not Unix), and give it away free&#8239;"
+"<a class=\"ftn\" href=\"#f1\">[1]</a> to everyone who can use it.  "
+"Contributions of time, money, programs and equipment are greatly needed."
 msgstr ""
 "Започвайки от този Ден на благодарността, 
ще напиша цялостна софтуерна "
 "система, съвместима с „Юникс“, наречена 
GNU (от GNU's Not Unix — GNU не е "
@@ -79,7 +97,7 @@
 "оборудване е много необходимо."
 
 # Последните няколко думи в абзаца не стоят 
много добре.
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To begin with, GNU will be a kernel plus all the utilities needed to write "
 "and run C programs: editor, shell, C compiler, linker, assembler, and a few "
@@ -97,7 +115,7 @@
 "„Юникс“, и всичко останало — включително 
документация в софтуерна и печатна "
 "форма."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU will be able to run Unix programs, but will not be identical to Unix.  "
 "We will make all improvements that are convenient, based on our experience "
@@ -121,11 +139,11 @@
 "имаме мрежов софтуер, базиран на 
протокола на МИТ „chaosnet“, далеч "
 "превъзхождащ UUCP.  Може също да имаме и нещо 
съвместимо с UUCP."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Who Am I?"
 msgstr "Кой съм аз?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am Richard Stallman, inventor of the original much-imitated EMACS editor, "
 "now at the Artificial Intelligence Lab at MIT.  I have worked extensively on "
@@ -142,11 +160,11 @@
 "Machine“.  Реализирал съм една надеждна 
файлова система и две прозоречни "
 "системи за машини на Лисп."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why I Must Write GNU"
 msgstr "Защо трябва да напиша GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I consider that the golden rule requires that if I like a program I must "
 "share it with other people who like it.  I cannot in good conscience sign a "
@@ -156,7 +174,7 @@
 "я споделя с останалите, които я харесват.  
Не мога с чиста съвест да подпиша "
 "споразумение за неразкриване или 
лицензно споразумение за софтуер."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So that I can continue to use computers without violating my principles, I "
 "have decided to put together a sufficient body of free software so that I "
@@ -166,11 +184,11 @@
 "аз реших да направя колекция от свободен 
софтуер с достатъчно голям размер, "
 "така че да мога да живея без да прибягвам 
до софтуер, който не е свободен."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How You Can Contribute"
 msgstr "Как може да допринесете"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am asking computer manufacturers for donations of machines and money.  I'm "
 "asking individuals for donations of programs and work."
@@ -178,7 +196,7 @@
 "Моля производителите на компютри за 
дарения на машини и пари.  Моля "
 "отделните хора за дарения на програми и 
работа."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One computer manufacturer has already offered to provide a machine.  But we "
 "could use more.  One consequence you can expect if you donate machines is "
@@ -193,7 +211,7 @@
 "\"#TransNote3\"><sup>3</sup></a> и да не изисква сложно ох
лаждане или "
 "захранване."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Individual programmers can contribute by writing a compatible duplicate of "
 "some Unix utility and giving it to me.  For most projects, such part-time "
@@ -212,7 +230,7 @@
 "съвместимост с „Юникс“.  Ако всяка 
допринесена програма работи с останалата "
 "част на „Юникс“, тя най-вероятно ще 
работи и с останалата част на GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If I get donations of money, I may be able to hire a few people full or part "
 "time.  The salary won't be high, but I'm looking for people for whom knowing "
@@ -227,69 +245,51 @@
 "пълната си енергия за работа върху GNU, като 
им се спести нуждата да си "
 "изкарват хляба по някакъв друг начин."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "For more information, contact me."
 msgstr "Свържете се с мен за повече 
информация."
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Arpanet mail:"
 msgstr "Поща Arpanet:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "RMS@MIT-MC.ARPA"
 msgstr "RMS@MIT-MC.ARPA"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Usenet:"
 msgstr "Usenet:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "...!mit-eddie!RMS@OZ"
 msgstr "...!mit-eddie!RMS@OZ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "...!mit-vax!RMS@OZ"
 msgstr "...!mit-vax!RMS@OZ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "US Snail:"
 msgstr "Адрес:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Richard Stallman"
 msgstr "Ричард Столман"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "166 Prospect St"
 msgstr "ул. „Проспект“ 166"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Cambridge, MA 02139"
 msgstr "Кембридж, Масачузетс 02139"
 
-#. type: Content of: <h4>
-msgid "Poor choice of wording around &ldquo;free&rdquo;"
-msgstr "Лош избор на думи около „free<a 
href=\"#TransNote4\"><sup>4</sup></a>“"
-
-#. type: Content of: <p>
-msgid ""
-"The wording here was careless.  The intention was that nobody would have to "
-"pay for <b>permission</b> to use the GNU system.  But the words don't make "
-"this clear, and people often interpret them as saying that copies of GNU "
-"should always be distributed at little or no charge.  That was never the "
-"intent."
-msgstr ""
-"Използването на думите тук е по 
невнимание.  Намерението беше, че никой не "
-"трябва да плаща за <b>разрешение</b> да 
използва системата GNU.  Но думите "
-"не изясняват това и хората често ги 
интерпретират, че копия на GNU би "
-"трябвало винаги да се разпространяват за 
малко пари или безплатно.  Такова "
-"намерение никога не е имало."
-
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Original message"
 msgstr "Оригинално писмо"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "For completeness, the original email is reproduced here, in its original "
 "form."
@@ -298,10 +298,172 @@
 "форма."
 
 #. TRANSLATORS: Don't translate anything except the headers.
-#. type: Content of: <div><pre>
-#, no-wrap
+#. type: Content of: <div><div><pre>
+# | [-\\nFrom-]{+From+}
+# | 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\\nFrom:
+# | RMS%MIT-OZ@mit-eddie\\nNewsgroups: net.unix-wizards,net.usoft\\nSubject:
+# | new Unix implementation\\nDate: Tue, 27-Sep-83 12:35:59
+# | EST\\nOrganization: MIT AI Lab, Cambridge, MA\\n\\nFree
+# | Unix!\\n\\nStarting this Thanksgiving I am going to write a
+# | complete\\nUnix-compatible software system called GNU (for Gnu's Not
+# | Unix), and\\ngive it away [-free<a href=\"#f1\">(1)</a>-] {+free&#8239;<a
+# | href=\"#f1\">[1]</a>+} to everyone who can use it.\\nContributions of
+# | time, money, programs and equipment are greatly\\nneeded.\\n\\nTo begin
+# | with, GNU will be a kernel plus all the utilities needed to\\nwrite and
+# | run C programs: editor, shell, C compiler, linker,\\nassembler, and a few
+# | other things.  After this we will add a text\\nformatter, a YACC, an
+# | Empire game, a spreadsheet, and hundreds of\\nother things.  We hope to
+# | supply, eventually, everything useful that\\nnormally comes with a Unix
+# | system, and anything else useful, including\\non-line and hardcopy
+# | documentation.\\n\\nGNU will be able to run Unix programs, but will not be
+# | identical\\nto Unix.  We will make all improvements that are convenient,
+# | based\\non our experience with other operating systems.  In
+# | particular,\\nwe plan to have longer filenames, file version numbers, a
+# | crashproof\\nfile system, filename completion perhaps,
+# | terminal-independent\\ndisplay support, and eventually a Lisp-based window
+# | system through\\nwhich several Lisp programs and ordinary Unix programs
+# | can share a screen.\\nBoth C and Lisp will be available as system
+# | programming languages.\\nWe will have network software based on MIT's
+# | chaosnet protocol,\\nfar superior to UUCP.  We may also have something
+# | compatible\\nwith UUCP.\\n\\n\\nWho Am I?\\n\\nI am Richard Stallman,
+# | inventor of the original much-imitated EMACS\\neditor, now at the
+# | Artificial Intelligence Lab at MIT.  I have worked\\nextensively on
+# | compilers, editors, debuggers, command interpreters, the\\nIncompatible
+# | Timesharing System and the Lisp Machine operating system.\\nI pioneered
+# | terminal-independent display support in ITS.  In addition I\\nhave
+# | implemented one crashproof file system and two window systems for\\nLisp
+# | machines.\\n\\n\\nWhy I Must Write GNU\\n\\nI consider that the golden
+# | rule requires that if I like a program I\\nmust share it with other people
+# | who like it.  I cannot in good\\nconscience sign a nondisclosure agreement
+# | or a software license\\nagreement.\\n\\nSo that I can continue to use
+# | computers without violating my principles,\\nI have decided to put
+# | together a sufficient body of free software so that\\nI will be able to
+# | get along without any software that is not free.\\n\\n\\nHow You Can
+# | Contribute\\n\\nI am asking computer manufacturers for donations of
+# | machines and money.\\nI'm asking individuals for donations of programs and
+# | work.\\n\\nOne computer manufacturer has already offered to provide a
+# | machine.  But\\nwe could use more.  One consequence you can expect if you
+# | donate\\nmachines is that GNU will run on them at an early date.  The
+# | machine had\\nbetter be able to operate in a residential area, and not
+# | require\\nsophisticated cooling or power.\\n\\nIndividual programmers can
+# | contribute by writing a compatible duplicate\\nof some Unix utility and
+# | giving it to me.  For most projects, such\\npart-time distributed work
+# | would be very hard to coordinate; the\\nindependently-written parts would
+# | not work together.  But for the\\nparticular task of replacing Unix, this
+# | problem is absent.  Most\\ninterface specifications are fixed by Unix
+# | compatibility.  If each\\ncontribution works with the rest of Unix, it
+# | will probably work\\nwith the rest of GNU.\\n\\nIf I get donations of
+# | money, I may be able to hire a few people full or\\npart time.  The salary
+# | won't be high, but I'm looking for people for\\nwhom knowing they are
+# | helping humanity is as important as money.  I view\\nthis as a way of
+# | enabling dedicated people to devote their full energies to\\nworking on
+# | GNU by sparing them the need to make a living in another way.\\n\\n\\nFor
+# | more information, contact me.\\nArpanet mail:\\n 
+# | RMS@MIT-MC.ARPA\\n\\nUsenet:\\n  ...!mit-eddie!RMS@OZ\\n 
+# | ...!mit-vax!RMS@OZ\\n\\nUS Snail:\\n  Richard Stallman\\n  166 Prospect
+# | St\\n  Cambridge, MA 02139\\n
+#, fuzzy, no-wrap
+#| msgid ""
+#| "\n"
+#| "From 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\n"
+#| "From: RMS%MIT-OZ@mit-eddie\n"
+#| "Newsgroups: net.unix-wizards,net.usoft\n"
+#| "Subject: new Unix implementation\n"
+#| "Date: Tue, 27-Sep-83 12:35:59 EST\n"
+#| "Organization: MIT AI Lab, Cambridge, MA\n"
+#| "\n"
+#| "Free Unix!\n"
+#| "\n"
+#| "Starting this Thanksgiving I am going to write a complete\n"
+#| "Unix-compatible software system called GNU (for Gnu's Not Unix), and\n"
+#| "give it away free<a href=\"#f1\">(1)</a> to everyone who can use it.\n"
+#| "Contributions of time, money, programs and equipment are greatly\n"
+#| "needed.\n"
+#| "\n"
+#| "To begin with, GNU will be a kernel plus all the utilities needed to\n"
+#| "write and run C programs: editor, shell, C compiler, linker,\n"
+#| "assembler, and a few other things.  After this we will add a text\n"
+#| "formatter, a YACC, an Empire game, a spreadsheet, and hundreds of\n"
+#| "other things.  We hope to supply, eventually, everything useful that\n"
+#| "normally comes with a Unix system, and anything else useful, including\n"
+#| "on-line and hardcopy documentation.\n"
+#| "\n"
+#| "GNU will be able to run Unix programs, but will not be identical\n"
+#| "to Unix.  We will make all improvements that are convenient, based\n"
+#| "on our experience with other operating systems.  In particular,\n"
+#| "we plan to have longer filenames, file version numbers, a crashproof\n"
+#| "file system, filename completion perhaps, terminal-independent\n"
+#| "display support, and eventually a Lisp-based window system through\n"
+#| "which several Lisp programs and ordinary Unix programs can share a 
screen.\n"
+#| "Both C and Lisp will be available as system programming languages.\n"
+#| "We will have network software based on MIT's chaosnet protocol,\n"
+#| "far superior to UUCP.  We may also have something compatible\n"
+#| "with UUCP.\n"
+#| "\n"
+#| "\n"
+#| "Who Am I?\n"
+#| "\n"
+#| "I am Richard Stallman, inventor of the original much-imitated EMACS\n"
+#| "editor, now at the Artificial Intelligence Lab at MIT.  I have worked\n"
+#| "extensively on compilers, editors, debuggers, command interpreters, the\n"
+#| "Incompatible Timesharing System and the Lisp Machine operating system.\n"
+#| "I pioneered terminal-independent display support in ITS.  In addition I\n"
+#| "have implemented one crashproof file system and two window systems for\n"
+#| "Lisp machines.\n"
+#| "\n"
+#| "\n"
+#| "Why I Must Write GNU\n"
+#| "\n"
+#| "I consider that the golden rule requires that if I like a program I\n"
+#| "must share it with other people who like it.  I cannot in good\n"
+#| "conscience sign a nondisclosure agreement or a software license\n"
+#| "agreement.\n"
+#| "\n"
+#| "So that I can continue to use computers without violating my principles,\n"
+#| "I have decided to put together a sufficient body of free software so 
that\n"
+#| "I will be able to get along without any software that is not free.\n"
+#| "\n"
+#| "\n"
+#| "How You Can Contribute\n"
+#| "\n"
+#| "I am asking computer manufacturers for donations of machines and money.\n"
+#| "I'm asking individuals for donations of programs and work.\n"
+#| "\n"
+#| "One computer manufacturer has already offered to provide a machine.  But\n"
+#| "we could use more.  One consequence you can expect if you donate\n"
+#| "machines is that GNU will run on them at an early date.  The machine had\n"
+#| "better be able to operate in a residential area, and not require\n"
+#| "sophisticated cooling or power.\n"
+#| "\n"
+#| "Individual programmers can contribute by writing a compatible duplicate\n"
+#| "of some Unix utility and giving it to me.  For most projects, such\n"
+#| "part-time distributed work would be very hard to coordinate; the\n"
+#| "independently-written parts would not work together.  But for the\n"
+#| "particular task of replacing Unix, this problem is absent.  Most\n"
+#| "interface specifications are fixed by Unix compatibility.  If each\n"
+#| "contribution works with the rest of Unix, it will probably work\n"
+#| "with the rest of GNU.\n"
+#| "\n"
+#| "If I get donations of money, I may be able to hire a few people full or\n"
+#| "part time.  The salary won't be high, but I'm looking for people for\n"
+#| "whom knowing they are helping humanity is as important as money.  I view\n"
+#| "this as a way of enabling dedicated people to devote their full energies 
to\n"
+#| "working on GNU by sparing them the need to make a living in another way.\n"
+#| "\n"
+#| "\n"
+#| "For more information, contact me.\n"
+#| "Arpanet mail:\n"
+#| "  RMS@MIT-MC.ARPA\n"
+#| "\n"
+#| "Usenet:\n"
+#| "  ...!mit-eddie!RMS@OZ\n"
+#| "  ...!mit-vax!RMS@OZ\n"
+#| "\n"
+#| "US Snail:\n"
+#| "  Richard Stallman\n"
+#| "  166 Prospect St\n"
+#| "  Cambridge, MA 02139\n"
 msgid ""
-"\n"
 "From 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\n"
 "From: RMS%MIT-OZ@mit-eddie\n"
 "Newsgroups: net.unix-wizards,net.usoft\n"
@@ -313,7 +475,7 @@
 "\n"
 "Starting this Thanksgiving I am going to write a complete\n"
 "Unix-compatible software system called GNU (for Gnu's Not Unix), and\n"
-"give it away free<a href=\"#f1\">(1)</a> to everyone who can use it.\n"
+"give it away free&#8239;<a href=\"#f1\">[1]</a> to everyone who can use it.\n"
 "Contributions of time, money, programs and equipment are greatly\n"
 "needed.\n"
 "\n"
@@ -501,6 +663,40 @@
 "  166 Prospect St\n"
 "  Cambridge, MA 02139\n"
 
+# type: Content of: <h4>
+#. type: Content of: <div><h3>
+# | Footnote[-s-]
+#, fuzzy
+#| msgid "Footnotes"
+msgid "Footnote"
+msgstr "Бележки"
+
+#. type: Content of: <div><ol><li>
+# | [-The-]{+<em>The+} wording here was [-careless.-] {+careless.</em>+} The
+# | intention was that nobody would have to pay for <b>permission</b> to use
+# | the GNU system.  But the words don't make this clear, and people often
+# | interpret them as saying that copies of GNU should always be distributed
+# | at little or no charge.  That was never the intent.
+#, fuzzy
+#| msgid ""
+#| "The wording here was careless.  The intention was that nobody would have "
+#| "to pay for <b>permission</b> to use the GNU system.  But the words don't "
+#| "make this clear, and people often interpret them as saying that copies of "
+#| "GNU should always be distributed at little or no charge.  That was never "
+#| "the intent."
+msgid ""
+"<em>The wording here was careless.</em> The intention was that nobody would "
+"have to pay for <b>permission</b> to use the GNU system.  But the words "
+"don't make this clear, and people often interpret them as saying that copies "
+"of GNU should always be distributed at little or no charge.  That was never "
+"the intent."
+msgstr ""
+"Използването на думите тук е по 
невнимание.  Намерението беше, че никой не "
+"трябва да плаща за <b>разрешение</b> да 
използва системата GNU.  Но думите "
+"не изясняват това и хората често ги 
интерпретират, че копия на GNU би "
+"трябвало винаги да се разпространяват за 
малко пари или безплатно.  Такова "
+"намерение никога не е имало."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -551,14 +747,23 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# | Please see the <a
+# | href=\"/server/standards/README.translations.html\">Translations
+# | README</a> for information on coordinating and [-submitting-]
+# | {+contributing+} translations of this article.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and submitting "
+#| "translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Моля, докладвайте грешки и предложения 
относно българския превод чрез <a "
@@ -568,28 +773,33 @@
 "подаването на преводи на тази статия."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 1983, 1999, 2007, 2008, [-2009-] {+2009, 2013, 2014+}
-# | Free Software Foundation, Inc.
+# | Copyright &copy; 1983, 1999, 2007, [-2008, 2009-] {+2009, 2021+} Free
+# | Software Foundation, Inc.
 #, fuzzy
 #| msgid ""
 #| "Copyright &copy; 1983, 1999, 2007, 2008, 2009 Free Software Foundation, "
 #| "Inc."
 msgid ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
-"Foundation, Inc."
+"Copyright &copy; 1983, 1999, 2007, 2009, 2021 Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1983, 1999, 2007, 2008, 2009 Free Software Foundation, Inc. "
 "(Фондация за свободен софтуер)"
 
 #. type: Content of: <div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+#| "NoDerivatives 4.0 International License</a>."
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
 "Може да копирате и разпространявате тази 
статия според условията на <a rel="
-"\"license\" href=\"http://creativecommons.org/licenses/by-nd/3.0/us/";
-"\">Криейтив Комънс „Признание-Без 
производни произведения“ 3.0 САЩ</a>."
+"\"license\" 
href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Криейтив "
+"Комънс „Признание-Без производни 
произведения“ 4.0</a>."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>
@@ -602,3 +812,27 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Последно обновяване:"
+
+#~ msgid "Poor choice of wording around &ldquo;free&rdquo;"
+#~ msgstr ""
+#~ "Лош избор на думи около „free<a 
href=\"#TransNote4\"><sup>4</sup></a>“"
+
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "Моля, докладвайте грешки и предложения 
относно българския превод чрез <a "
+#~ "href=\"mailto:web-translators@gnu.org\";>&lt;web-translators@gnu.org&gt;</"
+#~ "a>.</p> <p>Вижте <a href=\"/server/standards/README.translations.html"
+#~ "\">Документацията за преводачи</a> за 
информация за координирането и "
+#~ "подаването на преводи на тази статия."
+
+#~ msgid ""
+#~ "This page is licensed under a <a rel=\"license\" href=\"http://";
+#~ "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#~ "NoDerivs 3.0 United States License</a>."
+#~ msgstr ""
+#~ "Може да копирате и разпространявате 
тази статия според условията на <a "
+#~ "rel=\"license\" href=\"http://creativecommons.org/licenses/by-nd/3.0/us/";
+#~ "\">Криейтив Комънс „Признание-Без 
производни произведения“ 3.0 САЩ</a>."

Index: po/initial-announcement.ca.po
===================================================================
RCS file: /web/www/www/gnu/po/initial-announcement.ca.po,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- po/initial-announcement.ca.po       2 Nov 2021 13:25:56 -0000       1.33
+++ po/initial-announcement.ca.po       2 Nov 2021 14:41:52 -0000       1.34
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: initial-announcement.html\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-04 23:59+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2014-06-05 16:18+0200\n"
 "Last-Translator: Miquel Puigpelat <mpuigpe1@xtec.cat>\n"
 "Language-Team: Catalan <www-ca-traductors@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-11-02 14:27+0000\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
@@ -22,21 +23,28 @@
 msgstr "Anunci inicial - Projecte GNU - Free Software Foundation (FSF)"
 
 # type: Content of: <h2>
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Initial Announcement"
 msgstr "Anunci inicial"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
+# | This is the original announcement of the GNU Project, posted by <a
+# | href=\"http{+s+}://www.stallman.org/\">Richard Stallman</a> on September
+# | 27, 1983.
+#, fuzzy
+#| msgid ""
+#| "This is the original announcement of the GNU Project, posted by <a href="
+#| "\"http://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
 msgid ""
 "This is the original announcement of the GNU Project, posted by <a href="
-"\"http://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
+"\"https://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
 msgstr ""
 "Aquest és l'anunci inicial del Projecte GNU, escrit per <a 
href=\"http://www.";
 "stallman.org/\">Richard Stallman</a> el 27 de setembre 1983."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The actual history of the GNU Project differs in many ways from this initial "
 "plan. For example, the beginning was delayed until January 1984. Several of "
@@ -49,17 +57,28 @@
 "\">programari lliure</a> no es van clarificar fins alguns anys després."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Free Unix!"
 msgstr "Unix Lliure!"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Starting this Thanksgiving I am going to write a complete Unix-compatible
+# | software system called GNU (for Gnu's Not Unix), and give it away [-free<a
+# | href=\"#f1\">(1)</a>-] {+free&#8239;<a class=\"ftn\"
+# | href=\"#f1\">[1]</a>+} to everyone who can use it.  Contributions of time,
+# | money, programs and equipment are greatly needed.
+#, fuzzy
+#| msgid ""
+#| "Starting this Thanksgiving I am going to write a complete Unix-compatible "
+#| "software system called GNU (for Gnu's Not Unix), and give it away free<a "
+#| "href=\"#f1\">(1)</a> to everyone who can use it.  Contributions of time, "
+#| "money, programs and equipment are greatly needed."
 msgid ""
 "Starting this Thanksgiving I am going to write a complete Unix-compatible "
-"software system called GNU (for Gnu's Not Unix), and give it away free<a "
-"href=\"#f1\">(1)</a> to everyone who can use it.  Contributions of time, "
-"money, programs and equipment are greatly needed."
+"software system called GNU (for Gnu's Not Unix), and give it away free&#8239;"
+"<a class=\"ftn\" href=\"#f1\">[1]</a> to everyone who can use it.  "
+"Contributions of time, money, programs and equipment are greatly needed."
 msgstr ""
 "En aquest dia d'acció de gràcies començaré a escriure un sistema de "
 "programari plenament compatible amb Unix anomenat GNU (per GNU no és Unix), "
@@ -68,7 +87,7 @@
 "programes i equipaments informàtics."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To begin with, GNU will be a kernel plus all the utilities needed to write "
 "and run C programs: editor, shell, C compiler, linker, assembler, and a few "
@@ -86,7 +105,7 @@
 "altra cosa útil, incloent-hi documentació impresa i en línia."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU will be able to run Unix programs, but will not be identical to Unix.  "
 "We will make all improvements that are convenient, based on our experience "
@@ -111,12 +130,12 @@
 "superior a l'UUCP. Potser també tindrem alguna cosa compatible amb UUCP."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Who Am I?"
 msgstr "Qui Sóc?"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am Richard Stallman, inventor of the original much-imitated EMACS editor, "
 "now at the Artificial Intelligence Lab at MIT.  I have worked extensively on "
@@ -134,12 +153,12 @@
 "a prova de penjades i dos sistemes de finestres per a màquines Lisp."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why I Must Write GNU"
 msgstr "Per què he d'escriure GNU"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I consider that the golden rule requires that if I like a program I must "
 "share it with other people who like it.  I cannot in good conscience sign a "
@@ -150,7 +169,7 @@
 "de no revelació o una llicència de programari."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So that I can continue to use computers without violating my principles, I "
 "have decided to put together a sufficient body of free software so that I "
@@ -162,12 +181,12 @@
 "lliure."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How You Can Contribute"
 msgstr "Com podeu contribuir"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am asking computer manufacturers for donations of machines and money.  I'm "
 "asking individuals for donations of programs and work."
@@ -177,7 +196,7 @@
 "que aportin el seu treball."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One computer manufacturer has already offered to provide a machine.  But we "
 "could use more.  One consequence you can expect if you donate machines is "
@@ -192,7 +211,7 @@
 "elevat consum de refrigeració o d'energia elèctrica."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Individual programmers can contribute by writing a compatible duplicate of "
 "some Unix utility and giving it to me.  For most projects, such part-time "
@@ -212,7 +231,7 @@
 "d'Unix, probablement funcionarà amb la resta de GNU."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If I get donations of money, I may be able to hire a few people full or part "
 "time.  The salary won't be high, but I'm looking for people for whom knowing "
@@ -227,75 +246,54 @@
 "GNU, estalviant-los la necessitat de guanyar-se la vida d'una altra manera."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "For more information, contact me."
 msgstr "Per a més informació, contacteu amb mi."
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Arpanet mail:"
 msgstr "Arpanet mail:"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "RMS@MIT-MC.ARPA"
 msgstr "RMS@MIT-MC.ARPA"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Usenet:"
 msgstr "Usenet:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "...!mit-eddie!RMS@OZ"
 msgstr "...!mit-eddie!RMS@OZ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "...!mit-vax!RMS@OZ"
 msgstr "...!mit-vax!RMS@OZ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "US Snail:"
 msgstr "US Snail:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Richard Stallman"
 msgstr "Richard Stallman"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "166 Prospect St"
 msgstr "166 Prospect St"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Cambridge, MA 02139"
 msgstr "Cambridge, MA 02139"
 
-# type: Content of: <h4>
-#. type: Content of: <h4>
-msgid "Poor choice of wording around &ldquo;free&rdquo;"
-msgstr "La desafortunada elecció de la paraula \"free\""
-
-# type: Content of: <p>
-#. type: Content of: <p>
-msgid ""
-"The wording here was careless.  The intention was that nobody would have to "
-"pay for <b>permission</b> to use the GNU system.  But the words don't make "
-"this clear, and people often interpret them as saying that copies of GNU "
-"should always be distributed at little or no charge.  That was never the "
-"intent."
-msgstr ""
-"En aquest punt, la manera d'expressar-ho va ser poc acurada [A l'original "
-"anglès, \"free\" es podia entendre pel context com \"gratuïtament\"]. La "
-"intenció era que ningú no hagués de pagar per obtenir un <b>permís</b> 
per "
-"utilitzar GNU. Però la frase no ho deixava clar, i la gent sovint "
-"interpretava que les còpies del sistema GNU s'havien de distribuir de franc "
-"o a molt baix preu, cosa que mai no es va pretendre."
-
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Original message"
 msgstr "Missatge original"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "For completeness, the original email is reproduced here, in its original "
 "form."
@@ -305,10 +303,172 @@
 
 # type: Content of: <pre>
 #. TRANSLATORS: Don't translate anything except the headers.
-#. type: Content of: <div><pre>
-#, no-wrap
+#. type: Content of: <div><div><pre>
+# | [-\\nFrom-]{+From+}
+# | 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\\nFrom:
+# | RMS%MIT-OZ@mit-eddie\\nNewsgroups: net.unix-wizards,net.usoft\\nSubject:
+# | new Unix implementation\\nDate: Tue, 27-Sep-83 12:35:59
+# | EST\\nOrganization: MIT AI Lab, Cambridge, MA\\n\\nFree
+# | Unix!\\n\\nStarting this Thanksgiving I am going to write a
+# | complete\\nUnix-compatible software system called GNU (for Gnu's Not
+# | Unix), and\\ngive it away [-free<a href=\"#f1\">(1)</a>-] {+free&#8239;<a
+# | href=\"#f1\">[1]</a>+} to everyone who can use it.\\nContributions of
+# | time, money, programs and equipment are greatly\\nneeded.\\n\\nTo begin
+# | with, GNU will be a kernel plus all the utilities needed to\\nwrite and
+# | run C programs: editor, shell, C compiler, linker,\\nassembler, and a few
+# | other things.  After this we will add a text\\nformatter, a YACC, an
+# | Empire game, a spreadsheet, and hundreds of\\nother things.  We hope to
+# | supply, eventually, everything useful that\\nnormally comes with a Unix
+# | system, and anything else useful, including\\non-line and hardcopy
+# | documentation.\\n\\nGNU will be able to run Unix programs, but will not be
+# | identical\\nto Unix.  We will make all improvements that are convenient,
+# | based\\non our experience with other operating systems.  In
+# | particular,\\nwe plan to have longer filenames, file version numbers, a
+# | crashproof\\nfile system, filename completion perhaps,
+# | terminal-independent\\ndisplay support, and eventually a Lisp-based window
+# | system through\\nwhich several Lisp programs and ordinary Unix programs
+# | can share a screen.\\nBoth C and Lisp will be available as system
+# | programming languages.\\nWe will have network software based on MIT's
+# | chaosnet protocol,\\nfar superior to UUCP.  We may also have something
+# | compatible\\nwith UUCP.\\n\\n\\nWho Am I?\\n\\nI am Richard Stallman,
+# | inventor of the original much-imitated EMACS\\neditor, now at the
+# | Artificial Intelligence Lab at MIT.  I have worked\\nextensively on
+# | compilers, editors, debuggers, command interpreters, the\\nIncompatible
+# | Timesharing System and the Lisp Machine operating system.\\nI pioneered
+# | terminal-independent display support in ITS.  In addition I\\nhave
+# | implemented one crashproof file system and two window systems for\\nLisp
+# | machines.\\n\\n\\nWhy I Must Write GNU\\n\\nI consider that the golden
+# | rule requires that if I like a program I\\nmust share it with other people
+# | who like it.  I cannot in good\\nconscience sign a nondisclosure agreement
+# | or a software license\\nagreement.\\n\\nSo that I can continue to use
+# | computers without violating my principles,\\nI have decided to put
+# | together a sufficient body of free software so that\\nI will be able to
+# | get along without any software that is not free.\\n\\n\\nHow You Can
+# | Contribute\\n\\nI am asking computer manufacturers for donations of
+# | machines and money.\\nI'm asking individuals for donations of programs and
+# | work.\\n\\nOne computer manufacturer has already offered to provide a
+# | machine.  But\\nwe could use more.  One consequence you can expect if you
+# | donate\\nmachines is that GNU will run on them at an early date.  The
+# | machine had\\nbetter be able to operate in a residential area, and not
+# | require\\nsophisticated cooling or power.\\n\\nIndividual programmers can
+# | contribute by writing a compatible duplicate\\nof some Unix utility and
+# | giving it to me.  For most projects, such\\npart-time distributed work
+# | would be very hard to coordinate; the\\nindependently-written parts would
+# | not work together.  But for the\\nparticular task of replacing Unix, this
+# | problem is absent.  Most\\ninterface specifications are fixed by Unix
+# | compatibility.  If each\\ncontribution works with the rest of Unix, it
+# | will probably work\\nwith the rest of GNU.\\n\\nIf I get donations of
+# | money, I may be able to hire a few people full or\\npart time.  The salary
+# | won't be high, but I'm looking for people for\\nwhom knowing they are
+# | helping humanity is as important as money.  I view\\nthis as a way of
+# | enabling dedicated people to devote their full energies to\\nworking on
+# | GNU by sparing them the need to make a living in another way.\\n\\n\\nFor
+# | more information, contact me.\\nArpanet mail:\\n 
+# | RMS@MIT-MC.ARPA\\n\\nUsenet:\\n  ...!mit-eddie!RMS@OZ\\n 
+# | ...!mit-vax!RMS@OZ\\n\\nUS Snail:\\n  Richard Stallman\\n  166 Prospect
+# | St\\n  Cambridge, MA 02139\\n
+#, fuzzy, no-wrap
+#| msgid ""
+#| "\n"
+#| "From 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\n"
+#| "From: RMS%MIT-OZ@mit-eddie\n"
+#| "Newsgroups: net.unix-wizards,net.usoft\n"
+#| "Subject: new Unix implementation\n"
+#| "Date: Tue, 27-Sep-83 12:35:59 EST\n"
+#| "Organization: MIT AI Lab, Cambridge, MA\n"
+#| "\n"
+#| "Free Unix!\n"
+#| "\n"
+#| "Starting this Thanksgiving I am going to write a complete\n"
+#| "Unix-compatible software system called GNU (for Gnu's Not Unix), and\n"
+#| "give it away free<a href=\"#f1\">(1)</a> to everyone who can use it.\n"
+#| "Contributions of time, money, programs and equipment are greatly\n"
+#| "needed.\n"
+#| "\n"
+#| "To begin with, GNU will be a kernel plus all the utilities needed to\n"
+#| "write and run C programs: editor, shell, C compiler, linker,\n"
+#| "assembler, and a few other things.  After this we will add a text\n"
+#| "formatter, a YACC, an Empire game, a spreadsheet, and hundreds of\n"
+#| "other things.  We hope to supply, eventually, everything useful that\n"
+#| "normally comes with a Unix system, and anything else useful, including\n"
+#| "on-line and hardcopy documentation.\n"
+#| "\n"
+#| "GNU will be able to run Unix programs, but will not be identical\n"
+#| "to Unix.  We will make all improvements that are convenient, based\n"
+#| "on our experience with other operating systems.  In particular,\n"
+#| "we plan to have longer filenames, file version numbers, a crashproof\n"
+#| "file system, filename completion perhaps, terminal-independent\n"
+#| "display support, and eventually a Lisp-based window system through\n"
+#| "which several Lisp programs and ordinary Unix programs can share a 
screen.\n"
+#| "Both C and Lisp will be available as system programming languages.\n"
+#| "We will have network software based on MIT's chaosnet protocol,\n"
+#| "far superior to UUCP.  We may also have something compatible\n"
+#| "with UUCP.\n"
+#| "\n"
+#| "\n"
+#| "Who Am I?\n"
+#| "\n"
+#| "I am Richard Stallman, inventor of the original much-imitated EMACS\n"
+#| "editor, now at the Artificial Intelligence Lab at MIT.  I have worked\n"
+#| "extensively on compilers, editors, debuggers, command interpreters, the\n"
+#| "Incompatible Timesharing System and the Lisp Machine operating system.\n"
+#| "I pioneered terminal-independent display support in ITS.  In addition I\n"
+#| "have implemented one crashproof file system and two window systems for\n"
+#| "Lisp machines.\n"
+#| "\n"
+#| "\n"
+#| "Why I Must Write GNU\n"
+#| "\n"
+#| "I consider that the golden rule requires that if I like a program I\n"
+#| "must share it with other people who like it.  I cannot in good\n"
+#| "conscience sign a nondisclosure agreement or a software license\n"
+#| "agreement.\n"
+#| "\n"
+#| "So that I can continue to use computers without violating my principles,\n"
+#| "I have decided to put together a sufficient body of free software so 
that\n"
+#| "I will be able to get along without any software that is not free.\n"
+#| "\n"
+#| "\n"
+#| "How You Can Contribute\n"
+#| "\n"
+#| "I am asking computer manufacturers for donations of machines and money.\n"
+#| "I'm asking individuals for donations of programs and work.\n"
+#| "\n"
+#| "One computer manufacturer has already offered to provide a machine.  But\n"
+#| "we could use more.  One consequence you can expect if you donate\n"
+#| "machines is that GNU will run on them at an early date.  The machine had\n"
+#| "better be able to operate in a residential area, and not require\n"
+#| "sophisticated cooling or power.\n"
+#| "\n"
+#| "Individual programmers can contribute by writing a compatible duplicate\n"
+#| "of some Unix utility and giving it to me.  For most projects, such\n"
+#| "part-time distributed work would be very hard to coordinate; the\n"
+#| "independently-written parts would not work together.  But for the\n"
+#| "particular task of replacing Unix, this problem is absent.  Most\n"
+#| "interface specifications are fixed by Unix compatibility.  If each\n"
+#| "contribution works with the rest of Unix, it will probably work\n"
+#| "with the rest of GNU.\n"
+#| "\n"
+#| "If I get donations of money, I may be able to hire a few people full or\n"
+#| "part time.  The salary won't be high, but I'm looking for people for\n"
+#| "whom knowing they are helping humanity is as important as money.  I view\n"
+#| "this as a way of enabling dedicated people to devote their full energies 
to\n"
+#| "working on GNU by sparing them the need to make a living in another way.\n"
+#| "\n"
+#| "\n"
+#| "For more information, contact me.\n"
+#| "Arpanet mail:\n"
+#| "  RMS@MIT-MC.ARPA\n"
+#| "\n"
+#| "Usenet:\n"
+#| "  ...!mit-eddie!RMS@OZ\n"
+#| "  ...!mit-vax!RMS@OZ\n"
+#| "\n"
+#| "US Snail:\n"
+#| "  Richard Stallman\n"
+#| "  166 Prospect St\n"
+#| "  Cambridge, MA 02139\n"
 msgid ""
-"\n"
 "From 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\n"
 "From: RMS%MIT-OZ@mit-eddie\n"
 "Newsgroups: net.unix-wizards,net.usoft\n"
@@ -320,7 +480,7 @@
 "\n"
 "Starting this Thanksgiving I am going to write a complete\n"
 "Unix-compatible software system called GNU (for Gnu's Not Unix), and\n"
-"give it away free<a href=\"#f1\">(1)</a> to everyone who can use it.\n"
+"give it away free&#8239;<a href=\"#f1\">[1]</a> to everyone who can use it.\n"
 "Contributions of time, money, programs and equipment are greatly\n"
 "needed.\n"
 "\n"
@@ -508,6 +668,42 @@
 "  166 Prospect St\n"
 "  Cambridge, MA 02139\n"
 
+# type: Content of: <h4>
+#. type: Content of: <div><h3>
+# | Footnote[-s-]
+#, fuzzy
+#| msgid "Footnotes"
+msgid "Footnote"
+msgstr "Notes"
+
+# type: Content of: <p>
+#. type: Content of: <div><ol><li>
+# | [-The-]{+<em>The+} wording here was [-careless.-] {+careless.</em>+} The
+# | intention was that nobody would have to pay for <b>permission</b> to use
+# | the GNU system.  But the words don't make this clear, and people often
+# | interpret them as saying that copies of GNU should always be distributed
+# | at little or no charge.  That was never the intent.
+#, fuzzy
+#| msgid ""
+#| "The wording here was careless.  The intention was that nobody would have "
+#| "to pay for <b>permission</b> to use the GNU system.  But the words don't "
+#| "make this clear, and people often interpret them as saying that copies of "
+#| "GNU should always be distributed at little or no charge.  That was never "
+#| "the intent."
+msgid ""
+"<em>The wording here was careless.</em> The intention was that nobody would "
+"have to pay for <b>permission</b> to use the GNU system.  But the words "
+"don't make this clear, and people often interpret them as saying that copies "
+"of GNU should always be distributed at little or no charge.  That was never "
+"the intent."
+msgstr ""
+"En aquest punt, la manera d'expressar-ho va ser poc acurada [A l'original "
+"anglès, \"free\" es podia entendre pel context com \"gratuïtament\"]. La "
+"intenció era que ningú no hagués de pagar per obtenir un <b>permís</b> 
per "
+"utilitzar GNU. Però la frase no ho deixava clar, i la gent sovint "
+"interpretava que les còpies del sistema GNU s'havien de distribuir de franc "
+"o a molt baix preu, cosa que mai no es va pretendre."
+
 # type: Content of: <div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
@@ -535,14 +731,20 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Vegeu la <a href=\"/server/standards/README.translations.html\">Guia de "
@@ -553,18 +755,33 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
+# | Copyright &copy; 1983, 1999, 2007, [-2008,-] 2009, [-2013, 2014-] {+2021+}
+# | Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
+#| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
-"Foundation, Inc."
+"Copyright &copy; 1983, 1999, 2007, 2009, 2021 Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
 "Foundation, Inc."
 
 #. type: Content of: <div><p>
+# | This page is licensed under a <a rel=\"license\"
+# | [-href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative-]
+# | {+href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Creative+}
+# | Commons [-Attribution-NoDerivs 3.0 United States-]
+# | {+Attribution-NoDerivatives 4.0 International+} License</a>.
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#| "NoDerivs 3.0 United States License</a>."
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
 "Aquesta pàgina es troba sota la <a rel=\"license\" href=\"http://";
 "creativecommons.org/licenses/by-nd/3.0/us/deed.ca\">Llicència Creative "
@@ -583,14 +800,37 @@
 msgid "Updated:"
 msgstr "Updated:"
 
+# type: Content of: <h4>
+#~ msgid "Poor choice of wording around &ldquo;free&rdquo;"
+#~ msgstr "La desafortunada elecció de la paraula \"free\""
+
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "Vegeu la <a href=\"/server/standards/README.translations.html\">Guia de "
+#~ "traducció</a> per informar-vos sobre la coordinació i publicació de les 
"
+#~ "traduccions d'aquest article. <br />Contacteu amb l'<a href=\"/server/"
+#~ "standards/translations/ca/\">Equip de traducció</a> per col·laborar en 
la "
+#~ "traducció al català del web de GNU."
+
+#~ msgid ""
+#~ "This page is licensed under a <a rel=\"license\" href=\"http://";
+#~ "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#~ "NoDerivs 3.0 United States License</a>."
+#~ msgstr ""
+#~ "Aquesta pàgina es troba sota la <a rel=\"license\" href=\"http://";
+#~ "creativecommons.org/licenses/by-nd/3.0/us/deed.ca\">Llicència Creative "
+#~ "Commons Reconeixement-SenseObraDerivada 3.0 Estats Units d'Amèrica</a>."
+
 # type: Content of: <div><p>
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
-"Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
-"Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
+#~ "Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
+#~ "Software Foundation, Inc."
 
 # type: Content of: <div><p>
 #~ msgid ""

Index: po/initial-announcement.cs.po
===================================================================
RCS file: /web/www/www/gnu/po/initial-announcement.cs.po,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- po/initial-announcement.cs.po       2 Nov 2021 13:25:57 -0000       1.9
+++ po/initial-announcement.cs.po       2 Nov 2021 14:41:52 -0000       1.10
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: initial-announcement.html\n"
-"POT-Creation-Date: 2014-04-04 23:59+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2012-07-08 15:48+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-11-02 14:27+0000\n"
 "X-Generator: Lokalize 1.2\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
@@ -23,19 +24,26 @@
 msgid "Initial Announcement - GNU Project - Free Software Foundation"
 msgstr "Úvodní oznámení – Projekt GNU – Nadace pro svobodný software"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Initial Announcement"
 msgstr "Úvodní oznámení"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
+# | This is the original announcement of the GNU Project, posted by <a
+# | href=\"http{+s+}://www.stallman.org/\">Richard Stallman</a> on September
+# | 27, 1983.
+#, fuzzy
+#| msgid ""
+#| "This is the original announcement of the GNU Project, posted by <a href="
+#| "\"http://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
 msgid ""
 "This is the original announcement of the GNU Project, posted by <a href="
-"\"http://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
+"\"https://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
 msgstr ""
 "Toto je původní oznámení o projektu GNU, napsané <a href=\"http://www.";
 "stallman.org/\">Richardem Stallmanem</a> 27. září roku 1983."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The actual history of the GNU Project differs in many ways from this initial "
 "plan. For example, the beginning was delayed until January 1984. Several of "
@@ -47,23 +55,34 @@
 "href=\"/philosophy/free-sw.html\">svobodného softwaru</a> se ujasňovaly "
 "několik dalších let."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Free Unix!"
 msgstr "Svobodný Unix!"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Starting this Thanksgiving I am going to write a complete Unix-compatible
+# | software system called GNU (for Gnu's Not Unix), and give it away [-free<a
+# | href=\"#f1\">(1)</a>-] {+free&#8239;<a class=\"ftn\"
+# | href=\"#f1\">[1]</a>+} to everyone who can use it.  Contributions of time,
+# | money, programs and equipment are greatly needed.
+#, fuzzy
+#| msgid ""
+#| "Starting this Thanksgiving I am going to write a complete Unix-compatible "
+#| "software system called GNU (for Gnu's Not Unix), and give it away free<a "
+#| "href=\"#f1\">(1)</a> to everyone who can use it.  Contributions of time, "
+#| "money, programs and equipment are greatly needed."
 msgid ""
 "Starting this Thanksgiving I am going to write a complete Unix-compatible "
-"software system called GNU (for Gnu's Not Unix), and give it away free<a "
-"href=\"#f1\">(1)</a> to everyone who can use it.  Contributions of time, "
-"money, programs and equipment are greatly needed."
+"software system called GNU (for Gnu's Not Unix), and give it away free&#8239;"
+"<a class=\"ftn\" href=\"#f1\">[1]</a> to everyone who can use it.  "
+"Contributions of time, money, programs and equipment are greatly needed."
 msgstr ""
 "Od Díkuvzdání se chystám napsat operační systém kompatibilní s 
Unixem, "
 "nazvaný GNU, a dát jej svobodně <a href=\"#f1\">(1)</a> k dispozici 
každému, "
 "kdo jej může využít. Velmi jsou teď potřeba příspěvky formou času, 
peněz, "
 "programů a vybavení."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To begin with, GNU will be a kernel plus all the utilities needed to write "
 "and run C programs: editor, shell, C compiler, linker, assembler, and a few "
@@ -79,7 +98,7 @@
 "vše, co běžně obsahuje systém Unix a všechno ostatní, včetně on-line 
a "
 "tištěné dokumentace."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU will be able to run Unix programs, but will not be identical to Unix.  "
 "We will make all improvements that are convenient, based on our experience "
@@ -103,11 +122,11 @@
 "chaosnet, daleko lepším než UUCP.  Můžeme mít ale také něco 
kompatibilního s "
 "UUCP."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Who Am I?"
 msgstr "Kdo jsem ?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am Richard Stallman, inventor of the original much-imitated EMACS editor, "
 "now at the Artificial Intelligence Lab at MIT.  I have worked extensively on "
@@ -124,11 +143,11 @@
 "implementoval i jeden souborový systém odolný proti pádu a dva okenní "
 "systémy  pro lispové stroje."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why I Must Write GNU"
 msgstr "Proč musím napsat GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I consider that the golden rule requires that if I like a program I must "
 "share it with other people who like it.  I cannot in good conscience sign a "
@@ -138,7 +157,7 @@
 "s ostatními, kteří jej mají také rádi. Nemohu s čistým svědomím 
podepsat non-"
 "disclosure agreement (NSA) či softwarové licenční ujednání."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So that I can continue to use computers without violating my principles, I "
 "have decided to put together a sufficient body of free software so that I "
@@ -148,11 +167,11 @@
 "rozhodl jsem se dát dohromady dostatečný základ svobodného softwaru tak, 
"
 "abych se obešel bez jakéhokoli, který svobodný není."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How You Can Contribute"
 msgstr "Jak můžete přispět"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am asking computer manufacturers for donations of machines and money.  I'm "
 "asking individuals for donations of programs and work."
@@ -160,7 +179,7 @@
 "Vyzývám výrobce počítačů, aby věnovali techniku a peníze. Vyzývám "
 "jednotlivce, aby přispěli programy a svou prací."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One computer manufacturer has already offered to provide a machine.  But we "
 "could use more.  One consequence you can expect if you donate machines is "
@@ -173,7 +192,7 @@
 "na něm brzy poběží. Počítač by měl být použitelný v domácím 
prostředí a "
 "nevyžadovat složité chlazení či silný zdroj energie."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Individual programmers can contribute by writing a compatible duplicate of "
 "some Unix utility and giving it to me.  For most projects, such part-time "
@@ -190,7 +209,7 @@
 "týkajících se rozhraní je daná kompatibilitou s Unixem. Pokud bude 
každý "
 "takový příspěvek pracovat s Unixem, bude pravděpodobně pracovat i s 
GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If I get donations of money, I may be able to hire a few people full or part "
 "time.  The salary won't be high, but I'm looking for people for whom knowing "
@@ -204,78 +223,223 @@
 "mohli věnovat všechnu svoji energii práci na GNU a nemuseli se živit 
jiným "
 "způsobem."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "For more information, contact me."
 msgstr "Kontaktujte mne pro další informace."
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Arpanet mail:"
 msgstr "Arpanet mail:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "RMS@MIT-MC.ARPA"
 msgstr "RMS@MIT-MC.ARPA"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Usenet:"
 msgstr "Usenet:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "...!mit-eddie!RMS@OZ"
 msgstr "...!mit-eddie!RMS@OZ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "...!mit-vax!RMS@OZ"
 msgstr "...!mit-vax!RMS@OZ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "US Snail:"
 msgstr "US hlemýždí pošta:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Richard Stallman"
 msgstr "Richard Stallman"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "166 Prospect St"
 msgstr "166 Prospect St"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Cambridge, MA 02139"
 msgstr "Cambridge, MA 02139"
 
-#. type: Content of: <h4>
-msgid "Poor choice of wording around &ldquo;free&rdquo;"
-msgstr "Chudé vyjadřovací možnosti kolem „free“"
-
-#. type: Content of: <p>
-msgid ""
-"The wording here was careless.  The intention was that nobody would have to "
-"pay for <b>permission</b> to use the GNU system.  But the words don't make "
-"this clear, and people often interpret them as saying that copies of GNU "
-"should always be distributed at little or no charge.  That was never the "
-"intent."
-msgstr ""
-"Tato formulace byla nedbalá. Záměrem bylo, že nikdo nebude muset platit 
za "
-"<b>povolení</b> používat systém GNU. Ale slova to nevyjadřují 
jednoznačně a "
-"lidé je často vykládají tak, že kopie GNU musí být vždy 
distribuované za "
-"malý nebo žádný poplatek. To ale nikdy nebyl záměr."
-
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Original message"
 msgstr "Původní zpráva"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "For completeness, the original email is reproduced here, in its original "
 "form."
 msgstr "Pro úplnost zde uvádíme e-mail v jeho původním tvaru."
 
 #. TRANSLATORS: Don't translate anything except the headers.
-#. type: Content of: <div><pre>
-#, no-wrap
+#. type: Content of: <div><div><pre>
+# | [-\\nFrom-]{+From+}
+# | 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\\nFrom:
+# | RMS%MIT-OZ@mit-eddie\\nNewsgroups: net.unix-wizards,net.usoft\\nSubject:
+# | new Unix implementation\\nDate: Tue, 27-Sep-83 12:35:59
+# | EST\\nOrganization: MIT AI Lab, Cambridge, MA\\n\\nFree
+# | Unix!\\n\\nStarting this Thanksgiving I am going to write a
+# | complete\\nUnix-compatible software system called GNU (for Gnu's Not
+# | Unix), and\\ngive it away [-free<a href=\"#f1\">(1)</a>-] {+free&#8239;<a
+# | href=\"#f1\">[1]</a>+} to everyone who can use it.\\nContributions of
+# | time, money, programs and equipment are greatly\\nneeded.\\n\\nTo begin
+# | with, GNU will be a kernel plus all the utilities needed to\\nwrite and
+# | run C programs: editor, shell, C compiler, linker,\\nassembler, and a few
+# | other things.  After this we will add a text\\nformatter, a YACC, an
+# | Empire game, a spreadsheet, and hundreds of\\nother things.  We hope to
+# | supply, eventually, everything useful that\\nnormally comes with a Unix
+# | system, and anything else useful, including\\non-line and hardcopy
+# | documentation.\\n\\nGNU will be able to run Unix programs, but will not be
+# | identical\\nto Unix.  We will make all improvements that are convenient,
+# | based\\non our experience with other operating systems.  In
+# | particular,\\nwe plan to have longer filenames, file version numbers, a
+# | crashproof\\nfile system, filename completion perhaps,
+# | terminal-independent\\ndisplay support, and eventually a Lisp-based window
+# | system through\\nwhich several Lisp programs and ordinary Unix programs
+# | can share a screen.\\nBoth C and Lisp will be available as system
+# | programming languages.\\nWe will have network software based on MIT's
+# | chaosnet protocol,\\nfar superior to UUCP.  We may also have something
+# | compatible\\nwith UUCP.\\n\\n\\nWho Am I?\\n\\nI am Richard Stallman,
+# | inventor of the original much-imitated EMACS\\neditor, now at the
+# | Artificial Intelligence Lab at MIT.  I have worked\\nextensively on
+# | compilers, editors, debuggers, command interpreters, the\\nIncompatible
+# | Timesharing System and the Lisp Machine operating system.\\nI pioneered
+# | terminal-independent display support in ITS.  In addition I\\nhave
+# | implemented one crashproof file system and two window systems for\\nLisp
+# | machines.\\n\\n\\nWhy I Must Write GNU\\n\\nI consider that the golden
+# | rule requires that if I like a program I\\nmust share it with other people
+# | who like it.  I cannot in good\\nconscience sign a nondisclosure agreement
+# | or a software license\\nagreement.\\n\\nSo that I can continue to use
+# | computers without violating my principles,\\nI have decided to put
+# | together a sufficient body of free software so that\\nI will be able to
+# | get along without any software that is not free.\\n\\n\\nHow You Can
+# | Contribute\\n\\nI am asking computer manufacturers for donations of
+# | machines and money.\\nI'm asking individuals for donations of programs and
+# | work.\\n\\nOne computer manufacturer has already offered to provide a
+# | machine.  But\\nwe could use more.  One consequence you can expect if you
+# | donate\\nmachines is that GNU will run on them at an early date.  The
+# | machine had\\nbetter be able to operate in a residential area, and not
+# | require\\nsophisticated cooling or power.\\n\\nIndividual programmers can
+# | contribute by writing a compatible duplicate\\nof some Unix utility and
+# | giving it to me.  For most projects, such\\npart-time distributed work
+# | would be very hard to coordinate; the\\nindependently-written parts would
+# | not work together.  But for the\\nparticular task of replacing Unix, this
+# | problem is absent.  Most\\ninterface specifications are fixed by Unix
+# | compatibility.  If each\\ncontribution works with the rest of Unix, it
+# | will probably work\\nwith the rest of GNU.\\n\\nIf I get donations of
+# | money, I may be able to hire a few people full or\\npart time.  The salary
+# | won't be high, but I'm looking for people for\\nwhom knowing they are
+# | helping humanity is as important as money.  I view\\nthis as a way of
+# | enabling dedicated people to devote their full energies to\\nworking on
+# | GNU by sparing them the need to make a living in another way.\\n\\n\\nFor
+# | more information, contact me.\\nArpanet mail:\\n 
+# | RMS@MIT-MC.ARPA\\n\\nUsenet:\\n  ...!mit-eddie!RMS@OZ\\n 
+# | ...!mit-vax!RMS@OZ\\n\\nUS Snail:\\n  Richard Stallman\\n  166 Prospect
+# | St\\n  Cambridge, MA 02139\\n
+#, fuzzy, no-wrap
+#| msgid ""
+#| "\n"
+#| "From 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\n"
+#| "From: RMS%MIT-OZ@mit-eddie\n"
+#| "Newsgroups: net.unix-wizards,net.usoft\n"
+#| "Subject: new Unix implementation\n"
+#| "Date: Tue, 27-Sep-83 12:35:59 EST\n"
+#| "Organization: MIT AI Lab, Cambridge, MA\n"
+#| "\n"
+#| "Free Unix!\n"
+#| "\n"
+#| "Starting this Thanksgiving I am going to write a complete\n"
+#| "Unix-compatible software system called GNU (for Gnu's Not Unix), and\n"
+#| "give it away free<a href=\"#f1\">(1)</a> to everyone who can use it.\n"
+#| "Contributions of time, money, programs and equipment are greatly\n"
+#| "needed.\n"
+#| "\n"
+#| "To begin with, GNU will be a kernel plus all the utilities needed to\n"
+#| "write and run C programs: editor, shell, C compiler, linker,\n"
+#| "assembler, and a few other things.  After this we will add a text\n"
+#| "formatter, a YACC, an Empire game, a spreadsheet, and hundreds of\n"
+#| "other things.  We hope to supply, eventually, everything useful that\n"
+#| "normally comes with a Unix system, and anything else useful, including\n"
+#| "on-line and hardcopy documentation.\n"
+#| "\n"
+#| "GNU will be able to run Unix programs, but will not be identical\n"
+#| "to Unix.  We will make all improvements that are convenient, based\n"
+#| "on our experience with other operating systems.  In particular,\n"
+#| "we plan to have longer filenames, file version numbers, a crashproof\n"
+#| "file system, filename completion perhaps, terminal-independent\n"
+#| "display support, and eventually a Lisp-based window system through\n"
+#| "which several Lisp programs and ordinary Unix programs can share a 
screen.\n"
+#| "Both C and Lisp will be available as system programming languages.\n"
+#| "We will have network software based on MIT's chaosnet protocol,\n"
+#| "far superior to UUCP.  We may also have something compatible\n"
+#| "with UUCP.\n"
+#| "\n"
+#| "\n"
+#| "Who Am I?\n"
+#| "\n"
+#| "I am Richard Stallman, inventor of the original much-imitated EMACS\n"
+#| "editor, now at the Artificial Intelligence Lab at MIT.  I have worked\n"
+#| "extensively on compilers, editors, debuggers, command interpreters, the\n"
+#| "Incompatible Timesharing System and the Lisp Machine operating system.\n"
+#| "I pioneered terminal-independent display support in ITS.  In addition I\n"
+#| "have implemented one crashproof file system and two window systems for\n"
+#| "Lisp machines.\n"
+#| "\n"
+#| "\n"
+#| "Why I Must Write GNU\n"
+#| "\n"
+#| "I consider that the golden rule requires that if I like a program I\n"
+#| "must share it with other people who like it.  I cannot in good\n"
+#| "conscience sign a nondisclosure agreement or a software license\n"
+#| "agreement.\n"
+#| "\n"
+#| "So that I can continue to use computers without violating my principles,\n"
+#| "I have decided to put together a sufficient body of free software so 
that\n"
+#| "I will be able to get along without any software that is not free.\n"
+#| "\n"
+#| "\n"
+#| "How You Can Contribute\n"
+#| "\n"
+#| "I am asking computer manufacturers for donations of machines and money.\n"
+#| "I'm asking individuals for donations of programs and work.\n"
+#| "\n"
+#| "One computer manufacturer has already offered to provide a machine.  But\n"
+#| "we could use more.  One consequence you can expect if you donate\n"
+#| "machines is that GNU will run on them at an early date.  The machine had\n"
+#| "better be able to operate in a residential area, and not require\n"
+#| "sophisticated cooling or power.\n"
+#| "\n"
+#| "Individual programmers can contribute by writing a compatible duplicate\n"
+#| "of some Unix utility and giving it to me.  For most projects, such\n"
+#| "part-time distributed work would be very hard to coordinate; the\n"
+#| "independently-written parts would not work together.  But for the\n"
+#| "particular task of replacing Unix, this problem is absent.  Most\n"
+#| "interface specifications are fixed by Unix compatibility.  If each\n"
+#| "contribution works with the rest of Unix, it will probably work\n"
+#| "with the rest of GNU.\n"
+#| "\n"
+#| "If I get donations of money, I may be able to hire a few people full or\n"
+#| "part time.  The salary won't be high, but I'm looking for people for\n"
+#| "whom knowing they are helping humanity is as important as money.  I view\n"
+#| "this as a way of enabling dedicated people to devote their full energies 
to\n"
+#| "working on GNU by sparing them the need to make a living in another way.\n"
+#| "\n"
+#| "\n"
+#| "For more information, contact me.\n"
+#| "Arpanet mail:\n"
+#| "  RMS@MIT-MC.ARPA\n"
+#| "\n"
+#| "Usenet:\n"
+#| "  ...!mit-eddie!RMS@OZ\n"
+#| "  ...!mit-vax!RMS@OZ\n"
+#| "\n"
+#| "US Snail:\n"
+#| "  Richard Stallman\n"
+#| "  166 Prospect St\n"
+#| "  Cambridge, MA 02139\n"
 msgid ""
-"\n"
 "From 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\n"
 "From: RMS%MIT-OZ@mit-eddie\n"
 "Newsgroups: net.unix-wizards,net.usoft\n"
@@ -287,7 +451,7 @@
 "\n"
 "Starting this Thanksgiving I am going to write a complete\n"
 "Unix-compatible software system called GNU (for Gnu's Not Unix), and\n"
-"give it away free<a href=\"#f1\">(1)</a> to everyone who can use it.\n"
+"give it away free&#8239;<a href=\"#f1\">[1]</a> to everyone who can use it.\n"
 "Contributions of time, money, programs and equipment are greatly\n"
 "needed.\n"
 "\n"
@@ -475,6 +639,38 @@
 "  166 Prospect St\n"
 "  Cambridge, MA 02139\n"
 
+#. type: Content of: <div><h3>
+# | Footnote[-s-]
+#, fuzzy
+#| msgid "Footnotes"
+msgid "Footnote"
+msgstr "Poznámky pod čarou"
+
+#. type: Content of: <div><ol><li>
+# | [-The-]{+<em>The+} wording here was [-careless.-] {+careless.</em>+} The
+# | intention was that nobody would have to pay for <b>permission</b> to use
+# | the GNU system.  But the words don't make this clear, and people often
+# | interpret them as saying that copies of GNU should always be distributed
+# | at little or no charge.  That was never the intent.
+#, fuzzy
+#| msgid ""
+#| "The wording here was careless.  The intention was that nobody would have "
+#| "to pay for <b>permission</b> to use the GNU system.  But the words don't "
+#| "make this clear, and people often interpret them as saying that copies of "
+#| "GNU should always be distributed at little or no charge.  That was never "
+#| "the intent."
+msgid ""
+"<em>The wording here was careless.</em> The intention was that nobody would "
+"have to pay for <b>permission</b> to use the GNU system.  But the words "
+"don't make this clear, and people often interpret them as saying that copies "
+"of GNU should always be distributed at little or no charge.  That was never "
+"the intent."
+msgstr ""
+"Tato formulace byla nedbalá. Záměrem bylo, že nikdo nebude muset platit 
za "
+"<b>povolení</b> používat systém GNU. Ale slova to nevyjadřují 
jednoznačně a "
+"lidé je často vykládají tak, že kopie GNU musí být vždy 
distribuované za "
+"malý nebo žádný poplatek. To ale nikdy nebyl záměr."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -501,14 +697,20 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Pracujeme tvrdě a děláme to nejlepší, abychom vám přinesli přesné a 
kvalitní "
@@ -519,22 +721,37 @@
 "se dozvíte, jak koordinovat svoji práci a posílat překlady tohoto 
článku."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; 1983, 1999, 2007, [-2008,-] 2009, [-2013, 2014-] {+2021+}
+# | Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
+#| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
-"Foundation, Inc."
+"Copyright &copy; 1983, 1999, 2007, 2009, 2021 Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
 "Foundation, Inc."
 
 #. type: Content of: <div><p>
+# | This page is licensed under a <a rel=\"license\"
+# | [-href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative-]
+# | {+href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Creative+}
+# | Commons [-Attribution-NoDerivs 3.0 United States-]
+# | {+Attribution-NoDerivatives 4.0 International+} License</a>.
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#| "NoDerivs 3.0 United States License</a>."
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
 "Tato stránka je vydána pod licencí <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/deed.cs\">Creative Commons Uveďte "
-"původ-Nezpracovávejte 3.0 Spojené státy americké</a>."
+"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+"NoDerivs 3.0 United States License</a>."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>
@@ -546,10 +763,34 @@
 msgid "Updated:"
 msgstr "Aktualizováno:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
-"Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
-"Software Foundation, Inc."
+#~ msgid "Poor choice of wording around &ldquo;free&rdquo;"
+#~ msgstr "Chudé vyjadřovací možnosti kolem „free“"
+
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "Pracujeme tvrdě a děláme to nejlepší, abychom vám přinesli přesné 
a "
+#~ "kvalitní překlady. Nicméně i my můžeme udělat chybu. Vaše 
komentáře a "
+#~ "návrhy na vylepšení vítáme na adrese <a 
href=\"mailto:web-translators@gnu.";
+#~ "org\"> &lt;web-translators@gnu.org&gt;</a>.</p> <p>Přečtěte si prosím  
<a "
+#~ "href=\"/server/standards/README.translations.html\">Příručku "
+#~ "překladatele</a>, kde se dozvíte, jak koordinovat svoji práci a 
posílat "
+#~ "překlady tohoto článku."
+
+#~ msgid ""
+#~ "This page is licensed under a <a rel=\"license\" href=\"http://";
+#~ "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#~ "NoDerivs 3.0 United States License</a>."
+#~ msgstr ""
+#~ "Tato stránka je vydána pod licencí <a rel=\"license\" href=\"http://";
+#~ "creativecommons.org/licenses/by-nd/3.0/us/deed.cs\">Creative Commons "
+#~ "Uveďte původ-Nezpracovávejte 3.0 Spojené státy americké</a>."
+
+#~ msgid ""
+#~ "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
+#~ "Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
+#~ "Software Foundation, Inc."

Index: po/initial-announcement.de.po
===================================================================
RCS file: /web/www/www/gnu/po/initial-announcement.de.po,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- po/initial-announcement.de.po       2 Nov 2021 13:25:56 -0000       1.41
+++ po/initial-announcement.de.po       2 Nov 2021 14:41:52 -0000       1.42
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: initial-announcement.html\n"
 "Report-Msgid-Bugs-To: Webmasters <webmasters@gnu.org>\n"
-"POT-Creation-Date: 2014-04-04 23:59+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2014-04-14 22:00+0200\n"
 "Last-Translator: Joerg Kohne <joeko (AT) online [PUNKT] de>\n"
 "Language-Team: German <www-de-translators@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-11-02 14:27+0000\n"
 
 # (+) New Unix Implementation
 #. type: Content of: <title>
@@ -24,21 +25,28 @@
 "Neue Unix-Implementierung: Ursprüngliche Ankündigung [des GNU-Projekts] - "
 "GNU-Projekt - Free Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Initial Announcement"
 msgstr ""
 "Neue Unix-Implementierung: Ursprüngliche Ankündigung [des GNU-Projekts]"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
+# | This is the original announcement of the GNU Project, posted by <a
+# | href=\"http{+s+}://www.stallman.org/\">Richard Stallman</a> on September
+# | 27, 1983.
+#, fuzzy
+#| msgid ""
+#| "This is the original announcement of the GNU Project, posted by <a href="
+#| "\"http://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
 msgid ""
 "This is the original announcement of the GNU Project, posted by <a href="
-"\"http://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
+"\"https://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
 msgstr ""
 "<span class=\"intro\"><em>Dies ist die ursprüngliche Ankündigung des GNU-"
 "Projekts, geschrieben von <a href=\"http://www.stallman.org/\";>Richard "
 "Stallman</a> am 27. September 1983.</em></span>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The actual history of the GNU Project differs in many ways from this initial "
 "plan. For example, the beginning was delayed until January 1984. Several of "
@@ -57,16 +65,27 @@
 # "Nachrichten-ID: &lt;771@mit-eddie.UUCP&gt;\n"
 # "Datum: Dienstag, 27. Sep.-83 13:35:59 EDT\n"
 # "Organisation: MIT AI Lab, Cambridge, MA</p>\n"
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Free Unix!"
 msgstr "Freies Unix!"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Starting this Thanksgiving I am going to write a complete Unix-compatible
+# | software system called GNU (for Gnu's Not Unix), and give it away [-free<a
+# | href=\"#f1\">(1)</a>-] {+free&#8239;<a class=\"ftn\"
+# | href=\"#f1\">[1]</a>+} to everyone who can use it.  Contributions of time,
+# | money, programs and equipment are greatly needed.
+#, fuzzy
+#| msgid ""
+#| "Starting this Thanksgiving I am going to write a complete Unix-compatible "
+#| "software system called GNU (for Gnu's Not Unix), and give it away free<a "
+#| "href=\"#f1\">(1)</a> to everyone who can use it.  Contributions of time, "
+#| "money, programs and equipment are greatly needed."
 msgid ""
 "Starting this Thanksgiving I am going to write a complete Unix-compatible "
-"software system called GNU (for Gnu's Not Unix), and give it away free<a "
-"href=\"#f1\">(1)</a> to everyone who can use it.  Contributions of time, "
-"money, programs and equipment are greatly needed."
+"software system called GNU (for Gnu's Not Unix), and give it away free&#8239;"
+"<a class=\"ftn\" href=\"#f1\">[1]</a> to everyone who can use it.  "
+"Contributions of time, money, programs and equipment are greatly needed."
 msgstr ""
 "Ab diesem <span xml:lang=\"en\" lang=\"en\">Thanksgiving</span><a href="
 "\"#tn1\" id=\"tn1-ref\" class=\"transnote\">[*]</a> werde ich ein "
@@ -75,7 +94,7 @@
 "\" class=\"transnote\">(1)</a>, der es benutzen kann. Beiträge in Form von "
 "Zeit, Geld, Programmen und Ausrüstung sind dringend erforderlich."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To begin with, GNU will be a kernel plus all the utilities needed to write "
 "and run C programs: editor, shell, C compiler, linker, assembler, and a few "
@@ -95,7 +114,7 @@
 "System kommt, und alles sonst nützliche, einschließlich Onlinedokumentation 
"
 "und gedruckter Dokumentation."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU will be able to run Unix programs, but will not be identical to Unix.  "
 "We will make all improvements that are convenient, based on our experience "
@@ -121,11 +140,11 @@
 "lang=\"en\" lang=\"en\">Unix to Unix Copy Protocol (UUCP)</span> weit "
 "überlegen, haben. Möglicherweise auch etwas, das mit UUCP kompatibel ist."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Who Am I?"
 msgstr "Wer bin ich?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am Richard Stallman, inventor of the original much-imitated EMACS editor, "
 "now at the Artificial Intelligence Lab at MIT.  I have worked extensively on "
@@ -143,11 +162,11 @@
 "ITS. Darüber hinaus implementierte ich ein absturzsicheres Dateisystem und "
 "zwei Fenstersysteme für Lisp-Rechner."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why I Must Write GNU"
 msgstr "Warum ich GNU schreiben muss"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I consider that the golden rule requires that if I like a program I must "
 "share it with other people who like it.  I cannot in good conscience sign a "
@@ -158,7 +177,7 @@
 "Gewissens eine Vertraulichkeits- oder eine Softwarelizenzvereinbarung "
 "unterzeichnen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So that I can continue to use computers without violating my principles, I "
 "have decided to put together a sufficient body of free software so that I "
@@ -169,11 +188,11 @@
 "zusammenzustellen, damit ich in der Lage sein werde, ohne jegliche unfreie "
 "Software auszukommen."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How You Can Contribute"
 msgstr "Wie man beitragen kann"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am asking computer manufacturers for donations of machines and money.  I'm "
 "asking individuals for donations of programs and work."
@@ -181,7 +200,7 @@
 "Ich bitte Rechnerhersteller um Rechner- und Geldspenden. Einzelpersonen "
 "bitte ich um Programmspenden und deren Arbeitskraft."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One computer manufacturer has already offered to provide a machine.  But we "
 "could use more.  One consequence you can expect if you donate machines is "
@@ -195,7 +214,7 @@
 "sollte in einem Wohngebiet nutzbar sein und keine aufwendige Kühlung oder "
 "Stromversorgung benötigen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Individual programmers can contribute by writing a compatible duplicate of "
 "some Unix utility and giving it to me.  For most projects, such part-time "
@@ -214,7 +233,7 @@
 "werden durch Unix-Kompatibilität geregelt. Wenn jeder Beitrag mit dem Rest "
 "von Unix arbeitet, arbeitet es vermutlich mit dem Rest von GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If I get donations of money, I may be able to hire a few people full or part "
 "time.  The salary won't be high, but I'm looking for people for whom knowing "
@@ -230,71 +249,51 @@
 "widmen, indem ich ihnen die Notwendigkeit erspare, den Lebensunterhalt auf "
 "andere Weise zu bestreiten."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "For more information, contact me."
 msgstr "Kontaktieren Sie mich für weitere Informationen:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Arpanet mail:"
 msgstr "via ARPANET-E-Mail:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "RMS@MIT-MC.ARPA"
 msgstr "RMS@MIT-MC.ARPA"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Usenet:"
 msgstr "via Usenet:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "...!mit-eddie!RMS@OZ"
 msgstr "...!mit-eddie!RMS@OZ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "...!mit-vax!RMS@OZ"
 msgstr "...!mit-vax!RMS@OZ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "US Snail:"
 msgstr "US-Briefpost:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Richard Stallman"
 msgstr "Richard Stallman"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "166 Prospect St"
 msgstr "166 Prospect St"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Cambridge, MA 02139"
 msgstr "Cambridge, MA 02139"
 
-#. type: Content of: <h4>
-msgid "Poor choice of wording around &ldquo;free&rdquo;"
-msgstr ""
-"Nachtrag</h4><p><a href=\"#f1-ref\">(1)</a>  Schlechte Wortwahl um <em>"
-"‚frei‘</em></p><h4>"
-
-#. type: Content of: <p>
-msgid ""
-"The wording here was careless.  The intention was that nobody would have to "
-"pay for <b>permission</b> to use the GNU system.  But the words don't make "
-"this clear, and people often interpret them as saying that copies of GNU "
-"should always be distributed at little or no charge.  That was never the "
-"intent."
-msgstr ""
-"Die Formulierung war ein wenig sorglos. Die Absicht war, dass niemand für "
-"die <strong>Berechtigung</strong> würde zahlen müssen, um das GNU-System "
-"benutzen zu können. Aber die Wörter verdeutlichen dies nicht und werden "
-"häufig mit <em>Kopien von GNU sollten immer mit geringen Kosten oder "
-"kostenlos verbreitet werden</em> interpretiert. Das war nie die Absicht."
-
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Original message"
 msgstr "Ursprüngliche Nachricht"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "For completeness, the original email is reproduced here, in its original "
 "form."
@@ -303,10 +302,172 @@
 "ursprünglichen Form:"
 
 #. TRANSLATORS: Don't translate anything except the headers.
-#. type: Content of: <div><pre>
-#, no-wrap
+#. type: Content of: <div><div><pre>
+# | [-\\nFrom-]{+From+}
+# | 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\\nFrom:
+# | RMS%MIT-OZ@mit-eddie\\nNewsgroups: net.unix-wizards,net.usoft\\nSubject:
+# | new Unix implementation\\nDate: Tue, 27-Sep-83 12:35:59
+# | EST\\nOrganization: MIT AI Lab, Cambridge, MA\\n\\nFree
+# | Unix!\\n\\nStarting this Thanksgiving I am going to write a
+# | complete\\nUnix-compatible software system called GNU (for Gnu's Not
+# | Unix), and\\ngive it away [-free<a href=\"#f1\">(1)</a>-] {+free&#8239;<a
+# | href=\"#f1\">[1]</a>+} to everyone who can use it.\\nContributions of
+# | time, money, programs and equipment are greatly\\nneeded.\\n\\nTo begin
+# | with, GNU will be a kernel plus all the utilities needed to\\nwrite and
+# | run C programs: editor, shell, C compiler, linker,\\nassembler, and a few
+# | other things.  After this we will add a text\\nformatter, a YACC, an
+# | Empire game, a spreadsheet, and hundreds of\\nother things.  We hope to
+# | supply, eventually, everything useful that\\nnormally comes with a Unix
+# | system, and anything else useful, including\\non-line and hardcopy
+# | documentation.\\n\\nGNU will be able to run Unix programs, but will not be
+# | identical\\nto Unix.  We will make all improvements that are convenient,
+# | based\\non our experience with other operating systems.  In
+# | particular,\\nwe plan to have longer filenames, file version numbers, a
+# | crashproof\\nfile system, filename completion perhaps,
+# | terminal-independent\\ndisplay support, and eventually a Lisp-based window
+# | system through\\nwhich several Lisp programs and ordinary Unix programs
+# | can share a screen.\\nBoth C and Lisp will be available as system
+# | programming languages.\\nWe will have network software based on MIT's
+# | chaosnet protocol,\\nfar superior to UUCP.  We may also have something
+# | compatible\\nwith UUCP.\\n\\n\\nWho Am I?\\n\\nI am Richard Stallman,
+# | inventor of the original much-imitated EMACS\\neditor, now at the
+# | Artificial Intelligence Lab at MIT.  I have worked\\nextensively on
+# | compilers, editors, debuggers, command interpreters, the\\nIncompatible
+# | Timesharing System and the Lisp Machine operating system.\\nI pioneered
+# | terminal-independent display support in ITS.  In addition I\\nhave
+# | implemented one crashproof file system and two window systems for\\nLisp
+# | machines.\\n\\n\\nWhy I Must Write GNU\\n\\nI consider that the golden
+# | rule requires that if I like a program I\\nmust share it with other people
+# | who like it.  I cannot in good\\nconscience sign a nondisclosure agreement
+# | or a software license\\nagreement.\\n\\nSo that I can continue to use
+# | computers without violating my principles,\\nI have decided to put
+# | together a sufficient body of free software so that\\nI will be able to
+# | get along without any software that is not free.\\n\\n\\nHow You Can
+# | Contribute\\n\\nI am asking computer manufacturers for donations of
+# | machines and money.\\nI'm asking individuals for donations of programs and
+# | work.\\n\\nOne computer manufacturer has already offered to provide a
+# | machine.  But\\nwe could use more.  One consequence you can expect if you
+# | donate\\nmachines is that GNU will run on them at an early date.  The
+# | machine had\\nbetter be able to operate in a residential area, and not
+# | require\\nsophisticated cooling or power.\\n\\nIndividual programmers can
+# | contribute by writing a compatible duplicate\\nof some Unix utility and
+# | giving it to me.  For most projects, such\\npart-time distributed work
+# | would be very hard to coordinate; the\\nindependently-written parts would
+# | not work together.  But for the\\nparticular task of replacing Unix, this
+# | problem is absent.  Most\\ninterface specifications are fixed by Unix
+# | compatibility.  If each\\ncontribution works with the rest of Unix, it
+# | will probably work\\nwith the rest of GNU.\\n\\nIf I get donations of
+# | money, I may be able to hire a few people full or\\npart time.  The salary
+# | won't be high, but I'm looking for people for\\nwhom knowing they are
+# | helping humanity is as important as money.  I view\\nthis as a way of
+# | enabling dedicated people to devote their full energies to\\nworking on
+# | GNU by sparing them the need to make a living in another way.\\n\\n\\nFor
+# | more information, contact me.\\nArpanet mail:\\n 
+# | RMS@MIT-MC.ARPA\\n\\nUsenet:\\n  ...!mit-eddie!RMS@OZ\\n 
+# | ...!mit-vax!RMS@OZ\\n\\nUS Snail:\\n  Richard Stallman\\n  166 Prospect
+# | St\\n  Cambridge, MA 02139\\n
+#, fuzzy, no-wrap
+#| msgid ""
+#| "\n"
+#| "From 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\n"
+#| "From: RMS%MIT-OZ@mit-eddie\n"
+#| "Newsgroups: net.unix-wizards,net.usoft\n"
+#| "Subject: new Unix implementation\n"
+#| "Date: Tue, 27-Sep-83 12:35:59 EST\n"
+#| "Organization: MIT AI Lab, Cambridge, MA\n"
+#| "\n"
+#| "Free Unix!\n"
+#| "\n"
+#| "Starting this Thanksgiving I am going to write a complete\n"
+#| "Unix-compatible software system called GNU (for Gnu's Not Unix), and\n"
+#| "give it away free<a href=\"#f1\">(1)</a> to everyone who can use it.\n"
+#| "Contributions of time, money, programs and equipment are greatly\n"
+#| "needed.\n"
+#| "\n"
+#| "To begin with, GNU will be a kernel plus all the utilities needed to\n"
+#| "write and run C programs: editor, shell, C compiler, linker,\n"
+#| "assembler, and a few other things.  After this we will add a text\n"
+#| "formatter, a YACC, an Empire game, a spreadsheet, and hundreds of\n"
+#| "other things.  We hope to supply, eventually, everything useful that\n"
+#| "normally comes with a Unix system, and anything else useful, including\n"
+#| "on-line and hardcopy documentation.\n"
+#| "\n"
+#| "GNU will be able to run Unix programs, but will not be identical\n"
+#| "to Unix.  We will make all improvements that are convenient, based\n"
+#| "on our experience with other operating systems.  In particular,\n"
+#| "we plan to have longer filenames, file version numbers, a crashproof\n"
+#| "file system, filename completion perhaps, terminal-independent\n"
+#| "display support, and eventually a Lisp-based window system through\n"
+#| "which several Lisp programs and ordinary Unix programs can share a 
screen.\n"
+#| "Both C and Lisp will be available as system programming languages.\n"
+#| "We will have network software based on MIT's chaosnet protocol,\n"
+#| "far superior to UUCP.  We may also have something compatible\n"
+#| "with UUCP.\n"
+#| "\n"
+#| "\n"
+#| "Who Am I?\n"
+#| "\n"
+#| "I am Richard Stallman, inventor of the original much-imitated EMACS\n"
+#| "editor, now at the Artificial Intelligence Lab at MIT.  I have worked\n"
+#| "extensively on compilers, editors, debuggers, command interpreters, the\n"
+#| "Incompatible Timesharing System and the Lisp Machine operating system.\n"
+#| "I pioneered terminal-independent display support in ITS.  In addition I\n"
+#| "have implemented one crashproof file system and two window systems for\n"
+#| "Lisp machines.\n"
+#| "\n"
+#| "\n"
+#| "Why I Must Write GNU\n"
+#| "\n"
+#| "I consider that the golden rule requires that if I like a program I\n"
+#| "must share it with other people who like it.  I cannot in good\n"
+#| "conscience sign a nondisclosure agreement or a software license\n"
+#| "agreement.\n"
+#| "\n"
+#| "So that I can continue to use computers without violating my principles,\n"
+#| "I have decided to put together a sufficient body of free software so 
that\n"
+#| "I will be able to get along without any software that is not free.\n"
+#| "\n"
+#| "\n"
+#| "How You Can Contribute\n"
+#| "\n"
+#| "I am asking computer manufacturers for donations of machines and money.\n"
+#| "I'm asking individuals for donations of programs and work.\n"
+#| "\n"
+#| "One computer manufacturer has already offered to provide a machine.  But\n"
+#| "we could use more.  One consequence you can expect if you donate\n"
+#| "machines is that GNU will run on them at an early date.  The machine had\n"
+#| "better be able to operate in a residential area, and not require\n"
+#| "sophisticated cooling or power.\n"
+#| "\n"
+#| "Individual programmers can contribute by writing a compatible duplicate\n"
+#| "of some Unix utility and giving it to me.  For most projects, such\n"
+#| "part-time distributed work would be very hard to coordinate; the\n"
+#| "independently-written parts would not work together.  But for the\n"
+#| "particular task of replacing Unix, this problem is absent.  Most\n"
+#| "interface specifications are fixed by Unix compatibility.  If each\n"
+#| "contribution works with the rest of Unix, it will probably work\n"
+#| "with the rest of GNU.\n"
+#| "\n"
+#| "If I get donations of money, I may be able to hire a few people full or\n"
+#| "part time.  The salary won't be high, but I'm looking for people for\n"
+#| "whom knowing they are helping humanity is as important as money.  I view\n"
+#| "this as a way of enabling dedicated people to devote their full energies 
to\n"
+#| "working on GNU by sparing them the need to make a living in another way.\n"
+#| "\n"
+#| "\n"
+#| "For more information, contact me.\n"
+#| "Arpanet mail:\n"
+#| "  RMS@MIT-MC.ARPA\n"
+#| "\n"
+#| "Usenet:\n"
+#| "  ...!mit-eddie!RMS@OZ\n"
+#| "  ...!mit-vax!RMS@OZ\n"
+#| "\n"
+#| "US Snail:\n"
+#| "  Richard Stallman\n"
+#| "  166 Prospect St\n"
+#| "  Cambridge, MA 02139\n"
 msgid ""
-"\n"
 "From 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\n"
 "From: RMS%MIT-OZ@mit-eddie\n"
 "Newsgroups: net.unix-wizards,net.usoft\n"
@@ -318,7 +479,7 @@
 "\n"
 "Starting this Thanksgiving I am going to write a complete\n"
 "Unix-compatible software system called GNU (for Gnu's Not Unix), and\n"
-"give it away free<a href=\"#f1\">(1)</a> to everyone who can use it.\n"
+"give it away free&#8239;<a href=\"#f1\">[1]</a> to everyone who can use it.\n"
 "Contributions of time, money, programs and equipment are greatly\n"
 "needed.\n"
 "\n"
@@ -508,6 +669,39 @@
 "  Cambridge, MA 02139\n"
 "</span>\n"
 
+#. type: Content of: <div><h3>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Footnote"
+msgid "Footnote"
+msgstr "Fußnote"
+
+#. type: Content of: <div><ol><li>
+# | [-The-]{+<em>The+} wording here was [-careless.-] {+careless.</em>+} The
+# | intention was that nobody would have to pay for <b>permission</b> to use
+# | the GNU system.  But the words don't make this clear, and people often
+# | interpret them as saying that copies of GNU should always be distributed
+# | at little or no charge.  That was never the intent.
+#, fuzzy
+#| msgid ""
+#| "The wording here was careless.  The intention was that nobody would have "
+#| "to pay for <b>permission</b> to use the GNU system.  But the words don't "
+#| "make this clear, and people often interpret them as saying that copies of "
+#| "GNU should always be distributed at little or no charge.  That was never "
+#| "the intent."
+msgid ""
+"<em>The wording here was careless.</em> The intention was that nobody would "
+"have to pay for <b>permission</b> to use the GNU system.  But the words "
+"don't make this clear, and people often interpret them as saying that copies "
+"of GNU should always be distributed at little or no charge.  That was never "
+"the intent."
+msgstr ""
+"Die Formulierung war ein wenig sorglos. Die Absicht war, dass niemand für "
+"die <strong>Berechtigung</strong> würde zahlen müssen, um das GNU-System "
+"benutzen zu können. Aber die Wörter verdeutlichen dies nicht und werden "
+"häufig mit <em>Kopien von GNU sollten immer mit geringen Kosten oder "
+"kostenlos verbreitet werden</em> interpretiert. Das war nie die Absicht."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -543,14 +737,20 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Bei der Übersetzung dieses Werkes wurde mit größter Sorgfalt vorgegangen. "
@@ -564,23 +764,32 @@
 "standards/README.translations\">LIESMICH für Übersetzungen</a>."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; 1983, 1999, 2007, [-2008, 2009-] {+2009, 2021+} Free
+# | Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1983, 1999, 2007, 2008, 2009 Free Software Foundation, "
+#| "Inc."
 msgid ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
-"Foundation, Inc."
+"Copyright &copy; 1983, 1999, 2007, 2009, 2021 Free Software Foundation, Inc."
 msgstr ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
-"Foundation, Inc."
+"Copyright &copy; 1983, 1999, 2007, 2008, 2009 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+#| "NoDerivatives 4.0 International License</a>."
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
 "Dieses Werk ist lizenziert unter einer <a rel=\"license\" href=\"//"
-"creativecommons.org/licenses/by-nd/3.0/us/deed.de\">Creative Commons "
-"Namensnennung-Keine Bearbeitung 3.0 Vereinigte Staaten von Amerika</a>-"
-"Lizenz."
+"creativecommons.org/licenses/by-nd/4.0/deed.de\">Creative Commons "
+"Namensnennung-Keine Bearbeitungen 4.0 International</a>-Lizenz."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>
@@ -594,24 +803,38 @@
 msgid "Updated:"
 msgstr "Letzte Änderung:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
-"Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
-"Software Foundation, Inc."
+#~ msgid "Poor choice of wording around &ldquo;free&rdquo;"
+#~ msgstr ""
+#~ "Nachtrag</h4><p><a href=\"#f1-ref\">(1)</a>  Schlechte Wortwahl um <em>"
+#~ "‚frei‘</em></p><h4>"
 
 #~ msgid ""
-#~ "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013 Free Software "
+#~ "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
 #~ "Foundation, Inc."
 #~ msgstr ""
-#~ "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013 Free Software "
+#~ "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
 #~ "Foundation, Inc."
 
 #~ msgid ""
-#~ "Copyright &copy; 1983, 1999, 2007, 2008, 2009 Free Software Foundation, "
-#~ "Inc."
+#~ "This page is licensed under a <a rel=\"license\" href=\"http://";
+#~ "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#~ "NoDerivs 3.0 United States License</a>."
+#~ msgstr ""
+#~ "Dieses Werk ist lizenziert unter einer <a rel=\"license\" href=\"//"
+#~ "creativecommons.org/licenses/by-nd/3.0/us/deed.de\">Creative Commons "
+#~ "Namensnennung-Keine Bearbeitung 3.0 Vereinigte Staaten von Amerika</a>-"
+#~ "Lizenz."
+
+#~ msgid ""
+#~ "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
+#~ "Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
+#~ "Software Foundation, Inc."
+
+#~ msgid ""
+#~ "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013 Free Software "
+#~ "Foundation, Inc."
 #~ msgstr ""
-#~ "Copyright &copy; 1983, 1999, 2007, 2008, 2009 Free Software Foundation, "
-#~ "Inc."
+#~ "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013 Free Software "
+#~ "Foundation, Inc."

Index: po/initial-announcement.es.po
===================================================================
RCS file: /web/www/www/gnu/po/initial-announcement.es.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- po/initial-announcement.es.po       2 Nov 2021 13:25:56 -0000       1.21
+++ po/initial-announcement.es.po       2 Nov 2021 14:41:52 -0000       1.22
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: initial-announcement.html\n"
-"POT-Creation-Date: 2014-04-04 23:59+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2014-04-05 09:52+0100\n"
 "Last-Translator: Dora Scilipoti <dora AT gnu DOT 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-11-02 14:27+0000\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Poedit-Language: Spanish\n"
 
@@ -26,19 +27,26 @@
 msgid "Initial Announcement - GNU Project - Free Software Foundation"
 msgstr "Anuncio inicial - Proyecto GNU - Free Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Initial Announcement"
 msgstr "Anuncio inicial"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
+# | This is the original announcement of the GNU Project, posted by <a
+# | href=\"http{+s+}://www.stallman.org/\">Richard Stallman</a> on September
+# | 27, 1983.
+#, fuzzy
+#| msgid ""
+#| "This is the original announcement of the GNU Project, posted by <a href="
+#| "\"http://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
 msgid ""
 "This is the original announcement of the GNU Project, posted by <a href="
-"\"http://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
+"\"https://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
 msgstr ""
 "Este es el anuncio original del proyecto GNU, enviado por <a href=\"http://";
 "www.stallman.org/\">Richard Stallman</a> el 27 de septiembre de 1983."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The actual history of the GNU Project differs in many ways from this initial "
 "plan. For example, the beginning was delayed until January 1984. Several of "
@@ -51,16 +59,27 @@
 "philosophy/free-sw.html\">software libre</a> se aclararon unos años más "
 "tarde."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Free Unix!"
 msgstr "¡Unix Libre!"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Starting this Thanksgiving I am going to write a complete Unix-compatible
+# | software system called GNU (for Gnu's Not Unix), and give it away [-free<a
+# | href=\"#f1\">(1)</a>-] {+free&#8239;<a class=\"ftn\"
+# | href=\"#f1\">[1]</a>+} to everyone who can use it.  Contributions of time,
+# | money, programs and equipment are greatly needed.
+#, fuzzy
+#| msgid ""
+#| "Starting this Thanksgiving I am going to write a complete Unix-compatible "
+#| "software system called GNU (for Gnu's Not Unix), and give it away free<a "
+#| "href=\"#f1\">(1)</a> to everyone who can use it.  Contributions of time, "
+#| "money, programs and equipment are greatly needed."
 msgid ""
 "Starting this Thanksgiving I am going to write a complete Unix-compatible "
-"software system called GNU (for Gnu's Not Unix), and give it away free<a "
-"href=\"#f1\">(1)</a> to everyone who can use it.  Contributions of time, "
-"money, programs and equipment are greatly needed."
+"software system called GNU (for Gnu's Not Unix), and give it away free&#8239;"
+"<a class=\"ftn\" href=\"#f1\">[1]</a> to everyone who can use it.  "
+"Contributions of time, money, programs and equipment are greatly needed."
 msgstr ""
 "A partir del próximo Día de Acción de Gracias<a id=\"TransNote1-rev\" 
href="
 "\"#TransNote1\">[1]</a> comenzaré a escribir un sistema de software completo 
"
@@ -68,7 +87,7 @@
 "distribuiré libremente <a href=\"#f1\">(1)</a> para que todos puedan usarlo. 
"
 "Son muy necesarias las contribuciones de dinero, programas y equipos."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To begin with, GNU will be a kernel plus all the utilities needed to write "
 "and run C programs: editor, shell, C compiler, linker, assembler, and a few "
@@ -87,7 +106,7 @@
 "cualquier otro elemento de utilidad, incluyendo documentación online e "
 "impresa."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU will be able to run Unix programs, but will not be identical to Unix.  "
 "We will make all improvements that are convenient, based on our experience "
@@ -113,11 +132,11 @@
 "chaosnet desarrollado en el MIT, muy superior a UUCP. Quizás también 
hagamos "
 "algo compatible con UUCP."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Who Am I?"
 msgstr "¿Quién soy?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am Richard Stallman, inventor of the original much-imitated EMACS editor, "
 "now at the Artificial Intelligence Lab at MIT.  I have worked extensively on "
@@ -135,11 +154,11 @@
 "archivos a prueba de caídas y dos sistemas de ventanas para las máquinas "
 "Lisp."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why I Must Write GNU"
 msgstr "Por qué debo escribir GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I consider that the golden rule requires that if I like a program I must "
 "share it with other people who like it.  I cannot in good conscience sign a "
@@ -150,7 +169,7 @@
 "no me permite firmar un acuerdo de confidencialidad o un acuerdo de licencia "
 "de software."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So that I can continue to use computers without violating my principles, I "
 "have decided to put together a sufficient body of free software so that I "
@@ -160,11 +179,11 @@
 "decidido reunir suficiente software libre para no tener que usar ningún "
 "programa que no sea llibre. "
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How You Can Contribute"
 msgstr "Cómo contribuir"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am asking computer manufacturers for donations of machines and money.  I'm "
 "asking individuals for donations of programs and work."
@@ -172,7 +191,7 @@
 "A los fabricantes de computadoras les pido donaciones de máquinas y de "
 "dinero.  A las demás personas les pido la donación de programas y de 
trabajo."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One computer manufacturer has already offered to provide a machine.  But we "
 "could use more.  One consequence you can expect if you donate machines is "
@@ -186,7 +205,7 @@
 "capaz de operar preferiblemente en un área residencial, y no requerir "
 "sofisticados sistemas de energía o de refrigeración."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Individual programmers can contribute by writing a compatible duplicate of "
 "some Unix utility and giving it to me.  For most projects, such part-time "
@@ -205,7 +224,7 @@
 "compatibilidad con Unix. Si cada contribución funciona con el resto de Unix, 
"
 "probablemente funcionará con el resto de GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If I get donations of money, I may be able to hire a few people full or part "
 "time.  The salary won't be high, but I'm looking for people for whom knowing "
@@ -220,69 +239,51 @@
 "oportunidad de dedicar todas sus energías a trabajar en GNU,  ahorrándose 
la "
 "necesidad de tener que ganarse la vida de otra manera."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "For more information, contact me."
 msgstr "Para más información, póngase en contacto conmigo."
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Arpanet mail:"
 msgstr "Correo electrónico en Arpanet:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "RMS@MIT-MC.ARPA"
 msgstr "RMS@MIT-MC.ARPA"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Usenet:"
 msgstr "Usenet:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "...!mit-eddie!RMS@OZ"
 msgstr "...!mit-eddie!RMS@OZ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "...!mit-vax!RMS@OZ"
 msgstr "...!mit-vax!RMS@OZ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "US Snail:"
 msgstr "Dirección postal en los EE.&nbsp;UU.:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Richard Stallman"
 msgstr "Richard Stallman"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "166 Prospect St"
 msgstr "166 Prospect St"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Cambridge, MA 02139"
 msgstr "Cambridge, MA 02139"
 
-#. type: Content of: <h4>
-msgid "Poor choice of wording around &ldquo;free&rdquo;"
-msgstr "Poca claridad en torno al término «<cite>free</cite>»"
-
-#. type: Content of: <p>
-msgid ""
-"The wording here was careless.  The intention was that nobody would have to "
-"pay for <b>permission</b> to use the GNU system.  But the words don't make "
-"this clear, and people often interpret them as saying that copies of GNU "
-"should always be distributed at little or no charge.  That was never the "
-"intent."
-msgstr ""
-"La redacción aquí fue descuidada. La intención era que nadie tendría que "
-"pagar el <strong>permiso</strong> para usar el sistema GNU. Pero la "
-"redacción no lo deja en claro, y la gente suele interpretar que las copias "
-"de GNU se deberían distribuir siempre a un costo muy bajo o sin cobrar nada. 
"
-"Esa nunca fue la intención."
-
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Original message"
 msgstr "Mensaje original"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "For completeness, the original email is reproduced here, in its original "
 "form."
@@ -292,10 +293,172 @@
 
 # type: Content of: <pre>
 #. TRANSLATORS: Don't translate anything except the headers.
-#. type: Content of: <div><pre>
-#, no-wrap
+#. type: Content of: <div><div><pre>
+# | [-\\nFrom-]{+From+}
+# | 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\\nFrom:
+# | RMS%MIT-OZ@mit-eddie\\nNewsgroups: net.unix-wizards,net.usoft\\nSubject:
+# | new Unix implementation\\nDate: Tue, 27-Sep-83 12:35:59
+# | EST\\nOrganization: MIT AI Lab, Cambridge, MA\\n\\nFree
+# | Unix!\\n\\nStarting this Thanksgiving I am going to write a
+# | complete\\nUnix-compatible software system called GNU (for Gnu's Not
+# | Unix), and\\ngive it away [-free<a href=\"#f1\">(1)</a>-] {+free&#8239;<a
+# | href=\"#f1\">[1]</a>+} to everyone who can use it.\\nContributions of
+# | time, money, programs and equipment are greatly\\nneeded.\\n\\nTo begin
+# | with, GNU will be a kernel plus all the utilities needed to\\nwrite and
+# | run C programs: editor, shell, C compiler, linker,\\nassembler, and a few
+# | other things.  After this we will add a text\\nformatter, a YACC, an
+# | Empire game, a spreadsheet, and hundreds of\\nother things.  We hope to
+# | supply, eventually, everything useful that\\nnormally comes with a Unix
+# | system, and anything else useful, including\\non-line and hardcopy
+# | documentation.\\n\\nGNU will be able to run Unix programs, but will not be
+# | identical\\nto Unix.  We will make all improvements that are convenient,
+# | based\\non our experience with other operating systems.  In
+# | particular,\\nwe plan to have longer filenames, file version numbers, a
+# | crashproof\\nfile system, filename completion perhaps,
+# | terminal-independent\\ndisplay support, and eventually a Lisp-based window
+# | system through\\nwhich several Lisp programs and ordinary Unix programs
+# | can share a screen.\\nBoth C and Lisp will be available as system
+# | programming languages.\\nWe will have network software based on MIT's
+# | chaosnet protocol,\\nfar superior to UUCP.  We may also have something
+# | compatible\\nwith UUCP.\\n\\n\\nWho Am I?\\n\\nI am Richard Stallman,
+# | inventor of the original much-imitated EMACS\\neditor, now at the
+# | Artificial Intelligence Lab at MIT.  I have worked\\nextensively on
+# | compilers, editors, debuggers, command interpreters, the\\nIncompatible
+# | Timesharing System and the Lisp Machine operating system.\\nI pioneered
+# | terminal-independent display support in ITS.  In addition I\\nhave
+# | implemented one crashproof file system and two window systems for\\nLisp
+# | machines.\\n\\n\\nWhy I Must Write GNU\\n\\nI consider that the golden
+# | rule requires that if I like a program I\\nmust share it with other people
+# | who like it.  I cannot in good\\nconscience sign a nondisclosure agreement
+# | or a software license\\nagreement.\\n\\nSo that I can continue to use
+# | computers without violating my principles,\\nI have decided to put
+# | together a sufficient body of free software so that\\nI will be able to
+# | get along without any software that is not free.\\n\\n\\nHow You Can
+# | Contribute\\n\\nI am asking computer manufacturers for donations of
+# | machines and money.\\nI'm asking individuals for donations of programs and
+# | work.\\n\\nOne computer manufacturer has already offered to provide a
+# | machine.  But\\nwe could use more.  One consequence you can expect if you
+# | donate\\nmachines is that GNU will run on them at an early date.  The
+# | machine had\\nbetter be able to operate in a residential area, and not
+# | require\\nsophisticated cooling or power.\\n\\nIndividual programmers can
+# | contribute by writing a compatible duplicate\\nof some Unix utility and
+# | giving it to me.  For most projects, such\\npart-time distributed work
+# | would be very hard to coordinate; the\\nindependently-written parts would
+# | not work together.  But for the\\nparticular task of replacing Unix, this
+# | problem is absent.  Most\\ninterface specifications are fixed by Unix
+# | compatibility.  If each\\ncontribution works with the rest of Unix, it
+# | will probably work\\nwith the rest of GNU.\\n\\nIf I get donations of
+# | money, I may be able to hire a few people full or\\npart time.  The salary
+# | won't be high, but I'm looking for people for\\nwhom knowing they are
+# | helping humanity is as important as money.  I view\\nthis as a way of
+# | enabling dedicated people to devote their full energies to\\nworking on
+# | GNU by sparing them the need to make a living in another way.\\n\\n\\nFor
+# | more information, contact me.\\nArpanet mail:\\n 
+# | RMS@MIT-MC.ARPA\\n\\nUsenet:\\n  ...!mit-eddie!RMS@OZ\\n 
+# | ...!mit-vax!RMS@OZ\\n\\nUS Snail:\\n  Richard Stallman\\n  166 Prospect
+# | St\\n  Cambridge, MA 02139\\n
+#, fuzzy, no-wrap
+#| msgid ""
+#| "\n"
+#| "From 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\n"
+#| "From: RMS%MIT-OZ@mit-eddie\n"
+#| "Newsgroups: net.unix-wizards,net.usoft\n"
+#| "Subject: new Unix implementation\n"
+#| "Date: Tue, 27-Sep-83 12:35:59 EST\n"
+#| "Organization: MIT AI Lab, Cambridge, MA\n"
+#| "\n"
+#| "Free Unix!\n"
+#| "\n"
+#| "Starting this Thanksgiving I am going to write a complete\n"
+#| "Unix-compatible software system called GNU (for Gnu's Not Unix), and\n"
+#| "give it away free<a href=\"#f1\">(1)</a> to everyone who can use it.\n"
+#| "Contributions of time, money, programs and equipment are greatly\n"
+#| "needed.\n"
+#| "\n"
+#| "To begin with, GNU will be a kernel plus all the utilities needed to\n"
+#| "write and run C programs: editor, shell, C compiler, linker,\n"
+#| "assembler, and a few other things.  After this we will add a text\n"
+#| "formatter, a YACC, an Empire game, a spreadsheet, and hundreds of\n"
+#| "other things.  We hope to supply, eventually, everything useful that\n"
+#| "normally comes with a Unix system, and anything else useful, including\n"
+#| "on-line and hardcopy documentation.\n"
+#| "\n"
+#| "GNU will be able to run Unix programs, but will not be identical\n"
+#| "to Unix.  We will make all improvements that are convenient, based\n"
+#| "on our experience with other operating systems.  In particular,\n"
+#| "we plan to have longer filenames, file version numbers, a crashproof\n"
+#| "file system, filename completion perhaps, terminal-independent\n"
+#| "display support, and eventually a Lisp-based window system through\n"
+#| "which several Lisp programs and ordinary Unix programs can share a 
screen.\n"
+#| "Both C and Lisp will be available as system programming languages.\n"
+#| "We will have network software based on MIT's chaosnet protocol,\n"
+#| "far superior to UUCP.  We may also have something compatible\n"
+#| "with UUCP.\n"
+#| "\n"
+#| "\n"
+#| "Who Am I?\n"
+#| "\n"
+#| "I am Richard Stallman, inventor of the original much-imitated EMACS\n"
+#| "editor, now at the Artificial Intelligence Lab at MIT.  I have worked\n"
+#| "extensively on compilers, editors, debuggers, command interpreters, the\n"
+#| "Incompatible Timesharing System and the Lisp Machine operating system.\n"
+#| "I pioneered terminal-independent display support in ITS.  In addition I\n"
+#| "have implemented one crashproof file system and two window systems for\n"
+#| "Lisp machines.\n"
+#| "\n"
+#| "\n"
+#| "Why I Must Write GNU\n"
+#| "\n"
+#| "I consider that the golden rule requires that if I like a program I\n"
+#| "must share it with other people who like it.  I cannot in good\n"
+#| "conscience sign a nondisclosure agreement or a software license\n"
+#| "agreement.\n"
+#| "\n"
+#| "So that I can continue to use computers without violating my principles,\n"
+#| "I have decided to put together a sufficient body of free software so 
that\n"
+#| "I will be able to get along without any software that is not free.\n"
+#| "\n"
+#| "\n"
+#| "How You Can Contribute\n"
+#| "\n"
+#| "I am asking computer manufacturers for donations of machines and money.\n"
+#| "I'm asking individuals for donations of programs and work.\n"
+#| "\n"
+#| "One computer manufacturer has already offered to provide a machine.  But\n"
+#| "we could use more.  One consequence you can expect if you donate\n"
+#| "machines is that GNU will run on them at an early date.  The machine had\n"
+#| "better be able to operate in a residential area, and not require\n"
+#| "sophisticated cooling or power.\n"
+#| "\n"
+#| "Individual programmers can contribute by writing a compatible duplicate\n"
+#| "of some Unix utility and giving it to me.  For most projects, such\n"
+#| "part-time distributed work would be very hard to coordinate; the\n"
+#| "independently-written parts would not work together.  But for the\n"
+#| "particular task of replacing Unix, this problem is absent.  Most\n"
+#| "interface specifications are fixed by Unix compatibility.  If each\n"
+#| "contribution works with the rest of Unix, it will probably work\n"
+#| "with the rest of GNU.\n"
+#| "\n"
+#| "If I get donations of money, I may be able to hire a few people full or\n"
+#| "part time.  The salary won't be high, but I'm looking for people for\n"
+#| "whom knowing they are helping humanity is as important as money.  I view\n"
+#| "this as a way of enabling dedicated people to devote their full energies 
to\n"
+#| "working on GNU by sparing them the need to make a living in another way.\n"
+#| "\n"
+#| "\n"
+#| "For more information, contact me.\n"
+#| "Arpanet mail:\n"
+#| "  RMS@MIT-MC.ARPA\n"
+#| "\n"
+#| "Usenet:\n"
+#| "  ...!mit-eddie!RMS@OZ\n"
+#| "  ...!mit-vax!RMS@OZ\n"
+#| "\n"
+#| "US Snail:\n"
+#| "  Richard Stallman\n"
+#| "  166 Prospect St\n"
+#| "  Cambridge, MA 02139\n"
 msgid ""
-"\n"
 "From 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\n"
 "From: RMS%MIT-OZ@mit-eddie\n"
 "Newsgroups: net.unix-wizards,net.usoft\n"
@@ -307,7 +470,7 @@
 "\n"
 "Starting this Thanksgiving I am going to write a complete\n"
 "Unix-compatible software system called GNU (for Gnu's Not Unix), and\n"
-"give it away free<a href=\"#f1\">(1)</a> to everyone who can use it.\n"
+"give it away free&#8239;<a href=\"#f1\">[1]</a> to everyone who can use it.\n"
 "Contributions of time, money, programs and equipment are greatly\n"
 "needed.\n"
 "\n"
@@ -495,6 +658,39 @@
 "  166 Prospect St\n"
 "  Cambridge, MA 02139\n"
 
+#. type: Content of: <div><h3>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Footnote"
+msgid "Footnote"
+msgstr "Nota"
+
+#. type: Content of: <div><ol><li>
+# | [-The-]{+<em>The+} wording here was [-careless.-] {+careless.</em>+} The
+# | intention was that nobody would have to pay for <b>permission</b> to use
+# | the GNU system.  But the words don't make this clear, and people often
+# | interpret them as saying that copies of GNU should always be distributed
+# | at little or no charge.  That was never the intent.
+#, fuzzy
+#| msgid ""
+#| "The wording here was careless.  The intention was that nobody would have "
+#| "to pay for <b>permission</b> to use the GNU system.  But the words don't "
+#| "make this clear, and people often interpret them as saying that copies of "
+#| "GNU should always be distributed at little or no charge.  That was never "
+#| "the intent."
+msgid ""
+"<em>The wording here was careless.</em> The intention was that nobody would "
+"have to pay for <b>permission</b> to use the GNU system.  But the words "
+"don't make this clear, and people often interpret them as saying that copies "
+"of GNU should always be distributed at little or no charge.  That was never "
+"the intent."
+msgstr ""
+"La redacción aquí fue descuidada. La intención era que nadie tendría que "
+"pagar el <strong>permiso</strong> para usar el sistema GNU. Pero la "
+"redacción no lo deja en claro, y la gente suele interpretar que las copias "
+"de GNU se deberían distribuir siempre a un costo muy bajo o sin cobrar nada. 
"
+"Esa nunca fue la intención."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -518,7 +714,6 @@
 "proponer otras correcciones o sugerencias, diríjase a <a href=\"mailto:";
 "webmasters@gnu.org\">&lt;webmasters@gnu.org&gt;</a>."
 
-#
 #.  TRANSLATORS: Ignore the original text in this paragraph,
 #.         replace it with the translation of these two:
 #.         We work hard and do our best to provide accurate, good quality
@@ -526,14 +721,14 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "El equipo de traductores al español se esfuerza por ofrecer traducciones "
@@ -545,9 +740,14 @@
 "coordinación y el envío de traducciones de las páginas de este sitio web."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; 1983, 1999, 2007, [-2008,-] 2009, [-2013, 2014-] {+2021+}
+# | Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
+#| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
-"Foundation, Inc."
+"Copyright &copy; 1983, 1999, 2007, 2009, 2021 Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
 "Foundation, Inc."
@@ -555,12 +755,12 @@
 #. type: Content of: <div><p>
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
 "Esta página está bajo licencia <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/deed.es_ES\">Creative Commons "
-"Reconocimiento-SinObraDerivada 3.0 Estados Unidos de América</a>."
+"creativecommons.org/licenses/by-nd/4.0/deed.es_ES\">Creative Commons "
+"Reconocimiento-SinObraDerivada 4.0 Internacional</a>."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>
@@ -575,10 +775,12 @@
 msgid "Updated:"
 msgstr "Última actualización:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
-"Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
-"Software Foundation, Inc."
+#~ msgid "Poor choice of wording around &ldquo;free&rdquo;"
+#~ msgstr "Poca claridad en torno al término «<cite>free</cite>»"
+
+#~ msgid ""
+#~ "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
+#~ "Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
+#~ "Software Foundation, Inc."

Index: po/initial-announcement.fr.po
===================================================================
RCS file: /web/www/www/gnu/po/initial-announcement.fr.po,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- po/initial-announcement.fr.po       2 Nov 2021 13:25:57 -0000       1.52
+++ po/initial-announcement.fr.po       2 Nov 2021 14:41:52 -0000       1.53
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: initial-announcement.html\n"
-"POT-Creation-Date: 2014-04-04 23:59+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2021-09-12 19:21+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-11-02 14:27+0000\n"
 "Plural-Forms: \n"
 "X-Generator: Gtranslator 2.91.5\n"
 
@@ -24,19 +25,26 @@
 msgid "Initial Announcement - GNU Project - Free Software Foundation"
 msgstr "Annonce initiale - Projet GNU - Free Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Initial Announcement"
 msgstr "Annonce initiale"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
+# | This is the original announcement of the GNU Project, posted by <a
+# | href=\"http{+s+}://www.stallman.org/\">Richard Stallman</a> on September
+# | 27, 1983.
+#, fuzzy
+#| msgid ""
+#| "This is the original announcement of the GNU Project, posted by <a href="
+#| "\"http://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
 msgid ""
 "This is the original announcement of the GNU Project, posted by <a href="
-"\"http://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
+"\"https://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
 msgstr ""
 "Voici l'annonce originale du projet GNU, publiée par <a href=\"http://www.";
 "stallman.org/\">Richard Stallman</a> le 27 septembre 1983."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The actual history of the GNU Project differs in many ways from this initial "
 "plan. For example, the beginning was delayed until January 1984. Several of "
@@ -48,16 +56,27 @@
 "concepts philosophiques du <a href=\"/philosophy/free-sw.html\">logiciel "
 "libre</a> n'ont été clarifiés qu'après plusieurs années."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Free Unix!"
 msgstr "Libérez Unix !"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Starting this Thanksgiving I am going to write a complete Unix-compatible
+# | software system called GNU (for Gnu's Not Unix), and give it away [-free<a
+# | href=\"#f1\">(1)</a>-] {+free&#8239;<a class=\"ftn\"
+# | href=\"#f1\">[1]</a>+} to everyone who can use it.  Contributions of time,
+# | money, programs and equipment are greatly needed.
+#, fuzzy
+#| msgid ""
+#| "Starting this Thanksgiving I am going to write a complete Unix-compatible "
+#| "software system called GNU (for Gnu's Not Unix), and give it away free<a "
+#| "href=\"#f1\">(1)</a> to everyone who can use it.  Contributions of time, "
+#| "money, programs and equipment are greatly needed."
 msgid ""
 "Starting this Thanksgiving I am going to write a complete Unix-compatible "
-"software system called GNU (for Gnu's Not Unix), and give it away free<a "
-"href=\"#f1\">(1)</a> to everyone who can use it.  Contributions of time, "
-"money, programs and equipment are greatly needed."
+"software system called GNU (for Gnu's Not Unix), and give it away free&#8239;"
+"<a class=\"ftn\" href=\"#f1\">[1]</a> to everyone who can use it.  "
+"Contributions of time, money, programs and equipment are greatly needed."
 msgstr ""
 "À partir de Thanksgiving je vais écrire un système logiciel complet "
 "compatible avec Unix appelé GNU (pour <i>Gnu's Not Unix</i> – Gnu N'est 
pas "
@@ -66,7 +85,7 @@
 "\" href=\"#TransNote1\"><sup>a</sup></a> Il y a grand besoin de "
 "contributions sous forme de temps, d'argent, de programmes et d'équipement."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To begin with, GNU will be a kernel plus all the utilities needed to write "
 "and run C programs: editor, shell, C compiler, linker, assembler, and a few "
@@ -84,7 +103,7 @@
 "ainsi que tout autre composant utile, y compris de la documentation en ligne "
 "et imprimée."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU will be able to run Unix programs, but will not be identical to Unix.  "
 "We will make all improvements that are convenient, based on our experience "
@@ -111,11 +130,11 @@
 "protocole Chaosnet du MIT, bien supérieur à UUCP. Nous pourrions aussi 
avoir "
 "quelque chose de compatible avec UUCP."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Who Am I?"
 msgstr "Qui suis-je ?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am Richard Stallman, inventor of the original much-imitated EMACS editor, "
 "now at the Artificial Intelligence Lab at MIT.  I have worked extensively on "
@@ -135,11 +154,11 @@
 "œuvre un système de fichiers robuste et deux systèmes de fenêtrage pour "
 "machines Lisp."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why I Must Write GNU"
 msgstr "Pourquoi je dois écrire GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I consider that the golden rule requires that if I like a program I must "
 "share it with other people who like it.  I cannot in good conscience sign a "
@@ -150,7 +169,7 @@
 "conscience signer un accord de confidentialité ni un accord de licence de "
 "logiciel."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So that I can continue to use computers without violating my principles, I "
 "have decided to put together a sufficient body of free software so that I "
@@ -161,11 +180,11 @@
 "libres, de manière à pouvoir m'en tirer sans aucun logiciel qui ne soit pas 
"
 "libre."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How You Can Contribute"
 msgstr "Comment vous pouvez participer"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am asking computer manufacturers for donations of machines and money.  I'm "
 "asking individuals for donations of programs and work."
@@ -174,7 +193,7 @@
 "et d'argent. Je demande aux gens une participation sous forme de programmes "
 "et de travail."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One computer manufacturer has already offered to provide a machine.  But we "
 "could use more.  One consequence you can expect if you donate machines is "
@@ -189,7 +208,7 @@
 "requérir d'installation électrique ni de système de refroidissement "
 "sophistiqués."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Individual programmers can contribute by writing a compatible duplicate of "
 "some Unix utility and giving it to me.  For most projects, such part-time "
@@ -209,7 +228,7 @@
 "peut fonctionner avec le reste d'Unix, elle a de fortes chances de "
 "fonctionner avec le reste de GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If I get donations of money, I may be able to hire a few people full or part "
 "time.  The salary won't be high, but I'm looking for people for whom knowing "
@@ -224,69 +243,51 @@
 "mettre toute leur énergie à travailler sur GNU en leur épargnant le besoin 
"
 "de gagner leur vie d'une autre manière."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "For more information, contact me."
 msgstr "Pour plus ample information, contactez-moi."
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Arpanet mail:"
 msgstr "Arpanet mail:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "RMS@MIT-MC.ARPA"
 msgstr "RMS@MIT-MC.ARPA"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Usenet:"
 msgstr "Usenet:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "...!mit-eddie!RMS@OZ"
 msgstr "...!mit-eddie!RMS@OZ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "...!mit-vax!RMS@OZ"
 msgstr "...!mit-vax!RMS@OZ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "US Snail:"
 msgstr "US Snail:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Richard Stallman"
 msgstr "Richard Stallman"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "166 Prospect St"
 msgstr "166 Prospect St"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Cambridge, MA 02139"
 msgstr "Cambridge, MA 02139"
 
-#. type: Content of: <h4>
-msgid "Poor choice of wording around &ldquo;free&rdquo;"
-msgstr "Piètre formulation autour du mot <i>free</i>"
-
-#. type: Content of: <p>
-msgid ""
-"The wording here was careless.  The intention was that nobody would have to "
-"pay for <b>permission</b> to use the GNU system.  But the words don't make "
-"this clear, and people often interpret them as saying that copies of GNU "
-"should always be distributed at little or no charge.  That was never the "
-"intent."
-msgstr ""
-"Ici, les mots n'ont pas été choisis soigneusement. Le sens voulu était que 
"
-"personne n'aurait à payer pour la <b>permission</b> d'utiliser le système "
-"GNU. Mais la phrase ne rend pas cela clairement, et les gens l'interprètent "
-"souvent comme indiquant que les copies de GNU devraient toujours être "
-"distribuées à bas coût ou gratuitement ; cela n'a jamais été mon 
intention."
-
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Original message"
 msgstr "Message original"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "For completeness, the original email is reproduced here, in its original "
 "form."
@@ -295,10 +296,172 @@
 "forme originale."
 
 #. TRANSLATORS: Don't translate anything except the headers.
-#. type: Content of: <div><pre>
-#, no-wrap
+#. type: Content of: <div><div><pre>
+# | [-\\nFrom-]{+From+}
+# | 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\\nFrom:
+# | RMS%MIT-OZ@mit-eddie\\nNewsgroups: net.unix-wizards,net.usoft\\nSubject:
+# | new Unix implementation\\nDate: Tue, 27-Sep-83 12:35:59
+# | EST\\nOrganization: MIT AI Lab, Cambridge, MA\\n\\nFree
+# | Unix!\\n\\nStarting this Thanksgiving I am going to write a
+# | complete\\nUnix-compatible software system called GNU (for Gnu's Not
+# | Unix), and\\ngive it away [-free<a href=\"#f1\">(1)</a>-] {+free&#8239;<a
+# | href=\"#f1\">[1]</a>+} to everyone who can use it.\\nContributions of
+# | time, money, programs and equipment are greatly\\nneeded.\\n\\nTo begin
+# | with, GNU will be a kernel plus all the utilities needed to\\nwrite and
+# | run C programs: editor, shell, C compiler, linker,\\nassembler, and a few
+# | other things.  After this we will add a text\\nformatter, a YACC, an
+# | Empire game, a spreadsheet, and hundreds of\\nother things.  We hope to
+# | supply, eventually, everything useful that\\nnormally comes with a Unix
+# | system, and anything else useful, including\\non-line and hardcopy
+# | documentation.\\n\\nGNU will be able to run Unix programs, but will not be
+# | identical\\nto Unix.  We will make all improvements that are convenient,
+# | based\\non our experience with other operating systems.  In
+# | particular,\\nwe plan to have longer filenames, file version numbers, a
+# | crashproof\\nfile system, filename completion perhaps,
+# | terminal-independent\\ndisplay support, and eventually a Lisp-based window
+# | system through\\nwhich several Lisp programs and ordinary Unix programs
+# | can share a screen.\\nBoth C and Lisp will be available as system
+# | programming languages.\\nWe will have network software based on MIT's
+# | chaosnet protocol,\\nfar superior to UUCP.  We may also have something
+# | compatible\\nwith UUCP.\\n\\n\\nWho Am I?\\n\\nI am Richard Stallman,
+# | inventor of the original much-imitated EMACS\\neditor, now at the
+# | Artificial Intelligence Lab at MIT.  I have worked\\nextensively on
+# | compilers, editors, debuggers, command interpreters, the\\nIncompatible
+# | Timesharing System and the Lisp Machine operating system.\\nI pioneered
+# | terminal-independent display support in ITS.  In addition I\\nhave
+# | implemented one crashproof file system and two window systems for\\nLisp
+# | machines.\\n\\n\\nWhy I Must Write GNU\\n\\nI consider that the golden
+# | rule requires that if I like a program I\\nmust share it with other people
+# | who like it.  I cannot in good\\nconscience sign a nondisclosure agreement
+# | or a software license\\nagreement.\\n\\nSo that I can continue to use
+# | computers without violating my principles,\\nI have decided to put
+# | together a sufficient body of free software so that\\nI will be able to
+# | get along without any software that is not free.\\n\\n\\nHow You Can
+# | Contribute\\n\\nI am asking computer manufacturers for donations of
+# | machines and money.\\nI'm asking individuals for donations of programs and
+# | work.\\n\\nOne computer manufacturer has already offered to provide a
+# | machine.  But\\nwe could use more.  One consequence you can expect if you
+# | donate\\nmachines is that GNU will run on them at an early date.  The
+# | machine had\\nbetter be able to operate in a residential area, and not
+# | require\\nsophisticated cooling or power.\\n\\nIndividual programmers can
+# | contribute by writing a compatible duplicate\\nof some Unix utility and
+# | giving it to me.  For most projects, such\\npart-time distributed work
+# | would be very hard to coordinate; the\\nindependently-written parts would
+# | not work together.  But for the\\nparticular task of replacing Unix, this
+# | problem is absent.  Most\\ninterface specifications are fixed by Unix
+# | compatibility.  If each\\ncontribution works with the rest of Unix, it
+# | will probably work\\nwith the rest of GNU.\\n\\nIf I get donations of
+# | money, I may be able to hire a few people full or\\npart time.  The salary
+# | won't be high, but I'm looking for people for\\nwhom knowing they are
+# | helping humanity is as important as money.  I view\\nthis as a way of
+# | enabling dedicated people to devote their full energies to\\nworking on
+# | GNU by sparing them the need to make a living in another way.\\n\\n\\nFor
+# | more information, contact me.\\nArpanet mail:\\n 
+# | RMS@MIT-MC.ARPA\\n\\nUsenet:\\n  ...!mit-eddie!RMS@OZ\\n 
+# | ...!mit-vax!RMS@OZ\\n\\nUS Snail:\\n  Richard Stallman\\n  166 Prospect
+# | St\\n  Cambridge, MA 02139\\n
+#, fuzzy, no-wrap
+#| msgid ""
+#| "\n"
+#| "From 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\n"
+#| "From: RMS%MIT-OZ@mit-eddie\n"
+#| "Newsgroups: net.unix-wizards,net.usoft\n"
+#| "Subject: new Unix implementation\n"
+#| "Date: Tue, 27-Sep-83 12:35:59 EST\n"
+#| "Organization: MIT AI Lab, Cambridge, MA\n"
+#| "\n"
+#| "Free Unix!\n"
+#| "\n"
+#| "Starting this Thanksgiving I am going to write a complete\n"
+#| "Unix-compatible software system called GNU (for Gnu's Not Unix), and\n"
+#| "give it away free<a href=\"#f1\">(1)</a> to everyone who can use it.\n"
+#| "Contributions of time, money, programs and equipment are greatly\n"
+#| "needed.\n"
+#| "\n"
+#| "To begin with, GNU will be a kernel plus all the utilities needed to\n"
+#| "write and run C programs: editor, shell, C compiler, linker,\n"
+#| "assembler, and a few other things.  After this we will add a text\n"
+#| "formatter, a YACC, an Empire game, a spreadsheet, and hundreds of\n"
+#| "other things.  We hope to supply, eventually, everything useful that\n"
+#| "normally comes with a Unix system, and anything else useful, including\n"
+#| "on-line and hardcopy documentation.\n"
+#| "\n"
+#| "GNU will be able to run Unix programs, but will not be identical\n"
+#| "to Unix.  We will make all improvements that are convenient, based\n"
+#| "on our experience with other operating systems.  In particular,\n"
+#| "we plan to have longer filenames, file version numbers, a crashproof\n"
+#| "file system, filename completion perhaps, terminal-independent\n"
+#| "display support, and eventually a Lisp-based window system through\n"
+#| "which several Lisp programs and ordinary Unix programs can share a 
screen.\n"
+#| "Both C and Lisp will be available as system programming languages.\n"
+#| "We will have network software based on MIT's chaosnet protocol,\n"
+#| "far superior to UUCP.  We may also have something compatible\n"
+#| "with UUCP.\n"
+#| "\n"
+#| "\n"
+#| "Who Am I?\n"
+#| "\n"
+#| "I am Richard Stallman, inventor of the original much-imitated EMACS\n"
+#| "editor, now at the Artificial Intelligence Lab at MIT.  I have worked\n"
+#| "extensively on compilers, editors, debuggers, command interpreters, the\n"
+#| "Incompatible Timesharing System and the Lisp Machine operating system.\n"
+#| "I pioneered terminal-independent display support in ITS.  In addition I\n"
+#| "have implemented one crashproof file system and two window systems for\n"
+#| "Lisp machines.\n"
+#| "\n"
+#| "\n"
+#| "Why I Must Write GNU\n"
+#| "\n"
+#| "I consider that the golden rule requires that if I like a program I\n"
+#| "must share it with other people who like it.  I cannot in good\n"
+#| "conscience sign a nondisclosure agreement or a software license\n"
+#| "agreement.\n"
+#| "\n"
+#| "So that I can continue to use computers without violating my principles,\n"
+#| "I have decided to put together a sufficient body of free software so 
that\n"
+#| "I will be able to get along without any software that is not free.\n"
+#| "\n"
+#| "\n"
+#| "How You Can Contribute\n"
+#| "\n"
+#| "I am asking computer manufacturers for donations of machines and money.\n"
+#| "I'm asking individuals for donations of programs and work.\n"
+#| "\n"
+#| "One computer manufacturer has already offered to provide a machine.  But\n"
+#| "we could use more.  One consequence you can expect if you donate\n"
+#| "machines is that GNU will run on them at an early date.  The machine had\n"
+#| "better be able to operate in a residential area, and not require\n"
+#| "sophisticated cooling or power.\n"
+#| "\n"
+#| "Individual programmers can contribute by writing a compatible duplicate\n"
+#| "of some Unix utility and giving it to me.  For most projects, such\n"
+#| "part-time distributed work would be very hard to coordinate; the\n"
+#| "independently-written parts would not work together.  But for the\n"
+#| "particular task of replacing Unix, this problem is absent.  Most\n"
+#| "interface specifications are fixed by Unix compatibility.  If each\n"
+#| "contribution works with the rest of Unix, it will probably work\n"
+#| "with the rest of GNU.\n"
+#| "\n"
+#| "If I get donations of money, I may be able to hire a few people full or\n"
+#| "part time.  The salary won't be high, but I'm looking for people for\n"
+#| "whom knowing they are helping humanity is as important as money.  I view\n"
+#| "this as a way of enabling dedicated people to devote their full energies 
to\n"
+#| "working on GNU by sparing them the need to make a living in another way.\n"
+#| "\n"
+#| "\n"
+#| "For more information, contact me.\n"
+#| "Arpanet mail:\n"
+#| "  RMS@MIT-MC.ARPA\n"
+#| "\n"
+#| "Usenet:\n"
+#| "  ...!mit-eddie!RMS@OZ\n"
+#| "  ...!mit-vax!RMS@OZ\n"
+#| "\n"
+#| "US Snail:\n"
+#| "  Richard Stallman\n"
+#| "  166 Prospect St\n"
+#| "  Cambridge, MA 02139\n"
 msgid ""
-"\n"
 "From 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\n"
 "From: RMS%MIT-OZ@mit-eddie\n"
 "Newsgroups: net.unix-wizards,net.usoft\n"
@@ -310,7 +473,7 @@
 "\n"
 "Starting this Thanksgiving I am going to write a complete\n"
 "Unix-compatible software system called GNU (for Gnu's Not Unix), and\n"
-"give it away free<a href=\"#f1\">(1)</a> to everyone who can use it.\n"
+"give it away free&#8239;<a href=\"#f1\">[1]</a> to everyone who can use it.\n"
 "Contributions of time, money, programs and equipment are greatly\n"
 "needed.\n"
 "\n"
@@ -498,6 +661,39 @@
 "  166 Prospect St\n"
 "  Cambridge, MA 02139\n"
 
+#. type: Content of: <div><h3>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Footnote"
+msgid "Footnote"
+msgstr "Note"
+
+#. type: Content of: <div><ol><li>
+# | [-The-]{+<em>The+} wording here was [-careless.-] {+careless.</em>+} The
+# | intention was that nobody would have to pay for <b>permission</b> to use
+# | the GNU system.  But the words don't make this clear, and people often
+# | interpret them as saying that copies of GNU should always be distributed
+# | at little or no charge.  That was never the intent.
+#, fuzzy
+#| msgid ""
+#| "The wording here was careless.  The intention was that nobody would have "
+#| "to pay for <b>permission</b> to use the GNU system.  But the words don't "
+#| "make this clear, and people often interpret them as saying that copies of "
+#| "GNU should always be distributed at little or no charge.  That was never "
+#| "the intent."
+msgid ""
+"<em>The wording here was careless.</em> The intention was that nobody would "
+"have to pay for <b>permission</b> to use the GNU system.  But the words "
+"don't make this clear, and people often interpret them as saying that copies "
+"of GNU should always be distributed at little or no charge.  That was never "
+"the intent."
+msgstr ""
+"Ici, les mots n'ont pas été choisis soigneusement. Le sens voulu était que 
"
+"personne n'aurait à payer pour la <b>permission</b> d'utiliser le système "
+"GNU. Mais la phrase ne rend pas cela clairement, et les gens l'interprètent "
+"souvent comme indiquant que les copies de GNU devraient toujours être "
+"distribuées à bas coût ou gratuitement ; cela n'a jamais été mon 
intention."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -532,14 +728,14 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Merci d'adresser vos commentaires sur les pages en français à &lt;<a href="
@@ -550,9 +746,14 @@
 "traduction</a> les infos nécessaires."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; 1983, 1999, 2007, [-2008,-] 2009, [-2013, 2014-] {+2021+}
+# | Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
+#| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
-"Foundation, Inc."
+"Copyright &copy; 1983, 1999, 2007, 2009, 2021 Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
 "Foundation, Inc."
@@ -560,13 +761,13 @@
 #. type: Content of: <div><p>
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
 "Cette page peut être utilisée suivant les conditions de la licence <a rel="
-"\"license\" href=\"http://creativecommons.org/licenses/by-nd/3.0/us/deed.fr";
-"\">Creative Commons attribution, pas de modification, 3.0 États-Unis (CC 
BY-"
-"ND 3.0 US)</a>."
+"\"license\" href=\"http://creativecommons.org/licenses/by-nd/4.0/deed.fr";
+"\">Creative Commons attribution, pas de modification, 4.0 internationale "
+"(CC BY-ND 4.0)</a>."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>
@@ -580,10 +781,12 @@
 msgid "Updated:"
 msgstr "Dernière mise à jour :"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
-"Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
-"Software Foundation, Inc."
+#~ msgid "Poor choice of wording around &ldquo;free&rdquo;"
+#~ msgstr "Piètre formulation autour du mot <i>free</i>"
+
+#~ msgid ""
+#~ "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
+#~ "Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
+#~ "Software Foundation, Inc."

Index: po/initial-announcement.hr.po
===================================================================
RCS file: /web/www/www/gnu/po/initial-announcement.hr.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- po/initial-announcement.hr.po       2 Nov 2021 13:25:56 -0000       1.7
+++ po/initial-announcement.hr.po       2 Nov 2021 14:41:52 -0000       1.8
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: initial-announcement.html\n"
-"POT-Creation-Date: 2014-04-04 23:59+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2013-06-12 21:44+0100\n"
 "Last-Translator: Martina Bebek <martinaporec@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-11-02 14:27+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,19 +24,26 @@
 msgid "Initial Announcement - GNU Project - Free Software Foundation"
 msgstr "Prvotna objava - Projekt GNU - Zaklada za slobodan softver"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Initial Announcement"
 msgstr "Prvotna objava"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
+# | This is the original announcement of the GNU Project, posted by <a
+# | href=\"http{+s+}://www.stallman.org/\">Richard Stallman</a> on September
+# | 27, 1983.
+#, fuzzy
+#| msgid ""
+#| "This is the original announcement of the GNU Project, posted by <a href="
+#| "\"http://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
 msgid ""
 "This is the original announcement of the GNU Project, posted by <a href="
-"\"http://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
+"\"https://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
 msgstr ""
 "Ovo je izvorna objava Projekta GNU koju je 27. rujna 1983. objavio <a href="
 "\"http://www.stallman.org/\";>Richard Stallman</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The actual history of the GNU Project differs in many ways from this initial "
 "plan. For example, the beginning was delayed until January 1984. Several of "
@@ -47,16 +55,27 @@
 "koncepata <a href=\"/philosophy/free-sw.html\">slobodnog softvera</a> "
 "razjašnjeno je tek nekoliko godina kasnije."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Free Unix!"
 msgstr "Oslobodimo Unix!"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Starting this Thanksgiving I am going to write a complete Unix-compatible
+# | software system called GNU (for Gnu's Not Unix), and give it away [-free<a
+# | href=\"#f1\">(1)</a>-] {+free&#8239;<a class=\"ftn\"
+# | href=\"#f1\">[1]</a>+} to everyone who can use it.  Contributions of time,
+# | money, programs and equipment are greatly needed.
+#, fuzzy
+#| msgid ""
+#| "Starting this Thanksgiving I am going to write a complete Unix-compatible "
+#| "software system called GNU (for Gnu's Not Unix), and give it away free<a "
+#| "href=\"#f1\">(1)</a> to everyone who can use it.  Contributions of time, "
+#| "money, programs and equipment are greatly needed."
 msgid ""
 "Starting this Thanksgiving I am going to write a complete Unix-compatible "
-"software system called GNU (for Gnu's Not Unix), and give it away free<a "
-"href=\"#f1\">(1)</a> to everyone who can use it.  Contributions of time, "
-"money, programs and equipment are greatly needed."
+"software system called GNU (for Gnu's Not Unix), and give it away free&#8239;"
+"<a class=\"ftn\" href=\"#f1\">[1]</a> to everyone who can use it.  "
+"Contributions of time, money, programs and equipment are greatly needed."
 msgstr ""
 "Počevši od ovogodišnjeg Dana zahvalnosti počet ću s pisanjem potpunog "
 "softverskog sustava kompatibilnog s Unixom, nazvanog GNU (od izraza &ldquo;"
@@ -64,7 +83,7 @@
 "tko ga želi koristiti. Doprinosi u vremenu, novcu, programima i opremi veoma 
"
 "su potrebni."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To begin with, GNU will be a kernel plus all the utilities needed to write "
 "and run C programs: editor, shell, C compiler, linker, assembler, and a few "
@@ -81,7 +100,7 @@
 "uz sustav Unix, i sve drugo što je korisno, uključujući <i>on-line</i> i "
 "tiskanu dokumentaciju."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU will be able to run Unix programs, but will not be identical to Unix.  "
 "We will make all improvements that are convenient, based on our experience "
@@ -105,11 +124,11 @@
 "softver temeljen na MIT-ovom protokolu Chaosnet, daleko nadmoćnijim od UUCP-"
 "a. Mogli bismo imati i nešto kompatibilno s UUCP-om."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Who Am I?"
 msgstr "Tko sam ja?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am Richard Stallman, inventor of the original much-imitated EMACS editor, "
 "now at the Artificial Intelligence Lab at MIT.  I have worked extensively on "
@@ -127,11 +146,11 @@
 "Usto, implementirao sam i jedan datotečni sustav otporan na rušenje i dva "
 "sustava prozora za Lisp strojeve."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why I Must Write GNU"
 msgstr "Zašto moram napisati GNU?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I consider that the golden rule requires that if I like a program I must "
 "share it with other people who like it.  I cannot in good conscience sign a "
@@ -141,7 +160,7 @@
 "podijeliti s drugim ljudima kojima se on sviđa. Ne mogu čiste savjesti "
 "potpisati sporazum o neodavanju tajne ili softverski licenčni ugovor."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So that I can continue to use computers without violating my principles, I "
 "have decided to put together a sufficient body of free software so that I "
@@ -151,11 +170,11 @@
 "odlučio sam sastaviti dovoljnu količinu slobodnog softvera tako da mogu "
 "nastaviti ne koristeći ikakav softver koji nije slobodan."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How You Can Contribute"
 msgstr "Kako možete doprinijeti"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am asking computer manufacturers for donations of machines and money.  I'm "
 "asking individuals for donations of programs and work."
@@ -163,7 +182,7 @@
 "Molim proizvođače računala da doniraju strojeve i novac. Molim pojedince 
da "
 "doniraju programe i pripomognu radom."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One computer manufacturer has already offered to provide a machine.  But we "
 "could use more.  One consequence you can expect if you donate machines is "
@@ -176,7 +195,7 @@
 "raditi na njima u ranom stadiju razvoja. Strojevi trebaju moći raditi u "
 "stambenom prostoru i ne zahtijevati napredne sustave hlađenja ili napajanja."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Individual programmers can contribute by writing a compatible duplicate of "
 "some Unix utility and giving it to me.  For most projects, such part-time "
@@ -194,7 +213,7 @@
 "kompatibilnošću s Unixom. Ukoliko svaki prilog radi s ostatkom Unixa, "
 "vjerojatno će raditi i s ostatkom GNU-a."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If I get donations of money, I may be able to hire a few people full or part "
 "time.  The salary won't be high, but I'm looking for people for whom knowing "
@@ -208,69 +227,51 @@
 "na omogućavanje ljudima da posvete svu svoju energiju radu na GNU-u "
 "pošteđujući ih potrebe da zarađuju za život na drugi način."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "For more information, contact me."
 msgstr "Za više informacija, obratite mi se."
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Arpanet mail:"
 msgstr "Arpanet mail:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "RMS@MIT-MC.ARPA"
 msgstr "RMS@MIT-MC.ARPA"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Usenet:"
 msgstr "Usenet:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "...!mit-eddie!RMS@OZ"
 msgstr "...!mit-eddie!RMS@OZ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "...!mit-vax!RMS@OZ"
 msgstr "...!mit-vax!RMS@OZ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "US Snail:"
 msgstr "Pošta SAD-a:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Richard Stallman"
 msgstr "Richard Stallman"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "166 Prospect St"
 msgstr "166 Prospect St"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Cambridge, MA 02139"
 msgstr "Cambridge, MA 02139"
 
-#. type: Content of: <h4>
-msgid "Poor choice of wording around &ldquo;free&rdquo;"
-msgstr "Loš izbor riječi oko izraza &ldquo;besplatno&rdquo;"
-
-#. type: Content of: <p>
-msgid ""
-"The wording here was careless.  The intention was that nobody would have to "
-"pay for <b>permission</b> to use the GNU system.  But the words don't make "
-"this clear, and people often interpret them as saying that copies of GNU "
-"should always be distributed at little or no charge.  That was never the "
-"intent."
-msgstr ""
-"Ovdje su riječi odabrane nemarno. Namjera je bila da nitko ne mora platiti "
-"za <b>dozvolu</b> da koristi sustav GNU. Međutim, ovim riječima to nije "
-"jasno izrečeno i ljudi ih često tumače kao tvrdnju da kopije GNU-a treba "
-"uvijek distribuirati uz minimalnu ili nikakvu naknadu, iako to nikada nije "
-"bila namjera."
-
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Original message"
 msgstr "Izvorna poruka"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "For completeness, the original email is reproduced here, in its original "
 "form."
@@ -279,10 +280,172 @@
 "obliku."
 
 #. TRANSLATORS: Don't translate anything except the headers.
-#. type: Content of: <div><pre>
-#, no-wrap
+#. type: Content of: <div><div><pre>
+# | [-\\nFrom-]{+From+}
+# | 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\\nFrom:
+# | RMS%MIT-OZ@mit-eddie\\nNewsgroups: net.unix-wizards,net.usoft\\nSubject:
+# | new Unix implementation\\nDate: Tue, 27-Sep-83 12:35:59
+# | EST\\nOrganization: MIT AI Lab, Cambridge, MA\\n\\nFree
+# | Unix!\\n\\nStarting this Thanksgiving I am going to write a
+# | complete\\nUnix-compatible software system called GNU (for Gnu's Not
+# | Unix), and\\ngive it away [-free<a href=\"#f1\">(1)</a>-] {+free&#8239;<a
+# | href=\"#f1\">[1]</a>+} to everyone who can use it.\\nContributions of
+# | time, money, programs and equipment are greatly\\nneeded.\\n\\nTo begin
+# | with, GNU will be a kernel plus all the utilities needed to\\nwrite and
+# | run C programs: editor, shell, C compiler, linker,\\nassembler, and a few
+# | other things.  After this we will add a text\\nformatter, a YACC, an
+# | Empire game, a spreadsheet, and hundreds of\\nother things.  We hope to
+# | supply, eventually, everything useful that\\nnormally comes with a Unix
+# | system, and anything else useful, including\\non-line and hardcopy
+# | documentation.\\n\\nGNU will be able to run Unix programs, but will not be
+# | identical\\nto Unix.  We will make all improvements that are convenient,
+# | based\\non our experience with other operating systems.  In
+# | particular,\\nwe plan to have longer filenames, file version numbers, a
+# | crashproof\\nfile system, filename completion perhaps,
+# | terminal-independent\\ndisplay support, and eventually a Lisp-based window
+# | system through\\nwhich several Lisp programs and ordinary Unix programs
+# | can share a screen.\\nBoth C and Lisp will be available as system
+# | programming languages.\\nWe will have network software based on MIT's
+# | chaosnet protocol,\\nfar superior to UUCP.  We may also have something
+# | compatible\\nwith UUCP.\\n\\n\\nWho Am I?\\n\\nI am Richard Stallman,
+# | inventor of the original much-imitated EMACS\\neditor, now at the
+# | Artificial Intelligence Lab at MIT.  I have worked\\nextensively on
+# | compilers, editors, debuggers, command interpreters, the\\nIncompatible
+# | Timesharing System and the Lisp Machine operating system.\\nI pioneered
+# | terminal-independent display support in ITS.  In addition I\\nhave
+# | implemented one crashproof file system and two window systems for\\nLisp
+# | machines.\\n\\n\\nWhy I Must Write GNU\\n\\nI consider that the golden
+# | rule requires that if I like a program I\\nmust share it with other people
+# | who like it.  I cannot in good\\nconscience sign a nondisclosure agreement
+# | or a software license\\nagreement.\\n\\nSo that I can continue to use
+# | computers without violating my principles,\\nI have decided to put
+# | together a sufficient body of free software so that\\nI will be able to
+# | get along without any software that is not free.\\n\\n\\nHow You Can
+# | Contribute\\n\\nI am asking computer manufacturers for donations of
+# | machines and money.\\nI'm asking individuals for donations of programs and
+# | work.\\n\\nOne computer manufacturer has already offered to provide a
+# | machine.  But\\nwe could use more.  One consequence you can expect if you
+# | donate\\nmachines is that GNU will run on them at an early date.  The
+# | machine had\\nbetter be able to operate in a residential area, and not
+# | require\\nsophisticated cooling or power.\\n\\nIndividual programmers can
+# | contribute by writing a compatible duplicate\\nof some Unix utility and
+# | giving it to me.  For most projects, such\\npart-time distributed work
+# | would be very hard to coordinate; the\\nindependently-written parts would
+# | not work together.  But for the\\nparticular task of replacing Unix, this
+# | problem is absent.  Most\\ninterface specifications are fixed by Unix
+# | compatibility.  If each\\ncontribution works with the rest of Unix, it
+# | will probably work\\nwith the rest of GNU.\\n\\nIf I get donations of
+# | money, I may be able to hire a few people full or\\npart time.  The salary
+# | won't be high, but I'm looking for people for\\nwhom knowing they are
+# | helping humanity is as important as money.  I view\\nthis as a way of
+# | enabling dedicated people to devote their full energies to\\nworking on
+# | GNU by sparing them the need to make a living in another way.\\n\\n\\nFor
+# | more information, contact me.\\nArpanet mail:\\n 
+# | RMS@MIT-MC.ARPA\\n\\nUsenet:\\n  ...!mit-eddie!RMS@OZ\\n 
+# | ...!mit-vax!RMS@OZ\\n\\nUS Snail:\\n  Richard Stallman\\n  166 Prospect
+# | St\\n  Cambridge, MA 02139\\n
+#, fuzzy, no-wrap
+#| msgid ""
+#| "\n"
+#| "From 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\n"
+#| "From: RMS%MIT-OZ@mit-eddie\n"
+#| "Newsgroups: net.unix-wizards,net.usoft\n"
+#| "Subject: new Unix implementation\n"
+#| "Date: Tue, 27-Sep-83 12:35:59 EST\n"
+#| "Organization: MIT AI Lab, Cambridge, MA\n"
+#| "\n"
+#| "Free Unix!\n"
+#| "\n"
+#| "Starting this Thanksgiving I am going to write a complete\n"
+#| "Unix-compatible software system called GNU (for Gnu's Not Unix), and\n"
+#| "give it away free<a href=\"#f1\">(1)</a> to everyone who can use it.\n"
+#| "Contributions of time, money, programs and equipment are greatly\n"
+#| "needed.\n"
+#| "\n"
+#| "To begin with, GNU will be a kernel plus all the utilities needed to\n"
+#| "write and run C programs: editor, shell, C compiler, linker,\n"
+#| "assembler, and a few other things.  After this we will add a text\n"
+#| "formatter, a YACC, an Empire game, a spreadsheet, and hundreds of\n"
+#| "other things.  We hope to supply, eventually, everything useful that\n"
+#| "normally comes with a Unix system, and anything else useful, including\n"
+#| "on-line and hardcopy documentation.\n"
+#| "\n"
+#| "GNU will be able to run Unix programs, but will not be identical\n"
+#| "to Unix.  We will make all improvements that are convenient, based\n"
+#| "on our experience with other operating systems.  In particular,\n"
+#| "we plan to have longer filenames, file version numbers, a crashproof\n"
+#| "file system, filename completion perhaps, terminal-independent\n"
+#| "display support, and eventually a Lisp-based window system through\n"
+#| "which several Lisp programs and ordinary Unix programs can share a 
screen.\n"
+#| "Both C and Lisp will be available as system programming languages.\n"
+#| "We will have network software based on MIT's chaosnet protocol,\n"
+#| "far superior to UUCP.  We may also have something compatible\n"
+#| "with UUCP.\n"
+#| "\n"
+#| "\n"
+#| "Who Am I?\n"
+#| "\n"
+#| "I am Richard Stallman, inventor of the original much-imitated EMACS\n"
+#| "editor, now at the Artificial Intelligence Lab at MIT.  I have worked\n"
+#| "extensively on compilers, editors, debuggers, command interpreters, the\n"
+#| "Incompatible Timesharing System and the Lisp Machine operating system.\n"
+#| "I pioneered terminal-independent display support in ITS.  In addition I\n"
+#| "have implemented one crashproof file system and two window systems for\n"
+#| "Lisp machines.\n"
+#| "\n"
+#| "\n"
+#| "Why I Must Write GNU\n"
+#| "\n"
+#| "I consider that the golden rule requires that if I like a program I\n"
+#| "must share it with other people who like it.  I cannot in good\n"
+#| "conscience sign a nondisclosure agreement or a software license\n"
+#| "agreement.\n"
+#| "\n"
+#| "So that I can continue to use computers without violating my principles,\n"
+#| "I have decided to put together a sufficient body of free software so 
that\n"
+#| "I will be able to get along without any software that is not free.\n"
+#| "\n"
+#| "\n"
+#| "How You Can Contribute\n"
+#| "\n"
+#| "I am asking computer manufacturers for donations of machines and money.\n"
+#| "I'm asking individuals for donations of programs and work.\n"
+#| "\n"
+#| "One computer manufacturer has already offered to provide a machine.  But\n"
+#| "we could use more.  One consequence you can expect if you donate\n"
+#| "machines is that GNU will run on them at an early date.  The machine had\n"
+#| "better be able to operate in a residential area, and not require\n"
+#| "sophisticated cooling or power.\n"
+#| "\n"
+#| "Individual programmers can contribute by writing a compatible duplicate\n"
+#| "of some Unix utility and giving it to me.  For most projects, such\n"
+#| "part-time distributed work would be very hard to coordinate; the\n"
+#| "independently-written parts would not work together.  But for the\n"
+#| "particular task of replacing Unix, this problem is absent.  Most\n"
+#| "interface specifications are fixed by Unix compatibility.  If each\n"
+#| "contribution works with the rest of Unix, it will probably work\n"
+#| "with the rest of GNU.\n"
+#| "\n"
+#| "If I get donations of money, I may be able to hire a few people full or\n"
+#| "part time.  The salary won't be high, but I'm looking for people for\n"
+#| "whom knowing they are helping humanity is as important as money.  I view\n"
+#| "this as a way of enabling dedicated people to devote their full energies 
to\n"
+#| "working on GNU by sparing them the need to make a living in another way.\n"
+#| "\n"
+#| "\n"
+#| "For more information, contact me.\n"
+#| "Arpanet mail:\n"
+#| "  RMS@MIT-MC.ARPA\n"
+#| "\n"
+#| "Usenet:\n"
+#| "  ...!mit-eddie!RMS@OZ\n"
+#| "  ...!mit-vax!RMS@OZ\n"
+#| "\n"
+#| "US Snail:\n"
+#| "  Richard Stallman\n"
+#| "  166 Prospect St\n"
+#| "  Cambridge, MA 02139\n"
 msgid ""
-"\n"
 "From 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\n"
 "From: RMS%MIT-OZ@mit-eddie\n"
 "Newsgroups: net.unix-wizards,net.usoft\n"
@@ -294,7 +457,7 @@
 "\n"
 "Starting this Thanksgiving I am going to write a complete\n"
 "Unix-compatible software system called GNU (for Gnu's Not Unix), and\n"
-"give it away free<a href=\"#f1\">(1)</a> to everyone who can use it.\n"
+"give it away free&#8239;<a href=\"#f1\">[1]</a> to everyone who can use it.\n"
 "Contributions of time, money, programs and equipment are greatly\n"
 "needed.\n"
 "\n"
@@ -482,6 +645,39 @@
 "  166 Prospect St\n"
 "  Cambridge, MA 02139\n"
 
+#. type: Content of: <div><h3>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Footnote"
+msgid "Footnote"
+msgstr "Bilješka"
+
+#. type: Content of: <div><ol><li>
+# | [-The-]{+<em>The+} wording here was [-careless.-] {+careless.</em>+} The
+# | intention was that nobody would have to pay for <b>permission</b> to use
+# | the GNU system.  But the words don't make this clear, and people often
+# | interpret them as saying that copies of GNU should always be distributed
+# | at little or no charge.  That was never the intent.
+#, fuzzy
+#| msgid ""
+#| "The wording here was careless.  The intention was that nobody would have "
+#| "to pay for <b>permission</b> to use the GNU system.  But the words don't "
+#| "make this clear, and people often interpret them as saying that copies of "
+#| "GNU should always be distributed at little or no charge.  That was never "
+#| "the intent."
+msgid ""
+"<em>The wording here was careless.</em> The intention was that nobody would "
+"have to pay for <b>permission</b> to use the GNU system.  But the words "
+"don't make this clear, and people often interpret them as saying that copies "
+"of GNU should always be distributed at little or no charge.  That was never "
+"the intent."
+msgstr ""
+"Ovdje su riječi odabrane nemarno. Namjera je bila da nitko ne mora platiti "
+"za <b>dozvolu</b> da koristi sustav GNU. Međutim, ovim riječima to nije "
+"jasno izrečeno i ljudi ih često tumače kao tvrdnju da kopije GNU-a treba "
+"uvijek distribuirati uz minimalnu ili nikakvu naknadu, iako to nikada nije "
+"bila namjera."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -508,14 +704,20 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Radimo naporno i dajemo sve od sebe da bi pružili točne, visoko kvalitetne "
@@ -527,21 +729,36 @@
 "prijevode</a>."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; 1983, 1999, 2007, [-2008,-] 2009, [-2013, 2014-] {+2021+}
+# | Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
+#| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
-"Foundation, Inc."
+"Copyright &copy; 1983, 1999, 2007, 2009, 2021 Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
 "Foundation, Inc."
 
 #. type: Content of: <div><p>
+# | This page is licensed under a <a rel=\"license\"
+# | [-href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative-]
+# | {+href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Creative+}
+# | Commons [-Attribution-NoDerivs 3.0 United States-]
+# | {+Attribution-NoDerivatives 4.0 International+} License</a>.
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#| "NoDerivs 3.0 United States License</a>."
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
 "Ovo djelo je dano na korištenje pod licencom <a rel=\"license\" href="
-"\"http://creativecommons.org/licenses/by-nd/3.0/us/deed.hr\";>Creative "
+"\"http://creativecommons.org/licenses/by-nd/3.0/us/deed.hr\";> Creative "
 "Commons Imenovanje-Bez prerada 3.0 SAD</a>."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
@@ -554,10 +771,34 @@
 msgid "Updated:"
 msgstr "Zadnji put promijenjeno:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
-"Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
-"Software Foundation, Inc."
+#~ msgid "Poor choice of wording around &ldquo;free&rdquo;"
+#~ msgstr "Loš izbor riječi oko izraza &ldquo;besplatno&rdquo;"
+
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "Radimo naporno i dajemo sve od sebe da bi pružili točne, visoko "
+#~ "kvalitetne prijevode. Međutim, nismo oslobođeni od nesavršenosti. Molim 
"
+#~ "vas šaljite vaše komentare i općenite prijedloge u tom smislu na <a 
href="
+#~ "\"mailto:web-translators@gnu.org\";>&lt;web-translators@gnu.org&gt;</a>.</"
+#~ "p> <p>Za informacije o koordiniranju i slanju prijevoda naših mrežnih "
+#~ "stranica, pogledajte <a href=\"/server/standards/README.translations.html"
+#~ "\">README za prijevode</a>."
+
+#~ msgid ""
+#~ "This page is licensed under a <a rel=\"license\" href=\"http://";
+#~ "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#~ "NoDerivs 3.0 United States License</a>."
+#~ msgstr ""
+#~ "Ovo djelo je dano na korištenje pod licencom <a rel=\"license\" href="
+#~ "\"http://creativecommons.org/licenses/by-nd/3.0/us/deed.hr\";>Creative "
+#~ "Commons Imenovanje-Bez prerada 3.0 SAD</a>."
+
+#~ msgid ""
+#~ "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
+#~ "Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
+#~ "Software Foundation, Inc."

Index: po/initial-announcement.it.po
===================================================================
RCS file: /web/www/www/gnu/po/initial-announcement.it.po,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- po/initial-announcement.it.po       2 Nov 2021 13:25:56 -0000       1.51
+++ po/initial-announcement.it.po       2 Nov 2021 14:41:52 -0000       1.52
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: initial-announcement.html\n"
-"POT-Creation-Date: 2014-04-04 23:59+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2014-04-12 16:08+0100\n"
 "Last-Translator: Andrea Pescetti <pescetti@gnu.org>\n"
 "Language-Team: Italian\n"
@@ -13,6 +13,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-11-02 14:27+0000\n"
 "X-Generator: Poedit 1.5.4\n"
 
 # type: Content of: <title>
@@ -21,21 +22,28 @@
 msgstr "Annuncio iniziale - Progetto GNU - Free Software Foundation"
 
 # type: Content of: <h2>
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Initial Announcement"
 msgstr "Annuncio iniziale"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
+# | This is the original announcement of the GNU Project, posted by <a
+# | href=\"http{+s+}://www.stallman.org/\">Richard Stallman</a> on September
+# | 27, 1983.
+#, fuzzy
+#| msgid ""
+#| "This is the original announcement of the GNU Project, posted by <a href="
+#| "\"http://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
 msgid ""
 "This is the original announcement of the GNU Project, posted by <a href="
-"\"http://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
+"\"https://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
 msgstr ""
 "Questo è l'annuncio ufficiale del progetto GNU, inviato da <a href=\"http://";
 "www.stallman.org/\">Richard Stallman</a> il 27 settembre 1983."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The actual history of the GNU Project differs in many ways from this initial "
 "plan. For example, the beginning was delayed until January 1984. Several of "
@@ -49,17 +57,28 @@
 "libero</a> furono chiariti solo alcuni anni dopo."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Free Unix!"
 msgstr "Liberiamo Unix!"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Starting this Thanksgiving I am going to write a complete Unix-compatible
+# | software system called GNU (for Gnu's Not Unix), and give it away [-free<a
+# | href=\"#f1\">(1)</a>-] {+free&#8239;<a class=\"ftn\"
+# | href=\"#f1\">[1]</a>+} to everyone who can use it.  Contributions of time,
+# | money, programs and equipment are greatly needed.
+#, fuzzy
+#| msgid ""
+#| "Starting this Thanksgiving I am going to write a complete Unix-compatible "
+#| "software system called GNU (for Gnu's Not Unix), and give it away free<a "
+#| "href=\"#f1\">(1)</a> to everyone who can use it.  Contributions of time, "
+#| "money, programs and equipment are greatly needed."
 msgid ""
 "Starting this Thanksgiving I am going to write a complete Unix-compatible "
-"software system called GNU (for Gnu's Not Unix), and give it away free<a "
-"href=\"#f1\">(1)</a> to everyone who can use it.  Contributions of time, "
-"money, programs and equipment are greatly needed."
+"software system called GNU (for Gnu's Not Unix), and give it away free&#8239;"
+"<a class=\"ftn\" href=\"#f1\">[1]</a> to everyone who can use it.  "
+"Contributions of time, money, programs and equipment are greatly needed."
 msgstr ""
 "A partire dal prossimo Giorno del Ringraziamento (il quarto giovedì di "
 "novembre, N.d.T.) inizierò a scrivere un sistema operativo completo "
@@ -69,7 +88,7 @@
 "programmi ed attrezzature."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To begin with, GNU will be a kernel plus all the utilities needed to write "
 "and run C programs: editor, shell, C compiler, linker, assembler, and a few "
@@ -88,7 +107,7 @@
 "<i>on-line</i> e cartacea."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU will be able to run Unix programs, but will not be identical to Unix.  "
 "We will make all improvements that are convenient, based on our experience "
@@ -115,12 +134,12 @@
 "UUCP."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Who Am I?"
 msgstr "Chi sono io"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am Richard Stallman, inventor of the original much-imitated EMACS editor, "
 "now at the Artificial Intelligence Lab at MIT.  I have worked extensively on "
@@ -138,12 +157,12 @@
 "crash e due sistemi a finestre per le macchine Lisp. "
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why I Must Write GNU"
 msgstr "Perchè devo scrivere GNU"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I consider that the golden rule requires that if I like a program I must "
 "share it with other people who like it.  I cannot in good conscience sign a "
@@ -154,7 +173,7 @@
 "o un contratto di licenza software."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So that I can continue to use computers without violating my principles, I "
 "have decided to put together a sufficient body of free software so that I "
@@ -165,12 +184,12 @@
 "liberi in modo di non dover usare alcun software non libero."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How You Can Contribute"
 msgstr "Come potete contribuire"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am asking computer manufacturers for donations of machines and money.  I'm "
 "asking individuals for donations of programs and work."
@@ -179,7 +198,7 @@
 "persone di donare programmi e lavoro."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One computer manufacturer has already offered to provide a machine.  But we "
 "could use more.  One consequence you can expect if you donate machines is "
@@ -194,7 +213,7 @@
 "raffreddamento."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Individual programmers can contribute by writing a compatible duplicate of "
 "some Unix utility and giving it to me.  For most projects, such part-time "
@@ -215,7 +234,7 @@
 "resto di GNU."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If I get donations of money, I may be able to hire a few people full or part "
 "time.  The salary won't be high, but I'm looking for people for whom knowing "
@@ -231,74 +250,54 @@
 "vivere con altri mezzi."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "For more information, contact me."
 msgstr "Contattatemi per ulteriori informazioni."
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Arpanet mail:"
 msgstr "Arpanet mail:"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "RMS@MIT-MC.ARPA"
 msgstr "RMS@MIT-MC.ARPA"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Usenet:"
 msgstr "Usenet:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "...!mit-eddie!RMS@OZ"
 msgstr "...!mit-eddie!RMS@OZ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "...!mit-vax!RMS@OZ"
 msgstr "...!mit-vax!RMS@OZ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "US Snail:"
 msgstr "US Snail:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Richard Stallman"
 msgstr "Richard Stallman"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "166 Prospect St"
 msgstr "166 Prospect St"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Cambridge, MA 02139"
 msgstr "Cambridge, MA 02139"
 
-# type: Content of: <h4>
-#. type: Content of: <h4>
-msgid "Poor choice of wording around &ldquo;free&rdquo;"
-msgstr "Scarsa chiarezza nel testo circostante la parola \"libero\""
-
-# type: Content of: <p>
-#. type: Content of: <p>
-msgid ""
-"The wording here was careless.  The intention was that nobody would have to "
-"pay for <b>permission</b> to use the GNU system.  But the words don't make "
-"this clear, and people often interpret them as saying that copies of GNU "
-"should always be distributed at little or no charge.  That was never the "
-"intent."
-msgstr ""
-"Qui la scelta delle parole è stata disattenta, e spesso sono interpretate "
-"come se le copie di GNU dovessero essere sempre distribuite gratuitamente o "
-"a modico prezzo, ma l'intento non è mai stato questo. Il punto era che "
-"nessuno dovesse pagare per ottenere il <b>permesso</b> di usare il sistema "
-"GNU."
-
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Original message"
 msgstr "Messaggio originale"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "For completeness, the original email is reproduced here, in its original "
 "form."
@@ -308,10 +307,172 @@
 
 # type: Content of: <pre>
 #. TRANSLATORS: Don't translate anything except the headers.
-#. type: Content of: <div><pre>
-#, no-wrap
+#. type: Content of: <div><div><pre>
+# | [-\\nFrom-]{+From+}
+# | 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\\nFrom:
+# | RMS%MIT-OZ@mit-eddie\\nNewsgroups: net.unix-wizards,net.usoft\\nSubject:
+# | new Unix implementation\\nDate: Tue, 27-Sep-83 12:35:59
+# | EST\\nOrganization: MIT AI Lab, Cambridge, MA\\n\\nFree
+# | Unix!\\n\\nStarting this Thanksgiving I am going to write a
+# | complete\\nUnix-compatible software system called GNU (for Gnu's Not
+# | Unix), and\\ngive it away [-free<a href=\"#f1\">(1)</a>-] {+free&#8239;<a
+# | href=\"#f1\">[1]</a>+} to everyone who can use it.\\nContributions of
+# | time, money, programs and equipment are greatly\\nneeded.\\n\\nTo begin
+# | with, GNU will be a kernel plus all the utilities needed to\\nwrite and
+# | run C programs: editor, shell, C compiler, linker,\\nassembler, and a few
+# | other things.  After this we will add a text\\nformatter, a YACC, an
+# | Empire game, a spreadsheet, and hundreds of\\nother things.  We hope to
+# | supply, eventually, everything useful that\\nnormally comes with a Unix
+# | system, and anything else useful, including\\non-line and hardcopy
+# | documentation.\\n\\nGNU will be able to run Unix programs, but will not be
+# | identical\\nto Unix.  We will make all improvements that are convenient,
+# | based\\non our experience with other operating systems.  In
+# | particular,\\nwe plan to have longer filenames, file version numbers, a
+# | crashproof\\nfile system, filename completion perhaps,
+# | terminal-independent\\ndisplay support, and eventually a Lisp-based window
+# | system through\\nwhich several Lisp programs and ordinary Unix programs
+# | can share a screen.\\nBoth C and Lisp will be available as system
+# | programming languages.\\nWe will have network software based on MIT's
+# | chaosnet protocol,\\nfar superior to UUCP.  We may also have something
+# | compatible\\nwith UUCP.\\n\\n\\nWho Am I?\\n\\nI am Richard Stallman,
+# | inventor of the original much-imitated EMACS\\neditor, now at the
+# | Artificial Intelligence Lab at MIT.  I have worked\\nextensively on
+# | compilers, editors, debuggers, command interpreters, the\\nIncompatible
+# | Timesharing System and the Lisp Machine operating system.\\nI pioneered
+# | terminal-independent display support in ITS.  In addition I\\nhave
+# | implemented one crashproof file system and two window systems for\\nLisp
+# | machines.\\n\\n\\nWhy I Must Write GNU\\n\\nI consider that the golden
+# | rule requires that if I like a program I\\nmust share it with other people
+# | who like it.  I cannot in good\\nconscience sign a nondisclosure agreement
+# | or a software license\\nagreement.\\n\\nSo that I can continue to use
+# | computers without violating my principles,\\nI have decided to put
+# | together a sufficient body of free software so that\\nI will be able to
+# | get along without any software that is not free.\\n\\n\\nHow You Can
+# | Contribute\\n\\nI am asking computer manufacturers for donations of
+# | machines and money.\\nI'm asking individuals for donations of programs and
+# | work.\\n\\nOne computer manufacturer has already offered to provide a
+# | machine.  But\\nwe could use more.  One consequence you can expect if you
+# | donate\\nmachines is that GNU will run on them at an early date.  The
+# | machine had\\nbetter be able to operate in a residential area, and not
+# | require\\nsophisticated cooling or power.\\n\\nIndividual programmers can
+# | contribute by writing a compatible duplicate\\nof some Unix utility and
+# | giving it to me.  For most projects, such\\npart-time distributed work
+# | would be very hard to coordinate; the\\nindependently-written parts would
+# | not work together.  But for the\\nparticular task of replacing Unix, this
+# | problem is absent.  Most\\ninterface specifications are fixed by Unix
+# | compatibility.  If each\\ncontribution works with the rest of Unix, it
+# | will probably work\\nwith the rest of GNU.\\n\\nIf I get donations of
+# | money, I may be able to hire a few people full or\\npart time.  The salary
+# | won't be high, but I'm looking for people for\\nwhom knowing they are
+# | helping humanity is as important as money.  I view\\nthis as a way of
+# | enabling dedicated people to devote their full energies to\\nworking on
+# | GNU by sparing them the need to make a living in another way.\\n\\n\\nFor
+# | more information, contact me.\\nArpanet mail:\\n 
+# | RMS@MIT-MC.ARPA\\n\\nUsenet:\\n  ...!mit-eddie!RMS@OZ\\n 
+# | ...!mit-vax!RMS@OZ\\n\\nUS Snail:\\n  Richard Stallman\\n  166 Prospect
+# | St\\n  Cambridge, MA 02139\\n
+#, fuzzy, no-wrap
+#| msgid ""
+#| "\n"
+#| "From 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\n"
+#| "From: RMS%MIT-OZ@mit-eddie\n"
+#| "Newsgroups: net.unix-wizards,net.usoft\n"
+#| "Subject: new Unix implementation\n"
+#| "Date: Tue, 27-Sep-83 12:35:59 EST\n"
+#| "Organization: MIT AI Lab, Cambridge, MA\n"
+#| "\n"
+#| "Free Unix!\n"
+#| "\n"
+#| "Starting this Thanksgiving I am going to write a complete\n"
+#| "Unix-compatible software system called GNU (for Gnu's Not Unix), and\n"
+#| "give it away free<a href=\"#f1\">(1)</a> to everyone who can use it.\n"
+#| "Contributions of time, money, programs and equipment are greatly\n"
+#| "needed.\n"
+#| "\n"
+#| "To begin with, GNU will be a kernel plus all the utilities needed to\n"
+#| "write and run C programs: editor, shell, C compiler, linker,\n"
+#| "assembler, and a few other things.  After this we will add a text\n"
+#| "formatter, a YACC, an Empire game, a spreadsheet, and hundreds of\n"
+#| "other things.  We hope to supply, eventually, everything useful that\n"
+#| "normally comes with a Unix system, and anything else useful, including\n"
+#| "on-line and hardcopy documentation.\n"
+#| "\n"
+#| "GNU will be able to run Unix programs, but will not be identical\n"
+#| "to Unix.  We will make all improvements that are convenient, based\n"
+#| "on our experience with other operating systems.  In particular,\n"
+#| "we plan to have longer filenames, file version numbers, a crashproof\n"
+#| "file system, filename completion perhaps, terminal-independent\n"
+#| "display support, and eventually a Lisp-based window system through\n"
+#| "which several Lisp programs and ordinary Unix programs can share a 
screen.\n"
+#| "Both C and Lisp will be available as system programming languages.\n"
+#| "We will have network software based on MIT's chaosnet protocol,\n"
+#| "far superior to UUCP.  We may also have something compatible\n"
+#| "with UUCP.\n"
+#| "\n"
+#| "\n"
+#| "Who Am I?\n"
+#| "\n"
+#| "I am Richard Stallman, inventor of the original much-imitated EMACS\n"
+#| "editor, now at the Artificial Intelligence Lab at MIT.  I have worked\n"
+#| "extensively on compilers, editors, debuggers, command interpreters, the\n"
+#| "Incompatible Timesharing System and the Lisp Machine operating system.\n"
+#| "I pioneered terminal-independent display support in ITS.  In addition I\n"
+#| "have implemented one crashproof file system and two window systems for\n"
+#| "Lisp machines.\n"
+#| "\n"
+#| "\n"
+#| "Why I Must Write GNU\n"
+#| "\n"
+#| "I consider that the golden rule requires that if I like a program I\n"
+#| "must share it with other people who like it.  I cannot in good\n"
+#| "conscience sign a nondisclosure agreement or a software license\n"
+#| "agreement.\n"
+#| "\n"
+#| "So that I can continue to use computers without violating my principles,\n"
+#| "I have decided to put together a sufficient body of free software so 
that\n"
+#| "I will be able to get along without any software that is not free.\n"
+#| "\n"
+#| "\n"
+#| "How You Can Contribute\n"
+#| "\n"
+#| "I am asking computer manufacturers for donations of machines and money.\n"
+#| "I'm asking individuals for donations of programs and work.\n"
+#| "\n"
+#| "One computer manufacturer has already offered to provide a machine.  But\n"
+#| "we could use more.  One consequence you can expect if you donate\n"
+#| "machines is that GNU will run on them at an early date.  The machine had\n"
+#| "better be able to operate in a residential area, and not require\n"
+#| "sophisticated cooling or power.\n"
+#| "\n"
+#| "Individual programmers can contribute by writing a compatible duplicate\n"
+#| "of some Unix utility and giving it to me.  For most projects, such\n"
+#| "part-time distributed work would be very hard to coordinate; the\n"
+#| "independently-written parts would not work together.  But for the\n"
+#| "particular task of replacing Unix, this problem is absent.  Most\n"
+#| "interface specifications are fixed by Unix compatibility.  If each\n"
+#| "contribution works with the rest of Unix, it will probably work\n"
+#| "with the rest of GNU.\n"
+#| "\n"
+#| "If I get donations of money, I may be able to hire a few people full or\n"
+#| "part time.  The salary won't be high, but I'm looking for people for\n"
+#| "whom knowing they are helping humanity is as important as money.  I view\n"
+#| "this as a way of enabling dedicated people to devote their full energies 
to\n"
+#| "working on GNU by sparing them the need to make a living in another way.\n"
+#| "\n"
+#| "\n"
+#| "For more information, contact me.\n"
+#| "Arpanet mail:\n"
+#| "  RMS@MIT-MC.ARPA\n"
+#| "\n"
+#| "Usenet:\n"
+#| "  ...!mit-eddie!RMS@OZ\n"
+#| "  ...!mit-vax!RMS@OZ\n"
+#| "\n"
+#| "US Snail:\n"
+#| "  Richard Stallman\n"
+#| "  166 Prospect St\n"
+#| "  Cambridge, MA 02139\n"
 msgid ""
-"\n"
 "From 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\n"
 "From: RMS%MIT-OZ@mit-eddie\n"
 "Newsgroups: net.unix-wizards,net.usoft\n"
@@ -323,7 +484,7 @@
 "\n"
 "Starting this Thanksgiving I am going to write a complete\n"
 "Unix-compatible software system called GNU (for Gnu's Not Unix), and\n"
-"give it away free<a href=\"#f1\">(1)</a> to everyone who can use it.\n"
+"give it away free&#8239;<a href=\"#f1\">[1]</a> to everyone who can use it.\n"
 "Contributions of time, money, programs and equipment are greatly\n"
 "needed.\n"
 "\n"
@@ -511,6 +672,38 @@
 "  166 Prospect St\n"
 "  Cambridge, MA 02139\n"
 
+# type: Content of: <h4>
+#. type: Content of: <div><h3>
+msgid "Footnote"
+msgstr "Nota"
+
+# type: Content of: <p>
+#. type: Content of: <div><ol><li>
+# | [-The-]{+<em>The+} wording here was [-careless.-] {+careless.</em>+} The
+# | intention was that nobody would have to pay for <b>permission</b> to use
+# | the GNU system.  But the words don't make this clear, and people often
+# | interpret them as saying that copies of GNU should always be distributed
+# | at little or no charge.  That was never the intent.
+#, fuzzy
+#| msgid ""
+#| "The wording here was careless.  The intention was that nobody would have "
+#| "to pay for <b>permission</b> to use the GNU system.  But the words don't "
+#| "make this clear, and people often interpret them as saying that copies of "
+#| "GNU should always be distributed at little or no charge.  That was never "
+#| "the intent."
+msgid ""
+"<em>The wording here was careless.</em> The intention was that nobody would "
+"have to pay for <b>permission</b> to use the GNU system.  But the words "
+"don't make this clear, and people often interpret them as saying that copies "
+"of GNU should always be distributed at little or no charge.  That was never "
+"the intent."
+msgstr ""
+"Qui la scelta delle parole è stata disattenta, e spesso sono interpretate "
+"come se le copie di GNU dovessero essere sempre distribuite gratuitamente o "
+"a modico prezzo, ma l'intento non è mai stato questo. Il punto era che "
+"nessuno dovesse pagare per ottenere il <b>permesso</b> di usare il sistema "
+"GNU."
+
 # type: Content of: <div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
@@ -538,14 +731,14 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Le traduzioni italiane sono effettuate ponendo la massima attenzione ai "
@@ -560,9 +753,14 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
+# | Copyright &copy; 1983, 1999, 2007, [-2008,-] 2009, [-2013, 2014-] {+2021+}
+# | Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
+#| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
-"Foundation, Inc."
+"Copyright &copy; 1983, 1999, 2007, 2009, 2021 Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
 "Foundation, Inc."
@@ -570,13 +768,13 @@
 #. type: Content of: <div><p>
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
 "Questa pagina è distribuita secondo i termini della licenza <a rel=\"license"
-"\" href=\"http://creativecommons.org/licenses/by-nd/3.0/us/deed.it";
-"\">Creative Commons Attribuzione - Non opere derivate 3.0 Stati Uniti</a> "
-"(CC BY-ND 3.0)."
+"\" href=\"http://creativecommons.org/licenses/by-nd/4.0/deed.it\";>Creative "
+"Commons Attribuzione - Non opere derivate 4.0 Internazionale</a> (CC BY-ND "
+"4.0)."
 
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
@@ -591,11 +789,14 @@
 msgid "Updated:"
 msgstr "Ultimo aggiornamento:"
 
+# type: Content of: <h4>
+#~ msgid "Poor choice of wording around &ldquo;free&rdquo;"
+#~ msgstr "Scarsa chiarezza nel testo circostante la parola \"libero\""
+
 # type: Content of: <div><p>
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
-"Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
-"Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
+#~ "Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
+#~ "Software Foundation, Inc."

Index: po/initial-announcement.ja.po
===================================================================
RCS file: /web/www/www/gnu/po/initial-announcement.ja.po,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- po/initial-announcement.ja.po       2 Nov 2021 13:25:56 -0000       1.10
+++ po/initial-announcement.ja.po       2 Nov 2021 14:41:52 -0000       1.11
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: initial-announcement.html\n"
-"POT-Creation-Date: 2014-04-04 23:59+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2014-04-28 15:40+0900\n"
 "Last-Translator: NIIBE Yutaka <gniibe@fsij.org>\n"
 "Language-Team: Japanese <web-translators-ja@gnu.org>\n"
@@ -14,24 +14,29 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-11-02 14:27+0000\n"
 
 #. type: Content of: <title>
 msgid "Initial Announcement - GNU Project - Free Software Foundation"
 msgstr "最初の声明 - GNUプロジェクト - 
フリーソフトウェアファウンデーション"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Initial Announcement"
 msgstr "最初の声明"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "This is the original announcement of the GNU Project, posted by <a href="
+#| "\"http://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
 msgid ""
 "This is the original announcement of the GNU Project, posted by <a href="
-"\"http://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
+"\"https://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
 msgstr ""
 "これは、GNUプロジェクトのオリジナルの声明です。<a 
href=\"http://www.stallman.";
 
"org/\">リチャード・ストールマン</a>によって1983年9月27日に投稿されました。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The actual history of the GNU Project differs in many ways from this initial "
 "plan. For example, the beginning was delayed until January 1984. Several of "
@@ -43,23 +48,29 @@
 
"\">自由ソフトウェア</a>のいくつかの理念の考えは、数年後まで明確化されませんで"
 "した。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Free Unix!"
 msgstr "Unixを自由に!"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Starting this Thanksgiving I am going to write a complete Unix-compatible "
+#| "software system called GNU (for Gnu's Not Unix), and give it away free<a "
+#| "href=\"#f1\">(1)</a> to everyone who can use it.  Contributions of time, "
+#| "money, programs and equipment are greatly needed."
 msgid ""
 "Starting this Thanksgiving I am going to write a complete Unix-compatible "
-"software system called GNU (for Gnu's Not Unix), and give it away free<a "
-"href=\"#f1\">(1)</a> to everyone who can use it.  Contributions of time, "
-"money, programs and equipment are greatly needed."
+"software system called GNU (for Gnu's Not Unix), and give it away free&#8239;"
+"<a class=\"ftn\" href=\"#f1\">[1]</a> to everyone who can use it.  "
+"Contributions of time, money, programs and equipment are greatly needed."
 msgstr ""
 "今年の感謝祭から、わたしは完å…
¨ã«Unix互換のソフトウェアシステム、GNU(Gnu's "
 "Not Unix, 
「グヌーはUnixではない」の略)を書き始め、それを使えるå…
¨å“¡ã«ãƒ•ãƒªãƒ¼ã§"
 "<a 
href=\"#f1\">(1)</a>渡そうと考えています。時間、お金、プログラãƒ
 ã€ãã—て装"
 "置の貢献がとても必要です。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To begin with, GNU will be a kernel plus all the utilities needed to write "
 "and run C programs: editor, shell, C compiler, linker, assembler, and a few "
@@ -76,7 +87,7 @@
 
"ものと、オンラインとハードコピーの文書を含め、有用なものはなんでも、提供した"
 "いと考えています。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU will be able to run Unix programs, but will not be identical to Unix.  "
 "We will make all improvements that are convenient, based on our experience "
@@ -100,11 +111,11 @@
 "ソフトウェア、UUCPよりもとても素
晴らしいもの、を有するでしょう。UUCPと互換の"
 "ものも有するかもしれません。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Who Am I?"
 msgstr "わたしは何者?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am Richard Stallman, inventor of the original much-imitated EMACS editor, "
 "now at the Artificial Intelligence Lab at MIT.  I have worked extensively on "
@@ -121,11 +132,11 @@
 "て、わたしは、耐クラッシュファイルシステム
一つと、Lisp Machineの二つのウィン"
 "ドウシステムを実装したことがあります。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why I Must Write GNU"
 msgstr "なぜGNUを書かねばならないか"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I consider that the golden rule requires that if I like a program I must "
 "share it with other people who like it.  I cannot in good conscience sign a "
@@ -135,7 +146,7 @@
 "とå…
±æœ‰ã—なければならないと要請する、とわたしは考えます。わたしは良心から、非"
 
"開示契約やソフトウェア・ライセンス同意書にサインできません。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So that I can continue to use computers without violating my principles, I "
 "have decided to put together a sufficient body of free software so that I "
@@ -145,11 +156,11 @@
 
"は、十分な自由ソフトウェアをひとそろい、まとめようと決意しました。そうして、"
 
"どんな自由でないソフトウェアなしでもやっていけるように、です。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How You Can Contribute"
 msgstr "どのように貢献できるか"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am asking computer manufacturers for donations of machines and money.  I'm "
 "asking individuals for donations of programs and work."
@@ -157,7 +168,7 @@
 "わたしは、コンピュータの製造業者
にマシンとお金の寄付を求めています。個人には"
 "プログラムと作業の寄付を求めています。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One computer manufacturer has already offered to provide a machine.  But we "
 "could use more.  One consequence you can expect if you donate machines is "
@@ -170,7 +181,7 @@
 "は、GNUは早い時期にそのマシンで動くだ
ろう、というものです。マシンは居住地域で"
 "稼働し、特別な空調や電力設備を必
要としない方が好ましいです。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Individual programmers can contribute by writing a compatible duplicate of "
 "some Unix utility and giving it to me.  For most projects, such part-time "
@@ -187,7 +198,7 @@
 
"については、この問題はありません。それぞれの貢献がUnixのほかの部分と動くので"
 
"あれば、おそらくGNUのほかの部分とおそらく動くでしょう。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If I get donations of money, I may be able to hire a few people full or part "
 "time.  The salary won't be high, but I'm looking for people for whom knowing "
@@ -201,69 +212,51 @@
 
"のすべてのエネルギーをGNUの作業に向けることを可能にする方法、と考えています。"
 "別の方法で生計を立てる必要からå…
ã‚Œã‚‹ã“とができますから。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "For more information, contact me."
 msgstr "詳細の情報については、連絡してください。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Arpanet mail:"
 msgstr "Arpanetメール:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "RMS@MIT-MC.ARPA"
 msgstr "RMS@MIT-MC.ARPA"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Usenet:"
 msgstr "Usenet:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "...!mit-eddie!RMS@OZ"
 msgstr "...!mit-eddie!RMS@OZ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "...!mit-vax!RMS@OZ"
 msgstr "...!mit-vax!RMS@OZ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "US Snail:"
 msgstr "合衆国の郵便:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Richard Stallman"
 msgstr "リチャード・ストールマン"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "166 Prospect St"
 msgstr "プロスペクト街"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Cambridge, MA 02139"
 msgstr "ケンブリッジ、マサチューセッツ州 02139"
 
-#. type: Content of: <h4>
-msgid "Poor choice of wording around &ldquo;free&rdquo;"
-msgstr "「フリー」に関する言葉遣いの下手な選択"
-
-#. type: Content of: <p>
-msgid ""
-"The wording here was careless.  The intention was that nobody would have to "
-"pay for <b>permission</b> to use the GNU system.  But the words don't make "
-"this clear, and people often interpret them as saying that copies of GNU "
-"should always be distributed at little or no charge.  That was never the "
-"intent."
-msgstr ""
-"ここでの言葉遣いは注意深いものではありませんでした。この意図は、誰しもが、GNU"
-"システムを使う<b>許可</b>のために支払う必
要がない、ということでした。しかし、"
-"この言葉はこれに関して明確ではなく、人々は多くのå 
´åˆã“れを、GNUのコピーは、常"
-"に、ほとんど料金を取らないか無償でé…
å¸ƒã™ã‚‹ã¹ãã¨è¨€ã£ã¦ã„る、と解釈しました。"
-"これは決してその意図ではありませんでした。"
-
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Original message"
 msgstr "オリジナルのメッセージ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "For completeness, the original email is reproduced here, in its original "
 "form."
@@ -271,10 +264,109 @@
 "完å…
¨ã‚’期すため、オリジナルの電子メールをオリジナルの形で、ここに再掲します。"
 
 #. TRANSLATORS: Don't translate anything except the headers.
-#. type: Content of: <div><pre>
-#, no-wrap
+#. type: Content of: <div><div><pre>
+#, fuzzy, no-wrap
+#| msgid ""
+#| "\n"
+#| "From 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\n"
+#| "From: RMS%MIT-OZ@mit-eddie\n"
+#| "Newsgroups: net.unix-wizards,net.usoft\n"
+#| "Subject: new Unix implementation\n"
+#| "Date: Tue, 27-Sep-83 12:35:59 EST\n"
+#| "Organization: MIT AI Lab, Cambridge, MA\n"
+#| "\n"
+#| "Free Unix!\n"
+#| "\n"
+#| "Starting this Thanksgiving I am going to write a complete\n"
+#| "Unix-compatible software system called GNU (for Gnu's Not Unix), and\n"
+#| "give it away free<a href=\"#f1\">(1)</a> to everyone who can use it.\n"
+#| "Contributions of time, money, programs and equipment are greatly\n"
+#| "needed.\n"
+#| "\n"
+#| "To begin with, GNU will be a kernel plus all the utilities needed to\n"
+#| "write and run C programs: editor, shell, C compiler, linker,\n"
+#| "assembler, and a few other things.  After this we will add a text\n"
+#| "formatter, a YACC, an Empire game, a spreadsheet, and hundreds of\n"
+#| "other things.  We hope to supply, eventually, everything useful that\n"
+#| "normally comes with a Unix system, and anything else useful, including\n"
+#| "on-line and hardcopy documentation.\n"
+#| "\n"
+#| "GNU will be able to run Unix programs, but will not be identical\n"
+#| "to Unix.  We will make all improvements that are convenient, based\n"
+#| "on our experience with other operating systems.  In particular,\n"
+#| "we plan to have longer filenames, file version numbers, a crashproof\n"
+#| "file system, filename completion perhaps, terminal-independent\n"
+#| "display support, and eventually a Lisp-based window system through\n"
+#| "which several Lisp programs and ordinary Unix programs can share a 
screen.\n"
+#| "Both C and Lisp will be available as system programming languages.\n"
+#| "We will have network software based on MIT's chaosnet protocol,\n"
+#| "far superior to UUCP.  We may also have something compatible\n"
+#| "with UUCP.\n"
+#| "\n"
+#| "\n"
+#| "Who Am I?\n"
+#| "\n"
+#| "I am Richard Stallman, inventor of the original much-imitated EMACS\n"
+#| "editor, now at the Artificial Intelligence Lab at MIT.  I have worked\n"
+#| "extensively on compilers, editors, debuggers, command interpreters, the\n"
+#| "Incompatible Timesharing System and the Lisp Machine operating system.\n"
+#| "I pioneered terminal-independent display support in ITS.  In addition I\n"
+#| "have implemented one crashproof file system and two window systems for\n"
+#| "Lisp machines.\n"
+#| "\n"
+#| "\n"
+#| "Why I Must Write GNU\n"
+#| "\n"
+#| "I consider that the golden rule requires that if I like a program I\n"
+#| "must share it with other people who like it.  I cannot in good\n"
+#| "conscience sign a nondisclosure agreement or a software license\n"
+#| "agreement.\n"
+#| "\n"
+#| "So that I can continue to use computers without violating my principles,\n"
+#| "I have decided to put together a sufficient body of free software so 
that\n"
+#| "I will be able to get along without any software that is not free.\n"
+#| "\n"
+#| "\n"
+#| "How You Can Contribute\n"
+#| "\n"
+#| "I am asking computer manufacturers for donations of machines and money.\n"
+#| "I'm asking individuals for donations of programs and work.\n"
+#| "\n"
+#| "One computer manufacturer has already offered to provide a machine.  But\n"
+#| "we could use more.  One consequence you can expect if you donate\n"
+#| "machines is that GNU will run on them at an early date.  The machine had\n"
+#| "better be able to operate in a residential area, and not require\n"
+#| "sophisticated cooling or power.\n"
+#| "\n"
+#| "Individual programmers can contribute by writing a compatible duplicate\n"
+#| "of some Unix utility and giving it to me.  For most projects, such\n"
+#| "part-time distributed work would be very hard to coordinate; the\n"
+#| "independently-written parts would not work together.  But for the\n"
+#| "particular task of replacing Unix, this problem is absent.  Most\n"
+#| "interface specifications are fixed by Unix compatibility.  If each\n"
+#| "contribution works with the rest of Unix, it will probably work\n"
+#| "with the rest of GNU.\n"
+#| "\n"
+#| "If I get donations of money, I may be able to hire a few people full or\n"
+#| "part time.  The salary won't be high, but I'm looking for people for\n"
+#| "whom knowing they are helping humanity is as important as money.  I view\n"
+#| "this as a way of enabling dedicated people to devote their full energies 
to\n"
+#| "working on GNU by sparing them the need to make a living in another way.\n"
+#| "\n"
+#| "\n"
+#| "For more information, contact me.\n"
+#| "Arpanet mail:\n"
+#| "  RMS@MIT-MC.ARPA\n"
+#| "\n"
+#| "Usenet:\n"
+#| "  ...!mit-eddie!RMS@OZ\n"
+#| "  ...!mit-vax!RMS@OZ\n"
+#| "\n"
+#| "US Snail:\n"
+#| "  Richard Stallman\n"
+#| "  166 Prospect St\n"
+#| "  Cambridge, MA 02139\n"
 msgid ""
-"\n"
 "From 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\n"
 "From: RMS%MIT-OZ@mit-eddie\n"
 "Newsgroups: net.unix-wizards,net.usoft\n"
@@ -286,7 +378,7 @@
 "\n"
 "Starting this Thanksgiving I am going to write a complete\n"
 "Unix-compatible software system called GNU (for Gnu's Not Unix), and\n"
-"give it away free<a href=\"#f1\">(1)</a> to everyone who can use it.\n"
+"give it away free&#8239;<a href=\"#f1\">[1]</a> to everyone who can use it.\n"
 "Contributions of time, money, programs and equipment are greatly\n"
 "needed.\n"
 "\n"
@@ -474,6 +566,33 @@
 "  166 Prospect St\n"
 "  Cambridge, MA 02139\n"
 
+#. type: Content of: <div><h3>
+#, fuzzy
+#| msgid "Footnote"
+msgid "Footnote"
+msgstr "脚注"
+
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "The wording here was careless.  The intention was that nobody would have "
+#| "to pay for <b>permission</b> to use the GNU system.  But the words don't "
+#| "make this clear, and people often interpret them as saying that copies of "
+#| "GNU should always be distributed at little or no charge.  That was never "
+#| "the intent."
+msgid ""
+"<em>The wording here was careless.</em> The intention was that nobody would "
+"have to pay for <b>permission</b> to use the GNU system.  But the words "
+"don't make this clear, and people often interpret them as saying that copies "
+"of GNU should always be distributed at little or no charge.  That was never "
+"the intent."
+msgstr ""
+"ここでの言葉遣いは注意深いものではありませんでした。この意図は、誰しもが、GNU"
+"システムを使う<b>許可</b>のために支払う必
要がない、ということでした。しかし、"
+"この言葉はこれに関して明確ではなく、人々は多くのå 
´åˆã“れを、GNUのコピーは、常"
+"に、ほとんど料金を取らないか無償でé…
å¸ƒã™ã‚‹ã¹ãã¨è¨€ã£ã¦ã„る、と解釈しました。"
+"これは決してその意図ではありませんでした。"
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -499,26 +618,29 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 
"正確で良い品質の翻訳を提供するよう努力していますが、不完å
…¨ãªå ´åˆã‚‚あるかと思"
 "います。翻訳に関するコメントと提案は、<a 
href=\"mailto:web-translators@gnu.";
 
"org\">&lt;web-translators@gnu.org&gt;</a>におねがいします。</p><p>わたしたち"
-"のウェブページの翻訳の調整と提出については、<a 
href=\"/server/standards/"
+"のウェブページの翻訳の調整と貢献については、<a 
href=\"/server/standards/"
 "README.translations.html\">翻訳 README</a>をご覧ください。"
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
+#| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
-"Foundation, Inc."
+"Copyright &copy; 1983, 1999, 2007, 2009, 2021 Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
 "Foundation, Inc."
@@ -526,12 +648,12 @@
 #. type: Content of: <div><p>
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
 "このページは<a rel=\"license\" 
href=\"http://creativecommons.org/licenses/by-";
-"nd/3.0/us/deed.ja\">Creative Commons Attribution-NoDerivs 3.0 United States "
-"License</a>の条件で許諾されます。"
+"nd/4.0/deed.ja\">Creative Commons Attribution-NoDerivatives 4.0 "
+"International License</a>の条件で許諾されます。"
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>
@@ -543,10 +665,12 @@
 msgid "Updated:"
 msgstr "最終更新:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
-"Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
-"Software Foundation, Inc."
+#~ msgid "Poor choice of wording around &ldquo;free&rdquo;"
+#~ msgstr "「フリー」に関する言葉遣いの下手な選択"
+
+#~ msgid ""
+#~ "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
+#~ "Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
+#~ "Software Foundation, Inc."

Index: po/initial-announcement.nl.po
===================================================================
RCS file: /web/www/www/gnu/po/initial-announcement.nl.po,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- po/initial-announcement.nl.po       2 Nov 2021 13:25:56 -0000       1.11
+++ po/initial-announcement.nl.po       2 Nov 2021 14:41:52 -0000       1.12
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: initial-announcement.html\n"
-"POT-Creation-Date: 2014-04-04 23:59+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Tom Uijldert <tom.uijldert@gmail.com>\n"
 "Language-Team: Dutch\n"
@@ -15,24 +15,32 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-11-02 14:27+0000\n"
 
 #. type: Content of: <title>
 msgid "Initial Announcement - GNU Project - Free Software Foundation"
 msgstr "Over het GNU Project - GNU Project - Free Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Initial Announcement"
 msgstr "Eerste Aankondiging"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
+# | This is the original announcement of the GNU Project, posted by <a
+# | href=\"http{+s+}://www.stallman.org/\">Richard Stallman</a> on September
+# | 27, 1983.
+#, fuzzy
+#| msgid ""
+#| "This is the original announcement of the GNU Project, posted by <a href="
+#| "\"http://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
 msgid ""
 "This is the original announcement of the GNU Project, posted by <a href="
-"\"http://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
+"\"https://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
 msgstr ""
 "Dit is de originele aankondiging van het GNU project, geschreven door <a "
 "href=\"http://www.stallman.org/\";>Richard Stallman</a> op 27 September 1983."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The actual history of the GNU Project differs in many ways from this initial "
 "plan. For example, the beginning was delayed until January 1984. Several of "
@@ -44,16 +52,27 @@
 "diverse details van <a href=\"/philosophy/free-sw.html\">vrije software</a> "
 "werden jaren later pas geformuleerd."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Free Unix!"
 msgstr "Bevrijd Unix!"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Starting this Thanksgiving I am going to write a complete Unix-compatible
+# | software system called GNU (for Gnu's Not Unix), and give it away [-free<a
+# | href=\"#f1\">(1)</a>-] {+free&#8239;<a class=\"ftn\"
+# | href=\"#f1\">[1]</a>+} to everyone who can use it.  Contributions of time,
+# | money, programs and equipment are greatly needed.
+#, fuzzy
+#| msgid ""
+#| "Starting this Thanksgiving I am going to write a complete Unix-compatible "
+#| "software system called GNU (for Gnu's Not Unix), and give it away free<a "
+#| "href=\"#f1\">(1)</a> to everyone who can use it.  Contributions of time, "
+#| "money, programs and equipment are greatly needed."
 msgid ""
 "Starting this Thanksgiving I am going to write a complete Unix-compatible "
-"software system called GNU (for Gnu's Not Unix), and give it away free<a "
-"href=\"#f1\">(1)</a> to everyone who can use it.  Contributions of time, "
-"money, programs and equipment are greatly needed."
+"software system called GNU (for Gnu's Not Unix), and give it away free&#8239;"
+"<a class=\"ftn\" href=\"#f1\">[1]</a> to everyone who can use it.  "
+"Contributions of time, money, programs and equipment are greatly needed."
 msgstr ""
 "Vanaf eind November ga ik me toeleggen op het schrijven van een compleet "
 "besturingssysteem, uitwisselbaar met Unix, met de naam GNU (voor Gnu's Not "
@@ -61,7 +80,7 @@
 "aan iedereen die het gebruiken kan. Een bijdrage in de kosten, of in de vorm "
 "van hulp, programma's of systemen is hierbij nodig."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To begin with, GNU will be a kernel plus all the utilities needed to write "
 "and run C programs: editor, shell, C compiler, linker, assembler, and a few "
@@ -78,7 +97,7 @@
 "leveren die je normaal gesproken op een Unix systeem kunt verwachten en nog "
 "meer bruikbaars zoals online- en papieren handleidingen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU will be able to run Unix programs, but will not be identical to Unix.  "
 "We will make all improvements that are convenient, based on our experience "
@@ -105,11 +124,11 @@
 "opzichte van UUCP. We zullen misschien zelfs wel iets hebben wat "
 "uitwisselbaar is met UUCP."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Who Am I?"
 msgstr "Wie Ben Ik?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am Richard Stallman, inventor of the original much-imitated EMACS editor, "
 "now at the Artificial Intelligence Lab at MIT.  I have worked extensively on "
@@ -127,11 +146,11 @@
 "bestandssysteem ontwikkeld wat kapotte schijven overleeft en twee window "
 "systemen voor Lisp machines."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why I Must Write GNU"
 msgstr "Waarom Ik GNU Moet Maken"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I consider that the golden rule requires that if I like a program I must "
 "share it with other people who like it.  I cannot in good conscience sign a "
@@ -142,7 +161,7 @@
 "mijn geweten overeenstemmen om een geheimhoudingsverklaring te ondertekenen "
 "of een software licentie."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So that I can continue to use computers without violating my principles, I "
 "have decided to put together a sufficient body of free software so that I "
@@ -153,11 +172,11 @@
 "dat ik verder met computers kan werken zonder daarbij niet-vrije software te "
 "hoeven gebruiken."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How You Can Contribute"
 msgstr "Hoe Jij Bij Kunt Dragen"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am asking computer manufacturers for donations of machines and money.  I'm "
 "asking individuals for donations of programs and work."
@@ -166,7 +185,7 @@
 "vraag aan individuen bijdragen in de vorm van programma's of programmeer-"
 "inspanning."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One computer manufacturer has already offered to provide a machine.  But we "
 "could use more.  One consequence you can expect if you donate machines is "
@@ -179,7 +198,7 @@
 "systeem hier het eerst op zal draaien. De machine moet wel in een normale "
 "woonwijk kunnen functioneren en geen aparte koeling of voeding nodig hebben."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Individual programmers can contribute by writing a compatible duplicate of "
 "some Unix utility and giving it to me.  For most projects, such part-time "
@@ -198,7 +217,7 @@
 "met Unix. Wanneer iedere bijdrage met Unix kan werken, zal het ook wel met "
 "GNU werken."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If I get donations of money, I may be able to hire a few people full or part "
 "time.  The salary won't be high, but I'm looking for people for whom knowing "
@@ -213,69 +232,51 @@
 "volledig op de GNU-taak te concentreren zonder dat ze zich zorgen hoeven "
 "maken over brood op de plank."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "For more information, contact me."
 msgstr "Neem contact met mij op voor meer informatie."
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Arpanet mail:"
 msgstr "Arpanet mail:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "RMS@MIT-MC.ARPA"
 msgstr "RMS@MIT-MC.ARPA"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Usenet:"
 msgstr "Usenet:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "...!mit-eddie!RMS@OZ"
 msgstr "...!mit-eddie!RMS@OZ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "...!mit-vax!RMS@OZ"
 msgstr "...!mit-vax!RMS@OZ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "US Snail:"
 msgstr "US Snail:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Richard Stallman"
 msgstr "Richard Stallman"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "166 Prospect St"
 msgstr "166 Prospect St"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Cambridge, MA 02139"
 msgstr "Cambridge, MA 02139"
 
-#. type: Content of: <h4>
-msgid "Poor choice of wording around &ldquo;free&rdquo;"
-msgstr "Ongelukkige woordkeus"
-
-#. type: Content of: <p>
-msgid ""
-"The wording here was careless.  The intention was that nobody would have to "
-"pay for <b>permission</b> to use the GNU system.  But the words don't make "
-"this clear, and people often interpret them as saying that copies of GNU "
-"should always be distributed at little or no charge.  That was never the "
-"intent."
-msgstr ""
-"Hier was sprake van een ongelukkige woordkeus. De bedoeling was dat niemand "
-"hoefde te betalen voor <b>toestemming</b> om het GNU systeem te gebruiken. "
-"Maar deze woorden dekten de lading niet en velen interpreteerden het dat je "
-"voor de distributie van kopie&euml;n van GNU weinig of niets mocht "
-"berekenen. Dat is nooit de bedoeling geweest."
-
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Original message"
 msgstr "Originele bericht"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "For completeness, the original email is reproduced here, in its original "
 "form."
@@ -284,10 +285,172 @@
 "getoond."
 
 #. TRANSLATORS: Don't translate anything except the headers.
-#. type: Content of: <div><pre>
-#, no-wrap
+#. type: Content of: <div><div><pre>
+# | [-\\nFrom-]{+From+}
+# | 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\\nFrom:
+# | RMS%MIT-OZ@mit-eddie\\nNewsgroups: net.unix-wizards,net.usoft\\nSubject:
+# | new Unix implementation\\nDate: Tue, 27-Sep-83 12:35:59
+# | EST\\nOrganization: MIT AI Lab, Cambridge, MA\\n\\nFree
+# | Unix!\\n\\nStarting this Thanksgiving I am going to write a
+# | complete\\nUnix-compatible software system called GNU (for Gnu's Not
+# | Unix), and\\ngive it away [-free<a href=\"#f1\">(1)</a>-] {+free&#8239;<a
+# | href=\"#f1\">[1]</a>+} to everyone who can use it.\\nContributions of
+# | time, money, programs and equipment are greatly\\nneeded.\\n\\nTo begin
+# | with, GNU will be a kernel plus all the utilities needed to\\nwrite and
+# | run C programs: editor, shell, C compiler, linker,\\nassembler, and a few
+# | other things.  After this we will add a text\\nformatter, a YACC, an
+# | Empire game, a spreadsheet, and hundreds of\\nother things.  We hope to
+# | supply, eventually, everything useful that\\nnormally comes with a Unix
+# | system, and anything else useful, including\\non-line and hardcopy
+# | documentation.\\n\\nGNU will be able to run Unix programs, but will not be
+# | identical\\nto Unix.  We will make all improvements that are convenient,
+# | based\\non our experience with other operating systems.  In
+# | particular,\\nwe plan to have longer filenames, file version numbers, a
+# | crashproof\\nfile system, filename completion perhaps,
+# | terminal-independent\\ndisplay support, and eventually a Lisp-based window
+# | system through\\nwhich several Lisp programs and ordinary Unix programs
+# | can share a screen.\\nBoth C and Lisp will be available as system
+# | programming languages.\\nWe will have network software based on MIT's
+# | chaosnet protocol,\\nfar superior to UUCP.  We may also have something
+# | compatible\\nwith UUCP.\\n\\n\\nWho Am I?\\n\\nI am Richard Stallman,
+# | inventor of the original much-imitated EMACS\\neditor, now at the
+# | Artificial Intelligence Lab at MIT.  I have worked\\nextensively on
+# | compilers, editors, debuggers, command interpreters, the\\nIncompatible
+# | Timesharing System and the Lisp Machine operating system.\\nI pioneered
+# | terminal-independent display support in ITS.  In addition I\\nhave
+# | implemented one crashproof file system and two window systems for\\nLisp
+# | machines.\\n\\n\\nWhy I Must Write GNU\\n\\nI consider that the golden
+# | rule requires that if I like a program I\\nmust share it with other people
+# | who like it.  I cannot in good\\nconscience sign a nondisclosure agreement
+# | or a software license\\nagreement.\\n\\nSo that I can continue to use
+# | computers without violating my principles,\\nI have decided to put
+# | together a sufficient body of free software so that\\nI will be able to
+# | get along without any software that is not free.\\n\\n\\nHow You Can
+# | Contribute\\n\\nI am asking computer manufacturers for donations of
+# | machines and money.\\nI'm asking individuals for donations of programs and
+# | work.\\n\\nOne computer manufacturer has already offered to provide a
+# | machine.  But\\nwe could use more.  One consequence you can expect if you
+# | donate\\nmachines is that GNU will run on them at an early date.  The
+# | machine had\\nbetter be able to operate in a residential area, and not
+# | require\\nsophisticated cooling or power.\\n\\nIndividual programmers can
+# | contribute by writing a compatible duplicate\\nof some Unix utility and
+# | giving it to me.  For most projects, such\\npart-time distributed work
+# | would be very hard to coordinate; the\\nindependently-written parts would
+# | not work together.  But for the\\nparticular task of replacing Unix, this
+# | problem is absent.  Most\\ninterface specifications are fixed by Unix
+# | compatibility.  If each\\ncontribution works with the rest of Unix, it
+# | will probably work\\nwith the rest of GNU.\\n\\nIf I get donations of
+# | money, I may be able to hire a few people full or\\npart time.  The salary
+# | won't be high, but I'm looking for people for\\nwhom knowing they are
+# | helping humanity is as important as money.  I view\\nthis as a way of
+# | enabling dedicated people to devote their full energies to\\nworking on
+# | GNU by sparing them the need to make a living in another way.\\n\\n\\nFor
+# | more information, contact me.\\nArpanet mail:\\n 
+# | RMS@MIT-MC.ARPA\\n\\nUsenet:\\n  ...!mit-eddie!RMS@OZ\\n 
+# | ...!mit-vax!RMS@OZ\\n\\nUS Snail:\\n  Richard Stallman\\n  166 Prospect
+# | St\\n  Cambridge, MA 02139\\n
+#, fuzzy, no-wrap
+#| msgid ""
+#| "\n"
+#| "From 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\n"
+#| "From: RMS%MIT-OZ@mit-eddie\n"
+#| "Newsgroups: net.unix-wizards,net.usoft\n"
+#| "Subject: new Unix implementation\n"
+#| "Date: Tue, 27-Sep-83 12:35:59 EST\n"
+#| "Organization: MIT AI Lab, Cambridge, MA\n"
+#| "\n"
+#| "Free Unix!\n"
+#| "\n"
+#| "Starting this Thanksgiving I am going to write a complete\n"
+#| "Unix-compatible software system called GNU (for Gnu's Not Unix), and\n"
+#| "give it away free<a href=\"#f1\">(1)</a> to everyone who can use it.\n"
+#| "Contributions of time, money, programs and equipment are greatly\n"
+#| "needed.\n"
+#| "\n"
+#| "To begin with, GNU will be a kernel plus all the utilities needed to\n"
+#| "write and run C programs: editor, shell, C compiler, linker,\n"
+#| "assembler, and a few other things.  After this we will add a text\n"
+#| "formatter, a YACC, an Empire game, a spreadsheet, and hundreds of\n"
+#| "other things.  We hope to supply, eventually, everything useful that\n"
+#| "normally comes with a Unix system, and anything else useful, including\n"
+#| "on-line and hardcopy documentation.\n"
+#| "\n"
+#| "GNU will be able to run Unix programs, but will not be identical\n"
+#| "to Unix.  We will make all improvements that are convenient, based\n"
+#| "on our experience with other operating systems.  In particular,\n"
+#| "we plan to have longer filenames, file version numbers, a crashproof\n"
+#| "file system, filename completion perhaps, terminal-independent\n"
+#| "display support, and eventually a Lisp-based window system through\n"
+#| "which several Lisp programs and ordinary Unix programs can share a 
screen.\n"
+#| "Both C and Lisp will be available as system programming languages.\n"
+#| "We will have network software based on MIT's chaosnet protocol,\n"
+#| "far superior to UUCP.  We may also have something compatible\n"
+#| "with UUCP.\n"
+#| "\n"
+#| "\n"
+#| "Who Am I?\n"
+#| "\n"
+#| "I am Richard Stallman, inventor of the original much-imitated EMACS\n"
+#| "editor, now at the Artificial Intelligence Lab at MIT.  I have worked\n"
+#| "extensively on compilers, editors, debuggers, command interpreters, the\n"
+#| "Incompatible Timesharing System and the Lisp Machine operating system.\n"
+#| "I pioneered terminal-independent display support in ITS.  In addition I\n"
+#| "have implemented one crashproof file system and two window systems for\n"
+#| "Lisp machines.\n"
+#| "\n"
+#| "\n"
+#| "Why I Must Write GNU\n"
+#| "\n"
+#| "I consider that the golden rule requires that if I like a program I\n"
+#| "must share it with other people who like it.  I cannot in good\n"
+#| "conscience sign a nondisclosure agreement or a software license\n"
+#| "agreement.\n"
+#| "\n"
+#| "So that I can continue to use computers without violating my principles,\n"
+#| "I have decided to put together a sufficient body of free software so 
that\n"
+#| "I will be able to get along without any software that is not free.\n"
+#| "\n"
+#| "\n"
+#| "How You Can Contribute\n"
+#| "\n"
+#| "I am asking computer manufacturers for donations of machines and money.\n"
+#| "I'm asking individuals for donations of programs and work.\n"
+#| "\n"
+#| "One computer manufacturer has already offered to provide a machine.  But\n"
+#| "we could use more.  One consequence you can expect if you donate\n"
+#| "machines is that GNU will run on them at an early date.  The machine had\n"
+#| "better be able to operate in a residential area, and not require\n"
+#| "sophisticated cooling or power.\n"
+#| "\n"
+#| "Individual programmers can contribute by writing a compatible duplicate\n"
+#| "of some Unix utility and giving it to me.  For most projects, such\n"
+#| "part-time distributed work would be very hard to coordinate; the\n"
+#| "independently-written parts would not work together.  But for the\n"
+#| "particular task of replacing Unix, this problem is absent.  Most\n"
+#| "interface specifications are fixed by Unix compatibility.  If each\n"
+#| "contribution works with the rest of Unix, it will probably work\n"
+#| "with the rest of GNU.\n"
+#| "\n"
+#| "If I get donations of money, I may be able to hire a few people full or\n"
+#| "part time.  The salary won't be high, but I'm looking for people for\n"
+#| "whom knowing they are helping humanity is as important as money.  I view\n"
+#| "this as a way of enabling dedicated people to devote their full energies 
to\n"
+#| "working on GNU by sparing them the need to make a living in another way.\n"
+#| "\n"
+#| "\n"
+#| "For more information, contact me.\n"
+#| "Arpanet mail:\n"
+#| "  RMS@MIT-MC.ARPA\n"
+#| "\n"
+#| "Usenet:\n"
+#| "  ...!mit-eddie!RMS@OZ\n"
+#| "  ...!mit-vax!RMS@OZ\n"
+#| "\n"
+#| "US Snail:\n"
+#| "  Richard Stallman\n"
+#| "  166 Prospect St\n"
+#| "  Cambridge, MA 02139\n"
 msgid ""
-"\n"
 "From 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\n"
 "From: RMS%MIT-OZ@mit-eddie\n"
 "Newsgroups: net.unix-wizards,net.usoft\n"
@@ -299,7 +462,7 @@
 "\n"
 "Starting this Thanksgiving I am going to write a complete\n"
 "Unix-compatible software system called GNU (for Gnu's Not Unix), and\n"
-"give it away free<a href=\"#f1\">(1)</a> to everyone who can use it.\n"
+"give it away free&#8239;<a href=\"#f1\">[1]</a> to everyone who can use it.\n"
 "Contributions of time, money, programs and equipment are greatly\n"
 "needed.\n"
 "\n"
@@ -487,6 +650,39 @@
 "  166 Prospect St\n"
 "  Cambridge, MA 02139\n"
 
+#. type: Content of: <div><h3>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Footnote"
+msgid "Footnote"
+msgstr "Voetnoot"
+
+#. type: Content of: <div><ol><li>
+# | [-The-]{+<em>The+} wording here was [-careless.-] {+careless.</em>+} The
+# | intention was that nobody would have to pay for <b>permission</b> to use
+# | the GNU system.  But the words don't make this clear, and people often
+# | interpret them as saying that copies of GNU should always be distributed
+# | at little or no charge.  That was never the intent.
+#, fuzzy
+#| msgid ""
+#| "The wording here was careless.  The intention was that nobody would have "
+#| "to pay for <b>permission</b> to use the GNU system.  But the words don't "
+#| "make this clear, and people often interpret them as saying that copies of "
+#| "GNU should always be distributed at little or no charge.  That was never "
+#| "the intent."
+msgid ""
+"<em>The wording here was careless.</em> The intention was that nobody would "
+"have to pay for <b>permission</b> to use the GNU system.  But the words "
+"don't make this clear, and people often interpret them as saying that copies "
+"of GNU should always be distributed at little or no charge.  That was never "
+"the intent."
+msgstr ""
+"Hier was sprake van een ongelukkige woordkeus. De bedoeling was dat niemand "
+"hoefde te betalen voor <b>toestemming</b> om het GNU systeem te gebruiken. "
+"Maar deze woorden dekten de lading niet en velen interpreteerden het dat je "
+"voor de distributie van kopie&euml;n van GNU weinig of niets mocht "
+"berekenen. Dat is nooit de bedoeling geweest."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -513,14 +709,20 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "We doen ons best om goede vertalingen te maken maar staan altijd open voor "
@@ -530,22 +732,37 @@
 "voor informatie over het onderhoud van vertalingen op deze website."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; 1983, 1999, 2007, [-2008,-] 2009, [-2013, 2014-] {+2021+}
+# | Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
+#| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
-"Foundation, Inc."
+"Copyright &copy; 1983, 1999, 2007, 2009, 2021 Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
 "Foundation, Inc."
 
 #. type: Content of: <div><p>
+# | This page is licensed under a <a rel=\"license\"
+# | [-href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative-]
+# | {+href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Creative+}
+# | Commons [-Attribution-NoDerivs 3.0 United States-]
+# | {+Attribution-NoDerivatives 4.0 International+} License</a>.
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#| "NoDerivs 3.0 United States License</a>."
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
-"Deze pagina is uitgebracht onder de <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/deed.nl\">Creative Commons "
-"Naamsvermelding-GeenAfgeleideWerken 3.0 Verenigde Staten licentie</a>."
+"Deze pagina valt onder de <a rel=\"license\" href=\"http://creativecommons.";
+"org/licenses/by-nd/3.0/us/deed.nl\">Creative Commons Attribution-NoDerivs "
+"3.0 United States Licentie</a>."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>
@@ -557,10 +774,33 @@
 msgid "Updated:"
 msgstr "Bijgewerkt:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
-"Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
-"Software Foundation, Inc."
+#~ msgid "Poor choice of wording around &ldquo;free&rdquo;"
+#~ msgstr "Ongelukkige woordkeus"
+
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "We doen ons best om goede vertalingen te maken maar staan altijd open "
+#~ "voor verbeteringen. Suggesties, op- en aanmerkingen sturen aan: <a href="
+#~ "\"mailto:web-translators@gnu.org\";>&lt;web-translators@gnu.org&gt;</a>.</"
+#~ "p> <p>Zie <a href=\"/server/standards/README.translations.html\"> "
+#~ "Translations README</a> voor informatie over het onderhoud van "
+#~ "vertalingen op deze website."
+
+#~ msgid ""
+#~ "This page is licensed under a <a rel=\"license\" href=\"http://";
+#~ "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#~ "NoDerivs 3.0 United States License</a>."
+#~ msgstr ""
+#~ "Deze pagina is uitgebracht onder de <a rel=\"license\" href=\"http://";
+#~ "creativecommons.org/licenses/by-nd/3.0/us/deed.nl\">Creative Commons "
+#~ "Naamsvermelding-GeenAfgeleideWerken 3.0 Verenigde Staten licentie</a>."
+
+#~ msgid ""
+#~ "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
+#~ "Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
+#~ "Software Foundation, Inc."

Index: po/initial-announcement.pl.po
===================================================================
RCS file: /web/www/www/gnu/po/initial-announcement.pl.po,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- po/initial-announcement.pl.po       2 Nov 2021 13:25:56 -0000       1.22
+++ po/initial-announcement.pl.po       2 Nov 2021 14:41:52 -0000       1.23
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: initial-announcement.html\n"
-"POT-Creation-Date: 2014-04-04 23:59+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2014-04-16 21:01-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-11-02 14:27+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.0\n"
@@ -24,19 +25,26 @@
 msgstr ""
 "Pierwsze ogłoszenie - Projekt GNU - Fundacja Wolnego Oprogramowania (FSF)"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Initial Announcement"
 msgstr "Pierwsze ogłoszenie"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
+# | This is the original announcement of the GNU Project, posted by <a
+# | href=\"http{+s+}://www.stallman.org/\">Richard Stallman</a> on September
+# | 27, 1983.
+#, fuzzy
+#| msgid ""
+#| "This is the original announcement of the GNU Project, posted by <a href="
+#| "\"http://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
 msgid ""
 "This is the original announcement of the GNU Project, posted by <a href="
-"\"http://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
+"\"https://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
 msgstr ""
 "Oto oryginalne ogłoszenie rozpoczęcia Projektu GNU, napisane przez <a href="
 "\"http://www.stallman.org/\";>Richarda Stallmana</a> 27 września, 1983 roku."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The actual history of the GNU Project differs in many ways from this initial "
 "plan. For example, the beginning was delayed until January 1984. Several of "
@@ -49,17 +57,28 @@
 "sw.html\">wolnego oprogramowania</a> nie&nbsp;było jeszcze wyjaśnionych."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Free Unix!"
 msgstr "Wolny Unix!"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Starting this Thanksgiving I am going to write a complete Unix-compatible
+# | software system called GNU (for Gnu's Not Unix), and give it away [-free<a
+# | href=\"#f1\">(1)</a>-] {+free&#8239;<a class=\"ftn\"
+# | href=\"#f1\">[1]</a>+} to everyone who can use it.  Contributions of time,
+# | money, programs and equipment are greatly needed.
+#, fuzzy
+#| msgid ""
+#| "Starting this Thanksgiving I am going to write a complete Unix-compatible "
+#| "software system called GNU (for Gnu's Not Unix), and give it away free<a "
+#| "href=\"#f1\">(1)</a> to everyone who can use it.  Contributions of time, "
+#| "money, programs and equipment are greatly needed."
 msgid ""
 "Starting this Thanksgiving I am going to write a complete Unix-compatible "
-"software system called GNU (for Gnu's Not Unix), and give it away free<a "
-"href=\"#f1\">(1)</a> to everyone who can use it.  Contributions of time, "
-"money, programs and equipment are greatly needed."
+"software system called GNU (for Gnu's Not Unix), and give it away free&#8239;"
+"<a class=\"ftn\" href=\"#f1\">[1]</a> to everyone who can use it.  "
+"Contributions of time, money, programs and equipment are greatly needed."
 msgstr ""
 "Zaczynając w&nbsp;Święto Dziękczynienia zamierzam napisać pełny zgodny "
 "z&nbsp;Uniksem system oprogramowania nazwany GNU (od&nbsp;GNU to Nie&nbsp;"
@@ -69,7 +88,7 @@
 "sprzętu."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To begin with, GNU will be a kernel plus all the utilities needed to write "
 "and run C programs: editor, shell, C compiler, linker, assembler, and a few "
@@ -88,7 +107,7 @@
 "dokumentacją on-line i&nbsp;drukowaną."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU will be able to run Unix programs, but will not be identical to Unix.  "
 "We will make all improvements that are convenient, based on our experience "
@@ -115,12 +134,12 @@
 "UUCP. Możemy mieć też coś zgodnego z&nbsp;UUCP."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Who Am I?"
 msgstr "Kim jestem?"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am Richard Stallman, inventor of the original much-imitated EMACS editor, "
 "now at the Artificial Intelligence Lab at MIT.  I have worked extensively on "
@@ -139,12 +158,12 @@
 "systemy okienkowe dla maszyn Lisp."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why I Must Write GNU"
 msgstr "Dlaczego muszę napisać GNU"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I consider that the golden rule requires that if I like a program I must "
 "share it with other people who like it.  I cannot in good conscience sign a "
@@ -156,7 +175,7 @@
 "nieujawnianiu czy&nbsp;umowy licencyjnej oprogramowania."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So that I can continue to use computers without violating my principles, I "
 "have decided to put together a sufficient body of free software so that I "
@@ -168,12 +187,12 @@
 "nie&nbsp;są wolne."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How You Can Contribute"
 msgstr "Jak możecie wnieść swój wkład"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am asking computer manufacturers for donations of machines and money.  I'm "
 "asking individuals for donations of programs and work."
@@ -182,7 +201,7 @@
 "Proszę osoby prywatne o&nbsp;ofiarowanie programów i&nbsp;pracy."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One computer manufacturer has already offered to provide a machine.  But we "
 "could use more.  One consequence you can expect if you donate machines is "
@@ -198,7 +217,7 @@
 "czy&nbsp;zasilania."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Individual programmers can contribute by writing a compatible duplicate of "
 "some Unix utility and giving it to me.  For most projects, such part-time "
@@ -219,7 +238,7 @@
 "prawdopodobnie będzie działał i&nbsp;z&nbsp;resztą GNU."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If I get donations of money, I may be able to hire a few people full or part "
 "time.  The salary won't be high, but I'm looking for people for whom knowing "
@@ -235,74 +254,54 @@
 "musieli utrzymywać się w&nbsp;inny sposób."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "For more information, contact me."
 msgstr "Po&nbsp;dalsze informacje kontaktujcie się ze&nbsp;mną."
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Arpanet mail:"
 msgstr "Mail Arpanet:"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "RMS@MIT-MC.ARPA"
 msgstr "RMS@MIT-MC.ARPA"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Usenet:"
 msgstr "Usenet:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "...!mit-eddie!RMS@OZ"
 msgstr "...!mit-eddie!RMS@OZ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "...!mit-vax!RMS@OZ"
 msgstr "...!mit-vax!RMS@OZ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "US Snail:"
 msgstr "Zwykłą pocztą:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Richard Stallman"
 msgstr "Richard Stallman"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "166 Prospect St"
 msgstr "166 Prospect St"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Cambridge, MA 02139"
 msgstr "Cambridge, MA 02139"
 
-# type: Content of: <h4>
-#. type: Content of: <h4>
-msgid "Poor choice of wording around &ldquo;free&rdquo;"
-msgstr "Niezręczne rozumowanie słowa &bdquo;free&rdquo;"
-
-# type: Content of: <p>
-#. type: Content of: <p>
-msgid ""
-"The wording here was careless.  The intention was that nobody would have to "
-"pay for <b>permission</b> to use the GNU system.  But the words don't make "
-"this clear, and people often interpret them as saying that copies of GNU "
-"should always be distributed at little or no charge.  That was never the "
-"intent."
-msgstr ""
-"To sformułowanie jest niedokładne. Intencją było to, by nikt 
nie&nbsp;musiał "
-"płacić za&nbsp;<b>pozwolenie</b> używania systemu GNU. Ale&nbsp;nie&nbsp;"
-"wynikało to z&nbsp;tych słów, więc&nbsp;ludzie zazwyczaj interpretowali 
to "
-"tak, jakoby GNU miałoby być rozprowadzane z&nbsp;małą lub&nbsp;bez 
żadnej "
-"opłaty. To nigdy nie&nbsp;było jego zamiarem."
-
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Original message"
 msgstr "Oryginalna wiadomość"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "For completeness, the original email is reproduced here, in its original "
 "form."
@@ -312,10 +311,172 @@
 
 # type: Content of: <div><pre>
 #. TRANSLATORS: Don't translate anything except the headers.
-#. type: Content of: <div><pre>
-#, no-wrap
+#. type: Content of: <div><div><pre>
+# | [-\\nFrom-]{+From+}
+# | 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\\nFrom:
+# | RMS%MIT-OZ@mit-eddie\\nNewsgroups: net.unix-wizards,net.usoft\\nSubject:
+# | new Unix implementation\\nDate: Tue, 27-Sep-83 12:35:59
+# | EST\\nOrganization: MIT AI Lab, Cambridge, MA\\n\\nFree
+# | Unix!\\n\\nStarting this Thanksgiving I am going to write a
+# | complete\\nUnix-compatible software system called GNU (for Gnu's Not
+# | Unix), and\\ngive it away [-free<a href=\"#f1\">(1)</a>-] {+free&#8239;<a
+# | href=\"#f1\">[1]</a>+} to everyone who can use it.\\nContributions of
+# | time, money, programs and equipment are greatly\\nneeded.\\n\\nTo begin
+# | with, GNU will be a kernel plus all the utilities needed to\\nwrite and
+# | run C programs: editor, shell, C compiler, linker,\\nassembler, and a few
+# | other things.  After this we will add a text\\nformatter, a YACC, an
+# | Empire game, a spreadsheet, and hundreds of\\nother things.  We hope to
+# | supply, eventually, everything useful that\\nnormally comes with a Unix
+# | system, and anything else useful, including\\non-line and hardcopy
+# | documentation.\\n\\nGNU will be able to run Unix programs, but will not be
+# | identical\\nto Unix.  We will make all improvements that are convenient,
+# | based\\non our experience with other operating systems.  In
+# | particular,\\nwe plan to have longer filenames, file version numbers, a
+# | crashproof\\nfile system, filename completion perhaps,
+# | terminal-independent\\ndisplay support, and eventually a Lisp-based window
+# | system through\\nwhich several Lisp programs and ordinary Unix programs
+# | can share a screen.\\nBoth C and Lisp will be available as system
+# | programming languages.\\nWe will have network software based on MIT's
+# | chaosnet protocol,\\nfar superior to UUCP.  We may also have something
+# | compatible\\nwith UUCP.\\n\\n\\nWho Am I?\\n\\nI am Richard Stallman,
+# | inventor of the original much-imitated EMACS\\neditor, now at the
+# | Artificial Intelligence Lab at MIT.  I have worked\\nextensively on
+# | compilers, editors, debuggers, command interpreters, the\\nIncompatible
+# | Timesharing System and the Lisp Machine operating system.\\nI pioneered
+# | terminal-independent display support in ITS.  In addition I\\nhave
+# | implemented one crashproof file system and two window systems for\\nLisp
+# | machines.\\n\\n\\nWhy I Must Write GNU\\n\\nI consider that the golden
+# | rule requires that if I like a program I\\nmust share it with other people
+# | who like it.  I cannot in good\\nconscience sign a nondisclosure agreement
+# | or a software license\\nagreement.\\n\\nSo that I can continue to use
+# | computers without violating my principles,\\nI have decided to put
+# | together a sufficient body of free software so that\\nI will be able to
+# | get along without any software that is not free.\\n\\n\\nHow You Can
+# | Contribute\\n\\nI am asking computer manufacturers for donations of
+# | machines and money.\\nI'm asking individuals for donations of programs and
+# | work.\\n\\nOne computer manufacturer has already offered to provide a
+# | machine.  But\\nwe could use more.  One consequence you can expect if you
+# | donate\\nmachines is that GNU will run on them at an early date.  The
+# | machine had\\nbetter be able to operate in a residential area, and not
+# | require\\nsophisticated cooling or power.\\n\\nIndividual programmers can
+# | contribute by writing a compatible duplicate\\nof some Unix utility and
+# | giving it to me.  For most projects, such\\npart-time distributed work
+# | would be very hard to coordinate; the\\nindependently-written parts would
+# | not work together.  But for the\\nparticular task of replacing Unix, this
+# | problem is absent.  Most\\ninterface specifications are fixed by Unix
+# | compatibility.  If each\\ncontribution works with the rest of Unix, it
+# | will probably work\\nwith the rest of GNU.\\n\\nIf I get donations of
+# | money, I may be able to hire a few people full or\\npart time.  The salary
+# | won't be high, but I'm looking for people for\\nwhom knowing they are
+# | helping humanity is as important as money.  I view\\nthis as a way of
+# | enabling dedicated people to devote their full energies to\\nworking on
+# | GNU by sparing them the need to make a living in another way.\\n\\n\\nFor
+# | more information, contact me.\\nArpanet mail:\\n 
+# | RMS@MIT-MC.ARPA\\n\\nUsenet:\\n  ...!mit-eddie!RMS@OZ\\n 
+# | ...!mit-vax!RMS@OZ\\n\\nUS Snail:\\n  Richard Stallman\\n  166 Prospect
+# | St\\n  Cambridge, MA 02139\\n
+#, fuzzy, no-wrap
+#| msgid ""
+#| "\n"
+#| "From 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\n"
+#| "From: RMS%MIT-OZ@mit-eddie\n"
+#| "Newsgroups: net.unix-wizards,net.usoft\n"
+#| "Subject: new Unix implementation\n"
+#| "Date: Tue, 27-Sep-83 12:35:59 EST\n"
+#| "Organization: MIT AI Lab, Cambridge, MA\n"
+#| "\n"
+#| "Free Unix!\n"
+#| "\n"
+#| "Starting this Thanksgiving I am going to write a complete\n"
+#| "Unix-compatible software system called GNU (for Gnu's Not Unix), and\n"
+#| "give it away free<a href=\"#f1\">(1)</a> to everyone who can use it.\n"
+#| "Contributions of time, money, programs and equipment are greatly\n"
+#| "needed.\n"
+#| "\n"
+#| "To begin with, GNU will be a kernel plus all the utilities needed to\n"
+#| "write and run C programs: editor, shell, C compiler, linker,\n"
+#| "assembler, and a few other things.  After this we will add a text\n"
+#| "formatter, a YACC, an Empire game, a spreadsheet, and hundreds of\n"
+#| "other things.  We hope to supply, eventually, everything useful that\n"
+#| "normally comes with a Unix system, and anything else useful, including\n"
+#| "on-line and hardcopy documentation.\n"
+#| "\n"
+#| "GNU will be able to run Unix programs, but will not be identical\n"
+#| "to Unix.  We will make all improvements that are convenient, based\n"
+#| "on our experience with other operating systems.  In particular,\n"
+#| "we plan to have longer filenames, file version numbers, a crashproof\n"
+#| "file system, filename completion perhaps, terminal-independent\n"
+#| "display support, and eventually a Lisp-based window system through\n"
+#| "which several Lisp programs and ordinary Unix programs can share a 
screen.\n"
+#| "Both C and Lisp will be available as system programming languages.\n"
+#| "We will have network software based on MIT's chaosnet protocol,\n"
+#| "far superior to UUCP.  We may also have something compatible\n"
+#| "with UUCP.\n"
+#| "\n"
+#| "\n"
+#| "Who Am I?\n"
+#| "\n"
+#| "I am Richard Stallman, inventor of the original much-imitated EMACS\n"
+#| "editor, now at the Artificial Intelligence Lab at MIT.  I have worked\n"
+#| "extensively on compilers, editors, debuggers, command interpreters, the\n"
+#| "Incompatible Timesharing System and the Lisp Machine operating system.\n"
+#| "I pioneered terminal-independent display support in ITS.  In addition I\n"
+#| "have implemented one crashproof file system and two window systems for\n"
+#| "Lisp machines.\n"
+#| "\n"
+#| "\n"
+#| "Why I Must Write GNU\n"
+#| "\n"
+#| "I consider that the golden rule requires that if I like a program I\n"
+#| "must share it with other people who like it.  I cannot in good\n"
+#| "conscience sign a nondisclosure agreement or a software license\n"
+#| "agreement.\n"
+#| "\n"
+#| "So that I can continue to use computers without violating my principles,\n"
+#| "I have decided to put together a sufficient body of free software so 
that\n"
+#| "I will be able to get along without any software that is not free.\n"
+#| "\n"
+#| "\n"
+#| "How You Can Contribute\n"
+#| "\n"
+#| "I am asking computer manufacturers for donations of machines and money.\n"
+#| "I'm asking individuals for donations of programs and work.\n"
+#| "\n"
+#| "One computer manufacturer has already offered to provide a machine.  But\n"
+#| "we could use more.  One consequence you can expect if you donate\n"
+#| "machines is that GNU will run on them at an early date.  The machine had\n"
+#| "better be able to operate in a residential area, and not require\n"
+#| "sophisticated cooling or power.\n"
+#| "\n"
+#| "Individual programmers can contribute by writing a compatible duplicate\n"
+#| "of some Unix utility and giving it to me.  For most projects, such\n"
+#| "part-time distributed work would be very hard to coordinate; the\n"
+#| "independently-written parts would not work together.  But for the\n"
+#| "particular task of replacing Unix, this problem is absent.  Most\n"
+#| "interface specifications are fixed by Unix compatibility.  If each\n"
+#| "contribution works with the rest of Unix, it will probably work\n"
+#| "with the rest of GNU.\n"
+#| "\n"
+#| "If I get donations of money, I may be able to hire a few people full or\n"
+#| "part time.  The salary won't be high, but I'm looking for people for\n"
+#| "whom knowing they are helping humanity is as important as money.  I view\n"
+#| "this as a way of enabling dedicated people to devote their full energies 
to\n"
+#| "working on GNU by sparing them the need to make a living in another way.\n"
+#| "\n"
+#| "\n"
+#| "For more information, contact me.\n"
+#| "Arpanet mail:\n"
+#| "  RMS@MIT-MC.ARPA\n"
+#| "\n"
+#| "Usenet:\n"
+#| "  ...!mit-eddie!RMS@OZ\n"
+#| "  ...!mit-vax!RMS@OZ\n"
+#| "\n"
+#| "US Snail:\n"
+#| "  Richard Stallman\n"
+#| "  166 Prospect St\n"
+#| "  Cambridge, MA 02139\n"
 msgid ""
-"\n"
 "From 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\n"
 "From: RMS%MIT-OZ@mit-eddie\n"
 "Newsgroups: net.unix-wizards,net.usoft\n"
@@ -327,7 +488,7 @@
 "\n"
 "Starting this Thanksgiving I am going to write a complete\n"
 "Unix-compatible software system called GNU (for Gnu's Not Unix), and\n"
-"give it away free<a href=\"#f1\">(1)</a> to everyone who can use it.\n"
+"give it away free&#8239;<a href=\"#f1\">[1]</a> to everyone who can use it.\n"
 "Contributions of time, money, programs and equipment are greatly\n"
 "needed.\n"
 "\n"
@@ -513,6 +674,40 @@
 "  166 Prospect St\n"
 "  Cambridge, MA 02139\n"
 
+#. type: Content of: <div><h3>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Footnote"
+msgid "Footnote"
+msgstr "Przypis"
+
+# type: Content of: <p>
+#. type: Content of: <div><ol><li>
+# | [-The-]{+<em>The+} wording here was [-careless.-] {+careless.</em>+} The
+# | intention was that nobody would have to pay for <b>permission</b> to use
+# | the GNU system.  But the words don't make this clear, and people often
+# | interpret them as saying that copies of GNU should always be distributed
+# | at little or no charge.  That was never the intent.
+#, fuzzy
+#| msgid ""
+#| "The wording here was careless.  The intention was that nobody would have "
+#| "to pay for <b>permission</b> to use the GNU system.  But the words don't "
+#| "make this clear, and people often interpret them as saying that copies of "
+#| "GNU should always be distributed at little or no charge.  That was never "
+#| "the intent."
+msgid ""
+"<em>The wording here was careless.</em> The intention was that nobody would "
+"have to pay for <b>permission</b> to use the GNU system.  But the words "
+"don't make this clear, and people often interpret them as saying that copies "
+"of GNU should always be distributed at little or no charge.  That was never "
+"the intent."
+msgstr ""
+"To sformułowanie jest niedokładne. Intencją było to, by nikt 
nie&nbsp;musiał "
+"płacić za&nbsp;<b>pozwolenie</b> używania systemu GNU. Ale&nbsp;nie&nbsp;"
+"wynikało to z&nbsp;tych słów, więc&nbsp;ludzie zazwyczaj interpretowali 
to "
+"tak, jakoby GNU miałoby być rozprowadzane z&nbsp;małą lub&nbsp;bez 
żadnej "
+"opłaty. To nigdy nie&nbsp;było jego zamiarem."
+
 # type: Content of: <div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
@@ -541,14 +736,20 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Staramy się, aby&nbsp;tłumaczenia były wierne i&nbsp;wysokiej jakości, "
@@ -561,9 +762,14 @@
 "tłumaczeń</a>."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; 1983, 1999, 2007, [-2008,-] 2009, [-2013, 2014-] {+2021+}
+# | Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
+#| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
-"Foundation, Inc."
+"Copyright &copy; 1983, 1999, 2007, 2009, 2021 Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
 "Foundation, Inc."
@@ -571,12 +777,13 @@
 #. type: Content of: <div><p>
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
 "Ta strona jest dostępna na&nbsp;<a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">licencji Creative Commons "
-"Uznanie autorstwa-Bez utworów zależnych 3.0 Stany Zjednoczone</a>."
+"creativecommons.org/licenses/by-nd/4.0/deed.pl\">licencji Creative Commons "
+"Uznanie autorstwa&nbsp;&ndash; Bez&nbsp;utworów zależnych 4.0 "
+"Międzynarodowe</a>."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>
@@ -590,10 +797,13 @@
 msgid "Updated:"
 msgstr "Aktualizowane:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
-"Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
-"Software Foundation, Inc."
+# type: Content of: <h4>
+#~ msgid "Poor choice of wording around &ldquo;free&rdquo;"
+#~ msgstr "Niezręczne rozumowanie słowa &bdquo;free&rdquo;"
+
+#~ msgid ""
+#~ "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
+#~ "Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
+#~ "Software Foundation, Inc."

Index: po/initial-announcement.pot
===================================================================
RCS file: /web/www/www/gnu/po/initial-announcement.pot,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- po/initial-announcement.pot 5 Apr 2014 00:39:34 -0000       1.20
+++ po/initial-announcement.pot 2 Nov 2021 14:41:52 -0000       1.21
@@ -1,4 +1,4 @@
-# LANGUAGE translation of http://www.gnu.org/gnu/initial-announcement.html
+# LANGUAGE translation of https://www.gnu.org/gnu/initial-announcement.html
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # This file is distributed under the same license as the original article.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -7,30 +7,31 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: initial-announcement.html\n"
-"POT-Creation-Date: 2014-04-04 23:59+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <title>
 msgid "Initial Announcement - GNU Project - Free Software Foundation"
 msgstr ""
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Initial Announcement"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "This is the original announcement of the GNU Project, posted by <a "
-"href=\"http://www.stallman.org/\";>Richard Stallman</a> on September 27, "
+"href=\"https://www.stallman.org/\";>Richard Stallman</a> on September 27, "
 "1983."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The actual history of the GNU Project differs in many ways from this initial "
 "plan. For example, the beginning was delayed until January 1984. Several of "
@@ -38,19 +39,20 @@
 "software</a> were not clarified until a few years later."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Free Unix!"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Starting this Thanksgiving I am going to write a complete Unix-compatible "
-"software system called GNU (for Gnu's Not Unix), and give it away free<a "
-"href=\"#f1\">(1)</a> to everyone who can use it.  Contributions of time, "
-"money, programs and equipment are greatly needed."
+"software system called GNU (for Gnu's Not Unix), and give it away "
+"free&#8239;<a class=\"ftn\" href=\"#f1\">[1]</a> to everyone who can use "
+"it.  Contributions of time, money, programs and equipment are greatly "
+"needed."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To begin with, GNU will be a kernel plus all the utilities needed to write "
 "and run C programs: editor, shell, C compiler, linker, assembler, and a few "
@@ -60,7 +62,7 @@
 "anything else useful, including on-line and hardcopy documentation."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU will be able to run Unix programs, but will not be identical to Unix.  "
 "We will make all improvements that are convenient, based on our experience "
@@ -74,11 +76,11 @@
 "compatible with UUCP."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Who Am I?"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am Richard Stallman, inventor of the original much-imitated EMACS editor, "
 "now at the Artificial Intelligence Lab at MIT.  I have worked extensively on "
@@ -88,35 +90,35 @@
 "one crashproof file system and two window systems for Lisp machines."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why I Must Write GNU"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I consider that the golden rule requires that if I like a program I must "
 "share it with other people who like it.  I cannot in good conscience sign a "
 "nondisclosure agreement or a software license agreement."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So that I can continue to use computers without violating my principles, I "
 "have decided to put together a sufficient body of free software so that I "
 "will be able to get along without any software that is not free."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How You Can Contribute"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am asking computer manufacturers for donations of machines and money.  I'm "
 "asking individuals for donations of programs and work."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One computer manufacturer has already offered to provide a machine.  But we "
 "could use more.  One consequence you can expect if you donate machines is "
@@ -125,7 +127,7 @@
 "power."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Individual programmers can contribute by writing a compatible duplicate of "
 "some Unix utility and giving it to me.  For most projects, such part-time "
@@ -136,7 +138,7 @@
 "will probably work with the rest of GNU."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If I get donations of money, I may be able to hire a few people full or part "
 "time.  The salary won't be high, but I'm looking for people for whom knowing "
@@ -145,74 +147,61 @@
 "sparing them the need to make a living in another way."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "For more information, contact me."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Arpanet mail:"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "RMS@MIT-MC.ARPA"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Usenet:"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "...!mit-eddie!RMS@OZ"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "...!mit-vax!RMS@OZ"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "US Snail:"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Richard Stallman"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "166 Prospect St"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Cambridge, MA 02139"
 msgstr ""
 
-#. type: Content of: <h4>
-msgid "Poor choice of wording around &ldquo;free&rdquo;"
-msgstr ""
-
-#. type: Content of: <p>
-msgid ""
-"The wording here was careless.  The intention was that nobody would have to "
-"pay for <b>permission</b> to use the GNU system.  But the words don't make "
-"this clear, and people often interpret them as saying that copies of GNU "
-"should always be distributed at little or no charge.  That was never the "
-"intent."
-msgstr ""
-
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Original message"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "For completeness, the original email is reproduced here, in its original "
 "form."
 msgstr ""
 
 #. TRANSLATORS: Don't translate anything except the headers.
-#. type: Content of: <div><pre>
+#
+#. type: Content of: <div><div><pre>
 #, no-wrap
 msgid ""
-"\n"
 "From "
 
"CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\n"
 "From: RMS%MIT-OZ@mit-eddie\n"
@@ -225,7 +214,8 @@
 "\n"
 "Starting this Thanksgiving I am going to write a complete\n"
 "Unix-compatible software system called GNU (for Gnu's Not Unix), and\n"
-"give it away free<a href=\"#f1\">(1)</a> to everyone who can use it.\n"
+"give it away free&#8239;<a href=\"#f1\">[1]</a> to everyone who can use "
+"it.\n"
 "Contributions of time, money, programs and equipment are greatly\n"
 "needed.\n"
 "\n"
@@ -315,6 +305,19 @@
 "  Cambridge, MA 02139\n"
 msgstr ""
 
+#. type: Content of: <div><h3>
+msgid "Footnote"
+msgstr ""
+
+#. type: Content of: <div><ol><li>
+msgid ""
+"<em>The wording here was careless.</em> The intention was that nobody would "
+"have to pay for <b>permission</b> to use the GNU system.  But the words "
+"don't make this clear, and people often interpret them as saying that copies "
+"of GNU should always be distributed at little or no charge.  That was never "
+"the intent."
+msgstr ""
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -339,7 +342,7 @@
 #
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
 #
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
@@ -347,20 +350,19 @@
 msgid ""
 "Please see the <a "
 "href=\"/server/standards/README.translations.html\">Translations README</a> "
-"for information on coordinating and submitting translations of this article."
+"for information on coordinating and contributing translations of this "
+"article."
 msgstr ""
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
-"Foundation, Inc."
+msgid "Copyright &copy; 1983, 1999, 2007, 2009, 2021 Free Software Foundation, 
Inc."
 msgstr ""
 
 #. type: Content of: <div><p>
 msgid ""
 "This page is licensed under a <a rel=\"license\" "
-"href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative Commons "
-"Attribution-NoDerivs 3.0 United States License</a>."
+"href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Creative Commons "
+"Attribution-NoDerivatives 4.0 International License</a>."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.

Index: po/initial-announcement.pt-br.po
===================================================================
RCS file: /web/www/www/gnu/po/initial-announcement.pt-br.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- po/initial-announcement.pt-br.po    2 Nov 2021 13:25:56 -0000       1.18
+++ po/initial-announcement.pt-br.po    2 Nov 2021 14:41:52 -0000       1.19
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: initial announcement.html\n"
 "Report-Msgid-Bugs-To: www-pt-br-general@gnu.org\n"
-"POT-Creation-Date: 2014-04-04 23:59+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2017-05-20 16:20-0300\n"
 "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
 "Language-Team: Brazilian Portuguese <www-pt-br-general@gnu.org>\n"
@@ -18,25 +18,30 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bits\n"
+"X-Outdated-Since: 2021-11-02 14:27+0000\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
 #. type: Content of: <title>
 msgid "Initial Announcement - GNU Project - Free Software Foundation"
 msgstr "Anúncio Inicial - Projeto GNU - Free Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Initial Announcement"
 msgstr "Anúncio Inicial"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "This is the original announcement of the GNU Project, posted by <a href="
+#| "\"http://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
 msgid ""
 "This is the original announcement of the GNU Project, posted by <a href="
-"\"http://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
+"\"https://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
 msgstr ""
 "Este é o anúncio original do Projeto GNU, postado por <a href=\"http://www.";
 "stallman.org/\">Richard Stallman</a> em 27 de Setembro de 1983."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The actual history of the GNU Project differs in many ways from this initial "
 "plan. For example, the beginning was delayed until January 1984. Several of "
@@ -48,16 +53,22 @@
 "filosóficos de <a href=\"/philosophy/free-sw.html\">software livre</a> não "
 "foram clarificados até alguns anos depois."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Free Unix!"
 msgstr "Unix Livre!"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Starting this Thanksgiving I am going to write a complete Unix-compatible "
+#| "software system called GNU (for Gnu's Not Unix), and give it away free<a "
+#| "href=\"#f1\">(1)</a> to everyone who can use it.  Contributions of time, "
+#| "money, programs and equipment are greatly needed."
 msgid ""
 "Starting this Thanksgiving I am going to write a complete Unix-compatible "
-"software system called GNU (for Gnu's Not Unix), and give it away free<a "
-"href=\"#f1\">(1)</a> to everyone who can use it.  Contributions of time, "
-"money, programs and equipment are greatly needed."
+"software system called GNU (for Gnu's Not Unix), and give it away free&#8239;"
+"<a class=\"ftn\" href=\"#f1\">[1]</a> to everyone who can use it.  "
+"Contributions of time, money, programs and equipment are greatly needed."
 msgstr ""
 "A partir do próximo Dia de Ação de Graças, vou escrever um software 
completo "
 "compatível com Unix chamado GNU (sigla para Gnu Não é Unix), e o "
@@ -65,7 +76,7 @@
 "usá-lo. Contribuições em termos de tempo, dinheiro, programas e 
equipamentos "
 "são muito bem-vindas."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To begin with, GNU will be a kernel plus all the utilities needed to write "
 "and run C programs: editor, shell, C compiler, linker, assembler, and a few "
@@ -82,7 +93,7 @@
 "que normalmente vem com um sistema Unix, e tudo o mais que seja útil, "
 "incluindo documentação on-line e impressa."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU will be able to run Unix programs, but will not be identical to Unix.  "
 "We will make all improvements that are convenient, based on our experience "
@@ -107,11 +118,11 @@
 "controle de rede baseado no protocolo chaosnet do MIT, muito superior ao "
 "UUCP. Nós também podemos ter alguma compatibilidade com UUCP."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Who Am I?"
 msgstr "Quem sou eu?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am Richard Stallman, inventor of the original much-imitated EMACS editor, "
 "now at the Artificial Intelligence Lab at MIT.  I have worked extensively on "
@@ -129,11 +140,11 @@
 "sistema de arquivos à prova de quebra e dois sistemas com janelas para "
 "máquinas Lisp."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why I Must Write GNU"
 msgstr "Por Que eu Tenho que Escrever o GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I consider that the golden rule requires that if I like a program I must "
 "share it with other people who like it.  I cannot in good conscience sign a "
@@ -144,7 +155,7 @@
 "em boa consciência, assinar um acordo de não quebra ou um acordo de 
licença "
 "de software."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So that I can continue to use computers without violating my principles, I "
 "have decided to put together a sufficient body of free software so that I "
@@ -155,11 +166,11 @@
 "modo que eu esteja apto a passar sem o uso de qualquer software que não seja 
"
 "livre."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How You Can Contribute"
 msgstr "Como você pode contribuir"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am asking computer manufacturers for donations of machines and money.  I'm "
 "asking individuals for donations of programs and work."
@@ -167,7 +178,7 @@
 "Eu estou solicitando a fabricantes de computadores doações de máquinas e "
 "dinheiro. Eu estou solicitando a indivíduos que doem programas e trabalho."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One computer manufacturer has already offered to provide a machine.  But we "
 "could use more.  One consequence you can expect if you donate machines is "
@@ -180,7 +191,7 @@
 "irá rodar nelas assim que possível. É melhor que a máquina possa operar 
numa "
 "área residencial, e que não requeira energia ou resfriamento sofisticado."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Individual programmers can contribute by writing a compatible duplicate of "
 "some Unix utility and giving it to me.  For most projects, such part-time "
@@ -198,7 +209,7 @@
 "existe. Se cada contribuição funcionar com o resto do Unix, ela "
 "provavelmente funcionará com o restante do GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If I get donations of money, I may be able to hire a few people full or part "
 "time.  The salary won't be high, but I'm looking for people for whom knowing "
@@ -213,69 +224,51 @@
 "dedicadas devotar todas suas energias trabalhando no GNU, poupando-as da "
 "necessidade de ganhar a vida de outro modo."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "For more information, contact me."
 msgstr "Para mais informação, contate-me."
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Arpanet mail:"
 msgstr "correio Arpanet:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "RMS@MIT-MC.ARPA"
 msgstr "RMS@MIT-MC.ARPA"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Usenet:"
 msgstr "Usenet:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "...!mit-eddie!RMS@OZ"
 msgstr "...!mit-eddie!RMZ@OZ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "...!mit-vax!RMS@OZ"
 msgstr "...!mit-vax!RMS@OZ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "US Snail:"
 msgstr "Us Snail:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Richard Stallman"
 msgstr "Richard Stallman"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "166 Prospect St"
 msgstr "166 Prospect St"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Cambridge, MA 02139"
 msgstr "Cambridge, MA 02139"
 
-#. type: Content of: <h4>
-msgid "Poor choice of wording around &ldquo;free&rdquo;"
-msgstr "Escolha infeliz de redação em &ldquo;free&rdquo;"
-
-#. type: Content of: <p>
-msgid ""
-"The wording here was careless.  The intention was that nobody would have to "
-"pay for <b>permission</b> to use the GNU system.  But the words don't make "
-"this clear, and people often interpret them as saying that copies of GNU "
-"should always be distributed at little or no charge.  That was never the "
-"intent."
-msgstr ""
-"A redação aqui foi descuidada. A intenção era que ninguém tivesse que 
pagar "
-"pela <b>permissão</b> para usar o sistema GNU. Porém, na redação isso 
não "
-"ficou claro, e as pessoas frequentemente interpretam como dizendo que cópias 
"
-"do GNU sempre devem ser distribuídas a um custo pequeno ou a custo "
-"inexistente. Essa nunca foi a intenção."
-
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Original message"
 msgstr "Mensagem original"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "For completeness, the original email is reproduced here, in its original "
 "form."
@@ -284,10 +277,109 @@
 "original."
 
 #. TRANSLATORS: Don't translate anything except the headers.
-#. type: Content of: <div><pre>
-#, no-wrap
+#. type: Content of: <div><div><pre>
+#, fuzzy, no-wrap
+#| msgid ""
+#| "\n"
+#| "From 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\n"
+#| "From: RMS%MIT-OZ@mit-eddie\n"
+#| "Newsgroups: net.unix-wizards,net.usoft\n"
+#| "Subject: new Unix implementation\n"
+#| "Date: Tue, 27-Sep-83 12:35:59 EST\n"
+#| "Organization: MIT AI Lab, Cambridge, MA\n"
+#| "\n"
+#| "Free Unix!\n"
+#| "\n"
+#| "Starting this Thanksgiving I am going to write a complete\n"
+#| "Unix-compatible software system called GNU (for Gnu's Not Unix), and\n"
+#| "give it away free<a href=\"#f1\">(1)</a> to everyone who can use it.\n"
+#| "Contributions of time, money, programs and equipment are greatly\n"
+#| "needed.\n"
+#| "\n"
+#| "To begin with, GNU will be a kernel plus all the utilities needed to\n"
+#| "write and run C programs: editor, shell, C compiler, linker,\n"
+#| "assembler, and a few other things.  After this we will add a text\n"
+#| "formatter, a YACC, an Empire game, a spreadsheet, and hundreds of\n"
+#| "other things.  We hope to supply, eventually, everything useful that\n"
+#| "normally comes with a Unix system, and anything else useful, including\n"
+#| "on-line and hardcopy documentation.\n"
+#| "\n"
+#| "GNU will be able to run Unix programs, but will not be identical\n"
+#| "to Unix.  We will make all improvements that are convenient, based\n"
+#| "on our experience with other operating systems.  In particular,\n"
+#| "we plan to have longer filenames, file version numbers, a crashproof\n"
+#| "file system, filename completion perhaps, terminal-independent\n"
+#| "display support, and eventually a Lisp-based window system through\n"
+#| "which several Lisp programs and ordinary Unix programs can share a 
screen.\n"
+#| "Both C and Lisp will be available as system programming languages.\n"
+#| "We will have network software based on MIT's chaosnet protocol,\n"
+#| "far superior to UUCP.  We may also have something compatible\n"
+#| "with UUCP.\n"
+#| "\n"
+#| "\n"
+#| "Who Am I?\n"
+#| "\n"
+#| "I am Richard Stallman, inventor of the original much-imitated EMACS\n"
+#| "editor, now at the Artificial Intelligence Lab at MIT.  I have worked\n"
+#| "extensively on compilers, editors, debuggers, command interpreters, the\n"
+#| "Incompatible Timesharing System and the Lisp Machine operating system.\n"
+#| "I pioneered terminal-independent display support in ITS.  In addition I\n"
+#| "have implemented one crashproof file system and two window systems for\n"
+#| "Lisp machines.\n"
+#| "\n"
+#| "\n"
+#| "Why I Must Write GNU\n"
+#| "\n"
+#| "I consider that the golden rule requires that if I like a program I\n"
+#| "must share it with other people who like it.  I cannot in good\n"
+#| "conscience sign a nondisclosure agreement or a software license\n"
+#| "agreement.\n"
+#| "\n"
+#| "So that I can continue to use computers without violating my principles,\n"
+#| "I have decided to put together a sufficient body of free software so 
that\n"
+#| "I will be able to get along without any software that is not free.\n"
+#| "\n"
+#| "\n"
+#| "How You Can Contribute\n"
+#| "\n"
+#| "I am asking computer manufacturers for donations of machines and money.\n"
+#| "I'm asking individuals for donations of programs and work.\n"
+#| "\n"
+#| "One computer manufacturer has already offered to provide a machine.  But\n"
+#| "we could use more.  One consequence you can expect if you donate\n"
+#| "machines is that GNU will run on them at an early date.  The machine had\n"
+#| "better be able to operate in a residential area, and not require\n"
+#| "sophisticated cooling or power.\n"
+#| "\n"
+#| "Individual programmers can contribute by writing a compatible duplicate\n"
+#| "of some Unix utility and giving it to me.  For most projects, such\n"
+#| "part-time distributed work would be very hard to coordinate; the\n"
+#| "independently-written parts would not work together.  But for the\n"
+#| "particular task of replacing Unix, this problem is absent.  Most\n"
+#| "interface specifications are fixed by Unix compatibility.  If each\n"
+#| "contribution works with the rest of Unix, it will probably work\n"
+#| "with the rest of GNU.\n"
+#| "\n"
+#| "If I get donations of money, I may be able to hire a few people full or\n"
+#| "part time.  The salary won't be high, but I'm looking for people for\n"
+#| "whom knowing they are helping humanity is as important as money.  I view\n"
+#| "this as a way of enabling dedicated people to devote their full energies 
to\n"
+#| "working on GNU by sparing them the need to make a living in another way.\n"
+#| "\n"
+#| "\n"
+#| "For more information, contact me.\n"
+#| "Arpanet mail:\n"
+#| "  RMS@MIT-MC.ARPA\n"
+#| "\n"
+#| "Usenet:\n"
+#| "  ...!mit-eddie!RMS@OZ\n"
+#| "  ...!mit-vax!RMS@OZ\n"
+#| "\n"
+#| "US Snail:\n"
+#| "  Richard Stallman\n"
+#| "  166 Prospect St\n"
+#| "  Cambridge, MA 02139\n"
 msgid ""
-"\n"
 "From 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\n"
 "From: RMS%MIT-OZ@mit-eddie\n"
 "Newsgroups: net.unix-wizards,net.usoft\n"
@@ -299,7 +391,7 @@
 "\n"
 "Starting this Thanksgiving I am going to write a complete\n"
 "Unix-compatible software system called GNU (for Gnu's Not Unix), and\n"
-"give it away free<a href=\"#f1\">(1)</a> to everyone who can use it.\n"
+"give it away free&#8239;<a href=\"#f1\">[1]</a> to everyone who can use it.\n"
 "Contributions of time, money, programs and equipment are greatly\n"
 "needed.\n"
 "\n"
@@ -487,6 +579,34 @@
 "  166 Prospect St\n"
 "  Cambridge, MA 02139\n"
 
+# TODO: needs reviewing.
+#. type: Content of: <div><h3>
+#, fuzzy
+#| msgid "Footnote"
+msgid "Footnote"
+msgstr "Nota de rodapé"
+
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "The wording here was careless.  The intention was that nobody would have "
+#| "to pay for <b>permission</b> to use the GNU system.  But the words don't "
+#| "make this clear, and people often interpret them as saying that copies of "
+#| "GNU should always be distributed at little or no charge.  That was never "
+#| "the intent."
+msgid ""
+"<em>The wording here was careless.</em> The intention was that nobody would "
+"have to pay for <b>permission</b> to use the GNU system.  But the words "
+"don't make this clear, and people often interpret them as saying that copies "
+"of GNU should always be distributed at little or no charge.  That was never "
+"the intent."
+msgstr ""
+"A redação aqui foi descuidada. A intenção era que ninguém tivesse que 
pagar "
+"pela <b>permissão</b> para usar o sistema GNU. Porém, na redação isso 
não "
+"ficou claro, e as pessoas frequentemente interpretam como dizendo que cópias 
"
+"do GNU sempre devem ser distribuídas a um custo pequeno ou a custo "
+"inexistente. Essa nunca foi a intenção."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -513,14 +633,14 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "A equipe de traduções para o português brasileiro se esforça para 
oferecer "
@@ -528,13 +648,16 @@
 "favor, envie seus comentários e sugestões em geral sobre as traduções 
para "
 "<a href=\"mailto:web-translators@gnu.org\";>&lt;web-translators@gnu.org&gt;</"
 "a>. </p><p>Consulte o <a href=\"/server/standards/README.translations.html"
-"\">Guia para as traduções</a> para mais informações sobre a coordenação 
e o "
-"envio de traduções das páginas deste site."
+"\">Guia para as traduções</a> para mais informações sobre a coordenação 
e a "
+"contribuição com traduções das páginas deste site."
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
+#| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
-"Foundation, Inc."
+"Copyright &copy; 1983, 1999, 2007, 2009, 2021 Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
 "Foundation, Inc."
@@ -542,12 +665,12 @@
 #. type: Content of: <div><p>
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
 "Esta página está licenciada sob uma licença <a rel=\"license\" 
href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/deed.pt_BR\">Creative Commons "
-"Atribuição-SemDerivações 3.0 Estados Unidos</a>."
+"creativecommons.org/licenses/by-nd/4.0/deed.pt_BR\">Creative Commons "
+"Atribuição-SemDerivações 4.0 Internacional</a>."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>
@@ -559,10 +682,12 @@
 msgid "Updated:"
 msgstr "Última atualização:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
-"Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
-"Software Foundation, Inc."
+#~ msgid "Poor choice of wording around &ldquo;free&rdquo;"
+#~ msgstr "Escolha infeliz de redação em &ldquo;free&rdquo;"
+
+#~ msgid ""
+#~ "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
+#~ "Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
+#~ "Software Foundation, Inc."

Index: po/initial-announcement.ru.po
===================================================================
RCS file: /web/www/www/gnu/po/initial-announcement.ru.po,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- po/initial-announcement.ru.po       2 Nov 2021 13:25:56 -0000       1.27
+++ po/initial-announcement.ru.po       2 Nov 2021 14:41:52 -0000       1.28
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: initial-announcement.html\n"
-"POT-Creation-Date: 2014-04-04 23:59+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2020-12-09 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: 8-bit\n"
+"X-Outdated-Since: 2021-11-02 14:27+0000\n"
 
 #. type: Content of: <title>
 msgid "Initial Announcement - GNU Project - Free Software Foundation"
@@ -22,19 +23,26 @@
 "Первоначальное объявление - Проект GNU - 
Фонд свободного программного "
 "обеспечения"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Initial Announcement"
 msgstr "Первоначальное объявление"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
+# | This is the original announcement of the GNU Project, posted by <a
+# | href=\"http{+s+}://www.stallman.org/\">Richard Stallman</a> on September
+# | 27, 1983.
+#, fuzzy
+#| msgid ""
+#| "This is the original announcement of the GNU Project, posted by <a href="
+#| "\"http://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
 msgid ""
 "This is the original announcement of the GNU Project, posted by <a href="
-"\"http://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
+"\"https://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
 msgstr ""
 "Вот изначальное объявление о проекте GNU, 
опубликованное <a href=\"http://";
 "www.stallman.org/\">Ричардом Столменом</a> 27 
сентября 1983 года."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The actual history of the GNU Project differs in many ways from this initial "
 "plan. For example, the beginning was delayed until January 1984. Several of "
@@ -46,16 +54,27 @@
 "Некоторые философские аспекты <a 
href=\"/philosophy/free-sw.html\">свободных "
 "программ</a> прояснились только через 
несколько лет."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Free Unix!"
 msgstr "Свободу Unix!"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Starting this Thanksgiving I am going to write a complete Unix-compatible
+# | software system called GNU (for Gnu's Not Unix), and give it away [-free<a
+# | href=\"#f1\">(1)</a>-] {+free&#8239;<a class=\"ftn\"
+# | href=\"#f1\">[1]</a>+} to everyone who can use it.  Contributions of time,
+# | money, programs and equipment are greatly needed.
+#, fuzzy
+#| msgid ""
+#| "Starting this Thanksgiving I am going to write a complete Unix-compatible "
+#| "software system called GNU (for Gnu's Not Unix), and give it away free<a "
+#| "href=\"#f1\">(1)</a> to everyone who can use it.  Contributions of time, "
+#| "money, programs and equipment are greatly needed."
 msgid ""
 "Starting this Thanksgiving I am going to write a complete Unix-compatible "
-"software system called GNU (for Gnu's Not Unix), and give it away free<a "
-"href=\"#f1\">(1)</a> to everyone who can use it.  Contributions of time, "
-"money, programs and equipment are greatly needed."
+"software system called GNU (for Gnu's Not Unix), and give it away free&#8239;"
+"<a class=\"ftn\" href=\"#f1\">[1]</a> to everyone who can use it.  "
+"Contributions of time, money, programs and equipment are greatly needed."
 msgstr ""
 "Начиная с ближайшего Дня благодарения<a 
href=\"#ft1\">[1]</a>, \n"
 "я собираюсь написать полную совместимую с 
Unix программную систему \n"
@@ -66,7 +85,7 @@
 "Очень нужна помощь в виде рабочего 
времени, денег, \n"
 "программ и оборудования."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To begin with, GNU will be a kernel plus all the utilities needed to write "
 "and run C programs: editor, shell, C compiler, linker, assembler, and a few "
@@ -84,7 +103,7 @@
 "поставляется с системой семейства Unix, и 
всё прочее полезное, включая "
 "документацию в электронном виде и на 
бумаге."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU will be able to run Unix programs, but will not be identical to Unix.  "
 "We will make all improvements that are convenient, based on our experience "
@@ -113,11 +132,11 @@
 "превосходящего протокол UUCP. Может быть, у 
нас \n"
 "будет также что-нибудь совместимое с UUCP."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Who Am I?"
 msgstr "Кто я такой?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am Richard Stallman, inventor of the original much-imitated EMACS editor, "
 "now at the Artificial Intelligence Lab at MIT.  I have worked extensively on "
@@ -137,11 +156,11 @@
 "реализовал устойчивую к сбоям файловую 
систему и \n"
 "две оконных системы для машин Лисп."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why I Must Write GNU"
 msgstr "Почему я должен писать GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I consider that the golden rule requires that if I like a program I must "
 "share it with other people who like it.  I cannot in good conscience sign a "
@@ -153,7 +172,7 @@
 "без стыда подписать \n"
 "лицензионное соглашение программы или 
договор о неразглашении."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So that I can continue to use computers without violating my principles, I "
 "have decided to put together a sufficient body of free software so that I "
@@ -165,11 +184,11 @@
 "свободных программ, чтобы я мог обойтись \n"
 "без любой несвободной программы."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How You Can Contribute"
 msgstr "Чем вы можете помочь"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am asking computer manufacturers for donations of machines and money.  I'm "
 "asking individuals for donations of programs and work."
@@ -178,7 +197,7 @@
 "машины и деньги. Я призываю частных лиц \n"
 "приносить в дар программы и труд."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One computer manufacturer has already offered to provide a machine.  But we "
 "could use more.  One consequence you can expect if you donate machines is "
@@ -195,7 +214,7 @@
 "в жилых помещениях и не требовала х
итроумного \n"
 "охлаждения и питания."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Individual programmers can contribute by writing a compatible duplicate of "
 "some Unix utility and giving it to me.  For most projects, such part-time "
@@ -216,7 +235,7 @@
 "с Unix. Если каждый вклад будет работать с 
остальной Unix, он, вероятно, "
 "заработает с остальной GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If I get donations of money, I may be able to hire a few people full or part "
 "time.  The salary won't be high, but I'm looking for people for whom knowing "
@@ -234,71 +253,51 @@
 "работе над GNU, избавив их от нужды 
зарабатывать \n"
 "на жизнь другим способом."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "For more information, contact me."
 msgstr "За более подробными сведениями 
обращайтесь ко мне."
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Arpanet mail:"
 msgstr "Адрес Arpanet:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "RMS@MIT-MC.ARPA"
 msgstr "RMS@MIT-MC.ARPA"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Usenet:"
 msgstr "Адрес Usenet:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "...!mit-eddie!RMS@OZ"
 msgstr "...!mit-eddie!RMS@OZ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "...!mit-vax!RMS@OZ"
 msgstr "...!mit-vax!RMS@OZ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "US Snail:"
 msgstr "Почтовый адрес в США:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Richard Stallman"
 msgstr "Richard Stallman"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "166 Prospect St"
 msgstr "166 Prospect St"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Cambridge, MA 02139"
 msgstr "Cambridge, MA 02139"
 
-#. type: Content of: <h4>
-msgid "Poor choice of wording around &ldquo;free&rdquo;"
-msgstr "Плохой выбор формулировки понятия 
&ldquo;свободный&rdquo;"
-
-#. type: Content of: <p>
-msgid ""
-"The wording here was careless.  The intention was that nobody would have to "
-"pay for <b>permission</b> to use the GNU system.  But the words don't make "
-"this clear, and people often interpret them as saying that copies of GNU "
-"should always be distributed at little or no charge.  That was never the "
-"intent."
-msgstr ""
-"Здесь формулировка была небрежной. 
Подразумевалось, что никто не будет "
-"должен платить \n"
-"за <strong>разрешение</strong> пользоваться 
системой GNU. \n"
-"Но слова не разъясняли это, и люди часто 
понимают их как \n"
-"утверждение, что копии GNU должны всегда \n"
-"распространяться за небольшую плату или 
бесплатно. \n"
-"Это никогда не подразумевалось."
-
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Original message"
 msgstr "Оригинал сообщения"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "For completeness, the original email is reproduced here, in its original "
 "form."
@@ -307,10 +306,172 @@
 "воспроизводится здесь в оригинале."
 
 #. TRANSLATORS: Don't translate anything except the headers.
-#. type: Content of: <div><pre>
-#, no-wrap
+#. type: Content of: <div><div><pre>
+# | [-\\nFrom-]{+From+}
+# | 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\\nFrom:
+# | RMS%MIT-OZ@mit-eddie\\nNewsgroups: net.unix-wizards,net.usoft\\nSubject:
+# | new Unix implementation\\nDate: Tue, 27-Sep-83 12:35:59
+# | EST\\nOrganization: MIT AI Lab, Cambridge, MA\\n\\nFree
+# | Unix!\\n\\nStarting this Thanksgiving I am going to write a
+# | complete\\nUnix-compatible software system called GNU (for Gnu's Not
+# | Unix), and\\ngive it away [-free<a href=\"#f1\">(1)</a>-] {+free&#8239;<a
+# | href=\"#f1\">[1]</a>+} to everyone who can use it.\\nContributions of
+# | time, money, programs and equipment are greatly\\nneeded.\\n\\nTo begin
+# | with, GNU will be a kernel plus all the utilities needed to\\nwrite and
+# | run C programs: editor, shell, C compiler, linker,\\nassembler, and a few
+# | other things.  After this we will add a text\\nformatter, a YACC, an
+# | Empire game, a spreadsheet, and hundreds of\\nother things.  We hope to
+# | supply, eventually, everything useful that\\nnormally comes with a Unix
+# | system, and anything else useful, including\\non-line and hardcopy
+# | documentation.\\n\\nGNU will be able to run Unix programs, but will not be
+# | identical\\nto Unix.  We will make all improvements that are convenient,
+# | based\\non our experience with other operating systems.  In
+# | particular,\\nwe plan to have longer filenames, file version numbers, a
+# | crashproof\\nfile system, filename completion perhaps,
+# | terminal-independent\\ndisplay support, and eventually a Lisp-based window
+# | system through\\nwhich several Lisp programs and ordinary Unix programs
+# | can share a screen.\\nBoth C and Lisp will be available as system
+# | programming languages.\\nWe will have network software based on MIT's
+# | chaosnet protocol,\\nfar superior to UUCP.  We may also have something
+# | compatible\\nwith UUCP.\\n\\n\\nWho Am I?\\n\\nI am Richard Stallman,
+# | inventor of the original much-imitated EMACS\\neditor, now at the
+# | Artificial Intelligence Lab at MIT.  I have worked\\nextensively on
+# | compilers, editors, debuggers, command interpreters, the\\nIncompatible
+# | Timesharing System and the Lisp Machine operating system.\\nI pioneered
+# | terminal-independent display support in ITS.  In addition I\\nhave
+# | implemented one crashproof file system and two window systems for\\nLisp
+# | machines.\\n\\n\\nWhy I Must Write GNU\\n\\nI consider that the golden
+# | rule requires that if I like a program I\\nmust share it with other people
+# | who like it.  I cannot in good\\nconscience sign a nondisclosure agreement
+# | or a software license\\nagreement.\\n\\nSo that I can continue to use
+# | computers without violating my principles,\\nI have decided to put
+# | together a sufficient body of free software so that\\nI will be able to
+# | get along without any software that is not free.\\n\\n\\nHow You Can
+# | Contribute\\n\\nI am asking computer manufacturers for donations of
+# | machines and money.\\nI'm asking individuals for donations of programs and
+# | work.\\n\\nOne computer manufacturer has already offered to provide a
+# | machine.  But\\nwe could use more.  One consequence you can expect if you
+# | donate\\nmachines is that GNU will run on them at an early date.  The
+# | machine had\\nbetter be able to operate in a residential area, and not
+# | require\\nsophisticated cooling or power.\\n\\nIndividual programmers can
+# | contribute by writing a compatible duplicate\\nof some Unix utility and
+# | giving it to me.  For most projects, such\\npart-time distributed work
+# | would be very hard to coordinate; the\\nindependently-written parts would
+# | not work together.  But for the\\nparticular task of replacing Unix, this
+# | problem is absent.  Most\\ninterface specifications are fixed by Unix
+# | compatibility.  If each\\ncontribution works with the rest of Unix, it
+# | will probably work\\nwith the rest of GNU.\\n\\nIf I get donations of
+# | money, I may be able to hire a few people full or\\npart time.  The salary
+# | won't be high, but I'm looking for people for\\nwhom knowing they are
+# | helping humanity is as important as money.  I view\\nthis as a way of
+# | enabling dedicated people to devote their full energies to\\nworking on
+# | GNU by sparing them the need to make a living in another way.\\n\\n\\nFor
+# | more information, contact me.\\nArpanet mail:\\n 
+# | RMS@MIT-MC.ARPA\\n\\nUsenet:\\n  ...!mit-eddie!RMS@OZ\\n 
+# | ...!mit-vax!RMS@OZ\\n\\nUS Snail:\\n  Richard Stallman\\n  166 Prospect
+# | St\\n  Cambridge, MA 02139\\n
+#, fuzzy, no-wrap
+#| msgid ""
+#| "\n"
+#| "From 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\n"
+#| "From: RMS%MIT-OZ@mit-eddie\n"
+#| "Newsgroups: net.unix-wizards,net.usoft\n"
+#| "Subject: new Unix implementation\n"
+#| "Date: Tue, 27-Sep-83 12:35:59 EST\n"
+#| "Organization: MIT AI Lab, Cambridge, MA\n"
+#| "\n"
+#| "Free Unix!\n"
+#| "\n"
+#| "Starting this Thanksgiving I am going to write a complete\n"
+#| "Unix-compatible software system called GNU (for Gnu's Not Unix), and\n"
+#| "give it away free<a href=\"#f1\">(1)</a> to everyone who can use it.\n"
+#| "Contributions of time, money, programs and equipment are greatly\n"
+#| "needed.\n"
+#| "\n"
+#| "To begin with, GNU will be a kernel plus all the utilities needed to\n"
+#| "write and run C programs: editor, shell, C compiler, linker,\n"
+#| "assembler, and a few other things.  After this we will add a text\n"
+#| "formatter, a YACC, an Empire game, a spreadsheet, and hundreds of\n"
+#| "other things.  We hope to supply, eventually, everything useful that\n"
+#| "normally comes with a Unix system, and anything else useful, including\n"
+#| "on-line and hardcopy documentation.\n"
+#| "\n"
+#| "GNU will be able to run Unix programs, but will not be identical\n"
+#| "to Unix.  We will make all improvements that are convenient, based\n"
+#| "on our experience with other operating systems.  In particular,\n"
+#| "we plan to have longer filenames, file version numbers, a crashproof\n"
+#| "file system, filename completion perhaps, terminal-independent\n"
+#| "display support, and eventually a Lisp-based window system through\n"
+#| "which several Lisp programs and ordinary Unix programs can share a 
screen.\n"
+#| "Both C and Lisp will be available as system programming languages.\n"
+#| "We will have network software based on MIT's chaosnet protocol,\n"
+#| "far superior to UUCP.  We may also have something compatible\n"
+#| "with UUCP.\n"
+#| "\n"
+#| "\n"
+#| "Who Am I?\n"
+#| "\n"
+#| "I am Richard Stallman, inventor of the original much-imitated EMACS\n"
+#| "editor, now at the Artificial Intelligence Lab at MIT.  I have worked\n"
+#| "extensively on compilers, editors, debuggers, command interpreters, the\n"
+#| "Incompatible Timesharing System and the Lisp Machine operating system.\n"
+#| "I pioneered terminal-independent display support in ITS.  In addition I\n"
+#| "have implemented one crashproof file system and two window systems for\n"
+#| "Lisp machines.\n"
+#| "\n"
+#| "\n"
+#| "Why I Must Write GNU\n"
+#| "\n"
+#| "I consider that the golden rule requires that if I like a program I\n"
+#| "must share it with other people who like it.  I cannot in good\n"
+#| "conscience sign a nondisclosure agreement or a software license\n"
+#| "agreement.\n"
+#| "\n"
+#| "So that I can continue to use computers without violating my principles,\n"
+#| "I have decided to put together a sufficient body of free software so 
that\n"
+#| "I will be able to get along without any software that is not free.\n"
+#| "\n"
+#| "\n"
+#| "How You Can Contribute\n"
+#| "\n"
+#| "I am asking computer manufacturers for donations of machines and money.\n"
+#| "I'm asking individuals for donations of programs and work.\n"
+#| "\n"
+#| "One computer manufacturer has already offered to provide a machine.  But\n"
+#| "we could use more.  One consequence you can expect if you donate\n"
+#| "machines is that GNU will run on them at an early date.  The machine had\n"
+#| "better be able to operate in a residential area, and not require\n"
+#| "sophisticated cooling or power.\n"
+#| "\n"
+#| "Individual programmers can contribute by writing a compatible duplicate\n"
+#| "of some Unix utility and giving it to me.  For most projects, such\n"
+#| "part-time distributed work would be very hard to coordinate; the\n"
+#| "independently-written parts would not work together.  But for the\n"
+#| "particular task of replacing Unix, this problem is absent.  Most\n"
+#| "interface specifications are fixed by Unix compatibility.  If each\n"
+#| "contribution works with the rest of Unix, it will probably work\n"
+#| "with the rest of GNU.\n"
+#| "\n"
+#| "If I get donations of money, I may be able to hire a few people full or\n"
+#| "part time.  The salary won't be high, but I'm looking for people for\n"
+#| "whom knowing they are helping humanity is as important as money.  I view\n"
+#| "this as a way of enabling dedicated people to devote their full energies 
to\n"
+#| "working on GNU by sparing them the need to make a living in another way.\n"
+#| "\n"
+#| "\n"
+#| "For more information, contact me.\n"
+#| "Arpanet mail:\n"
+#| "  RMS@MIT-MC.ARPA\n"
+#| "\n"
+#| "Usenet:\n"
+#| "  ...!mit-eddie!RMS@OZ\n"
+#| "  ...!mit-vax!RMS@OZ\n"
+#| "\n"
+#| "US Snail:\n"
+#| "  Richard Stallman\n"
+#| "  166 Prospect St\n"
+#| "  Cambridge, MA 02139\n"
 msgid ""
-"\n"
 "From 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\n"
 "From: RMS%MIT-OZ@mit-eddie\n"
 "Newsgroups: net.unix-wizards,net.usoft\n"
@@ -322,7 +483,7 @@
 "\n"
 "Starting this Thanksgiving I am going to write a complete\n"
 "Unix-compatible software system called GNU (for Gnu's Not Unix), and\n"
-"give it away free<a href=\"#f1\">(1)</a> to everyone who can use it.\n"
+"give it away free&#8239;<a href=\"#f1\">[1]</a> to everyone who can use it.\n"
 "Contributions of time, money, programs and equipment are greatly\n"
 "needed.\n"
 "\n"
@@ -510,6 +671,42 @@
 "  166 Prospect St\n"
 "  Cambridge, MA 02139\n"
 
+# type: Content of: <h4>
+#. type: Content of: <div><h3>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Footnote"
+msgid "Footnote"
+msgstr "Примечание"
+
+#. type: Content of: <div><ol><li>
+# | [-The-]{+<em>The+} wording here was [-careless.-] {+careless.</em>+} The
+# | intention was that nobody would have to pay for <b>permission</b> to use
+# | the GNU system.  But the words don't make this clear, and people often
+# | interpret them as saying that copies of GNU should always be distributed
+# | at little or no charge.  That was never the intent.
+#, fuzzy
+#| msgid ""
+#| "The wording here was careless.  The intention was that nobody would have "
+#| "to pay for <b>permission</b> to use the GNU system.  But the words don't "
+#| "make this clear, and people often interpret them as saying that copies of "
+#| "GNU should always be distributed at little or no charge.  That was never "
+#| "the intent."
+msgid ""
+"<em>The wording here was careless.</em> The intention was that nobody would "
+"have to pay for <b>permission</b> to use the GNU system.  But the words "
+"don't make this clear, and people often interpret them as saying that copies "
+"of GNU should always be distributed at little or no charge.  That was never "
+"the intent."
+msgstr ""
+"Здесь формулировка была небрежной. 
Подразумевалось, что никто не будет "
+"должен платить \n"
+"за <strong>разрешение</strong> пользоваться 
системой GNU. \n"
+"Но слова не разъясняли это, и люди часто 
понимают их как \n"
+"утверждение, что копии GNU должны всегда \n"
+"распространяться за небольшую плату или 
бесплатно. \n"
+"Это никогда не подразумевалось."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -539,14 +736,20 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Мы старались сделать этот перевод точным 
и качественным, но исключить "
@@ -557,23 +760,34 @@
 "translations.html\">&ldquo;Руководстве по 
переводам&rdquo;</a>."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; 1983, 1999, 2007, [-2008,-] 2009, [-2013, 2014-] {+2021+}
+# | Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
+#| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
-"Foundation, Inc."
+"Copyright &copy; 1983, 1999, 2007, 2009, 2021 Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2020 Free "
 "Software Foundation, Inc."
 
 #. type: Content of: <div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+#| "NoDerivatives 4.0 International License</a>."
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
 "Это произведение доступно по <a rel=\"license\" 
href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/deed.ru\">лицензии Creative 
"
-"Commons Attribution-NoDerivs (<em>Атрибуция&nbsp;&mdash; Без 
производных "
-"произведений</em>) 3.0 США</a>."
+"creativecommons.org/licenses/by-nd/4.0/deed.ru\">лицензии Creative 
Commons "
+"Attribution-NoDerivs (<em>Атрибуция&nbsp;&mdash; Без 
производных "
+"произведений</em>) 4.0 Всемирная</a>."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>
@@ -589,10 +803,12 @@
 msgid "Updated:"
 msgstr "Обновлено:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
-"Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2020, 2021 Free "
-"Software Foundation, Inc."
+#~ msgid "Poor choice of wording around &ldquo;free&rdquo;"
+#~ msgstr "Плохой выбор формулировки понятия 
&ldquo;свободный&rdquo;"
+
+#~ msgid ""
+#~ "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
+#~ "Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2020, 2021 "
+#~ "Free Software Foundation, Inc."

Index: po/initial-announcement.sq.po
===================================================================
RCS file: /web/www/www/gnu/po/initial-announcement.sq.po,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- po/initial-announcement.sq.po       25 Jul 2020 14:01:00 -0000      1.37
+++ po/initial-announcement.sq.po       2 Nov 2021 14:41:52 -0000       1.38
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2014-04-04 23:59+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2020-07-25 16:41+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-11-02 14:27+0000\n"
 "X-Generator: Poedit 2.3.1\n"
 
 # type: Content of: <title>
@@ -22,21 +23,25 @@
 msgstr "Njoftimi Fillestar - Projekti GNU - Free Software Foundation"
 
 # type: Content of: <h2>
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Initial Announcement"
 msgstr "Njoftimi Fillestar"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "This is the original announcement of the GNU Project, posted by <a href="
+#| "\"http://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
 msgid ""
 "This is the original announcement of the GNU Project, posted by <a href="
-"\"http://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
+"\"https://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
 msgstr ""
 "Ky është njoftimi origjinal mbi Projektin GNU, postuar nga <a 
href=\"http://";
 "www.stallman.org/\">Richard Stallman</a> më 27 shtator, 1983."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The actual history of the GNU Project differs in many ways from this initial "
 "plan. For example, the beginning was delayed until January 1984. Several of "
@@ -49,17 +54,23 @@
 "\">software-it të lirë</a> nuk qenë të qartësuara deri para pak vitesh."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Free Unix!"
 msgstr "Free Unix!"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Starting this Thanksgiving I am going to write a complete Unix-compatible "
+#| "software system called GNU (for Gnu's Not Unix), and give it away free<a "
+#| "href=\"#f1\">(1)</a> to everyone who can use it.  Contributions of time, "
+#| "money, programs and equipment are greatly needed."
 msgid ""
 "Starting this Thanksgiving I am going to write a complete Unix-compatible "
-"software system called GNU (for Gnu's Not Unix), and give it away free<a "
-"href=\"#f1\">(1)</a> to everyone who can use it.  Contributions of time, "
-"money, programs and equipment are greatly needed."
+"software system called GNU (for Gnu's Not Unix), and give it away free&#8239;"
+"<a class=\"ftn\" href=\"#f1\">[1]</a> to everyone who can use it.  "
+"Contributions of time, money, programs and equipment are greatly needed."
 msgstr ""
 "Duke nisur nga kjo Ditë e Falënderimeve do të filloj të shkruaj një 
sistem "
 "të plotë <em>software</em>-i, të përputhshëm me Unix-in, të quajtur GNU 
"
@@ -68,7 +79,7 @@
 "nevojiten shumë."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To begin with, GNU will be a kernel plus all the utilities needed to write "
 "and run C programs: editor, shell, C compiler, linker, assembler, and a few "
@@ -86,7 +97,7 @@
 "dobishme, përfshi dokumentim on-line dhe në shtypshkrim."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU will be able to run Unix programs, but will not be identical to Unix.  "
 "We will make all improvements that are convenient, based on our experience "
@@ -112,12 +123,12 @@
 "Ndoshta do të kemi diçka të përputhshme me UUCP-në."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Who Am I?"
 msgstr "Kush Jam?"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am Richard Stallman, inventor of the original much-imitated EMACS editor, "
 "now at the Artificial Intelligence Lab at MIT.  I have worked extensively on "
@@ -135,12 +146,12 @@
 "për makina Lisp."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why I Must Write GNU"
 msgstr "Pse Duhet Ta Shkruaj GNU-në"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I consider that the golden rule requires that if I like a program I must "
 "share it with other people who like it.  I cannot in good conscience sign a "
@@ -152,7 +163,7 @@
 "<em>software</em>-i.  "
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So that I can continue to use computers without violating my principles, I "
 "have decided to put together a sufficient body of free software so that I "
@@ -163,12 +174,12 @@
 "jem në gjendje të vazhdoj pa ndonjë <em>software</em> që nuk është i 
lirë."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How You Can Contribute"
 msgstr "Si Mund të Kontribuoni"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am asking computer manufacturers for donations of machines and money.  I'm "
 "asking individuals for donations of programs and work."
@@ -177,7 +188,7 @@
 "individëve dhurime programesh dhe pune."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One computer manufacturer has already offered to provide a machine.  But we "
 "could use more.  One consequence you can expect if you donate machines is "
@@ -192,7 +203,7 @@
 "dhe të mos ketë nevojë për ftohje ose ushqim të sofistikuar."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Individual programmers can contribute by writing a compatible duplicate of "
 "some Unix utility and giving it to me.  For most projects, such part-time "
@@ -213,7 +224,7 @@
 "pjesën tjetër të GNU-së."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If I get donations of money, I may be able to hire a few people full or part "
 "time.  The salary won't be high, but I'm looking for people for whom knowing "
@@ -229,74 +240,54 @@
 "GNU-në, duke i çliruar nga nevoja të fitojnë jetesën në një rrugë 
tjetër."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "For more information, contact me."
 msgstr "Për më tepër të dhëna, lidhuni me mua."
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Arpanet mail:"
 msgstr "Postë Arpanet:"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "RMS@MIT-MC.ARPA"
 msgstr "RMS@MIT-MC.ARPA"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Usenet:"
 msgstr "Usenet:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "...!mit-eddie!RMS@OZ"
 msgstr "...!mit-eddie!RMS@OZ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "...!mit-vax!RMS@OZ"
 msgstr "...!mit-vax!RMS@OZ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "US Snail:"
 msgstr "Postë e Zakonshme në ShBA:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Richard Stallman"
 msgstr "Richard Stallman"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "166 Prospect St"
 msgstr "166 Prospect St"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Cambridge, MA 02139"
 msgstr "Cambridge, MA 02139"
 
-# type: Content of: <h4>
-#. type: Content of: <h4>
-msgid "Poor choice of wording around &ldquo;free&rdquo;"
-msgstr "Zgjedhje e dobët fjalësh përqark &ldquo;i lirë&rdquo;"
-
-# type: Content of: <p>
-#. type: Content of: <p>
-msgid ""
-"The wording here was careless.  The intention was that nobody would have to "
-"pay for <b>permission</b> to use the GNU system.  But the words don't make "
-"this clear, and people often interpret them as saying that copies of GNU "
-"should always be distributed at little or no charge.  That was never the "
-"intent."
-msgstr ""
-"Përdorimi i fjalëve këtu qe i pakujdesshëm. Dëshira qe që askujt nuk do 
t’i "
-"duhej të paguante për <b>leje</b> përdorimi të sistemit GNU.  Por fjalët 
nuk "
-"e bëjnë të qartë këtë, dhe njerëzit shpesh i interpretojnë ato si të 
thoshin "
-"që kopjet e GNU-së do të duhej të shpërndaheshin përherë kundrejt pak 
ose "
-"aspak shpërblimi.  Ky kurrë nuk qe synimi."
-
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Original message"
 msgstr "Mesazhi origjinal"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "For completeness, the original email is reproduced here, in its original "
 "form."
@@ -306,10 +297,109 @@
 
 # type: Content of: <div><pre>
 #. TRANSLATORS: Don't translate anything except the headers.
-#. type: Content of: <div><pre>
-#, no-wrap
+#. type: Content of: <div><div><pre>
+#, fuzzy, no-wrap
+#| msgid ""
+#| "\n"
+#| "From 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\n"
+#| "From: RMS%MIT-OZ@mit-eddie\n"
+#| "Newsgroups: net.unix-wizards,net.usoft\n"
+#| "Subject: new Unix implementation\n"
+#| "Date: Tue, 27-Sep-83 12:35:59 EST\n"
+#| "Organization: MIT AI Lab, Cambridge, MA\n"
+#| "\n"
+#| "Free Unix!\n"
+#| "\n"
+#| "Starting this Thanksgiving I am going to write a complete\n"
+#| "Unix-compatible software system called GNU (for Gnu's Not Unix), and\n"
+#| "give it away free<a href=\"#f1\">(1)</a> to everyone who can use it.\n"
+#| "Contributions of time, money, programs and equipment are greatly\n"
+#| "needed.\n"
+#| "\n"
+#| "To begin with, GNU will be a kernel plus all the utilities needed to\n"
+#| "write and run C programs: editor, shell, C compiler, linker,\n"
+#| "assembler, and a few other things.  After this we will add a text\n"
+#| "formatter, a YACC, an Empire game, a spreadsheet, and hundreds of\n"
+#| "other things.  We hope to supply, eventually, everything useful that\n"
+#| "normally comes with a Unix system, and anything else useful, including\n"
+#| "on-line and hardcopy documentation.\n"
+#| "\n"
+#| "GNU will be able to run Unix programs, but will not be identical\n"
+#| "to Unix.  We will make all improvements that are convenient, based\n"
+#| "on our experience with other operating systems.  In particular,\n"
+#| "we plan to have longer filenames, file version numbers, a crashproof\n"
+#| "file system, filename completion perhaps, terminal-independent\n"
+#| "display support, and eventually a Lisp-based window system through\n"
+#| "which several Lisp programs and ordinary Unix programs can share a 
screen.\n"
+#| "Both C and Lisp will be available as system programming languages.\n"
+#| "We will have network software based on MIT's chaosnet protocol,\n"
+#| "far superior to UUCP.  We may also have something compatible\n"
+#| "with UUCP.\n"
+#| "\n"
+#| "\n"
+#| "Who Am I?\n"
+#| "\n"
+#| "I am Richard Stallman, inventor of the original much-imitated EMACS\n"
+#| "editor, now at the Artificial Intelligence Lab at MIT.  I have worked\n"
+#| "extensively on compilers, editors, debuggers, command interpreters, the\n"
+#| "Incompatible Timesharing System and the Lisp Machine operating system.\n"
+#| "I pioneered terminal-independent display support in ITS.  In addition I\n"
+#| "have implemented one crashproof file system and two window systems for\n"
+#| "Lisp machines.\n"
+#| "\n"
+#| "\n"
+#| "Why I Must Write GNU\n"
+#| "\n"
+#| "I consider that the golden rule requires that if I like a program I\n"
+#| "must share it with other people who like it.  I cannot in good\n"
+#| "conscience sign a nondisclosure agreement or a software license\n"
+#| "agreement.\n"
+#| "\n"
+#| "So that I can continue to use computers without violating my principles,\n"
+#| "I have decided to put together a sufficient body of free software so 
that\n"
+#| "I will be able to get along without any software that is not free.\n"
+#| "\n"
+#| "\n"
+#| "How You Can Contribute\n"
+#| "\n"
+#| "I am asking computer manufacturers for donations of machines and money.\n"
+#| "I'm asking individuals for donations of programs and work.\n"
+#| "\n"
+#| "One computer manufacturer has already offered to provide a machine.  But\n"
+#| "we could use more.  One consequence you can expect if you donate\n"
+#| "machines is that GNU will run on them at an early date.  The machine had\n"
+#| "better be able to operate in a residential area, and not require\n"
+#| "sophisticated cooling or power.\n"
+#| "\n"
+#| "Individual programmers can contribute by writing a compatible duplicate\n"
+#| "of some Unix utility and giving it to me.  For most projects, such\n"
+#| "part-time distributed work would be very hard to coordinate; the\n"
+#| "independently-written parts would not work together.  But for the\n"
+#| "particular task of replacing Unix, this problem is absent.  Most\n"
+#| "interface specifications are fixed by Unix compatibility.  If each\n"
+#| "contribution works with the rest of Unix, it will probably work\n"
+#| "with the rest of GNU.\n"
+#| "\n"
+#| "If I get donations of money, I may be able to hire a few people full or\n"
+#| "part time.  The salary won't be high, but I'm looking for people for\n"
+#| "whom knowing they are helping humanity is as important as money.  I view\n"
+#| "this as a way of enabling dedicated people to devote their full energies 
to\n"
+#| "working on GNU by sparing them the need to make a living in another way.\n"
+#| "\n"
+#| "\n"
+#| "For more information, contact me.\n"
+#| "Arpanet mail:\n"
+#| "  RMS@MIT-MC.ARPA\n"
+#| "\n"
+#| "Usenet:\n"
+#| "  ...!mit-eddie!RMS@OZ\n"
+#| "  ...!mit-vax!RMS@OZ\n"
+#| "\n"
+#| "US Snail:\n"
+#| "  Richard Stallman\n"
+#| "  166 Prospect St\n"
+#| "  Cambridge, MA 02139\n"
 msgid ""
-"\n"
 "From 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\n"
 "From: RMS%MIT-OZ@mit-eddie\n"
 "Newsgroups: net.unix-wizards,net.usoft\n"
@@ -321,7 +411,7 @@
 "\n"
 "Starting this Thanksgiving I am going to write a complete\n"
 "Unix-compatible software system called GNU (for Gnu's Not Unix), and\n"
-"give it away free<a href=\"#f1\">(1)</a> to everyone who can use it.\n"
+"give it away free&#8239;<a href=\"#f1\">[1]</a> to everyone who can use it.\n"
 "Contributions of time, money, programs and equipment are greatly\n"
 "needed.\n"
 "\n"
@@ -511,6 +601,34 @@
 "  166 Prospect St\n"
 "  Cambridge, MA 02139\n"
 
+#. type: Content of: <div><h3>
+#, fuzzy
+#| msgid "Footnote"
+msgid "Footnote"
+msgstr "Poshtëshënim"
+
+# type: Content of: <p>
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "The wording here was careless.  The intention was that nobody would have "
+#| "to pay for <b>permission</b> to use the GNU system.  But the words don't "
+#| "make this clear, and people often interpret them as saying that copies of "
+#| "GNU should always be distributed at little or no charge.  That was never "
+#| "the intent."
+msgid ""
+"<em>The wording here was careless.</em> The intention was that nobody would "
+"have to pay for <b>permission</b> to use the GNU system.  But the words "
+"don't make this clear, and people often interpret them as saying that copies "
+"of GNU should always be distributed at little or no charge.  That was never "
+"the intent."
+msgstr ""
+"Përdorimi i fjalëve këtu qe i pakujdesshëm. Dëshira qe që askujt nuk do 
t’i "
+"duhej të paguante për <b>leje</b> përdorimi të sistemit GNU.  Por fjalët 
nuk "
+"e bëjnë të qartë këtë, dhe njerëzit shpesh i interpretojnë ato si të 
thoshin "
+"që kopjet e GNU-së do të duhej të shpërndaheshin përherë kundrejt pak 
ose "
+"aspak shpërblimi.  Ky kurrë nuk qe synimi."
+
 # type: Content of: <div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
@@ -532,6 +650,7 @@
 "të dërgohen te <a href=\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu."
 "org&gt;</a>."
 
+# TODO: submitting -> contributing.
 #.  TRANSLATORS: Ignore the original text in this paragraph,
 #.         replace it with the translation of these two:
 #.         We work hard and do our best to provide accurate, good quality
@@ -539,14 +658,19 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Përpiqemi fort dhe bëjmë sa mundemi për të ofruar përkthime me cilësi 
të "
@@ -559,18 +683,26 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
+#| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
-"Foundation, Inc."
+"Copyright &copy; 1983, 1999, 2007, 2009, 2021 Free Software Foundation, Inc."
 msgstr ""
 "Të drejta kopjimi &copy; 1983, 1999, 2007, 2008, 2009, 2013,2014 Free "
 "Software Foundation, Inc."
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#| "NoDerivs 3.0 United States License</a>."
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
 "Kjo faqe mund të përdoret sipas një licence <a rel=\"license\" 
href=\"http://";
 "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
@@ -586,3 +718,7 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "U përditësua më:"
+
+# type: Content of: <h4>
+#~ msgid "Poor choice of wording around &ldquo;free&rdquo;"
+#~ msgstr "Zgjedhje e dobët fjalësh përqark &ldquo;i lirë&rdquo;"

Index: po/initial-announcement.sv.po
===================================================================
RCS file: /web/www/www/gnu/po/initial-announcement.sv.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- po/initial-announcement.sv.po       2 Nov 2021 13:25:57 -0000       1.2
+++ po/initial-announcement.sv.po       2 Nov 2021 14:41:52 -0000       1.3
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: initial-announcement.html\n"
-"POT-Creation-Date: 2015-03-15 16:41+0100\n"
+"POT-Creation-Date: 2021-11-02 14:27+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"
@@ -21,23 +21,32 @@
 msgid "Initial Announcement - GNU Project - Free Software Foundation"
 msgstr "Initial Announcement - GNU Project - Free Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Initial Announcement"
 msgstr "Initial Announcement"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
+# | This is the original announcement of the GNU Project, [-written-]
+# | {+posted+} by <a href=\"http{+s+}://www.stallman.org/\">Richard
+# | Stallman</a> [-in-] {+on September 27,+} 1983.
 #, fuzzy
 #| msgid ""
 #| "This is the original announcement of the GNU Project, written by <a href="
 #| "\"http://www.stallman.org/\";>Richard Stallman</a> in 1983."
 msgid ""
 "This is the original announcement of the GNU Project, posted by <a href="
-"\"http://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
+"\"https://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
 msgstr ""
 "Detta är det ursprungliga tillkännagivandet av GNU-projektet, författat av 
"
 "<a href=\"http://www.stallman.org/\";>Richard Stallman</a> 1983."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
+# | The {+actual+} history of the GNU Project [-is-] {+differs+} in many ways
+# | [-different-] from this initial plan. For example, the beginning was
+# | delayed until [-January, 1984 and several-] {+January 1984. Several+} of
+# | the [-details about-] {+philosophical concepts of+} <a
+# | href=\"/philosophy/free-sw.html\">free software</a> [-had-] {+were+} not
+# | [-yet been clarified.-] {+clarified until a few years later.+}
 #, fuzzy
 #| msgid ""
 #| "The history of the GNU Project is in many ways different from this "
@@ -55,23 +64,34 @@
 "href=\"/philosophy/free-sw.html\">fri mjukvara</a> hade ännu inte blivit "
 "klargjorda."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Free Unix!"
 msgstr "Befria Unix!"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Starting this Thanksgiving I am going to write a complete Unix-compatible
+# | software system called GNU (for Gnu's Not Unix), and give it away [-free<a
+# | href=\"#f1\">(1)</a>-] {+free&#8239;<a class=\"ftn\"
+# | href=\"#f1\">[1]</a>+} to everyone who can use it.  Contributions of time,
+# | money, programs and equipment are greatly needed.
+#, fuzzy
+#| msgid ""
+#| "Starting this Thanksgiving I am going to write a complete Unix-compatible "
+#| "software system called GNU (for Gnu's Not Unix), and give it away free<a "
+#| "href=\"#f1\">(1)</a> to everyone who can use it.  Contributions of time, "
+#| "money, programs and equipment are greatly needed."
 msgid ""
 "Starting this Thanksgiving I am going to write a complete Unix-compatible "
-"software system called GNU (for Gnu's Not Unix), and give it away free<a "
-"href=\"#f1\">(1)</a> to everyone who can use it.  Contributions of time, "
-"money, programs and equipment are greatly needed."
+"software system called GNU (for Gnu's Not Unix), and give it away free&#8239;"
+"<a class=\"ftn\" href=\"#f1\">[1]</a> to everyone who can use it.  "
+"Contributions of time, money, programs and equipment are greatly needed."
 msgstr ""
 "Med start denna tacksägelsehelg kommer jag skriva ett komplett "
 "Unixkompatibelt system kallat GNU (kort för Gnu är Inte Unix), och ge bort "
 "det fritt <a href=\"#f1\">(1)</a> till alla som kan använda det. Det finns "
 "ett stort behov av bidrag med tid, pengar, program och utrustning."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To begin with, GNU will be a kernel plus all the utilities needed to write "
 "and run C programs: editor, shell, C compiler, linker, assembler, and a few "
@@ -88,7 +108,7 @@
 "som vanligtvis kommer med ett Unixsystem, och allt annat användbart, "
 "inklusive dokumentation både i datorn och i bokform."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU will be able to run Unix programs, but will not be identical to Unix.  "
 "We will make all improvements that are convenient, based on our experience "
@@ -112,11 +132,11 @@
 "baserad på MITs chaosnetprotokoll, vilket är mycket bättre än UUCP.  Vi 
kan "
 "också ha något kompatibelt med UUCP."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Who Am I?"
 msgstr "Vem är jag?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am Richard Stallman, inventor of the original much-imitated EMACS editor, "
 "now at the Artificial Intelligence Lab at MIT.  I have worked extensively on "
@@ -133,11 +153,11 @@
 "skärmstöd i ITS.  Dessutom har jag implementerat ett kraschsäkert 
filsystem "
 "och två fönstersystem för Lispmaskiner."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why I Must Write GNU"
 msgstr "Varför jag måste skriva GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I consider that the golden rule requires that if I like a program I must "
 "share it with other people who like it.  I cannot in good conscience sign a "
@@ -148,7 +168,7 @@
 "inte med gott samvete skriva under ett sekretessavtal eller ett kontrakt om "
 "mjukvarulicens."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So that I can continue to use computers without violating my principles, I "
 "have decided to put together a sufficient body of free software so that I "
@@ -159,11 +179,11 @@
 "samling av fri mjukvara så att jag ska kunna klara mig utan någon mjukvara "
 "som inte är fri."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How You Can Contribute"
 msgstr "Hur du kan bidra"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am asking computer manufacturers for donations of machines and money.  I'm "
 "asking individuals for donations of programs and work."
@@ -171,7 +191,7 @@
 "Jag ber datortillverkare om donationer av maskiner och pengar.  Jag ber "
 "individer om donationer av program och arbete."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One computer manufacturer has already offered to provide a machine.  But we "
 "could use more.  One consequence you can expect if you donate machines is "
@@ -185,7 +205,7 @@
 "måste kunna operera i ett bostadaområde och inte behöva sofistikerad 
kylning "
 "och elförsörjning."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Individual programmers can contribute by writing a compatible duplicate of "
 "some Unix utility and giving it to me.  For most projects, such part-time "
@@ -204,7 +224,7 @@
 "bidrag fungerar med resten av Unix kommer det förmodligen fungera med resten 
"
 "av GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If I get donations of money, I may be able to hire a few people full or part "
 "time.  The salary won't be high, but I'm looking for people for whom knowing "
@@ -219,70 +239,51 @@
 "människor att spendera all sin energi på att arbeta på GNU genom att 
bespara "
 "dem från deras behov av att tjäna sin uppehälle på något annat sätt."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "For more information, contact me."
 msgstr "För mer information, kontakta mig."
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Arpanet mail:"
 msgstr "Arpanetmail:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "RMS@MIT-MC.ARPA"
 msgstr "RMS@MIT-MC.ARPA"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Usenet:"
 msgstr "Usenet:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "...!mit-eddie!RMS@OZ"
 msgstr "...!mit-eddie!RMS@OZ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "...!mit-vax!RMS@OZ"
 msgstr "...!mit-vax!RMS@OZ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "US Snail:"
 msgstr "Amerikansk post:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Richard Stallman"
 msgstr "Richard Stallman"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "166 Prospect St"
 msgstr "166 Prospect St"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Cambridge, MA 02139"
 msgstr "Cambridge, MA 02139"
 
-#. type: Content of: <h4>
-msgid "Poor choice of wording around &ldquo;free&rdquo;"
-msgstr ""
-
-#. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "This remark shows that Richard had not yet clarified the distinction "
-#| "between \"free speech\" and \"free beer\". "
-msgid ""
-"The wording here was careless.  The intention was that nobody would have to "
-"pay for <b>permission</b> to use the GNU system.  But the words don't make "
-"this clear, and people often interpret them as saying that copies of GNU "
-"should always be distributed at little or no charge.  That was never the "
-"intent."
-msgstr ""
-"Denna kommentar visar att Richard inte ännu hade klargjort skillnaden mellan 
"
-"“fritt tal” och “gratis öl”."
-
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Original message"
 msgstr "Original message"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "For completeness, the original email is reproduced here, in its original "
 "form."
@@ -291,10 +292,172 @@
 "form."
 
 #. TRANSLATORS: Don't translate anything except the headers.
-#. type: Content of: <div><pre>
-#, no-wrap
+#. type: Content of: <div><div><pre>
+# | [-\\nFrom-]{+From+}
+# | 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\\nFrom:
+# | RMS%MIT-OZ@mit-eddie\\nNewsgroups: net.unix-wizards,net.usoft\\nSubject:
+# | new Unix implementation\\nDate: Tue, 27-Sep-83 12:35:59
+# | EST\\nOrganization: MIT AI Lab, Cambridge, MA\\n\\nFree
+# | Unix!\\n\\nStarting this Thanksgiving I am going to write a
+# | complete\\nUnix-compatible software system called GNU (for Gnu's Not
+# | Unix), and\\ngive it away [-free<a href=\"#f1\">(1)</a>-] {+free&#8239;<a
+# | href=\"#f1\">[1]</a>+} to everyone who can use it.\\nContributions of
+# | time, money, programs and equipment are greatly\\nneeded.\\n\\nTo begin
+# | with, GNU will be a kernel plus all the utilities needed to\\nwrite and
+# | run C programs: editor, shell, C compiler, linker,\\nassembler, and a few
+# | other things.  After this we will add a text\\nformatter, a YACC, an
+# | Empire game, a spreadsheet, and hundreds of\\nother things.  We hope to
+# | supply, eventually, everything useful that\\nnormally comes with a Unix
+# | system, and anything else useful, including\\non-line and hardcopy
+# | documentation.\\n\\nGNU will be able to run Unix programs, but will not be
+# | identical\\nto Unix.  We will make all improvements that are convenient,
+# | based\\non our experience with other operating systems.  In
+# | particular,\\nwe plan to have longer filenames, file version numbers, a
+# | crashproof\\nfile system, filename completion perhaps,
+# | terminal-independent\\ndisplay support, and eventually a Lisp-based window
+# | system through\\nwhich several Lisp programs and ordinary Unix programs
+# | can share a screen.\\nBoth C and Lisp will be available as system
+# | programming languages.\\nWe will have network software based on MIT's
+# | chaosnet protocol,\\nfar superior to UUCP.  We may also have something
+# | compatible\\nwith UUCP.\\n\\n\\nWho Am I?\\n\\nI am Richard Stallman,
+# | inventor of the original much-imitated EMACS\\neditor, now at the
+# | Artificial Intelligence Lab at MIT.  I have worked\\nextensively on
+# | compilers, editors, debuggers, command interpreters, the\\nIncompatible
+# | Timesharing System and the Lisp Machine operating system.\\nI pioneered
+# | terminal-independent display support in ITS.  In addition I\\nhave
+# | implemented one crashproof file system and two window systems for\\nLisp
+# | machines.\\n\\n\\nWhy I Must Write GNU\\n\\nI consider that the golden
+# | rule requires that if I like a program I\\nmust share it with other people
+# | who like it.  I cannot in good\\nconscience sign a nondisclosure agreement
+# | or a software license\\nagreement.\\n\\nSo that I can continue to use
+# | computers without violating my principles,\\nI have decided to put
+# | together a sufficient body of free software so that\\nI will be able to
+# | get along without any software that is not free.\\n\\n\\nHow You Can
+# | Contribute\\n\\nI am asking computer manufacturers for donations of
+# | machines and money.\\nI'm asking individuals for donations of programs and
+# | work.\\n\\nOne computer manufacturer has already offered to provide a
+# | machine.  But\\nwe could use more.  One consequence you can expect if you
+# | donate\\nmachines is that GNU will run on them at an early date.  The
+# | machine had\\nbetter be able to operate in a residential area, and not
+# | require\\nsophisticated cooling or power.\\n\\nIndividual programmers can
+# | contribute by writing a compatible duplicate\\nof some Unix utility and
+# | giving it to me.  For most projects, such\\npart-time distributed work
+# | would be very hard to coordinate; the\\nindependently-written parts would
+# | not work together.  But for the\\nparticular task of replacing Unix, this
+# | problem is absent.  Most\\ninterface specifications are fixed by Unix
+# | compatibility.  If each\\ncontribution works with the rest of Unix, it
+# | will probably work\\nwith the rest of GNU.\\n\\nIf I get donations of
+# | money, I may be able to hire a few people full or\\npart time.  The salary
+# | won't be high, but I'm looking for people for\\nwhom knowing they are
+# | helping humanity is as important as money.  I view\\nthis as a way of
+# | enabling dedicated people to devote their full energies to\\nworking on
+# | GNU by sparing them the need to make a living in another way.\\n\\n\\nFor
+# | more information, contact me.\\nArpanet mail:\\n 
+# | RMS@MIT-MC.ARPA\\n\\nUsenet:\\n  ...!mit-eddie!RMS@OZ\\n 
+# | ...!mit-vax!RMS@OZ\\n\\nUS Snail:\\n  Richard Stallman\\n  166 Prospect
+# | St\\n  Cambridge, MA 02139\\n
+#, fuzzy, no-wrap
+#| msgid ""
+#| "\n"
+#| "From 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\n"
+#| "From: RMS%MIT-OZ@mit-eddie\n"
+#| "Newsgroups: net.unix-wizards,net.usoft\n"
+#| "Subject: new Unix implementation\n"
+#| "Date: Tue, 27-Sep-83 12:35:59 EST\n"
+#| "Organization: MIT AI Lab, Cambridge, MA\n"
+#| "\n"
+#| "Free Unix!\n"
+#| "\n"
+#| "Starting this Thanksgiving I am going to write a complete\n"
+#| "Unix-compatible software system called GNU (for Gnu's Not Unix), and\n"
+#| "give it away free<a href=\"#f1\">(1)</a> to everyone who can use it.\n"
+#| "Contributions of time, money, programs and equipment are greatly\n"
+#| "needed.\n"
+#| "\n"
+#| "To begin with, GNU will be a kernel plus all the utilities needed to\n"
+#| "write and run C programs: editor, shell, C compiler, linker,\n"
+#| "assembler, and a few other things.  After this we will add a text\n"
+#| "formatter, a YACC, an Empire game, a spreadsheet, and hundreds of\n"
+#| "other things.  We hope to supply, eventually, everything useful that\n"
+#| "normally comes with a Unix system, and anything else useful, including\n"
+#| "on-line and hardcopy documentation.\n"
+#| "\n"
+#| "GNU will be able to run Unix programs, but will not be identical\n"
+#| "to Unix.  We will make all improvements that are convenient, based\n"
+#| "on our experience with other operating systems.  In particular,\n"
+#| "we plan to have longer filenames, file version numbers, a crashproof\n"
+#| "file system, filename completion perhaps, terminal-independent\n"
+#| "display support, and eventually a Lisp-based window system through\n"
+#| "which several Lisp programs and ordinary Unix programs can share a 
screen.\n"
+#| "Both C and Lisp will be available as system programming languages.\n"
+#| "We will have network software based on MIT's chaosnet protocol,\n"
+#| "far superior to UUCP.  We may also have something compatible\n"
+#| "with UUCP.\n"
+#| "\n"
+#| "\n"
+#| "Who Am I?\n"
+#| "\n"
+#| "I am Richard Stallman, inventor of the original much-imitated EMACS\n"
+#| "editor, now at the Artificial Intelligence Lab at MIT.  I have worked\n"
+#| "extensively on compilers, editors, debuggers, command interpreters, the\n"
+#| "Incompatible Timesharing System and the Lisp Machine operating system.\n"
+#| "I pioneered terminal-independent display support in ITS.  In addition I\n"
+#| "have implemented one crashproof file system and two window systems for\n"
+#| "Lisp machines.\n"
+#| "\n"
+#| "\n"
+#| "Why I Must Write GNU\n"
+#| "\n"
+#| "I consider that the golden rule requires that if I like a program I\n"
+#| "must share it with other people who like it.  I cannot in good\n"
+#| "conscience sign a nondisclosure agreement or a software license\n"
+#| "agreement.\n"
+#| "\n"
+#| "So that I can continue to use computers without violating my principles,\n"
+#| "I have decided to put together a sufficient body of free software so 
that\n"
+#| "I will be able to get along without any software that is not free.\n"
+#| "\n"
+#| "\n"
+#| "How You Can Contribute\n"
+#| "\n"
+#| "I am asking computer manufacturers for donations of machines and money.\n"
+#| "I'm asking individuals for donations of programs and work.\n"
+#| "\n"
+#| "One computer manufacturer has already offered to provide a machine.  But\n"
+#| "we could use more.  One consequence you can expect if you donate\n"
+#| "machines is that GNU will run on them at an early date.  The machine had\n"
+#| "better be able to operate in a residential area, and not require\n"
+#| "sophisticated cooling or power.\n"
+#| "\n"
+#| "Individual programmers can contribute by writing a compatible duplicate\n"
+#| "of some Unix utility and giving it to me.  For most projects, such\n"
+#| "part-time distributed work would be very hard to coordinate; the\n"
+#| "independently-written parts would not work together.  But for the\n"
+#| "particular task of replacing Unix, this problem is absent.  Most\n"
+#| "interface specifications are fixed by Unix compatibility.  If each\n"
+#| "contribution works with the rest of Unix, it will probably work\n"
+#| "with the rest of GNU.\n"
+#| "\n"
+#| "If I get donations of money, I may be able to hire a few people full or\n"
+#| "part time.  The salary won't be high, but I'm looking for people for\n"
+#| "whom knowing they are helping humanity is as important as money.  I view\n"
+#| "this as a way of enabling dedicated people to devote their full energies 
to\n"
+#| "working on GNU by sparing them the need to make a living in another way.\n"
+#| "\n"
+#| "\n"
+#| "For more information, contact me.\n"
+#| "Arpanet mail:\n"
+#| "  RMS@MIT-MC.ARPA\n"
+#| "\n"
+#| "Usenet:\n"
+#| "  ...!mit-eddie!RMS@OZ\n"
+#| "  ...!mit-vax!RMS@OZ\n"
+#| "\n"
+#| "US Snail:\n"
+#| "  Richard Stallman\n"
+#| "  166 Prospect St\n"
+#| "  Cambridge, MA 02139\n"
 msgid ""
-"\n"
 "From 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\n"
 "From: RMS%MIT-OZ@mit-eddie\n"
 "Newsgroups: net.unix-wizards,net.usoft\n"
@@ -306,7 +469,7 @@
 "\n"
 "Starting this Thanksgiving I am going to write a complete\n"
 "Unix-compatible software system called GNU (for Gnu's Not Unix), and\n"
-"give it away free<a href=\"#f1\">(1)</a> to everyone who can use it.\n"
+"give it away free&#8239;<a href=\"#f1\">[1]</a> to everyone who can use it.\n"
 "Contributions of time, money, programs and equipment are greatly\n"
 "needed.\n"
 "\n"
@@ -494,6 +657,32 @@
 "  166 Prospect St\n"
 "  Cambridge, MA 02139\n"
 
+#. type: Content of: <div><h3>
+msgid "Footnote"
+msgstr ""
+
+#. type: Content of: <div><ol><li>
+# | [-This remark shows-]{+<em>The wording here was careless.</em> The
+# | intention was+} that [-Richard had not yet clarified-] {+nobody would have
+# | to pay for <b>permission</b> to use+} the [-distinction between \"free
+# | speech\"-] {+GNU system.  But the words don't make this clear,+} and
+# | [-\"free beer\".-] {+people often interpret them as saying that copies of
+# | GNU should always be distributed at little or no charge.  That was never
+# | the intent.+}
+#, fuzzy
+#| msgid ""
+#| "This remark shows that Richard had not yet clarified the distinction "
+#| "between \"free speech\" and \"free beer\". "
+msgid ""
+"<em>The wording here was careless.</em> The intention was that nobody would "
+"have to pay for <b>permission</b> to use the GNU system.  But the words "
+"don't make this clear, and people often interpret them as saying that copies "
+"of GNU should always be distributed at little or no charge.  That was never "
+"the intent."
+msgstr ""
+"Denna kommentar visar att Richard inte ännu hade klargjort skillnaden mellan 
"
+"“fritt tal” och “gratis öl”."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -520,15 +709,23 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# | Please see the <a
+# | href=\"/server/standards/README.translations.html\">Translations
+# | README</a> for information on coordinating and [-submitting-]
+# | {+contributing+} translations of this article.
 #, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and submitting "
+#| "translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Var god läs <a href=\"/server/standards/README.translations.html\">README "
@@ -536,20 +733,35 @@
 "översättningar till den här artikeln."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; 1983, 1999, 2007, [-2008,-] 2009, [-2013, 2014-] {+2021+}
+# | Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
+#| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
-"Foundation, Inc."
+"Copyright &copy; 1983, 1999, 2007, 2009, 2021 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 1983, 1999 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
+# | This page is licensed under a <a rel=\"license\"
+# | [-href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative-]
+# | {+href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Creative+}
+# | Commons [-Attribution-NoDerivs 3.0 United States-]
+# | {+Attribution-NoDerivatives 4.0 International+} License</a>.
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#| "NoDerivs 3.0 United States License</a>."
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
 "Den här sidan är licensierad under en <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Erkännande-"
-"IngaBearbetningar 3.0 Förenta Staterna Licens</a>."
+"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+"NoDerivs 3.0 United States License</a>."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>
@@ -561,8 +773,26 @@
 msgid "Updated:"
 msgstr "Updaterat:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
-"Software Foundation, Inc."
-msgstr "Copyright &copy; 1983, 1999, 2021 Free Software Foundation, Inc."
+#, fuzzy
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "Var god läs <a href=\"/server/standards/README.translations.html\">README 
"
+#~ "för Översättningar</a> för information om att samarbeta och skicka in "
+#~ "översättningar till den här artikeln."
+
+#~ msgid ""
+#~ "This page is licensed under a <a rel=\"license\" href=\"http://";
+#~ "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#~ "NoDerivs 3.0 United States License</a>."
+#~ msgstr ""
+#~ "Den här sidan är licensierad under en <a rel=\"license\" href=\"http://";
+#~ "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Erkännande-"
+#~ "IngaBearbetningar 3.0 Förenta Staterna Licens</a>."
+
+#~ msgid ""
+#~ "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
+#~ "Software Foundation, Inc."
+#~ msgstr "Copyright &copy; 1983, 1999, 2021 Free Software Foundation, Inc."

Index: po/initial-announcement.tr.po
===================================================================
RCS file: /web/www/www/gnu/po/initial-announcement.tr.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- po/initial-announcement.tr.po       2 Nov 2021 13:25:57 -0000       1.5
+++ po/initial-announcement.tr.po       2 Nov 2021 14:41:53 -0000       1.6
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: initial-announcement.html\n"
-"POT-Creation-Date: 2014-04-04 23:59+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2020-01-30 18:40+0100\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-11-02 14:27+0000\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Poedit 2.2.4\n"
 
@@ -21,19 +22,23 @@
 msgid "Initial Announcement - GNU Project - Free Software Foundation"
 msgstr "İlk Duyuru - GNU Projesi - Özgür Yazılım Vakfı"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Initial Announcement"
 msgstr "Ä°lk Duyuru"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "This is the original announcement of the GNU Project, posted by <a href="
+#| "\"http://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
 msgid ""
 "This is the original announcement of the GNU Project, posted by <a href="
-"\"http://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
+"\"https://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
 msgstr ""
 "Bu, 27 Eylül 1983'te <a href=\"http://www.stallman.org/\";>Richard Stallman</"
 "a> tarafından yayınlanan GNU Projesi'nin özgün duyurusu."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The actual history of the GNU Project differs in many ways from this initial "
 "plan. For example, the beginning was delayed until January 1984. Several of "
@@ -45,23 +50,29 @@
 "sw.html\">Özgür yazılımın</a> felsefi kavramlarının birçoğu, birkaç 
yıl "
 "sonrasına kadar açıklığa kavuşmadı."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Free Unix!"
 msgstr "Özgür Unix!"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Starting this Thanksgiving I am going to write a complete Unix-compatible "
+#| "software system called GNU (for Gnu's Not Unix), and give it away free<a "
+#| "href=\"#f1\">(1)</a> to everyone who can use it.  Contributions of time, "
+#| "money, programs and equipment are greatly needed."
 msgid ""
 "Starting this Thanksgiving I am going to write a complete Unix-compatible "
-"software system called GNU (for Gnu's Not Unix), and give it away free<a "
-"href=\"#f1\">(1)</a> to everyone who can use it.  Contributions of time, "
-"money, programs and equipment are greatly needed."
+"software system called GNU (for Gnu's Not Unix), and give it away free&#8239;"
+"<a class=\"ftn\" href=\"#f1\">[1]</a> to everyone who can use it.  "
+"Contributions of time, money, programs and equipment are greatly needed."
 msgstr ""
 "Bu Şükran Günü'nü başlatarak GNU (Gnu's Not Unix [GNU, Unix Değildir] 
için) "
 "adlı eksiksiz bir Unix uyumlu yazılım sistemi yazacağım ve onu 
kullanabilen "
 "herkese bedava<a href=\"#f1\">(1)</a> olarak vereceğim. Zaman, para, program 
"
 "ve gereçlerin katkıları büyük ölçüde gereklidir."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To begin with, GNU will be a kernel plus all the utilities needed to write "
 "and run C programs: editor, shell, C compiler, linker, assembler, and a few "
@@ -78,7 +89,7 @@
 "birlikte gelen her şeyi ve çevrim içi ve basılı kâğıt dokümantasyonu 
da "
 "dâhil olmak üzere faydalı her şeyi sağlamayı umuyoruz."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU will be able to run Unix programs, but will not be identical to Unix.  "
 "We will make all improvements that are convenient, based on our experience "
@@ -102,11 +113,11 @@
 "UUCP'den çok daha üstün olan chaosnet protokolüne dayanan ağ 
yazılımımız "
 "olacak. Ayrıca UUCP ile uyumlu bir şeyimiz olabilir."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Who Am I?"
 msgstr "Ben Kimim?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am Richard Stallman, inventor of the original much-imitated EMACS editor, "
 "now at the Artificial Intelligence Lab at MIT.  I have worked extensively on "
@@ -124,11 +135,11 @@
 "parçalanmaya veya bozulmaya dayanıklı bir dosya sistemi ve iki pencere "
 "sistemi uyguladım."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why I Must Write GNU"
 msgstr "Neden GNU'yu Yazmalıyım"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I consider that the golden rule requires that if I like a program I must "
 "share it with other people who like it.  I cannot in good conscience sign a "
@@ -138,7 +149,7 @@
 "paylaşmam gerektirdiğini düşünüyorum. Ben vicdanı rahat biçimde bir 
gizlilik "
 "sözleşmesi veya bir yazılım lisans sözleşmesi imzalayamıyorum."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So that I can continue to use computers without violating my principles, I "
 "have decided to put together a sufficient body of free software so that I "
@@ -148,11 +159,11 @@
 "olmayan herhangi bir yazılım olmadan idare edebilmem için yeterli bir 
özgür "
 "yazılım gövdesi oluşturmaya karar verdim."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How You Can Contribute"
 msgstr "Nasıl Katkıda Bulunabilirsiniz"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am asking computer manufacturers for donations of machines and money.  I'm "
 "asking individuals for donations of programs and work."
@@ -160,7 +171,7 @@
 "Bilgisayar üreticilerinden makine ve para bağışları istiyorum. 
Bireylerden "
 "program ve çalışma bağışları bekliyorum."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One computer manufacturer has already offered to provide a machine.  But we "
 "could use more.  One consequence you can expect if you donate machines is "
@@ -174,7 +185,7 @@
 "Makine bir yerleşim bölgesinde çalışırsa ve karmaşık soğutma veya 
güç "
 "gerektirmezse iyi olur."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Individual programmers can contribute by writing a compatible duplicate of "
 "some Unix utility and giving it to me.  For most projects, such part-time "
@@ -192,7 +203,7 @@
 "belirlenmiştir. Her katkı Unix'in geri kalanıyla çalışıyorsa 
muhtemelen "
 "GNU'nun geri kalanıyla birlikte de çalışacaktır."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If I get donations of money, I may be able to hire a few people full or part "
 "time.  The salary won't be high, but I'm looking for people for whom knowing "
@@ -207,70 +218,51 @@
 "enerjilerini GNU üzerinde çalışmaya adamalarını sağlamanın bir yolu 
olarak "
 "görüyorum."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "For more information, contact me."
 msgstr "Daha fazla bilgi için benimle iletişime geçin."
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Arpanet mail:"
 msgstr "Arpanet postası:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "RMS@MIT-MC.ARPA"
 msgstr "RMS@MIT-MC.ARPA"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Usenet:"
 msgstr "Usenet:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "...!mit-eddie!RMS@OZ"
 msgstr "...!mit-eddie!RMS@OZ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "...!mit-vax!RMS@OZ"
 msgstr "...!mit-vax!RMS@OZ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "US Snail:"
 msgstr "Birleşik Devletler Posta Adresi:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Richard Stallman"
 msgstr "Richard Stallman"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "166 Prospect St"
 msgstr "166 Prospect St"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Cambridge, MA 02139"
 msgstr "Cambridge, MA 02139"
 
-#. type: Content of: <h4>
-msgid "Poor choice of wording around &ldquo;free&rdquo;"
-msgstr ""
-"&ldquo;free&rdquo; <a href=\"#tn-1\">(2)</a> çevresinde çaresiz sözcük 
seçimi"
-
-#. type: Content of: <p>
-msgid ""
-"The wording here was careless.  The intention was that nobody would have to "
-"pay for <b>permission</b> to use the GNU system.  But the words don't make "
-"this clear, and people often interpret them as saying that copies of GNU "
-"should always be distributed at little or no charge.  That was never the "
-"intent."
-msgstr ""
-"Buradaki sözcük kullanımı dikkatsizdi. Amaç, hiç kimsenin GNU sistemini 
"
-"kullanma <b>izni</b> için ödeme yapmak zorunda olmamasıydı. Ancak 
sözcükler "
-"bunu netleştirmiyor ve insanlar bunları genellikle GNU kopyalarının her "
-"zaman az veya hiçbir ücret ödemeden dağıtılması gerektiğini 
söyleyerek "
-"yorumluyorlar. Asla niyet bu değildi."
-
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Original message"
 msgstr "Orijinal ileti"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "For completeness, the original email is reproduced here, in its original "
 "form."
@@ -278,10 +270,109 @@
 "Tamlık için orijinal e-posta burada özgün biçiminde yeniden gösterilir."
 
 #. TRANSLATORS: Don't translate anything except the headers.
-#. type: Content of: <div><pre>
-#, no-wrap
+#. type: Content of: <div><div><pre>
+#, fuzzy, no-wrap
+#| msgid ""
+#| "\n"
+#| "From 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\n"
+#| "From: RMS%MIT-OZ@mit-eddie\n"
+#| "Newsgroups: net.unix-wizards,net.usoft\n"
+#| "Subject: new Unix implementation\n"
+#| "Date: Tue, 27-Sep-83 12:35:59 EST\n"
+#| "Organization: MIT AI Lab, Cambridge, MA\n"
+#| "\n"
+#| "Free Unix!\n"
+#| "\n"
+#| "Starting this Thanksgiving I am going to write a complete\n"
+#| "Unix-compatible software system called GNU (for Gnu's Not Unix), and\n"
+#| "give it away free<a href=\"#f1\">(1)</a> to everyone who can use it.\n"
+#| "Contributions of time, money, programs and equipment are greatly\n"
+#| "needed.\n"
+#| "\n"
+#| "To begin with, GNU will be a kernel plus all the utilities needed to\n"
+#| "write and run C programs: editor, shell, C compiler, linker,\n"
+#| "assembler, and a few other things.  After this we will add a text\n"
+#| "formatter, a YACC, an Empire game, a spreadsheet, and hundreds of\n"
+#| "other things.  We hope to supply, eventually, everything useful that\n"
+#| "normally comes with a Unix system, and anything else useful, including\n"
+#| "on-line and hardcopy documentation.\n"
+#| "\n"
+#| "GNU will be able to run Unix programs, but will not be identical\n"
+#| "to Unix.  We will make all improvements that are convenient, based\n"
+#| "on our experience with other operating systems.  In particular,\n"
+#| "we plan to have longer filenames, file version numbers, a crashproof\n"
+#| "file system, filename completion perhaps, terminal-independent\n"
+#| "display support, and eventually a Lisp-based window system through\n"
+#| "which several Lisp programs and ordinary Unix programs can share a 
screen.\n"
+#| "Both C and Lisp will be available as system programming languages.\n"
+#| "We will have network software based on MIT's chaosnet protocol,\n"
+#| "far superior to UUCP.  We may also have something compatible\n"
+#| "with UUCP.\n"
+#| "\n"
+#| "\n"
+#| "Who Am I?\n"
+#| "\n"
+#| "I am Richard Stallman, inventor of the original much-imitated EMACS\n"
+#| "editor, now at the Artificial Intelligence Lab at MIT.  I have worked\n"
+#| "extensively on compilers, editors, debuggers, command interpreters, the\n"
+#| "Incompatible Timesharing System and the Lisp Machine operating system.\n"
+#| "I pioneered terminal-independent display support in ITS.  In addition I\n"
+#| "have implemented one crashproof file system and two window systems for\n"
+#| "Lisp machines.\n"
+#| "\n"
+#| "\n"
+#| "Why I Must Write GNU\n"
+#| "\n"
+#| "I consider that the golden rule requires that if I like a program I\n"
+#| "must share it with other people who like it.  I cannot in good\n"
+#| "conscience sign a nondisclosure agreement or a software license\n"
+#| "agreement.\n"
+#| "\n"
+#| "So that I can continue to use computers without violating my principles,\n"
+#| "I have decided to put together a sufficient body of free software so 
that\n"
+#| "I will be able to get along without any software that is not free.\n"
+#| "\n"
+#| "\n"
+#| "How You Can Contribute\n"
+#| "\n"
+#| "I am asking computer manufacturers for donations of machines and money.\n"
+#| "I'm asking individuals for donations of programs and work.\n"
+#| "\n"
+#| "One computer manufacturer has already offered to provide a machine.  But\n"
+#| "we could use more.  One consequence you can expect if you donate\n"
+#| "machines is that GNU will run on them at an early date.  The machine had\n"
+#| "better be able to operate in a residential area, and not require\n"
+#| "sophisticated cooling or power.\n"
+#| "\n"
+#| "Individual programmers can contribute by writing a compatible duplicate\n"
+#| "of some Unix utility and giving it to me.  For most projects, such\n"
+#| "part-time distributed work would be very hard to coordinate; the\n"
+#| "independently-written parts would not work together.  But for the\n"
+#| "particular task of replacing Unix, this problem is absent.  Most\n"
+#| "interface specifications are fixed by Unix compatibility.  If each\n"
+#| "contribution works with the rest of Unix, it will probably work\n"
+#| "with the rest of GNU.\n"
+#| "\n"
+#| "If I get donations of money, I may be able to hire a few people full or\n"
+#| "part time.  The salary won't be high, but I'm looking for people for\n"
+#| "whom knowing they are helping humanity is as important as money.  I view\n"
+#| "this as a way of enabling dedicated people to devote their full energies 
to\n"
+#| "working on GNU by sparing them the need to make a living in another way.\n"
+#| "\n"
+#| "\n"
+#| "For more information, contact me.\n"
+#| "Arpanet mail:\n"
+#| "  RMS@MIT-MC.ARPA\n"
+#| "\n"
+#| "Usenet:\n"
+#| "  ...!mit-eddie!RMS@OZ\n"
+#| "  ...!mit-vax!RMS@OZ\n"
+#| "\n"
+#| "US Snail:\n"
+#| "  Richard Stallman\n"
+#| "  166 Prospect St\n"
+#| "  Cambridge, MA 02139\n"
 msgid ""
-"\n"
 "From 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\n"
 "From: RMS%MIT-OZ@mit-eddie\n"
 "Newsgroups: net.unix-wizards,net.usoft\n"
@@ -293,7 +384,7 @@
 "\n"
 "Starting this Thanksgiving I am going to write a complete\n"
 "Unix-compatible software system called GNU (for Gnu's Not Unix), and\n"
-"give it away free<a href=\"#f1\">(1)</a> to everyone who can use it.\n"
+"give it away free&#8239;<a href=\"#f1\">[1]</a> to everyone who can use it.\n"
 "Contributions of time, money, programs and equipment are greatly\n"
 "needed.\n"
 "\n"
@@ -481,6 +572,33 @@
 "  166 Prospect St\n"
 "  Cambridge, MA 02139\n"
 
+#. type: Content of: <div><h3>
+#, fuzzy
+#| msgid "Footnote"
+msgid "Footnote"
+msgstr "Dipnotlar"
+
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "The wording here was careless.  The intention was that nobody would have "
+#| "to pay for <b>permission</b> to use the GNU system.  But the words don't "
+#| "make this clear, and people often interpret them as saying that copies of "
+#| "GNU should always be distributed at little or no charge.  That was never "
+#| "the intent."
+msgid ""
+"<em>The wording here was careless.</em> The intention was that nobody would "
+"have to pay for <b>permission</b> to use the GNU system.  But the words "
+"don't make this clear, and people often interpret them as saying that copies "
+"of GNU should always be distributed at little or no charge.  That was never "
+"the intent."
+msgstr ""
+"Buradaki sözcük kullanımı dikkatsizdi. Amaç, hiç kimsenin GNU sistemini 
"
+"kullanma <b>izni</b> için ödeme yapmak zorunda olmamasıydı. Ancak 
sözcükler "
+"bunu netleştirmiyor ve insanlar bunları genellikle GNU kopyalarının her "
+"zaman az veya hiçbir ücret ödemeden dağıtılması gerektiğini 
söyleyerek "
+"yorumluyorlar. Asla niyet bu değildi."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -511,14 +629,19 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Çevirilerimizde bulmuş olabileceğiniz hataları, aklınızdaki soru ve "
@@ -532,9 +655,12 @@
 "\">çalışma&nbsp;sayfamızı</a> ziyaret edebilirsiniz."
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
+#| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
-"Foundation, Inc."
+"Copyright &copy; 1983, 1999, 2007, 2009, 2021 Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
 "Foundation, Inc."
@@ -542,11 +668,11 @@
 #. type: Content of: <div><p>
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
 "Bu sayfa <a rel=\"license\" href=\"http://creativecommons.org/licenses/by-";
-"nd/3.0/us/deed.tr\">Creative Commons Atıf-Türetilemez 3.0 Birleşik 
Devletler "
+"nd/4.0/deed.tr\">Creative Commons Alıntı-Türetilemez 4.0 Uluslararası "
 "Lisansı</a> altında lisanslanmıştır."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
@@ -564,10 +690,14 @@
 msgid "Updated:"
 msgstr "Son Güncelleme:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
-"Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
-"Software Foundation, Inc."
+#~ msgid "Poor choice of wording around &ldquo;free&rdquo;"
+#~ msgstr ""
+#~ "&ldquo;free&rdquo; <a href=\"#tn-1\">(2)</a> çevresinde çaresiz sözcük 
"
+#~ "seçimi"
+
+#~ msgid ""
+#~ "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
+#~ "Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
+#~ "Software Foundation, Inc."

Index: po/initial-announcement.uk.po
===================================================================
RCS file: /web/www/www/gnu/po/initial-announcement.uk.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- po/initial-announcement.uk.po       2 Nov 2021 13:25:57 -0000       1.7
+++ po/initial-announcement.uk.po       2 Nov 2021 14:41:53 -0000       1.8
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: initial-announcement.html\n"
-"POT-Creation-Date: 2014-04-04 23:59+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2015-06-01 09:05+0300\n"
 "Last-Translator: Andriy Bandura <andriykopanytsia@gmail.com>\n"
 "Language-Team: Ukrainian <www-uk-translations@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-11-02 14:27+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 1.5\n"
@@ -25,19 +26,23 @@
 msgstr ""
 "Початкове оголошення - Проект GNU - Фонд 
вільного програмного забезпечення"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Initial Announcement"
 msgstr "Початкове оголошення"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "This is the original announcement of the GNU Project, posted by <a href="
+#| "\"http://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
 msgid ""
 "This is the original announcement of the GNU Project, posted by <a href="
-"\"http://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
+"\"https://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
 msgstr ""
 "Ось початкове оголошення про проект GNU, 
опубліковане <a href=\"http://www.";
 "stallman.org/\">Річардом Столменом</a> 27 вересня 
1983 року."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The actual history of the GNU Project differs in many ways from this initial "
 "plan. For example, the beginning was delayed until January 1984. Several of "
@@ -49,16 +54,22 @@
 "філософські аспекти <a 
href=\"/philosophy/free-sw.html\">вільних програм</a> "
 "прояснилися тільки через кілька років."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Free Unix!"
 msgstr "Вільний Unix!"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Starting this Thanksgiving I am going to write a complete Unix-compatible "
+#| "software system called GNU (for Gnu's Not Unix), and give it away free<a "
+#| "href=\"#f1\">(1)</a> to everyone who can use it.  Contributions of time, "
+#| "money, programs and equipment are greatly needed."
 msgid ""
 "Starting this Thanksgiving I am going to write a complete Unix-compatible "
-"software system called GNU (for Gnu's Not Unix), and give it away free<a "
-"href=\"#f1\">(1)</a> to everyone who can use it.  Contributions of time, "
-"money, programs and equipment are greatly needed."
+"software system called GNU (for Gnu's Not Unix), and give it away free&#8239;"
+"<a class=\"ftn\" href=\"#f1\">[1]</a> to everyone who can use it.  "
+"Contributions of time, money, programs and equipment are greatly needed."
 msgstr ""
 "Починаючи з найближчого Дня подяки, \n"
 "я збираюся написати \n"
@@ -69,7 +80,7 @@
 "Дуже потрібна допомога у вигляді робочого 
часу, грошей, \n"
 "програм і обладнання."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To begin with, GNU will be a kernel plus all the utilities needed to write "
 "and run C programs: editor, shell, C compiler, linker, assembler, and a few "
@@ -87,7 +98,7 @@
 "поставляється з системою сім'ї Unix, і все 
інше корисне, включаючи "
 "документацію в електронному вигляді та на 
папері."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU will be able to run Unix programs, but will not be identical to Unix.  "
 "We will make all improvements that are convenient, based on our experience "
@@ -116,11 +127,11 @@
 "протокол UUCP. Можливо, у нас \n"
 "буде також що-небудь сумісне з UUCP."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Who Am I?"
 msgstr "Хто я такий?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am Richard Stallman, inventor of the original much-imitated EMACS editor, "
 "now at the Artificial Intelligence Lab at MIT.  I have worked extensively on "
@@ -140,11 +151,11 @@
 "реалізував стійку до збоїв файлову 
систему і \n"
 "дві віконні системи для машин Лісп."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why I Must Write GNU"
 msgstr "Чому я повинен писати GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I consider that the golden rule requires that if I like a program I must "
 "share it with other people who like it.  I cannot in good conscience sign a "
@@ -156,7 +167,7 @@
 "без сорому підписати \n"
 "ліцензійну угоду програми або договір про 
нерозголошення."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So that I can continue to use computers without violating my principles, I "
 "have decided to put together a sufficient body of free software so that I "
@@ -168,11 +179,11 @@
 "вільних програм, щоб я міг обійтися \n"
 "без будь-якої невільної програми."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How You Can Contribute"
 msgstr "Чим ви можете допомогти"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am asking computer manufacturers for donations of machines and money.  I'm "
 "asking individuals for donations of programs and work."
@@ -181,7 +192,7 @@
 "машини і гроші. Я закликаю приватних осіб 
\n"
 "приносити в дар програми і працю."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One computer manufacturer has already offered to provide a machine.  But we "
 "could use more.  One consequence you can expect if you donate machines is "
@@ -198,7 +209,7 @@
 "в житлових приміщеннях і не вимагала х
итромудрого \n"
 "охолодження і живлення."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Individual programmers can contribute by writing a compatible duplicate of "
 "some Unix utility and giving it to me.  For most projects, such part-time "
@@ -218,7 +229,7 @@
 "з Unix. Якщо кожен внесок буде працювати з 
іншою Unix, він, ймовірно, "
 "запрацює з рештою GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If I get donations of money, I may be able to hire a few people full or part "
 "time.  The salary won't be high, but I'm looking for people for whom knowing "
@@ -236,71 +247,51 @@
 "роботі над GNU, позбавивши їх від потреби 
заробляти \n"
 "на життя іншим способом."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "For more information, contact me."
 msgstr "За докладнішими відомостями 
звертайтеся до мене."
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Arpanet mail:"
 msgstr "Адреса Arpanet:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "RMS@MIT-MC.ARPA"
 msgstr "RMS@MIT-MC.ARPA"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Usenet:"
 msgstr "Usenet:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "...!mit-eddie!RMS@OZ"
 msgstr "...!mit-eddie!RMS@OZ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "...!mit-vax!RMS@OZ"
 msgstr "...!mit-vax!RMS@OZ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "US Snail:"
 msgstr "Поштова адреса у США:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Richard Stallman"
 msgstr "Richard Stallman"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "166 Prospect St"
 msgstr "166 Prospect St"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Cambridge, MA 02139"
 msgstr "Cambridge, MA 02139"
 
-#. type: Content of: <h4>
-msgid "Poor choice of wording around &ldquo;free&rdquo;"
-msgstr "Поганий вибір формулювання поняття 
&ldquo;вільний&rdquo;"
-
-#. type: Content of: <p>
-msgid ""
-"The wording here was careless.  The intention was that nobody would have to "
-"pay for <b>permission</b> to use the GNU system.  But the words don't make "
-"this clear, and people often interpret them as saying that copies of GNU "
-"should always be distributed at little or no charge.  That was never the "
-"intent."
-msgstr ""
-"Тут формулювання було недбалим. \n"
-"Малося на увазі, що ніхто не повинен 
платити \n"
-"за <strong>дозвіл</strong> користуватися 
системою GNU. \n"
-"Але слова не роз'яснювали це, і люди часто 
розуміють їх як \n"
-"твердження, що копії GNU повинні завжди \n"
-"поширюватися за невелику плату або 
безкоштовно. \n"
-"Це ніколи не малося на увазі."
-
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Original message"
 msgstr "Первісний лист"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "For completeness, the original email is reproduced here, in its original "
 "form."
@@ -309,10 +300,109 @@
 "відтворюється тут в оригіналі."
 
 #. TRANSLATORS: Don't translate anything except the headers.
-#. type: Content of: <div><pre>
-#, no-wrap
+#. type: Content of: <div><div><pre>
+#, fuzzy, no-wrap
+#| msgid ""
+#| "\n"
+#| "From 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\n"
+#| "From: RMS%MIT-OZ@mit-eddie\n"
+#| "Newsgroups: net.unix-wizards,net.usoft\n"
+#| "Subject: new Unix implementation\n"
+#| "Date: Tue, 27-Sep-83 12:35:59 EST\n"
+#| "Organization: MIT AI Lab, Cambridge, MA\n"
+#| "\n"
+#| "Free Unix!\n"
+#| "\n"
+#| "Starting this Thanksgiving I am going to write a complete\n"
+#| "Unix-compatible software system called GNU (for Gnu's Not Unix), and\n"
+#| "give it away free<a href=\"#f1\">(1)</a> to everyone who can use it.\n"
+#| "Contributions of time, money, programs and equipment are greatly\n"
+#| "needed.\n"
+#| "\n"
+#| "To begin with, GNU will be a kernel plus all the utilities needed to\n"
+#| "write and run C programs: editor, shell, C compiler, linker,\n"
+#| "assembler, and a few other things.  After this we will add a text\n"
+#| "formatter, a YACC, an Empire game, a spreadsheet, and hundreds of\n"
+#| "other things.  We hope to supply, eventually, everything useful that\n"
+#| "normally comes with a Unix system, and anything else useful, including\n"
+#| "on-line and hardcopy documentation.\n"
+#| "\n"
+#| "GNU will be able to run Unix programs, but will not be identical\n"
+#| "to Unix.  We will make all improvements that are convenient, based\n"
+#| "on our experience with other operating systems.  In particular,\n"
+#| "we plan to have longer filenames, file version numbers, a crashproof\n"
+#| "file system, filename completion perhaps, terminal-independent\n"
+#| "display support, and eventually a Lisp-based window system through\n"
+#| "which several Lisp programs and ordinary Unix programs can share a 
screen.\n"
+#| "Both C and Lisp will be available as system programming languages.\n"
+#| "We will have network software based on MIT's chaosnet protocol,\n"
+#| "far superior to UUCP.  We may also have something compatible\n"
+#| "with UUCP.\n"
+#| "\n"
+#| "\n"
+#| "Who Am I?\n"
+#| "\n"
+#| "I am Richard Stallman, inventor of the original much-imitated EMACS\n"
+#| "editor, now at the Artificial Intelligence Lab at MIT.  I have worked\n"
+#| "extensively on compilers, editors, debuggers, command interpreters, the\n"
+#| "Incompatible Timesharing System and the Lisp Machine operating system.\n"
+#| "I pioneered terminal-independent display support in ITS.  In addition I\n"
+#| "have implemented one crashproof file system and two window systems for\n"
+#| "Lisp machines.\n"
+#| "\n"
+#| "\n"
+#| "Why I Must Write GNU\n"
+#| "\n"
+#| "I consider that the golden rule requires that if I like a program I\n"
+#| "must share it with other people who like it.  I cannot in good\n"
+#| "conscience sign a nondisclosure agreement or a software license\n"
+#| "agreement.\n"
+#| "\n"
+#| "So that I can continue to use computers without violating my principles,\n"
+#| "I have decided to put together a sufficient body of free software so 
that\n"
+#| "I will be able to get along without any software that is not free.\n"
+#| "\n"
+#| "\n"
+#| "How You Can Contribute\n"
+#| "\n"
+#| "I am asking computer manufacturers for donations of machines and money.\n"
+#| "I'm asking individuals for donations of programs and work.\n"
+#| "\n"
+#| "One computer manufacturer has already offered to provide a machine.  But\n"
+#| "we could use more.  One consequence you can expect if you donate\n"
+#| "machines is that GNU will run on them at an early date.  The machine had\n"
+#| "better be able to operate in a residential area, and not require\n"
+#| "sophisticated cooling or power.\n"
+#| "\n"
+#| "Individual programmers can contribute by writing a compatible duplicate\n"
+#| "of some Unix utility and giving it to me.  For most projects, such\n"
+#| "part-time distributed work would be very hard to coordinate; the\n"
+#| "independently-written parts would not work together.  But for the\n"
+#| "particular task of replacing Unix, this problem is absent.  Most\n"
+#| "interface specifications are fixed by Unix compatibility.  If each\n"
+#| "contribution works with the rest of Unix, it will probably work\n"
+#| "with the rest of GNU.\n"
+#| "\n"
+#| "If I get donations of money, I may be able to hire a few people full or\n"
+#| "part time.  The salary won't be high, but I'm looking for people for\n"
+#| "whom knowing they are helping humanity is as important as money.  I view\n"
+#| "this as a way of enabling dedicated people to devote their full energies 
to\n"
+#| "working on GNU by sparing them the need to make a living in another way.\n"
+#| "\n"
+#| "\n"
+#| "For more information, contact me.\n"
+#| "Arpanet mail:\n"
+#| "  RMS@MIT-MC.ARPA\n"
+#| "\n"
+#| "Usenet:\n"
+#| "  ...!mit-eddie!RMS@OZ\n"
+#| "  ...!mit-vax!RMS@OZ\n"
+#| "\n"
+#| "US Snail:\n"
+#| "  Richard Stallman\n"
+#| "  166 Prospect St\n"
+#| "  Cambridge, MA 02139\n"
 msgid ""
-"\n"
 "From 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\n"
 "From: RMS%MIT-OZ@mit-eddie\n"
 "Newsgroups: net.unix-wizards,net.usoft\n"
@@ -324,7 +414,7 @@
 "\n"
 "Starting this Thanksgiving I am going to write a complete\n"
 "Unix-compatible software system called GNU (for Gnu's Not Unix), and\n"
-"give it away free<a href=\"#f1\">(1)</a> to everyone who can use it.\n"
+"give it away free&#8239;<a href=\"#f1\">[1]</a> to everyone who can use it.\n"
 "Contributions of time, money, programs and equipment are greatly\n"
 "needed.\n"
 "\n"
@@ -512,6 +602,35 @@
 "  166 Prospect St\n"
 "  Cambridge, MA 02139\n"
 
+#. type: Content of: <div><h3>
+#, fuzzy
+#| msgid "Footnote"
+msgid "Footnote"
+msgstr "Виноска"
+
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "The wording here was careless.  The intention was that nobody would have "
+#| "to pay for <b>permission</b> to use the GNU system.  But the words don't "
+#| "make this clear, and people often interpret them as saying that copies of "
+#| "GNU should always be distributed at little or no charge.  That was never "
+#| "the intent."
+msgid ""
+"<em>The wording here was careless.</em> The intention was that nobody would "
+"have to pay for <b>permission</b> to use the GNU system.  But the words "
+"don't make this clear, and people often interpret them as saying that copies "
+"of GNU should always be distributed at little or no charge.  That was never "
+"the intent."
+msgstr ""
+"Тут формулювання було недбалим. \n"
+"Малося на увазі, що ніхто не повинен 
платити \n"
+"за <strong>дозвіл</strong> користуватися 
системою GNU. \n"
+"Але слова не роз'яснювали це, і люди часто 
розуміють їх як \n"
+"твердження, що копії GNU повинні завжди \n"
+"поширюватися за невелику плату або 
безкоштовно. \n"
+"Це ніколи не малося на увазі."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -538,14 +657,19 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Ми намагалися зробити цей переклад точним 
та якісним, але виключити "
@@ -556,18 +680,26 @@
 "translations.html\">&ldquo;Посібнику з 
перекладу&rdquo;</a>."
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
+#| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
-"Foundation, Inc."
+"Copyright &copy; 1983, 1999, 2007, 2009, 2021 Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
 "Foundation, Inc. (Фонд вільного програмного 
забезпечення, Inc.)"
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#| "NoDerivs 3.0 United States License</a>."
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
 "Ця сторінка доступна на умовах <a rel=\"license\" 
href=\"http://";
 "creativecommons.org/licenses/by-nd/3.0/us/deed.uk\"> ліцензії 
Creative "
@@ -585,10 +717,25 @@
 msgid "Updated:"
 msgstr "Оновлено:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
-"Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
-"Software Foundation, Inc. (Фонд вільного програмного 
забезпечення, Inc.)"
+#~ msgid "Poor choice of wording around &ldquo;free&rdquo;"
+#~ msgstr "Поганий вибір формулювання поняття 
&ldquo;вільний&rdquo;"
+
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "Ми намагалися зробити цей переклад 
точним та якісним, але виключити "
+#~ "можливість помилки ми не можемо. 
Надсилайте, будь ласка, свої зауваження "
+#~ "і пропозиції щодо перекладу за адресою <a 
href=\"mailto:web-";
+#~ "translators@gnu.org\">&lt;web-translators@gnu.org&gt;</a>. </"
+#~ "p><p>Відомості з координації та 
пропозицій перекладів наших статей див. у "
+#~ "<a 
href=\"/server/standards/README.translations.html\">&ldquo;Посібнику 
з "
+#~ "перекладу&rdquo;</a>."
+
+#~ msgid ""
+#~ "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
+#~ "Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
+#~ "Software Foundation, Inc. (Фонд вільного 
програмного забезпечення, Inc.)"

Index: po/initial-announcement.zh-cn.po
===================================================================
RCS file: /web/www/www/gnu/po/initial-announcement.zh-cn.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- po/initial-announcement.zh-cn.po    2 Nov 2021 13:25:56 -0000       1.5
+++ po/initial-announcement.zh-cn.po    2 Nov 2021 14:41:53 -0000       1.6
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: initial-announcement.html\n"
-"POT-Creation-Date: 2014-04-04 23:59+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2018-06-26 21:07+0800\n"
 "Last-Translator: 尚卓燃 <PsiACE@Outlook.com>\n"
 "Language-Team: Chinese <www-zh-cn-translators@gnu.org>\n"
@@ -15,24 +15,29 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-11-02 14:27+0000\n"
 
 #. type: Content of: <title>
 msgid "Initial Announcement - GNU Project - Free Software Foundation"
 msgstr "初始声明 - GNU工程 - 自由软件基金会"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Initial Announcement"
 msgstr "初始声明"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "This is the original announcement of the GNU Project, posted by <a href="
+#| "\"http://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
 msgid ""
 "This is the original announcement of the GNU Project, posted by <a href="
-"\"http://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
+"\"https://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
 msgstr ""
 "这是GNU工程的初始声明,于1983年9月27日由<a 
href=\"http://www.stallman.org/";
 "\">Richard Stallman</a>提出。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The actual history of the GNU Project differs in many ways from this initial "
 "plan. For example, the beginning was delayed until January 1984. Several of "
@@ -43,22 +48,28 @@
 "月。多个关于<a 
href=\"/philosophy/free-sw.html\">自由软件</a>的哲学概念直到几"
 "年之后才得以澄清。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Free Unix!"
 msgstr "自由的Unix!"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Starting this Thanksgiving I am going to write a complete Unix-compatible "
+#| "software system called GNU (for Gnu's Not Unix), and give it away free<a "
+#| "href=\"#f1\">(1)</a> to everyone who can use it.  Contributions of time, "
+#| "money, programs and equipment are greatly needed."
 msgid ""
 "Starting this Thanksgiving I am going to write a complete Unix-compatible "
-"software system called GNU (for Gnu's Not Unix), and give it away free<a "
-"href=\"#f1\">(1)</a> to everyone who can use it.  Contributions of time, "
-"money, programs and equipment are greatly needed."
+"software system called GNU (for Gnu's Not Unix), and give it away free&#8239;"
+"<a class=\"ftn\" href=\"#f1\">[1]</a> to everyone who can use it.  "
+"Contributions of time, money, programs and equipment are greatly needed."
 msgstr ""
 "从这个感恩节开始,我将编写一个完全和Unixå…
¼å®¹çš„软件系统,它叫做GNU(意思是"
 "Gnu's Not 
Unix,GNU并非Unix),并且我会将它分发给能够使用的人,供他们自由<a
 "
 
"href=\"#f1\">(1)</a>使用。我迫切需要大家贡献时间、金钱、程序和设备。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To begin with, GNU will be a kernel plus all the utilities needed to write "
 "and run C programs: editor, shell, C compiler, linker, assembler, and a few "
@@ -73,7 +84,7 @@
 "有的所有有用的东西,此外还有Unix不带的所有å…
¶ä»–有用的东西,包括在线和实质的文"
 "档。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU will be able to run Unix programs, but will not be identical to Unix.  "
 "We will make all improvements that are convenient, based on our experience "
@@ -93,11 +104,11 @@
 
"一个屏幕。C和Lisp都可以作为系统编程语言。我们将会有基于MIT
 chaosnet协议的网络"
 "软件,这远比UUCP要优越。我们也许也会有一些和UUCPå…
¼å®¹çš„程序。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Who Am I?"
 msgstr "我是谁?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am Richard Stallman, inventor of the original much-imitated EMACS editor, "
 "now at the Artificial Intelligence Lab at MIT.  I have worked extensively on "
@@ -112,11 +123,11 @@
 "的开拓者。此外,我在Lisp 
machine上实现了一个防崩溃的文件系统和两个窗口管理系"
 "统。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why I Must Write GNU"
 msgstr "为什么我必须编写GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I consider that the golden rule requires that if I like a program I must "
 "share it with other people who like it.  I cannot in good conscience sign a "
@@ -125,7 +136,7 @@
 "我信奉的金科玉律是如果我喜欢一个程序,那么我必
须要和其他喜欢该程序的人分享。"
 "签署保密协议或软件许可证协议会使我的良心不安。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So that I can continue to use computers without violating my principles, I "
 "have decided to put together a sufficient body of free software so that I "
@@ -134,17 +145,17 @@
 "我决定组合一系列充
分的自由软件来让我摆脱非自由软件的限制,这æ 
·æˆ‘就可以在不违"
 "背自己的原则的情况下继续使用电脑。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How You Can Contribute"
 msgstr "你该如何做贡献"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am asking computer manufacturers for donations of machines and money.  I'm "
 "asking individuals for donations of programs and work."
 msgstr "我请求计算机制造商捐赠
设备和金钱。我请求个人捐赠程序和作品。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One computer manufacturer has already offered to provide a machine.  But we "
 "could use more.  One consequence you can expect if you donate machines is "
@@ -156,7 +167,7 @@
 "么你可以预期GNU会早一点在你
的机器上运行。这些机器最好能在居民区操作,而不是要"
 "求复杂的冷却或供电设施。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Individual programmers can contribute by writing a compatible duplicate of "
 "some Unix utility and giving it to me.  For most projects, such part-time "
@@ -172,7 +183,7 @@
 "多数接口规格由Unix的å…
¼å®¹æ€§å†³å®šã€‚如果每个人的贡献都能在Unix上工作,那么它极可"
 "能也在GNU上工作。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If I get donations of money, I may be able to hire a few people full or part "
 "time.  The salary won't be high, but I'm looking for people for whom knowing "
@@ -184,77 +195,160 @@
 "人要明白他们的工作是在帮助人类,这和金钱一æ 
·é‡è¦ã€‚我认为这是在为那些愿意全身"
 "心投入到GNU工作中的人们提供一个不用再寻找å…
¶ä»–谋生手段的机会。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "For more information, contact me."
 msgstr "如需更多信息,请联系我。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Arpanet mail:"
 msgstr "Arpanet mail:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "RMS@MIT-MC.ARPA"
 msgstr "RMS@MIT-MC.ARPA"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Usenet:"
 msgstr "Usenet:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "...!mit-eddie!RMS@OZ"
 msgstr "...!mit-eddie!RMS@OZ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "...!mit-vax!RMS@OZ"
 msgstr "...!mit-vax!RMS@OZ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "US Snail:"
 msgstr "US Snail:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Richard Stallman"
 msgstr "Richard Stallman"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "166 Prospect St"
 msgstr "166 Prospect St"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "Cambridge, MA 02139"
 msgstr "Cambridge, MA 02139"
 
-#. type: Content of: <h4>
-msgid "Poor choice of wording around &ldquo;free&rdquo;"
-msgstr " &ldquo;free&rdquo;一词选得不好。"
-
-#. type: Content of: <p>
-msgid ""
-"The wording here was careless.  The intention was that nobody would have to "
-"pay for <b>permission</b> to use the GNU system.  But the words don't make "
-"this clear, and people often interpret them as saying that copies of GNU "
-"should always be distributed at little or no charge.  That was never the "
-"intent."
-msgstr ""
-"这里的用词不太严谨。其初衷是人们不必
支付费用来获得使用GNU系统的<b>许可</b>。"
-"但是此处用词没有明确这一点,而且人们通常会理解成这是在说GNU的拷贝总是廉价或不"
-"花钱的。原意绝不是这样的。"
-
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Original message"
 msgstr "原始消息"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "For completeness, the original email is reproduced here, in its original "
 "form."
 msgstr "为了完整,原始的邮件列在下面,并且保留原始的æ 
¼å¼ã€‚"
 
 #. TRANSLATORS: Don't translate anything except the headers.
-#. type: Content of: <div><pre>
-#, no-wrap
+#. type: Content of: <div><div><pre>
+#, fuzzy, no-wrap
+#| msgid ""
+#| "\n"
+#| "From 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\n"
+#| "From: RMS%MIT-OZ@mit-eddie\n"
+#| "Newsgroups: net.unix-wizards,net.usoft\n"
+#| "Subject: new Unix implementation\n"
+#| "Date: Tue, 27-Sep-83 12:35:59 EST\n"
+#| "Organization: MIT AI Lab, Cambridge, MA\n"
+#| "\n"
+#| "Free Unix!\n"
+#| "\n"
+#| "Starting this Thanksgiving I am going to write a complete\n"
+#| "Unix-compatible software system called GNU (for Gnu's Not Unix), and\n"
+#| "give it away free<a href=\"#f1\">(1)</a> to everyone who can use it.\n"
+#| "Contributions of time, money, programs and equipment are greatly\n"
+#| "needed.\n"
+#| "\n"
+#| "To begin with, GNU will be a kernel plus all the utilities needed to\n"
+#| "write and run C programs: editor, shell, C compiler, linker,\n"
+#| "assembler, and a few other things.  After this we will add a text\n"
+#| "formatter, a YACC, an Empire game, a spreadsheet, and hundreds of\n"
+#| "other things.  We hope to supply, eventually, everything useful that\n"
+#| "normally comes with a Unix system, and anything else useful, including\n"
+#| "on-line and hardcopy documentation.\n"
+#| "\n"
+#| "GNU will be able to run Unix programs, but will not be identical\n"
+#| "to Unix.  We will make all improvements that are convenient, based\n"
+#| "on our experience with other operating systems.  In particular,\n"
+#| "we plan to have longer filenames, file version numbers, a crashproof\n"
+#| "file system, filename completion perhaps, terminal-independent\n"
+#| "display support, and eventually a Lisp-based window system through\n"
+#| "which several Lisp programs and ordinary Unix programs can share a 
screen.\n"
+#| "Both C and Lisp will be available as system programming languages.\n"
+#| "We will have network software based on MIT's chaosnet protocol,\n"
+#| "far superior to UUCP.  We may also have something compatible\n"
+#| "with UUCP.\n"
+#| "\n"
+#| "\n"
+#| "Who Am I?\n"
+#| "\n"
+#| "I am Richard Stallman, inventor of the original much-imitated EMACS\n"
+#| "editor, now at the Artificial Intelligence Lab at MIT.  I have worked\n"
+#| "extensively on compilers, editors, debuggers, command interpreters, the\n"
+#| "Incompatible Timesharing System and the Lisp Machine operating system.\n"
+#| "I pioneered terminal-independent display support in ITS.  In addition I\n"
+#| "have implemented one crashproof file system and two window systems for\n"
+#| "Lisp machines.\n"
+#| "\n"
+#| "\n"
+#| "Why I Must Write GNU\n"
+#| "\n"
+#| "I consider that the golden rule requires that if I like a program I\n"
+#| "must share it with other people who like it.  I cannot in good\n"
+#| "conscience sign a nondisclosure agreement or a software license\n"
+#| "agreement.\n"
+#| "\n"
+#| "So that I can continue to use computers without violating my principles,\n"
+#| "I have decided to put together a sufficient body of free software so 
that\n"
+#| "I will be able to get along without any software that is not free.\n"
+#| "\n"
+#| "\n"
+#| "How You Can Contribute\n"
+#| "\n"
+#| "I am asking computer manufacturers for donations of machines and money.\n"
+#| "I'm asking individuals for donations of programs and work.\n"
+#| "\n"
+#| "One computer manufacturer has already offered to provide a machine.  But\n"
+#| "we could use more.  One consequence you can expect if you donate\n"
+#| "machines is that GNU will run on them at an early date.  The machine had\n"
+#| "better be able to operate in a residential area, and not require\n"
+#| "sophisticated cooling or power.\n"
+#| "\n"
+#| "Individual programmers can contribute by writing a compatible duplicate\n"
+#| "of some Unix utility and giving it to me.  For most projects, such\n"
+#| "part-time distributed work would be very hard to coordinate; the\n"
+#| "independently-written parts would not work together.  But for the\n"
+#| "particular task of replacing Unix, this problem is absent.  Most\n"
+#| "interface specifications are fixed by Unix compatibility.  If each\n"
+#| "contribution works with the rest of Unix, it will probably work\n"
+#| "with the rest of GNU.\n"
+#| "\n"
+#| "If I get donations of money, I may be able to hire a few people full or\n"
+#| "part time.  The salary won't be high, but I'm looking for people for\n"
+#| "whom knowing they are helping humanity is as important as money.  I view\n"
+#| "this as a way of enabling dedicated people to devote their full energies 
to\n"
+#| "working on GNU by sparing them the need to make a living in another way.\n"
+#| "\n"
+#| "\n"
+#| "For more information, contact me.\n"
+#| "Arpanet mail:\n"
+#| "  RMS@MIT-MC.ARPA\n"
+#| "\n"
+#| "Usenet:\n"
+#| "  ...!mit-eddie!RMS@OZ\n"
+#| "  ...!mit-vax!RMS@OZ\n"
+#| "\n"
+#| "US Snail:\n"
+#| "  Richard Stallman\n"
+#| "  166 Prospect St\n"
+#| "  Cambridge, MA 02139\n"
 msgid ""
-"\n"
 "From 
CSvax:pur-ee:inuxc!ixn5c!ihnp4!houxm!mhuxi!eagle!mit-vax!mit-eddie!RMS@MIT-OZ\n"
 "From: RMS%MIT-OZ@mit-eddie\n"
 "Newsgroups: net.unix-wizards,net.usoft\n"
@@ -266,7 +360,7 @@
 "\n"
 "Starting this Thanksgiving I am going to write a complete\n"
 "Unix-compatible software system called GNU (for Gnu's Not Unix), and\n"
-"give it away free<a href=\"#f1\">(1)</a> to everyone who can use it.\n"
+"give it away free&#8239;<a href=\"#f1\">[1]</a> to everyone who can use it.\n"
 "Contributions of time, money, programs and equipment are greatly\n"
 "needed.\n"
 "\n"
@@ -454,6 +548,31 @@
 "  166 Prospect St\n"
 "  Cambridge, MA 02139\n"
 
+#. type: Content of: <div><h3>
+#, fuzzy
+#| msgid "Footnote"
+msgid "Footnote"
+msgstr "脚注"
+
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "The wording here was careless.  The intention was that nobody would have "
+#| "to pay for <b>permission</b> to use the GNU system.  But the words don't "
+#| "make this clear, and people often interpret them as saying that copies of "
+#| "GNU should always be distributed at little or no charge.  That was never "
+#| "the intent."
+msgid ""
+"<em>The wording here was careless.</em> The intention was that nobody would "
+"have to pay for <b>permission</b> to use the GNU system.  But the words "
+"don't make this clear, and people often interpret them as saying that copies "
+"of GNU should always be distributed at little or no charge.  That was never "
+"the intent."
+msgstr ""
+"这里的用词不太严谨。其初衷是人们不必
支付费用来获得使用GNU系统的<b>许可</b>。"
+"但是此处用词没有明确这一点,而且人们通常会理解成这是在说GNU的拷贝总是廉价或不"
+"花钱的。原意绝不是这样的。"
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -472,9 +591,7 @@
 "系方法</a>联系自由软件基金会(FSF)。请将无效链接,å…
¶ä»–错误或建议发送给<a href="
 "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>。"
 
-#
-#
-#
+# TODO: submitting -> contributing.
 #.  TRANSLATORS: Ignore the original text in this paragraph,
 #.         replace it with the translation of these two:
 #.         We work hard and do our best to provide accurate, good quality
@@ -482,36 +599,49 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
-"若您想翻译本文,请参看<a 
href=\"/server/standards/README.translations.html\">"
-"翻译须知</a>。"
+"请参考 <a 
href=\"/server/standards/README.translations.html\">翻译说明</a> 了"
+"解有关协调和提交文章翻译的信息。"
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
+#| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
-"Foundation, Inc."
+"Copyright &copy; 1983, 1999, 2007, 2009, 2021 Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014 Free Software "
 "Foundation, Inc."
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#| "NoDerivs 3.0 United States License</a>."
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
-"本页面使用<a rel=\"license\" 
href=\"http://creativecommons.org/licenses/by-";
+"本页面采用 <a rel=\"license\" 
href=\"http://creativecommons.org/licenses/by-";
 "nd/3.0/us/\">Creative Commons Attribution-NoDerivs 3.0 United States "
-"License</a>授权。"
+"License</a> 许可证授权。"
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>
@@ -525,10 +655,32 @@
 msgid "Updated:"
 msgstr "最后更新:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
-"Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
-"Software Foundation, Inc."
+#~ msgid "Poor choice of wording around &ldquo;free&rdquo;"
+#~ msgstr " &ldquo;free&rdquo;一词选得不好。"
+
+#
+#
+#
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "若您想翻译本文,请参看<a 
href=\"/server/standards/README.translations.html"
+#~ "\">翻译须知</a>。"
+
+#~ msgid ""
+#~ "This page is licensed under a <a rel=\"license\" href=\"http://";
+#~ "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#~ "NoDerivs 3.0 United States License</a>."
+#~ msgstr ""
+#~ "本页面使用<a rel=\"license\" 
href=\"http://creativecommons.org/licenses/";
+#~ "by-nd/3.0/us/\">Creative Commons Attribution-NoDerivs 3.0 United States "
+#~ "License</a>授权。"
+
+#~ msgid ""
+#~ "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
+#~ "Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1983, 1999, 2007, 2008, 2009, 2013, 2014, 2021 Free "
+#~ "Software Foundation, Inc."

Index: po/linux-and-gnu.ar-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.ar-diff.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- po/linux-and-gnu.ar-diff.html       11 Oct 2021 09:34:51 -0000      1.10
+++ po/linux-and-gnu.ar-diff.html       2 Nov 2021 14:41:53 -0000       1.11
@@ -12,23 +12,31 @@
 <body><pre>
 &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;!-- This page is derived from /server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="gnulinux" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</em></ins></span> --&gt;
 &lt;title&gt;Linux and GNU
 - GNU Project - Free Software Foundation&lt;/title&gt;
+<span class="inserted"><ins><em>&lt;style type="text/css" 
media="print,screen"&gt;&lt;!--
+a.ftn { font-size: .94em; }
+--&gt;&lt;/style&gt;</em></ins></span>
 &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="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&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 &lt;a 
href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&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"&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="announcement"&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;,
+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;/blockquote&gt;
 &lt;/div&gt;</strong></del></span>
@@ -133,11 +141,12 @@
 to make it one.  We made a list of the programs needed to make
 a &lt;em&gt;complete&lt;/em&gt; free system, and we systematically found, 
wrote,
 or found people to write everything on the list.  We wrote essential
-but unexciting
-&lt;a href="#unexciting"&gt;(1)&lt;/a&gt; components because you can't have a 
system
+but <span class="removed"><del><strong>unexciting
+&lt;a href="#unexciting"&gt;(1)&lt;/a&gt;</strong></del></span> <span 
class="inserted"><ins><em>unexciting&#8239;&lt;a class="ftn" 
href="#unexciting"&gt;[1]&lt;/a&gt;</em></ins></span> components
+because you can't have a system
 without them.  Some of our system components, the programming tools,
 became popular on their own among programmers, but we wrote many
-components that are not tools  &lt;a href="#nottools"&gt;(2)&lt;/a&gt;.  We 
even
+components that are not <span class="removed"><del><strong>tools  &lt;a 
href="#nottools"&gt;(2)&lt;/a&gt;.</strong></del></span> <span 
class="inserted"><ins><em>tools&#8239;&lt;a class="ftn" 
href="#nottools"&gt;[2]&lt;/a&gt;.</em></ins></span>  We even
 developed a chess game, GNU Chess, because a complete system needs
 games too.&lt;/p&gt;
 
@@ -155,13 +164,15 @@
 Once Torvalds freed Linux in 1992, it fit into the last major gap in
 the GNU system.  People could
 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
+combine Linux with the GNU system&lt;/a&gt; to make a complete free <span 
class="removed"><del><strong>system
+&mdash; a</strong></del></span> <span 
class="inserted"><ins><em>system&mdash;a</em></ins></span>
+version of the GNU system which also contained Linux.  The
 GNU/Linux system, in other words.&lt;/p&gt;
 
 &lt;p&gt;
 Making them work well together was not a trivial job.  Some GNU
-components&lt;a href="#somecomponents"&gt;(3)&lt;/a&gt; needed substantial 
change
+<span class="removed"><del><strong>components&lt;a 
href="#somecomponents"&gt;(3)&lt;/a&gt;</strong></del></span>
+<span class="inserted"><ins><em>components&#8239;&lt;a class="ftn" 
href="#somecomponents"&gt;[3]&lt;/a&gt;</em></ins></span> needed substantial 
change
 to work with Linux.  Integrating a complete system as a distribution
 that would work &ldquo;out of the box&rdquo; was a big job, too.  It
 required addressing the issue of how to install and boot the
@@ -209,9 +220,9 @@
 
 &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;
-<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
+reference, this page and &lt;a <span 
class="removed"><del><strong>href="/gnu/the-gnu-project.html"&gt;
+http://www.gnu.org/gnu/the-gnu-project.html&lt;/a&gt;</strong></del></span> 
<span class="inserted"><ins><em>href="/gnu/thegnuproject.html"&gt;
+https://www.gnu.org/gnu/thegnuproject.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 <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;
@@ -226,7 +237,8 @@
 a free Unix-like operating system.  This system is known as BSD, and
 it was developed at UC Berkeley.  It was <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> in the 80s, but
 became free in the early 90s.  A free operating system that exists
-today&lt;a href="#newersystems"&gt;(4)&lt;/a&gt; is almost certainly either a
+<span class="removed"><del><strong>today&lt;a 
href="#newersystems"&gt;(4)&lt;/a&gt;</strong></del></span>
+<span class="inserted"><ins><em>today&#8239;&lt;a class="ftn" 
href="#newersystems"&gt;[4]&lt;/a&gt;</em></ins></span> is almost certainly 
either a
 variant of the GNU system, or a kind of BSD system.&lt;/p&gt;
 
 &lt;p&gt;
@@ -238,11 +250,12 @@
 system and its variants use some BSD programs; however, taken as
 wholes, they are two different systems that evolved separately.  The
 BSD developers did not write a kernel and add it to the GNU system,
-and a name like GNU/BSD would not fit the situation.&lt;a
+and a name like GNU/BSD would not fit the <span 
class="removed"><del><strong>situation.&lt;a
 href="#gnubsd"&gt;(5)&lt;/a&gt;&lt;/p&gt;
 
-<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&gt;Notes:&lt;/h3&gt;</strong></del></span> <span 
class="inserted"><ins><em>situation&#8239;&lt;a class="ftn"
+href="#gnubsd"&gt;[5]&lt;/a&gt;.&lt;/p&gt;
+&lt;div class="column-limit"&gt;&lt;/div&gt;
 
 &lt;h3 class="footnote"&gt;Footnotes&lt;/h3&gt;</em></ins></span>
 &lt;ol&gt;
@@ -350,7 +363,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/10/11 09:34:51 $
+$Date: 2021/11/02 14:41:53 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: po/linux-and-gnu.ar.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.ar.po,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- po/linux-and-gnu.ar.po      11 Oct 2021 09:34:51 -0000      1.65
+++ po/linux-and-gnu.ar.po      2 Nov 2021 14:41:53 -0000       1.66
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-10-11 09:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2011-02-21 00:31+0200\n"
 "Last-Translator: Hicham <hicham@gmail.com>\n"
 "Language-Team: Arabic\n"
@@ -255,6 +255,36 @@
 "حر كامل</em>هو نظام التشغيل جنو."
 
 #. type: Content of: <div><p>
+# | 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
+# | is <em>an integrated system</em>&mdash;and not just a collection of useful
+# | programs&mdash;is because the GNU Project set out to make it one.  We made
+# | a list of the programs needed to make a <em>complete</em> free system, and
+# | we systematically found, wrote, or found people to write everything on the
+# | list.  We wrote essential but [-unexciting <a
+# | href=\"#unexciting\">(1)</a>-] {+unexciting&#8239;<a class=\"ftn\"
+# | href=\"#unexciting\">[1]</a>+} components because you can't have a system
+# | without them.  Some of our system components, the programming tools,
+# | became popular on their own among programmers, but we wrote many
+# | components that are not [-tools <a href=\"#nottools\">(2)</a>.-]
+# | {+tools&#8239;<a class=\"ftn\" href=\"#nottools\">[2]</a>.+}  We even
+# | developed a chess game, GNU Chess, because a complete system needs games
+# | too.
+#, fuzzy
+#| 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 is <em>an integrated system</em>&mdash;and not just a collection of "
+#| "useful programs&mdash;is because the GNU Project set out to make it one.  "
+#| "We made a list of the programs needed to make a <em>complete</em> free "
+#| "system, and we systematically found, wrote, or found people to write "
+#| "everything on the list.  We wrote essential but unexciting <a href="
+#| "\"#unexciting\">(1)</a> components because you can't have a system "
+#| "without them.  Some of our system components, the programming tools, "
+#| "became popular on their own among programmers, but we wrote many "
+#| "components that are not tools <a href=\"#nottools\">(2)</a>.  We even "
+#| "developed a chess game, GNU Chess, because a complete system needs games "
+#| "too."
 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,12 +292,12 @@
 "programs&mdash;is because the GNU Project set out to make it one.  We made a "
 "list of the programs needed to make a <em>complete</em> free system, and we "
 "systematically found, wrote, or found people to write everything on the "
-"list.  We wrote essential but unexciting <a href=\"#unexciting\">(1)</a> "
-"components because you can't have a system without them.  Some of our system "
-"components, the programming tools, became popular on their own among "
-"programmers, but we wrote many components that are not tools <a href="
-"\"#nottools\">(2)</a>.  We even developed a chess game, GNU Chess, because a "
-"complete system needs games too."
+"list.  We wrote essential but unexciting&#8239;<a class=\"ftn\" href="
+"\"#unexciting\">[1]</a> components because you can't have a system without "
+"them.  Some of our system components, the programming tools, became popular "
+"on their own among programmers, but we wrote many components that are not "
+"tools&#8239;<a class=\"ftn\" href=\"#nottools\">[2]</a>.  We even developed "
+"a chess game, GNU Chess, because a complete system needs games too."
 msgstr ""
 "قدّم الكثير من الناس مساهمات جوهرية للبرم
جيات الحرة في النظام، وكلهم يستحقون "
 "الإشادة على برمجياتهم. لكن سبب وجود 
<em>النظام الكامل</em> &mdash;وليس "
@@ -299,9 +329,9 @@
 # | 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.
+# | combine Linux with the GNU system</a> to make a complete free [-system
+# | &mdash; a-] {+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 "
@@ -316,8 +346,8 @@
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
 "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."
+"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 ""
 "لحسن الحظ، لم يكن علينا انتظار هُرد بفضل 
لينكس. عندما كتب تورفالدس لينكس، حلّت "
 "محل آخر فجوة جوهرية في نظام جنو. استطاع 
الناس وقتها <a href=\"http://ftp.";
@@ -326,16 +356,37 @@
 "للاختصار نظام جنو/لينكس."
 
 #. 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 "
-"Linux.  Integrating a complete system as a distribution that would work "
-"&ldquo;out of the box&rdquo; was a big job, too.  It required addressing the "
-"issue of how to install and boot the system&mdash;a problem we had not "
-"tackled, because we hadn't yet reached that point.  Thus, the people who "
-"developed the various system distributions did a lot of essential work.  But "
-"it was work that, in the nature of things, was surely going to be done by "
-"someone."
+# | Making them work well together was not a trivial job.  Some GNU
+# | [-components<a href=\"#somecomponents\">(3)</a>-] {+components&#8239;<a
+# | class=\"ftn\" href=\"#somecomponents\">[3]</a>+} needed substantial change
+# | to work with Linux.  Integrating a complete system as a distribution that
+# | would work &ldquo;out of the box&rdquo; was a big job, too.  It required
+# | addressing the issue of how to install and boot the system&mdash;a problem
+# | we had not tackled, because we hadn't yet reached that point.  Thus, the
+# | people who developed the various system distributions did a lot of
+# | essential work.  But it was work that, in the nature of things, was surely
+# | going to be done by someone.
+#, fuzzy
+#| 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 Linux.  Integrating a complete system as a distribution that "
+#| "would work &ldquo;out of the box&rdquo; was a big job, too.  It required "
+#| "addressing the issue of how to install and boot the system&mdash;a "
+#| "problem we had not tackled, because we hadn't yet reached that point.  "
+#| "Thus, the people who developed the various system distributions did a lot "
+#| "of essential work.  But it was work that, in the nature of things, was "
+#| "surely going to be done by someone."
+msgid ""
+"Making them work well together was not a trivial job.  Some GNU "
+"components&#8239;<a class=\"ftn\" href=\"#somecomponents\">[3]</a> needed "
+"substantial change to work with Linux.  Integrating a complete system as a "
+"distribution that would work &ldquo;out of the box&rdquo; was a big job, "
+"too.  It required addressing the issue of how to install and boot the "
+"system&mdash;a problem we had not tackled, because we hadn't yet reached "
+"that point.  Thus, the people who developed the various system distributions "
+"did a lot of essential work.  But it was work that, in the nature of things, "
+"was surely going to be done by someone."
 msgstr ""
 "لم تكن عملية جعلهما يعملان معًا مهمةً 
سهلةً. بعض مكونات جنو<a href="
 "\"#somecomponents\">(3)</a> احتاجت تغييرًا جوهريًا 
لتعمل مع لينكس. كان إعداد "
@@ -475,11 +526,12 @@
 
 #. 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>-]
+# | reference, this page and <a [-href=\"/gnu/the-gnu-project.html\">
+# | http://www.gnu.org/gnu/the-gnu-project.html</a>-]
+# | {+href=\"/gnu/thegnuproject.html\">
+# | https://www.gnu.org/gnu/thegnuproject.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
@@ -492,10 +544,10 @@
 #| "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\"> 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=\"https://";
-"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
+"this page and <a href=\"/gnu/thegnuproject.html\"> https://www.gnu.org/gnu/";
+"thegnuproject.html</a> are good choices.  If you mention Linux, the 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-";
@@ -511,9 +563,10 @@
 # | 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
-# | in the early 90s.  A free operating system that exists today<a
-# | href=\"#newersystems\">(4)</a> is almost certainly either a variant of the
-# | GNU system, or a kind of BSD system.
+# | in the early 90s.  A free operating system that exists [-today<a
+# | href=\"#newersystems\">(4)</a>-] {+today&#8239;<a class=\"ftn\"
+# | href=\"#newersystems\">[4]</a>+} is almost certainly either a variant of
+# | the GNU system, or a kind of BSD system.
 #, fuzzy
 #| msgid ""
 #| "Aside from GNU, one other project has independently produced a free Unix-"
@@ -526,9 +579,9 @@
 "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 the early 90s.  "
-"A free operating system that exists today<a href=\"#newersystems\">(4)</a> "
-"is almost certainly either a variant of the GNU system, or a kind of BSD "
-"system."
+"A free operating system that exists today&#8239;<a class=\"ftn\" href="
+"\"#newersystems\">[4]</a> is almost certainly either a variant of the GNU "
+"system, or a kind of BSD system."
 msgstr ""
 "أنتج مشروع آخر -بجانب جنو- بشكل مستقل نظام 
تشغيل حر شبيه بيونيكس. هذا النظام "
 "يعرف باسم بي&#8204;إس&#8204;دي، وطُور في يوكي 
بيركيلي. لم يكن حرًا في "
@@ -537,6 +590,27 @@
 "نوعًا من نظام بي&#8204;إس&#8204;دي."
 
 #. 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
+# | persuade them, but the code had little overlap with GNU.  BSD systems
+# | today use some GNU programs, just as the GNU system and its variants use
+# | some BSD programs; however, taken as wholes, they are two different
+# | systems that evolved separately.  The BSD developers did not write a
+# | kernel and add it to the GNU system, and a name like GNU/BSD would not fit
+# | the [-situation.<a href=\"#gnubsd\">(5)</a>-] {+situation&#8239;<a
+# | class=\"ftn\" href=\"#gnubsd\">[5]</a>.+}
+#, fuzzy
+#| 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 example of the GNU Project, and explicit appeals from GNU "
+#| "activists helped persuade them, but the code had little overlap with "
+#| "GNU.  BSD systems today use some GNU programs, just as the GNU system and "
+#| "its variants use some BSD programs; however, taken as wholes, they are "
+#| "two different systems that evolved separately.  The BSD developers did "
+#| "not write a kernel and add it to the GNU system, and a name like GNU/BSD "
+#| "would not fit the situation.<a href=\"#gnubsd\">(5)</a>"
 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 "
@@ -545,8 +619,8 @@
 "use some GNU programs, just as the GNU system and its variants use some BSD "
 "programs; however, taken as wholes, they are two different systems that "
 "evolved separately.  The BSD developers did not write a kernel and add it to "
-"the GNU system, and a name like GNU/BSD would not fit the situation.<a href="
-"\"#gnubsd\">(5)</a>"
+"the GNU system, and a name like GNU/BSD would not fit the situation&#8239;<a "
+"class=\"ftn\" href=\"#gnubsd\">[5]</a>."
 msgstr ""
 "يسأل الناس أحيانا فيما إذا كان 
بي&#8204;إس&#8204;دي أيضا إصدارًا من جنو، مثل "
 "جنو/لينكس. احتذى مطورو بي&#8204;إس&#8204;دي بجعل 
كودهم حرًّا بمشروع جنو، ومن "

Index: po/linux-and-gnu.bg.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.bg.po,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- po/linux-and-gnu.bg.po      11 Oct 2021 09:34:51 -0000      1.49
+++ po/linux-and-gnu.bg.po      2 Nov 2021 14:41:53 -0000       1.50
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-10-11 09:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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"
@@ -263,6 +263,36 @@
 "подобна на „Юникс“</em> — GNU."
 
 #. type: Content of: <div><p>
+# | 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
+# | is <em>an integrated system</em>&mdash;and not just a collection of useful
+# | programs&mdash;is because the GNU Project set out to make it one.  We made
+# | a list of the programs needed to make a <em>complete</em> free system, and
+# | we systematically found, wrote, or found people to write everything on the
+# | list.  We wrote essential but [-unexciting <a
+# | href=\"#unexciting\">(1)</a>-] {+unexciting&#8239;<a class=\"ftn\"
+# | href=\"#unexciting\">[1]</a>+} components because you can't have a system
+# | without them.  Some of our system components, the programming tools,
+# | became popular on their own among programmers, but we wrote many
+# | components that are not [-tools <a href=\"#nottools\">(2)</a>.-]
+# | {+tools&#8239;<a class=\"ftn\" href=\"#nottools\">[2]</a>.+}  We even
+# | developed a chess game, GNU Chess, because a complete system needs games
+# | too.
+#, fuzzy
+#| 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 is <em>an integrated system</em>&mdash;and not just a collection of "
+#| "useful programs&mdash;is because the GNU Project set out to make it one.  "
+#| "We made a list of the programs needed to make a <em>complete</em> free "
+#| "system, and we systematically found, wrote, or found people to write "
+#| "everything on the list.  We wrote essential but unexciting <a href="
+#| "\"#unexciting\">(1)</a> components because you can't have a system "
+#| "without them.  Some of our system components, the programming tools, "
+#| "became popular on their own among programmers, but we wrote many "
+#| "components that are not tools <a href=\"#nottools\">(2)</a>.  We even "
+#| "developed a chess game, GNU Chess, because a complete system needs games "
+#| "too."
 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,12 +300,12 @@
 "programs&mdash;is because the GNU Project set out to make it one.  We made a "
 "list of the programs needed to make a <em>complete</em> free system, and we "
 "systematically found, wrote, or found people to write everything on the "
-"list.  We wrote essential but unexciting <a href=\"#unexciting\">(1)</a> "
-"components because you can't have a system without them.  Some of our system "
-"components, the programming tools, became popular on their own among "
-"programmers, but we wrote many components that are not tools <a href="
-"\"#nottools\">(2)</a>.  We even developed a chess game, GNU Chess, because a "
-"complete system needs games too."
+"list.  We wrote essential but unexciting&#8239;<a class=\"ftn\" href="
+"\"#unexciting\">[1]</a> components because you can't have a system without "
+"them.  Some of our system components, the programming tools, became popular "
+"on their own among programmers, but we wrote many components that are not "
+"tools&#8239;<a class=\"ftn\" href=\"#nottools\">[2]</a>.  We even developed "
+"a chess game, GNU Chess, because a complete system needs games too."
 msgstr ""
 "Много хора имат съществен принос към 
свободния софтуер в системата и всички "
 "те заслужават признание.  Но причината 
това да е <em>интегрирана система</"
@@ -311,8 +341,8 @@
 # | Torvalds [-wrote Linux,-] {+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:-]
-# | {+system &mdash;+} a [-Linux-based-] version of the GNU [-system; the-]
+# | combine Linux with the GNU system</a> to make a complete free [-system: a
+# | Linux-based-] {+system&mdash;a+} version of the GNU [-system; the-]
 # | {+system which also contained Linux.  The+} GNU/Linux system, [-for
 # | short.-] {+in other words.+}
 #, fuzzy
@@ -328,8 +358,8 @@
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
 "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."
+"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 ""
 "За щастие, нямаше нужда да чакаме за Hurd, 
понеже Линукс беше на "
 "разположение.  Когато Линус Торвалдс 
написа Линукс, той запълни последната "
@@ -340,16 +370,37 @@
 "или съкратено — GNU/Линукс."
 
 #. 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 "
-"Linux.  Integrating a complete system as a distribution that would work "
-"&ldquo;out of the box&rdquo; was a big job, too.  It required addressing the "
-"issue of how to install and boot the system&mdash;a problem we had not "
-"tackled, because we hadn't yet reached that point.  Thus, the people who "
-"developed the various system distributions did a lot of essential work.  But "
-"it was work that, in the nature of things, was surely going to be done by "
-"someone."
+# | Making them work well together was not a trivial job.  Some GNU
+# | [-components<a href=\"#somecomponents\">(3)</a>-] {+components&#8239;<a
+# | class=\"ftn\" href=\"#somecomponents\">[3]</a>+} needed substantial change
+# | to work with Linux.  Integrating a complete system as a distribution that
+# | would work &ldquo;out of the box&rdquo; was a big job, too.  It required
+# | addressing the issue of how to install and boot the system&mdash;a problem
+# | we had not tackled, because we hadn't yet reached that point.  Thus, the
+# | people who developed the various system distributions did a lot of
+# | essential work.  But it was work that, in the nature of things, was surely
+# | going to be done by someone.
+#, fuzzy
+#| 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 Linux.  Integrating a complete system as a distribution that "
+#| "would work &ldquo;out of the box&rdquo; was a big job, too.  It required "
+#| "addressing the issue of how to install and boot the system&mdash;a "
+#| "problem we had not tackled, because we hadn't yet reached that point.  "
+#| "Thus, the people who developed the various system distributions did a lot "
+#| "of essential work.  But it was work that, in the nature of things, was "
+#| "surely going to be done by someone."
+msgid ""
+"Making them work well together was not a trivial job.  Some GNU "
+"components&#8239;<a class=\"ftn\" href=\"#somecomponents\">[3]</a> needed "
+"substantial change to work with Linux.  Integrating a complete system as a "
+"distribution that would work &ldquo;out of the box&rdquo; was a big job, "
+"too.  It required addressing the issue of how to install and boot the "
+"system&mdash;a problem we had not tackled, because we hadn't yet reached "
+"that point.  Thus, the people who developed the various system distributions "
+"did a lot of essential work.  But it was work that, in the nature of things, "
+"was surely going to be done by someone."
 msgstr ""
 "Събирането им заедно звучи просто, но не 
беше незначителна работа.  Бяха "
 "нужни съществени промени за някои от 
компонентите на GNU <a href="
@@ -496,11 +547,12 @@
 
 #. 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>-]
+# | reference, this page and <a [-href=\"/gnu/the-gnu-project.html\">
+# | http://www.gnu.org/gnu/the-gnu-project.html</a>-]
+# | {+href=\"/gnu/thegnuproject.html\">
+# | https://www.gnu.org/gnu/thegnuproject.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
@@ -513,10 +565,10 @@
 #| "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\"> 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=\"https://";
-"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
+"this page and <a href=\"/gnu/thegnuproject.html\"> https://www.gnu.org/gnu/";
+"thegnuproject.html</a> are good choices.  If you mention Linux, the 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/";
@@ -530,13 +582,28 @@
 msgstr "Послепис"
 
 #. 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
+# | the early 90s.  A free operating system that exists [-today<a
+# | href=\"#newersystems\">(4)</a>-] {+today&#8239;<a class=\"ftn\"
+# | href=\"#newersystems\">[4]</a>+} is almost certainly either a variant of
+# | the GNU system, or a kind of BSD system.
+#, fuzzy
+#| 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 UC Berkeley.  It was nonfree in the 80s, but became free in the early "
+#| "90s.  A free operating system that exists today<a href=\"#newersystems\">"
+#| "(4)</a> is almost certainly either a variant of the GNU system, or a kind "
+#| "of BSD system."
 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 "
 "UC Berkeley.  It was nonfree in the 80s, but became free in the early 90s.  "
-"A free operating system that exists today<a href=\"#newersystems\">(4)</a> "
-"is almost certainly either a variant of the GNU system, or a kind of BSD "
-"system."
+"A free operating system that exists today&#8239;<a class=\"ftn\" href="
+"\"#newersystems\">[4]</a> is almost certainly either a variant of the GNU "
+"system, or a kind of BSD system."
 msgstr ""
 "Освен GNU, един друг проект независимо 
издаде свободна операционна система, "
 "подобна на Юникс.  Тази система е позната 
като BSD и е била разработена в "
@@ -546,6 +613,27 @@
 "сигурност или вариант на системата GNU, или 
разновидност на системата BSD."
 
 #. 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
+# | persuade them, but the code had little overlap with GNU.  BSD systems
+# | today use some GNU programs, just as the GNU system and its variants use
+# | some BSD programs; however, taken as wholes, they are two different
+# | systems that evolved separately.  The BSD developers did not write a
+# | kernel and add it to the GNU system, and a name like GNU/BSD would not fit
+# | the [-situation.<a href=\"#gnubsd\">(5)</a>-] {+situation&#8239;<a
+# | class=\"ftn\" href=\"#gnubsd\">[5]</a>.+}
+#, fuzzy
+#| 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 example of the GNU Project, and explicit appeals from GNU "
+#| "activists helped persuade them, but the code had little overlap with "
+#| "GNU.  BSD systems today use some GNU programs, just as the GNU system and "
+#| "its variants use some BSD programs; however, taken as wholes, they are "
+#| "two different systems that evolved separately.  The BSD developers did "
+#| "not write a kernel and add it to the GNU system, and a name like GNU/BSD "
+#| "would not fit the situation.<a href=\"#gnubsd\">(5)</a>"
 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 "
@@ -554,8 +642,8 @@
 "use some GNU programs, just as the GNU system and its variants use some BSD "
 "programs; however, taken as wholes, they are two different systems that "
 "evolved separately.  The BSD developers did not write a kernel and add it to "
-"the GNU system, and a name like GNU/BSD would not fit the situation.<a href="
-"\"#gnubsd\">(5)</a>"
+"the GNU system, and a name like GNU/BSD would not fit the situation&#8239;<a "
+"class=\"ftn\" href=\"#gnubsd\">[5]</a>."
 msgstr ""
 "Хората понякога питат дали BSD също е 
версия на GNU, както GNU/Линукс.  "
 "Разработчиците на BSD бяха вдъхновени да 
направят кода си свободен софтуер "

Index: po/linux-and-gnu.ca-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.ca-diff.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- po/linux-and-gnu.ca-diff.html       11 Oct 2021 09:34:51 -0000      1.16
+++ po/linux-and-gnu.ca-diff.html       2 Nov 2021 14:41:53 -0000       1.17
@@ -12,14 +12,22 @@
 <body><pre>
 &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;!-- This page is derived from /server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="gnulinux" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</em></ins></span> --&gt;
 &lt;title&gt;Linux and GNU
 - GNU Project - Free Software Foundation&lt;/title&gt;
+<span class="inserted"><ins><em>&lt;style type="text/css" 
media="print,screen"&gt;&lt;!--
+a.ftn { font-size: .94em; }
+--&gt;&lt;/style&gt;</em></ins></span>
 &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="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&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 &lt;a 
href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;
@@ -133,11 +141,12 @@
 to make it one.  We made a list of the programs needed to make
 a &lt;em&gt;complete&lt;/em&gt; free system, and we systematically found, 
wrote,
 or found people to write everything on the list.  We wrote essential
-but unexciting
-&lt;a href="#unexciting"&gt;(1)&lt;/a&gt; components because you can't have a 
system
+but <span class="removed"><del><strong>unexciting
+&lt;a href="#unexciting"&gt;(1)&lt;/a&gt;</strong></del></span> <span 
class="inserted"><ins><em>unexciting&#8239;&lt;a class="ftn" 
href="#unexciting"&gt;[1]&lt;/a&gt;</em></ins></span> components
+because you can't have a system
 without them.  Some of our system components, the programming tools,
 became popular on their own among programmers, but we wrote many
-components that are not tools  &lt;a href="#nottools"&gt;(2)&lt;/a&gt;.  We 
even
+components that are not <span class="removed"><del><strong>tools  &lt;a 
href="#nottools"&gt;(2)&lt;/a&gt;.</strong></del></span> <span 
class="inserted"><ins><em>tools&#8239;&lt;a class="ftn" 
href="#nottools"&gt;[2]&lt;/a&gt;.</em></ins></span>  We even
 developed a chess game, GNU Chess, because a complete system needs
 games too.&lt;/p&gt;
 
@@ -155,13 +164,15 @@
 Once Torvalds freed Linux in 1992, it fit into the last major gap in
 the GNU system.  People could
 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
+combine Linux with the GNU system&lt;/a&gt; to make a complete free <span 
class="removed"><del><strong>system
+&mdash; a</strong></del></span> <span 
class="inserted"><ins><em>system&mdash;a</em></ins></span>
+version of the GNU system which also contained Linux.  The
 GNU/Linux system, in other words.&lt;/p&gt;
 
 &lt;p&gt;
 Making them work well together was not a trivial job.  Some GNU
-components&lt;a href="#somecomponents"&gt;(3)&lt;/a&gt; needed substantial 
change
+<span class="removed"><del><strong>components&lt;a 
href="#somecomponents"&gt;(3)&lt;/a&gt;</strong></del></span>
+<span class="inserted"><ins><em>components&#8239;&lt;a class="ftn" 
href="#somecomponents"&gt;[3]&lt;/a&gt;</em></ins></span> needed substantial 
change
 to work with Linux.  Integrating a complete system as a distribution
 that would work &ldquo;out of the box&rdquo; was a big job, too.  It
 required addressing the issue of how to install and boot the
@@ -209,9 +220,9 @@
 
 &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;
-<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
+reference, this page and &lt;a <span 
class="removed"><del><strong>href="/gnu/the-gnu-project.html"&gt;
+http://www.gnu.org/gnu/the-gnu-project.html&lt;/a&gt;</strong></del></span> 
<span class="inserted"><ins><em>href="/gnu/thegnuproject.html"&gt;
+https://www.gnu.org/gnu/thegnuproject.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 <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;
@@ -226,7 +237,8 @@
 a free Unix-like operating system.  This system is known as BSD, and
 it was developed at UC Berkeley.  It was <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> in the 80s, but
 became free in the early 90s.  A free operating system that exists
-today&lt;a href="#newersystems"&gt;(4)&lt;/a&gt; is almost certainly either a
+<span class="removed"><del><strong>today&lt;a 
href="#newersystems"&gt;(4)&lt;/a&gt;</strong></del></span>
+<span class="inserted"><ins><em>today&#8239;&lt;a class="ftn" 
href="#newersystems"&gt;[4]&lt;/a&gt;</em></ins></span> is almost certainly 
either a
 variant of the GNU system, or a kind of BSD system.&lt;/p&gt;
 
 &lt;p&gt;
@@ -238,11 +250,12 @@
 system and its variants use some BSD programs; however, taken as
 wholes, they are two different systems that evolved separately.  The
 BSD developers did not write a kernel and add it to the GNU system,
-and a name like GNU/BSD would not fit the situation.&lt;a
+and a name like GNU/BSD would not fit the <span 
class="removed"><del><strong>situation.&lt;a
 href="#gnubsd"&gt;(5)&lt;/a&gt;&lt;/p&gt;
 
-<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&gt;Notes:&lt;/h3&gt;</strong></del></span> <span 
class="inserted"><ins><em>situation&#8239;&lt;a class="ftn"
+href="#gnubsd"&gt;[5]&lt;/a&gt;.&lt;/p&gt;
+&lt;div class="column-limit"&gt;&lt;/div&gt;
 
 &lt;h3 class="footnote"&gt;Footnotes&lt;/h3&gt;</em></ins></span>
 &lt;ol&gt;
@@ -350,7 +363,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/10/11 09:34:51 $
+$Date: 2021/11/02 14:41:53 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: po/linux-and-gnu.ca.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.ca.po,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- po/linux-and-gnu.ca.po      11 Oct 2021 09:34:51 -0000      1.69
+++ po/linux-and-gnu.ca.po      2 Nov 2021 14:41:53 -0000       1.70
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-11 09:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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"
@@ -263,6 +263,36 @@
 "complet i lliure a l'estil d'Unix</em>: GNU."
 
 #. type: Content of: <div><p>
+# | 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
+# | is <em>an integrated system</em>&mdash;and not just a collection of useful
+# | programs&mdash;is because the GNU Project set out to make it one.  We made
+# | a list of the programs needed to make a <em>complete</em> free system, and
+# | we systematically found, wrote, or found people to write everything on the
+# | list.  We wrote essential but [-unexciting <a
+# | href=\"#unexciting\">(1)</a>-] {+unexciting&#8239;<a class=\"ftn\"
+# | href=\"#unexciting\">[1]</a>+} components because you can't have a system
+# | without them.  Some of our system components, the programming tools,
+# | became popular on their own among programmers, but we wrote many
+# | components that are not [-tools <a href=\"#nottools\">(2)</a>.-]
+# | {+tools&#8239;<a class=\"ftn\" href=\"#nottools\">[2]</a>.+}  We even
+# | developed a chess game, GNU Chess, because a complete system needs games
+# | too.
+#, fuzzy
+#| 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 is <em>an integrated system</em>&mdash;and not just a collection of "
+#| "useful programs&mdash;is because the GNU Project set out to make it one.  "
+#| "We made a list of the programs needed to make a <em>complete</em> free "
+#| "system, and we systematically found, wrote, or found people to write "
+#| "everything on the list.  We wrote essential but unexciting <a href="
+#| "\"#unexciting\">(1)</a> components because you can't have a system "
+#| "without them.  Some of our system components, the programming tools, "
+#| "became popular on their own among programmers, but we wrote many "
+#| "components that are not tools <a href=\"#nottools\">(2)</a>.  We even "
+#| "developed a chess game, GNU Chess, because a complete system needs games "
+#| "too."
 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,12 +300,12 @@
 "programs&mdash;is because the GNU Project set out to make it one.  We made a "
 "list of the programs needed to make a <em>complete</em> free system, and we "
 "systematically found, wrote, or found people to write everything on the "
-"list.  We wrote essential but unexciting <a href=\"#unexciting\">(1)</a> "
-"components because you can't have a system without them.  Some of our system "
-"components, the programming tools, became popular on their own among "
-"programmers, but we wrote many components that are not tools <a href="
-"\"#nottools\">(2)</a>.  We even developed a chess game, GNU Chess, because a "
-"complete system needs games too."
+"list.  We wrote essential but unexciting&#8239;<a class=\"ftn\" href="
+"\"#unexciting\">[1]</a> components because you can't have a system without "
+"them.  Some of our system components, the programming tools, became popular "
+"on their own among programmers, but we wrote many components that are not "
+"tools&#8239;<a class=\"ftn\" href=\"#nottools\">[2]</a>.  We even developed "
+"a chess game, GNU Chess, because a complete system needs games too."
 msgstr ""
 "Molta gent ha fet grans contribucions als programes lliures del sistema, i "
 "totes es mereixen un reconeixement. Però la finalitat era <em>un sistema "
@@ -312,9 +342,9 @@
 # | 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.
+# | combine Linux with the GNU system</a> to make a complete free [-system
+# | &mdash; a-] {+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 "
@@ -329,8 +359,8 @@
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
 "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."
+"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 ""
 "Afortunadament no vam haver d'esperar que Hurd estigués enllestit, perquè "
 "Linux ja estava disponible. Quan el 1992 Linus Torvalds va publicar Linux "
@@ -341,16 +371,37 @@
 "que contenia Linux. En altres paraules, un sistema GNU/Linux."
 
 #. 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 "
-"Linux.  Integrating a complete system as a distribution that would work "
-"&ldquo;out of the box&rdquo; was a big job, too.  It required addressing the "
-"issue of how to install and boot the system&mdash;a problem we had not "
-"tackled, because we hadn't yet reached that point.  Thus, the people who "
-"developed the various system distributions did a lot of essential work.  But "
-"it was work that, in the nature of things, was surely going to be done by "
-"someone."
+# | Making them work well together was not a trivial job.  Some GNU
+# | [-components<a href=\"#somecomponents\">(3)</a>-] {+components&#8239;<a
+# | class=\"ftn\" href=\"#somecomponents\">[3]</a>+} needed substantial change
+# | to work with Linux.  Integrating a complete system as a distribution that
+# | would work &ldquo;out of the box&rdquo; was a big job, too.  It required
+# | addressing the issue of how to install and boot the system&mdash;a problem
+# | we had not tackled, because we hadn't yet reached that point.  Thus, the
+# | people who developed the various system distributions did a lot of
+# | essential work.  But it was work that, in the nature of things, was surely
+# | going to be done by someone.
+#, fuzzy
+#| 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 Linux.  Integrating a complete system as a distribution that "
+#| "would work &ldquo;out of the box&rdquo; was a big job, too.  It required "
+#| "addressing the issue of how to install and boot the system&mdash;a "
+#| "problem we had not tackled, because we hadn't yet reached that point.  "
+#| "Thus, the people who developed the various system distributions did a lot "
+#| "of essential work.  But it was work that, in the nature of things, was "
+#| "surely going to be done by someone."
+msgid ""
+"Making them work well together was not a trivial job.  Some GNU "
+"components&#8239;<a class=\"ftn\" href=\"#somecomponents\">[3]</a> needed "
+"substantial change to work with Linux.  Integrating a complete system as a "
+"distribution that would work &ldquo;out of the box&rdquo; was a big job, "
+"too.  It required addressing the issue of how to install and boot the "
+"system&mdash;a problem we had not tackled, because we hadn't yet reached "
+"that point.  Thus, the people who developed the various system distributions "
+"did a lot of essential work.  But it was work that, in the nature of things, "
+"was surely going to be done by someone."
 msgstr ""
 "Posar-los tots dos junts sona senzill, però no va ser una tasca trivial. "
 "Alguns components de GNU&nbsp;<a href=\"#somecomponents\">(3)</a> "
@@ -495,11 +546,12 @@
 
 #. 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>-]
+# | reference, this page and <a [-href=\"/gnu/the-gnu-project.html\">
+# | http://www.gnu.org/gnu/the-gnu-project.html</a>-]
+# | {+href=\"/gnu/thegnuproject.html\">
+# | https://www.gnu.org/gnu/thegnuproject.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
@@ -512,10 +564,10 @@
 #| "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\"> 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=\"https://";
-"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
+"this page and <a href=\"/gnu/thegnuproject.html\"> https://www.gnu.org/gnu/";
+"thegnuproject.html</a> are good choices.  If you mention Linux, the 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/";
@@ -528,13 +580,28 @@
 msgstr "Postdates"
 
 #. 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
+# | the early 90s.  A free operating system that exists [-today<a
+# | href=\"#newersystems\">(4)</a>-] {+today&#8239;<a class=\"ftn\"
+# | href=\"#newersystems\">[4]</a>+} is almost certainly either a variant of
+# | the GNU system, or a kind of BSD system.
+#, fuzzy
+#| 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 UC Berkeley.  It was nonfree in the 80s, but became free in the early "
+#| "90s.  A free operating system that exists today<a href=\"#newersystems\">"
+#| "(4)</a> is almost certainly either a variant of the GNU system, or a kind "
+#| "of BSD system."
 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 "
 "UC Berkeley.  It was nonfree in the 80s, but became free in the early 90s.  "
-"A free operating system that exists today<a href=\"#newersystems\">(4)</a> "
-"is almost certainly either a variant of the GNU system, or a kind of BSD "
-"system."
+"A free operating system that exists today&#8239;<a class=\"ftn\" href="
+"\"#newersystems\">[4]</a> is almost certainly either a variant of the GNU "
+"system, or a kind of BSD system."
 msgstr ""
 "A més de GNU, un altre projecte ha produït, de manera independent, un "
 "sistema operatiu lliure a l'estil d'Unix. Aquest sistema és conegut com a "
@@ -545,6 +612,27 @@
 "sistema BSD."
 
 #. 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
+# | persuade them, but the code had little overlap with GNU.  BSD systems
+# | today use some GNU programs, just as the GNU system and its variants use
+# | some BSD programs; however, taken as wholes, they are two different
+# | systems that evolved separately.  The BSD developers did not write a
+# | kernel and add it to the GNU system, and a name like GNU/BSD would not fit
+# | the [-situation.<a href=\"#gnubsd\">(5)</a>-] {+situation&#8239;<a
+# | class=\"ftn\" href=\"#gnubsd\">[5]</a>.+}
+#, fuzzy
+#| 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 example of the GNU Project, and explicit appeals from GNU "
+#| "activists helped persuade them, but the code had little overlap with "
+#| "GNU.  BSD systems today use some GNU programs, just as the GNU system and "
+#| "its variants use some BSD programs; however, taken as wholes, they are "
+#| "two different systems that evolved separately.  The BSD developers did "
+#| "not write a kernel and add it to the GNU system, and a name like GNU/BSD "
+#| "would not fit the situation.<a href=\"#gnubsd\">(5)</a>"
 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 "
@@ -553,8 +641,8 @@
 "use some GNU programs, just as the GNU system and its variants use some BSD "
 "programs; however, taken as wholes, they are two different systems that "
 "evolved separately.  The BSD developers did not write a kernel and add it to "
-"the GNU system, and a name like GNU/BSD would not fit the situation.<a href="
-"\"#gnubsd\">(5)</a>"
+"the GNU system, and a name like GNU/BSD would not fit the situation&#8239;<a "
+"class=\"ftn\" href=\"#gnubsd\">[5]</a>."
 msgstr ""
 "De vegades la gent pregunta si BSD també és una versió de GNU, com GNU/"
 "Linux. Els desenvolupadors del sistema BSD es van plantejar fer lliure el "

Index: po/linux-and-gnu.cs-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.cs-diff.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- po/linux-and-gnu.cs-diff.html       29 Oct 2021 13:32:43 -0000      1.30
+++ po/linux-and-gnu.cs-diff.html       2 Nov 2021 14:41:53 -0000       1.31
@@ -12,15 +12,23 @@
 <body><pre>
 &lt;!--#include <span 
class="removed"><del><strong>virtual="/server/html5-header.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/header.html"</em></ins></span> --&gt;
 &lt;!-- Parent-Version: 1.96 --&gt;
-<span class="inserted"><ins><em>&lt;!-- This page is derived from 
/server/standards/boilerplate.html --&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;!-- This page is derived from 
/server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="gnulinux" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes" --&gt;</em></ins></span>
 &lt;title&gt;Linux and GNU
 - GNU Project - Free Software Foundation&lt;/title&gt;
+<span class="inserted"><ins><em>&lt;style type="text/css" 
media="print,screen"&gt;&lt;!--
+a.ftn { font-size: .94em; }
+--&gt;&lt;/style&gt;</em></ins></span>
 &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 
class="c"&gt;Linux</strong></del></span>
-<span class="inserted"><ins><em>&lt;div class="article reduced-width"&gt;
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&lt;div class="article reduced-width"&gt;
 &lt;h2&gt;Linux</em></ins></span> and the GNU System&lt;/h2&gt;
 
 &lt;address <span class="removed"><del><strong>class="byline 
c"&gt;by</strong></del></span> <span 
class="inserted"><ins><em>class="byline"&gt;by</em></ins></span> &lt;a
@@ -136,11 +144,12 @@
 to make it one.  We made a list of the programs needed to make
 a &lt;em&gt;complete&lt;/em&gt; free system, and we systematically found, 
wrote,
 or found people to write everything on the list.  We wrote essential
-but unexciting
-&lt;a href="#unexciting"&gt;(1)&lt;/a&gt; components because you can't have a 
system
+but <span class="removed"><del><strong>unexciting
+&lt;a href="#unexciting"&gt;(1)&lt;/a&gt;</strong></del></span> <span 
class="inserted"><ins><em>unexciting&#8239;&lt;a class="ftn" 
href="#unexciting"&gt;[1]&lt;/a&gt;</em></ins></span> components
+because you can't have a system
 without them.  Some of our system components, the programming tools,
 became popular on their own among programmers, but we wrote many
-components that are not tools  &lt;a href="#nottools"&gt;(2)&lt;/a&gt;.  We 
even
+components that are not <span class="removed"><del><strong>tools  &lt;a 
href="#nottools"&gt;(2)&lt;/a&gt;.</strong></del></span> <span 
class="inserted"><ins><em>tools&#8239;&lt;a class="ftn" 
href="#nottools"&gt;[2]&lt;/a&gt;.</em></ins></span>  We even
 developed a chess game, GNU Chess, because a complete system needs
 games too.&lt;/p&gt;
 
@@ -158,13 +167,15 @@
 Once Torvalds freed Linux in 1992, it fit into the last major gap in
 the GNU system.  People could
 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
+combine Linux with the GNU system&lt;/a&gt; to make a complete free <span 
class="removed"><del><strong>system
+&mdash; a</strong></del></span> <span 
class="inserted"><ins><em>system&mdash;a</em></ins></span>
+version of the GNU system which also contained Linux.  The
 GNU/Linux system, in other words.&lt;/p&gt;
 
 &lt;p&gt;
 Making them work well together was not a trivial job.  Some GNU
-components&lt;a href="#somecomponents"&gt;(3)&lt;/a&gt; needed substantial 
change
+<span class="removed"><del><strong>components&lt;a 
href="#somecomponents"&gt;(3)&lt;/a&gt;</strong></del></span>
+<span class="inserted"><ins><em>components&#8239;&lt;a class="ftn" 
href="#somecomponents"&gt;[3]&lt;/a&gt;</em></ins></span> needed substantial 
change
 to work with Linux.  Integrating a complete system as a distribution
 that would work &ldquo;out of the box&rdquo; was a big job, too.  It
 required addressing the issue of how to install and boot the
@@ -211,9 +222,9 @@
 
 &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;
-<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
+reference, this page and &lt;a <span 
class="removed"><del><strong>href="/gnu/the-gnu-project.html"&gt;
+http://www.gnu.org/gnu/the-gnu-project.html&lt;/a&gt;</strong></del></span> 
<span class="inserted"><ins><em>href="/gnu/thegnuproject.html"&gt;
+https://www.gnu.org/gnu/thegnuproject.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 <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;
@@ -226,7 +237,8 @@
 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 the early 90s.  A free operating system that exists
-today&lt;a href="#newersystems"&gt;(4)&lt;/a&gt; is almost certainly either a
+<span class="removed"><del><strong>today&lt;a 
href="#newersystems"&gt;(4)&lt;/a&gt;</strong></del></span>
+<span class="inserted"><ins><em>today&#8239;&lt;a class="ftn" 
href="#newersystems"&gt;[4]&lt;/a&gt;</em></ins></span> is almost certainly 
either a
 variant of the GNU system, or a kind of BSD system.&lt;/p&gt;
 
 &lt;p&gt;
@@ -238,8 +250,9 @@
 system and its variants use some BSD programs; however, taken as
 wholes, they are two different systems that evolved separately.  The
 BSD developers did not write a kernel and add it to the GNU system,
-and a name like GNU/BSD would not fit the situation.&lt;a
-href="#gnubsd"&gt;(5)&lt;/a&gt;&lt;/p&gt;
+and a name like GNU/BSD would not fit the <span 
class="removed"><del><strong>situation.&lt;a
+href="#gnubsd"&gt;(5)&lt;/a&gt;&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>situation&#8239;&lt;a class="ftn"
+href="#gnubsd"&gt;[5]&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
 &lt;div class="column-limit"&gt;&lt;/div&gt;
 
 &lt;h3 <span 
class="removed"><del><strong>class="footnote"&gt;Notes&lt;/h3&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>class="footnote"&gt;Footnotes&lt;/h3&gt;</em></ins></span>
@@ -348,7 +361,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/10/29 13:32:43 $
+$Date: 2021/11/02 14:41:53 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: po/linux-and-gnu.cs.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.cs.po,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- po/linux-and-gnu.cs.po      11 Oct 2021 09:34:51 -0000      1.34
+++ po/linux-and-gnu.cs.po      2 Nov 2021 14:41:53 -0000       1.35
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-10-11 09:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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"
@@ -256,6 +256,36 @@
 "svobodný systém podobný Unixu</em>: GNU. "
 
 #. type: Content of: <div><p>
+# | 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
+# | is <em>an integrated system</em>&mdash;and not just a collection of useful
+# | programs&mdash;is because the GNU Project set out to make it one.  We made
+# | a list of the programs needed to make a <em>complete</em> free system, and
+# | we systematically found, wrote, or found people to write everything on the
+# | list.  We wrote essential but [-unexciting <a
+# | href=\"#unexciting\">(1)</a>-] {+unexciting&#8239;<a class=\"ftn\"
+# | href=\"#unexciting\">[1]</a>+} components because you can't have a system
+# | without them.  Some of our system components, the programming tools,
+# | became popular on their own among programmers, but we wrote many
+# | components that are not [-tools <a href=\"#nottools\">(2)</a>.-]
+# | {+tools&#8239;<a class=\"ftn\" href=\"#nottools\">[2]</a>.+}  We even
+# | developed a chess game, GNU Chess, because a complete system needs games
+# | too.
+#, fuzzy
+#| 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 is <em>an integrated system</em>&mdash;and not just a collection of "
+#| "useful programs&mdash;is because the GNU Project set out to make it one.  "
+#| "We made a list of the programs needed to make a <em>complete</em> free "
+#| "system, and we systematically found, wrote, or found people to write "
+#| "everything on the list.  We wrote essential but unexciting <a href="
+#| "\"#unexciting\">(1)</a> components because you can't have a system "
+#| "without them.  Some of our system components, the programming tools, "
+#| "became popular on their own among programmers, but we wrote many "
+#| "components that are not tools <a href=\"#nottools\">(2)</a>.  We even "
+#| "developed a chess game, GNU Chess, because a complete system needs games "
+#| "too."
 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 "
@@ -263,12 +293,12 @@
 "programs&mdash;is because the GNU Project set out to make it one.  We made a "
 "list of the programs needed to make a <em>complete</em> free system, and we "
 "systematically found, wrote, or found people to write everything on the "
-"list.  We wrote essential but unexciting <a href=\"#unexciting\">(1)</a> "
-"components because you can't have a system without them.  Some of our system "
-"components, the programming tools, became popular on their own among "
-"programmers, but we wrote many components that are not tools <a href="
-"\"#nottools\">(2)</a>.  We even developed a chess game, GNU Chess, because a "
-"complete system needs games too."
+"list.  We wrote essential but unexciting&#8239;<a class=\"ftn\" href="
+"\"#unexciting\">[1]</a> components because you can't have a system without "
+"them.  Some of our system components, the programming tools, became popular "
+"on their own among programmers, but we wrote many components that are not "
+"tools&#8239;<a class=\"ftn\" href=\"#nottools\">[2]</a>.  We even developed "
+"a chess game, GNU Chess, because a complete system needs games too."
 msgstr ""
 "Mnoho lidí významně přispělo svobodnému software v systému a všichni 
si "
 "zasluhují uznání. Ale důvodem, díky kterému je to <em>integrovaný 
systém</"
@@ -304,9 +334,9 @@
 # | 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.
+# | combine Linux with the GNU system</a> to make a complete free [-system
+# | &mdash; a-] {+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 "
@@ -321,8 +351,8 @@
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
 "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."
+"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 ""
 "Naštěstí nemusíme čekat, až bude Hurd hotový, protože je tu Linux. 
Když "
 "Torvalds v roce 1992 uvolnil Linux, zaplnil tak poslední velkou mezeru v GNU 
"
@@ -332,16 +362,37 @@
 "Linux; nebo jinými slovy: systém GNU/Linux."
 
 #. 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 "
-"Linux.  Integrating a complete system as a distribution that would work "
-"&ldquo;out of the box&rdquo; was a big job, too.  It required addressing the "
-"issue of how to install and boot the system&mdash;a problem we had not "
-"tackled, because we hadn't yet reached that point.  Thus, the people who "
-"developed the various system distributions did a lot of essential work.  But "
-"it was work that, in the nature of things, was surely going to be done by "
-"someone."
+# | Making them work well together was not a trivial job.  Some GNU
+# | [-components<a href=\"#somecomponents\">(3)</a>-] {+components&#8239;<a
+# | class=\"ftn\" href=\"#somecomponents\">[3]</a>+} needed substantial change
+# | to work with Linux.  Integrating a complete system as a distribution that
+# | would work &ldquo;out of the box&rdquo; was a big job, too.  It required
+# | addressing the issue of how to install and boot the system&mdash;a problem
+# | we had not tackled, because we hadn't yet reached that point.  Thus, the
+# | people who developed the various system distributions did a lot of
+# | essential work.  But it was work that, in the nature of things, was surely
+# | going to be done by someone.
+#, fuzzy
+#| 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 Linux.  Integrating a complete system as a distribution that "
+#| "would work &ldquo;out of the box&rdquo; was a big job, too.  It required "
+#| "addressing the issue of how to install and boot the system&mdash;a "
+#| "problem we had not tackled, because we hadn't yet reached that point.  "
+#| "Thus, the people who developed the various system distributions did a lot "
+#| "of essential work.  But it was work that, in the nature of things, was "
+#| "surely going to be done by someone."
+msgid ""
+"Making them work well together was not a trivial job.  Some GNU "
+"components&#8239;<a class=\"ftn\" href=\"#somecomponents\">[3]</a> needed "
+"substantial change to work with Linux.  Integrating a complete system as a "
+"distribution that would work &ldquo;out of the box&rdquo; was a big job, "
+"too.  It required addressing the issue of how to install and boot the "
+"system&mdash;a problem we had not tackled, because we hadn't yet reached "
+"that point.  Thus, the people who developed the various system distributions "
+"did a lot of essential work.  But it was work that, in the nature of things, "
+"was surely going to be done by someone."
 msgstr ""
 "Dát je dohromady zní jednoduše, ale nebylo to tak snadné. Některé 
součásti "
 "GNU <a href=\"#somecomponents\">(3)</a> potřebovaly značné úpravy, aby "
@@ -464,11 +515,12 @@
 
 #. 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>-]
+# | reference, this page and <a [-href=\"/gnu/the-gnu-project.html\">
+# | http://www.gnu.org/gnu/the-gnu-project.html</a>-]
+# | {+href=\"/gnu/thegnuproject.html\">
+# | https://www.gnu.org/gnu/thegnuproject.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
@@ -481,10 +533,10 @@
 #| "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\"> 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=\"https://";
-"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
+"this page and <a href=\"/gnu/thegnuproject.html\"> https://www.gnu.org/gnu/";
+"thegnuproject.html</a> are good choices.  If you mention Linux, the 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.";
@@ -497,13 +549,28 @@
 msgstr "Dodatky"
 
 #. 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
+# | the early 90s.  A free operating system that exists [-today<a
+# | href=\"#newersystems\">(4)</a>-] {+today&#8239;<a class=\"ftn\"
+# | href=\"#newersystems\">[4]</a>+} is almost certainly either a variant of
+# | the GNU system, or a kind of BSD system.
+#, fuzzy
+#| 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 UC Berkeley.  It was nonfree in the 80s, but became free in the early "
+#| "90s.  A free operating system that exists today<a href=\"#newersystems\">"
+#| "(4)</a> is almost certainly either a variant of the GNU system, or a kind "
+#| "of BSD system."
 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 "
 "UC Berkeley.  It was nonfree in the 80s, but became free in the early 90s.  "
-"A free operating system that exists today<a href=\"#newersystems\">(4)</a> "
-"is almost certainly either a variant of the GNU system, or a kind of BSD "
-"system."
+"A free operating system that exists today&#8239;<a class=\"ftn\" href="
+"\"#newersystems\">[4]</a> is almost certainly either a variant of the GNU "
+"system, or a kind of BSD system."
 msgstr ""
 "Vedle GNU ještě jeden další projekt vytvořil svobodný unixový systém. 
Tento "
 "systém je známý jako BSD a byl vyvinut na universitě UC Berkeley. Tento "
@@ -513,6 +580,27 @@
 "systému."
 
 #. 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
+# | persuade them, but the code had little overlap with GNU.  BSD systems
+# | today use some GNU programs, just as the GNU system and its variants use
+# | some BSD programs; however, taken as wholes, they are two different
+# | systems that evolved separately.  The BSD developers did not write a
+# | kernel and add it to the GNU system, and a name like GNU/BSD would not fit
+# | the [-situation.<a href=\"#gnubsd\">(5)</a>-] {+situation&#8239;<a
+# | class=\"ftn\" href=\"#gnubsd\">[5]</a>.+}
+#, fuzzy
+#| 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 example of the GNU Project, and explicit appeals from GNU "
+#| "activists helped persuade them, but the code had little overlap with "
+#| "GNU.  BSD systems today use some GNU programs, just as the GNU system and "
+#| "its variants use some BSD programs; however, taken as wholes, they are "
+#| "two different systems that evolved separately.  The BSD developers did "
+#| "not write a kernel and add it to the GNU system, and a name like GNU/BSD "
+#| "would not fit the situation.<a href=\"#gnubsd\">(5)</a>"
 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 "
@@ -521,8 +609,8 @@
 "use some GNU programs, just as the GNU system and its variants use some BSD "
 "programs; however, taken as wholes, they are two different systems that "
 "evolved separately.  The BSD developers did not write a kernel and add it to "
-"the GNU system, and a name like GNU/BSD would not fit the situation.<a href="
-"\"#gnubsd\">(5)</a>"
+"the GNU system, and a name like GNU/BSD would not fit the situation&#8239;<a "
+"class=\"ftn\" href=\"#gnubsd\">[5]</a>."
 msgstr ""
 "Lidé se někdy ptají, jestli je BSD také verzí GNU podobně jako 
GNU/Linux. "
 "Vývojáři BSD se inspirovali projektem GNU a také svůj systém učinili "

Index: po/linux-and-gnu.de-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.de-diff.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- po/linux-and-gnu.de-diff.html       11 Oct 2021 09:34:51 -0000      1.8
+++ po/linux-and-gnu.de-diff.html       2 Nov 2021 14:41:53 -0000       1.9
@@ -12,23 +12,31 @@
 <body><pre>
 &lt;!--#include virtual="/server/header.html" --&gt;
 &lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.84</strong></del></span> <span 
class="inserted"><ins><em>1.96 --&gt;
-&lt;!-- This page is derived from 
/server/standards/boilerplate.html</em></ins></span> --&gt;
+&lt;!-- This page is derived from /server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="gnulinux" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</em></ins></span> --&gt;
 &lt;title&gt;Linux and GNU
 - GNU Project - Free Software Foundation&lt;/title&gt;
+<span class="inserted"><ins><em>&lt;style type="text/css" 
media="print,screen"&gt;&lt;!--
+a.ftn { font-size: .94em; }
+--&gt;&lt;/style&gt;</em></ins></span>
 &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="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&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 &lt;a 
href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&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"&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="announcement"&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;,
+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;/blockquote&gt;
 &lt;/div&gt;</strong></del></span>
@@ -133,11 +141,12 @@
 to make it one.  We made a list of the programs needed to make
 a &lt;em&gt;complete&lt;/em&gt; free system, and we systematically found, 
wrote,
 or found people to write everything on the list.  We wrote essential
-but unexciting
-&lt;a href="#unexciting"&gt;(1)&lt;/a&gt; components because you can't have a 
system
+but <span class="removed"><del><strong>unexciting
+&lt;a href="#unexciting"&gt;(1)&lt;/a&gt;</strong></del></span> <span 
class="inserted"><ins><em>unexciting&#8239;&lt;a class="ftn" 
href="#unexciting"&gt;[1]&lt;/a&gt;</em></ins></span> components
+because you can't have a system
 without them.  Some of our system components, the programming tools,
 became popular on their own among programmers, but we wrote many
-components that are not tools  &lt;a href="#nottools"&gt;(2)&lt;/a&gt;.  We 
even
+components that are not <span class="removed"><del><strong>tools  &lt;a 
href="#nottools"&gt;(2)&lt;/a&gt;.</strong></del></span> <span 
class="inserted"><ins><em>tools&#8239;&lt;a class="ftn" 
href="#nottools"&gt;[2]&lt;/a&gt;.</em></ins></span>  We even
 developed a chess game, GNU Chess, because a complete system needs
 games too.&lt;/p&gt;
 
@@ -155,13 +164,15 @@
 Once Torvalds freed Linux in 1992, it fit into the last major gap in
 the GNU system.  People could
 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
+combine Linux with the GNU system&lt;/a&gt; to make a complete free <span 
class="removed"><del><strong>system
+&mdash; a</strong></del></span> <span 
class="inserted"><ins><em>system&mdash;a</em></ins></span>
+version of the GNU system which also contained Linux.  The
 GNU/Linux system, in other words.&lt;/p&gt;
 
 &lt;p&gt;
 Making them work well together was not a trivial job.  Some GNU
-components&lt;a href="#somecomponents"&gt;(3)&lt;/a&gt; needed substantial 
change
+<span class="removed"><del><strong>components&lt;a 
href="#somecomponents"&gt;(3)&lt;/a&gt;</strong></del></span>
+<span class="inserted"><ins><em>components&#8239;&lt;a class="ftn" 
href="#somecomponents"&gt;[3]&lt;/a&gt;</em></ins></span> needed substantial 
change
 to work with Linux.  Integrating a complete system as a distribution
 that would work &ldquo;out of the box&rdquo; was a big job, too.  It
 required addressing the issue of how to install and boot the
@@ -209,9 +220,9 @@
 
 &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;
-<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
+reference, this page and &lt;a <span 
class="removed"><del><strong>href="/gnu/the-gnu-project.html"&gt;
+http://www.gnu.org/gnu/the-gnu-project.html&lt;/a&gt;</strong></del></span> 
<span class="inserted"><ins><em>href="/gnu/thegnuproject.html"&gt;
+https://www.gnu.org/gnu/thegnuproject.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 <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;
@@ -226,7 +237,8 @@
 a free Unix-like operating system.  This system is known as BSD, and
 it was developed at UC Berkeley.  It was <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> in the 80s, but
 became free in the early 90s.  A free operating system that exists
-today&lt;a href="#newersystems"&gt;(4)&lt;/a&gt; is almost certainly either a
+<span class="removed"><del><strong>today&lt;a 
href="#newersystems"&gt;(4)&lt;/a&gt;</strong></del></span>
+<span class="inserted"><ins><em>today&#8239;&lt;a class="ftn" 
href="#newersystems"&gt;[4]&lt;/a&gt;</em></ins></span> is almost certainly 
either a
 variant of the GNU system, or a kind of BSD system.&lt;/p&gt;
 
 &lt;p&gt;
@@ -238,11 +250,12 @@
 system and its variants use some BSD programs; however, taken as
 wholes, they are two different systems that evolved separately.  The
 BSD developers did not write a kernel and add it to the GNU system,
-and a name like GNU/BSD would not fit the situation.&lt;a
+and a name like GNU/BSD would not fit the <span 
class="removed"><del><strong>situation.&lt;a
 href="#gnubsd"&gt;(5)&lt;/a&gt;&lt;/p&gt;
 
-<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&gt;Notes:&lt;/h3&gt;</strong></del></span> <span 
class="inserted"><ins><em>situation&#8239;&lt;a class="ftn"
+href="#gnubsd"&gt;[5]&lt;/a&gt;.&lt;/p&gt;
+&lt;div class="column-limit"&gt;&lt;/div&gt;
 
 &lt;h3 class="footnote"&gt;Footnotes&lt;/h3&gt;</em></ins></span>
 &lt;ol&gt;
@@ -350,7 +363,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/10/11 09:34:51 $
+$Date: 2021/11/02 14:41:53 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: po/linux-and-gnu.de.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.de.po,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- po/linux-and-gnu.de.po      11 Oct 2021 09:34:51 -0000      1.50
+++ po/linux-and-gnu.de.po      2 Nov 2021 14:41:53 -0000       1.51
@@ -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-10-11 09:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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"
@@ -272,6 +272,36 @@
 
 # ab hier Korrekturlesen, 2.5.2013
 #. type: Content of: <div><p>
+# | 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
+# | is <em>an integrated system</em>&mdash;and not just a collection of useful
+# | programs&mdash;is because the GNU Project set out to make it one.  We made
+# | a list of the programs needed to make a <em>complete</em> free system, and
+# | we systematically found, wrote, or found people to write everything on the
+# | list.  We wrote essential but [-unexciting <a
+# | href=\"#unexciting\">(1)</a>-] {+unexciting&#8239;<a class=\"ftn\"
+# | href=\"#unexciting\">[1]</a>+} components because you can't have a system
+# | without them.  Some of our system components, the programming tools,
+# | became popular on their own among programmers, but we wrote many
+# | components that are not [-tools <a href=\"#nottools\">(2)</a>.-]
+# | {+tools&#8239;<a class=\"ftn\" href=\"#nottools\">[2]</a>.+}  We even
+# | developed a chess game, GNU Chess, because a complete system needs games
+# | too.
+#, fuzzy
+#| 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 is <em>an integrated system</em>&mdash;and not just a collection of "
+#| "useful programs&mdash;is because the GNU Project set out to make it one.  "
+#| "We made a list of the programs needed to make a <em>complete</em> free "
+#| "system, and we systematically found, wrote, or found people to write "
+#| "everything on the list.  We wrote essential but unexciting <a href="
+#| "\"#unexciting\">(1)</a> components because you can't have a system "
+#| "without them.  Some of our system components, the programming tools, "
+#| "became popular on their own among programmers, but we wrote many "
+#| "components that are not tools <a href=\"#nottools\">(2)</a>.  We even "
+#| "developed a chess game, GNU Chess, because a complete system needs games "
+#| "too."
 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 "
@@ -279,12 +309,12 @@
 "programs&mdash;is because the GNU Project set out to make it one.  We made a "
 "list of the programs needed to make a <em>complete</em> free system, and we "
 "systematically found, wrote, or found people to write everything on the "
-"list.  We wrote essential but unexciting <a href=\"#unexciting\">(1)</a> "
-"components because you can't have a system without them.  Some of our system "
-"components, the programming tools, became popular on their own among "
-"programmers, but we wrote many components that are not tools <a href="
-"\"#nottools\">(2)</a>.  We even developed a chess game, GNU Chess, because a "
-"complete system needs games too."
+"list.  We wrote essential but unexciting&#8239;<a class=\"ftn\" href="
+"\"#unexciting\">[1]</a> components because you can't have a system without "
+"them.  Some of our system components, the programming tools, became popular "
+"on their own among programmers, but we wrote many components that are not "
+"tools&#8239;<a class=\"ftn\" href=\"#nottools\">[2]</a>.  We even developed "
+"a chess game, GNU Chess, because a complete system needs games too."
 msgstr ""
 "Viele haben maßgebliche Beiträge zu der freien Software im System 
geleistet, "
 "und sie alle verdienen Anerkennung für ihre Software. Aber der Grund, "
@@ -324,9 +354,9 @@
 # | 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.
+# | combine Linux with the GNU system</a> to make a complete free [-system
+# | &mdash; a-] {+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 "
@@ -341,8 +371,8 @@
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
 "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."
+"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 ""
 "Glücklicherweise mussten wir wegen Linux nicht auf Hurd warten. Nachdem "
 "Torvalds im Jahr 1992 Linux freigegebenen hatte, füllte es die letzte große 
"
@@ -354,16 +384,37 @@
 "Worten: das GNU/Linux-System."
 
 #. 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 "
-"Linux.  Integrating a complete system as a distribution that would work "
-"&ldquo;out of the box&rdquo; was a big job, too.  It required addressing the "
-"issue of how to install and boot the system&mdash;a problem we had not "
-"tackled, because we hadn't yet reached that point.  Thus, the people who "
-"developed the various system distributions did a lot of essential work.  But "
-"it was work that, in the nature of things, was surely going to be done by "
-"someone."
+# | Making them work well together was not a trivial job.  Some GNU
+# | [-components<a href=\"#somecomponents\">(3)</a>-] {+components&#8239;<a
+# | class=\"ftn\" href=\"#somecomponents\">[3]</a>+} needed substantial change
+# | to work with Linux.  Integrating a complete system as a distribution that
+# | would work &ldquo;out of the box&rdquo; was a big job, too.  It required
+# | addressing the issue of how to install and boot the system&mdash;a problem
+# | we had not tackled, because we hadn't yet reached that point.  Thus, the
+# | people who developed the various system distributions did a lot of
+# | essential work.  But it was work that, in the nature of things, was surely
+# | going to be done by someone.
+#, fuzzy
+#| 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 Linux.  Integrating a complete system as a distribution that "
+#| "would work &ldquo;out of the box&rdquo; was a big job, too.  It required "
+#| "addressing the issue of how to install and boot the system&mdash;a "
+#| "problem we had not tackled, because we hadn't yet reached that point.  "
+#| "Thus, the people who developed the various system distributions did a lot "
+#| "of essential work.  But it was work that, in the nature of things, was "
+#| "surely going to be done by someone."
+msgid ""
+"Making them work well together was not a trivial job.  Some GNU "
+"components&#8239;<a class=\"ftn\" href=\"#somecomponents\">[3]</a> needed "
+"substantial change to work with Linux.  Integrating a complete system as a "
+"distribution that would work &ldquo;out of the box&rdquo; was a big job, "
+"too.  It required addressing the issue of how to install and boot the "
+"system&mdash;a problem we had not tackled, because we hadn't yet reached "
+"that point.  Thus, the people who developed the various system distributions "
+"did a lot of essential work.  But it was work that, in the nature of things, "
+"was surely going to be done by someone."
 msgstr ""
 "Damit sie gut zusammenarbeiten, war keine triviale Aufgabe. Einige GNU-"
 "Komponenten<a href=\"#somecomponents\" id=\"somecomponents-ref\" class="
@@ -516,11 +567,12 @@
 # (Service Temporarily Unavailable) -> 
https://web.archive.org/web/20091004063519/http://foldoc.org/Linux
 #. 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>-]
+# | reference, this page and <a [-href=\"/gnu/the-gnu-project.html\">
+# | http://www.gnu.org/gnu/the-gnu-project.html</a>-]
+# | {+href=\"/gnu/thegnuproject.html\">
+# | https://www.gnu.org/gnu/thegnuproject.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
@@ -533,10 +585,10 @@
 #| "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\"> 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=\"https://";
-"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
+"this page and <a href=\"/gnu/thegnuproject.html\"> https://www.gnu.org/gnu/";
+"thegnuproject.html</a> are good choices.  If you mention Linux, the 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://";
@@ -553,9 +605,10 @@
 # | 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
-# | in the early 90s.  A free operating system that exists today<a
-# | href=\"#newersystems\">(4)</a> is almost certainly either a variant of the
-# | GNU system, or a kind of BSD system.
+# | in the early 90s.  A free operating system that exists [-today<a
+# | href=\"#newersystems\">(4)</a>-] {+today&#8239;<a class=\"ftn\"
+# | href=\"#newersystems\">[4]</a>+} is almost certainly either a variant of
+# | the GNU system, or a kind of BSD system.
 #, fuzzy
 #| msgid ""
 #| "Aside from GNU, one other project has independently produced a free Unix-"
@@ -568,9 +621,9 @@
 "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 the early 90s.  "
-"A free operating system that exists today<a href=\"#newersystems\">(4)</a> "
-"is almost certainly either a variant of the GNU system, or a kind of BSD "
-"system."
+"A free operating system that exists today&#8239;<a class=\"ftn\" href="
+"\"#newersystems\">[4]</a> is almost certainly either a variant of the GNU "
+"system, or a kind of BSD system."
 msgstr ""
 "Abgesehen von GNU hat ein anderes Projekt unabhängig ein freies unixoides "
 "Betriebssystem hergestellt. Dieses System ist als BSD bekannt und wurde an "
@@ -582,6 +635,27 @@
 "von BSD-System."
 
 #. 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
+# | persuade them, but the code had little overlap with GNU.  BSD systems
+# | today use some GNU programs, just as the GNU system and its variants use
+# | some BSD programs; however, taken as wholes, they are two different
+# | systems that evolved separately.  The BSD developers did not write a
+# | kernel and add it to the GNU system, and a name like GNU/BSD would not fit
+# | the [-situation.<a href=\"#gnubsd\">(5)</a>-] {+situation&#8239;<a
+# | class=\"ftn\" href=\"#gnubsd\">[5]</a>.+}
+#, fuzzy
+#| 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 example of the GNU Project, and explicit appeals from GNU "
+#| "activists helped persuade them, but the code had little overlap with "
+#| "GNU.  BSD systems today use some GNU programs, just as the GNU system and "
+#| "its variants use some BSD programs; however, taken as wholes, they are "
+#| "two different systems that evolved separately.  The BSD developers did "
+#| "not write a kernel and add it to the GNU system, and a name like GNU/BSD "
+#| "would not fit the situation.<a href=\"#gnubsd\">(5)</a>"
 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 "
@@ -590,8 +664,8 @@
 "use some GNU programs, just as the GNU system and its variants use some BSD "
 "programs; however, taken as wholes, they are two different systems that "
 "evolved separately.  The BSD developers did not write a kernel and add it to "
-"the GNU system, and a name like GNU/BSD would not fit the situation.<a href="
-"\"#gnubsd\">(5)</a>"
+"the GNU system, and a name like GNU/BSD would not fit the situation&#8239;<a "
+"class=\"ftn\" href=\"#gnubsd\">[5]</a>."
 msgstr ""
 "Manchmal wird angefragt, ob BSD auch eine Variante von GNU sei, wie GNU/"
 "Linux. Die BSD-Entwickler wurden angeregt, ihren Quellcode am Beispiel des "

Index: po/linux-and-gnu.el-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.el-diff.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- po/linux-and-gnu.el-diff.html       11 Oct 2021 09:34:51 -0000      1.18
+++ po/linux-and-gnu.el-diff.html       2 Nov 2021 14:41:53 -0000       1.19
@@ -12,23 +12,31 @@
 <body><pre>
 &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;!-- This page is derived from /server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="gnulinux" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</em></ins></span> --&gt;
 &lt;title&gt;Linux and GNU
 - GNU Project - Free Software Foundation&lt;/title&gt;
+<span class="inserted"><ins><em>&lt;style type="text/css" 
media="print,screen"&gt;&lt;!--
+a.ftn { font-size: .94em; }
+--&gt;&lt;/style&gt;</em></ins></span>
 &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="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&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 &lt;a 
href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&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"&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="announcement"&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;,
+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;/blockquote&gt;
 &lt;/div&gt;</strong></del></span>
@@ -133,11 +141,12 @@
 to make it one.  We made a list of the programs needed to make
 a &lt;em&gt;complete&lt;/em&gt; free system, and we systematically found, 
wrote,
 or found people to write everything on the list.  We wrote essential
-but unexciting
-&lt;a href="#unexciting"&gt;(1)&lt;/a&gt; components because you can't have a 
system
+but <span class="removed"><del><strong>unexciting
+&lt;a href="#unexciting"&gt;(1)&lt;/a&gt;</strong></del></span> <span 
class="inserted"><ins><em>unexciting&#8239;&lt;a class="ftn" 
href="#unexciting"&gt;[1]&lt;/a&gt;</em></ins></span> components
+because you can't have a system
 without them.  Some of our system components, the programming tools,
 became popular on their own among programmers, but we wrote many
-components that are not tools  &lt;a href="#nottools"&gt;(2)&lt;/a&gt;.  We 
even
+components that are not <span class="removed"><del><strong>tools  &lt;a 
href="#nottools"&gt;(2)&lt;/a&gt;.</strong></del></span> <span 
class="inserted"><ins><em>tools&#8239;&lt;a class="ftn" 
href="#nottools"&gt;[2]&lt;/a&gt;.</em></ins></span>  We even
 developed a chess game, GNU Chess, because a complete system needs
 games too.&lt;/p&gt;
 
@@ -155,13 +164,15 @@
 Once Torvalds freed Linux in 1992, it fit into the last major gap in
 the GNU system.  People could
 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
+combine Linux with the GNU system&lt;/a&gt; to make a complete free <span 
class="removed"><del><strong>system
+&mdash; a</strong></del></span> <span 
class="inserted"><ins><em>system&mdash;a</em></ins></span>
+version of the GNU system which also contained Linux.  The
 GNU/Linux system, in other words.&lt;/p&gt;
 
 &lt;p&gt;
 Making them work well together was not a trivial job.  Some GNU
-components&lt;a href="#somecomponents"&gt;(3)&lt;/a&gt; needed substantial 
change
+<span class="removed"><del><strong>components&lt;a 
href="#somecomponents"&gt;(3)&lt;/a&gt;</strong></del></span>
+<span class="inserted"><ins><em>components&#8239;&lt;a class="ftn" 
href="#somecomponents"&gt;[3]&lt;/a&gt;</em></ins></span> needed substantial 
change
 to work with Linux.  Integrating a complete system as a distribution
 that would work &ldquo;out of the box&rdquo; was a big job, too.  It
 required addressing the issue of how to install and boot the
@@ -209,9 +220,9 @@
 
 &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;
-<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
+reference, this page and &lt;a <span 
class="removed"><del><strong>href="/gnu/the-gnu-project.html"&gt;
+http://www.gnu.org/gnu/the-gnu-project.html&lt;/a&gt;</strong></del></span> 
<span class="inserted"><ins><em>href="/gnu/thegnuproject.html"&gt;
+https://www.gnu.org/gnu/thegnuproject.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 <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;
@@ -226,7 +237,8 @@
 a free Unix-like operating system.  This system is known as BSD, and
 it was developed at UC Berkeley.  It was <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> in the 80s, but
 became free in the early 90s.  A free operating system that exists
-today&lt;a href="#newersystems"&gt;(4)&lt;/a&gt; is almost certainly either a
+<span class="removed"><del><strong>today&lt;a 
href="#newersystems"&gt;(4)&lt;/a&gt;</strong></del></span>
+<span class="inserted"><ins><em>today&#8239;&lt;a class="ftn" 
href="#newersystems"&gt;[4]&lt;/a&gt;</em></ins></span> is almost certainly 
either a
 variant of the GNU system, or a kind of BSD system.&lt;/p&gt;
 
 &lt;p&gt;
@@ -238,11 +250,12 @@
 system and its variants use some BSD programs; however, taken as
 wholes, they are two different systems that evolved separately.  The
 BSD developers did not write a kernel and add it to the GNU system,
-and a name like GNU/BSD would not fit the situation.&lt;a
+and a name like GNU/BSD would not fit the <span 
class="removed"><del><strong>situation.&lt;a
 href="#gnubsd"&gt;(5)&lt;/a&gt;&lt;/p&gt;
 
-<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&gt;Notes:&lt;/h3&gt;</strong></del></span> <span 
class="inserted"><ins><em>situation&#8239;&lt;a class="ftn"
+href="#gnubsd"&gt;[5]&lt;/a&gt;.&lt;/p&gt;
+&lt;div class="column-limit"&gt;&lt;/div&gt;
 
 &lt;h3 class="footnote"&gt;Footnotes&lt;/h3&gt;</em></ins></span>
 &lt;ol&gt;
@@ -350,7 +363,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/10/11 09:34:51 $
+$Date: 2021/11/02 14:41:53 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: po/linux-and-gnu.el.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.el.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- po/linux-and-gnu.el.po      11 Oct 2021 09:34:51 -0000      1.20
+++ po/linux-and-gnu.el.po      2 Nov 2021 14:41:53 -0000       1.21
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-10-11 09:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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"
@@ -278,6 +278,36 @@
 "το Unix σύστημα</em>: το GNU."
 
 #. type: Content of: <div><p>
+# | 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
+# | is <em>an integrated system</em>&mdash;and not just a collection of useful
+# | programs&mdash;is because the GNU Project set out to make it one.  We made
+# | a list of the programs needed to make a <em>complete</em> free system, and
+# | we systematically found, wrote, or found people to write everything on the
+# | list.  We wrote essential but [-unexciting <a
+# | href=\"#unexciting\">(1)</a>-] {+unexciting&#8239;<a class=\"ftn\"
+# | href=\"#unexciting\">[1]</a>+} components because you can't have a system
+# | without them.  Some of our system components, the programming tools,
+# | became popular on their own among programmers, but we wrote many
+# | components that are not [-tools <a href=\"#nottools\">(2)</a>.-]
+# | {+tools&#8239;<a class=\"ftn\" href=\"#nottools\">[2]</a>.+}  We even
+# | developed a chess game, GNU Chess, because a complete system needs games
+# | too.
+#, fuzzy
+#| 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 is <em>an integrated system</em>&mdash;and not just a collection of "
+#| "useful programs&mdash;is because the GNU Project set out to make it one.  "
+#| "We made a list of the programs needed to make a <em>complete</em> free "
+#| "system, and we systematically found, wrote, or found people to write "
+#| "everything on the list.  We wrote essential but unexciting <a href="
+#| "\"#unexciting\">(1)</a> components because you can't have a system "
+#| "without them.  Some of our system components, the programming tools, "
+#| "became popular on their own among programmers, but we wrote many "
+#| "components that are not tools <a href=\"#nottools\">(2)</a>.  We even "
+#| "developed a chess game, GNU Chess, because a complete system needs games "
+#| "too."
 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 "
@@ -285,12 +315,12 @@
 "programs&mdash;is because the GNU Project set out to make it one.  We made a "
 "list of the programs needed to make a <em>complete</em> free system, and we "
 "systematically found, wrote, or found people to write everything on the "
-"list.  We wrote essential but unexciting <a href=\"#unexciting\">(1)</a> "
-"components because you can't have a system without them.  Some of our system "
-"components, the programming tools, became popular on their own among "
-"programmers, but we wrote many components that are not tools <a href="
-"\"#nottools\">(2)</a>.  We even developed a chess game, GNU Chess, because a "
-"complete system needs games too."
+"list.  We wrote essential but unexciting&#8239;<a class=\"ftn\" href="
+"\"#unexciting\">[1]</a> components because you can't have a system without "
+"them.  Some of our system components, the programming tools, became popular "
+"on their own among programmers, but we wrote many components that are not "
+"tools&#8239;<a class=\"ftn\" href=\"#nottools\">[2]</a>.  We even developed "
+"a chess game, GNU Chess, because a complete system needs games too."
 msgstr ""
 "Πολλοί άνθρωποι έχουν κάνει κύριες συ
νεισφορές στο ελεύθερο λογισμικό που "
 "υπάρχει στο σύστημα, και φυσικά όλοι τους 
αξίζουν συγχαρητήρια για το "
@@ -328,9 +358,9 @@
 # | 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.
+# | combine Linux with the GNU system</a> to make a complete free [-system
+# | &mdash; a-] {+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 "
@@ -345,8 +375,8 @@
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
 "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."
+"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 ""
 "Ευτυχώς, δεν χρειάστηκε να περιμένουμε 
την ολοκλήρωση του Hurd, εξαιτίας του "
 "Linux.  Όταν ο Torvalds ελευθέρωσε το Linux το 1992, 
εκείνο ταίριαξε στο "
@@ -357,16 +387,37 @@
 "που περιείχε επίσης το Linux.  Το GNU/Linux 
σύστημα με άλλα λόγια. "
 
 #. 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 "
-"Linux.  Integrating a complete system as a distribution that would work "
-"&ldquo;out of the box&rdquo; was a big job, too.  It required addressing the "
-"issue of how to install and boot the system&mdash;a problem we had not "
-"tackled, because we hadn't yet reached that point.  Thus, the people who "
-"developed the various system distributions did a lot of essential work.  But "
-"it was work that, in the nature of things, was surely going to be done by "
-"someone."
+# | Making them work well together was not a trivial job.  Some GNU
+# | [-components<a href=\"#somecomponents\">(3)</a>-] {+components&#8239;<a
+# | class=\"ftn\" href=\"#somecomponents\">[3]</a>+} needed substantial change
+# | to work with Linux.  Integrating a complete system as a distribution that
+# | would work &ldquo;out of the box&rdquo; was a big job, too.  It required
+# | addressing the issue of how to install and boot the system&mdash;a problem
+# | we had not tackled, because we hadn't yet reached that point.  Thus, the
+# | people who developed the various system distributions did a lot of
+# | essential work.  But it was work that, in the nature of things, was surely
+# | going to be done by someone.
+#, fuzzy
+#| 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 Linux.  Integrating a complete system as a distribution that "
+#| "would work &ldquo;out of the box&rdquo; was a big job, too.  It required "
+#| "addressing the issue of how to install and boot the system&mdash;a "
+#| "problem we had not tackled, because we hadn't yet reached that point.  "
+#| "Thus, the people who developed the various system distributions did a lot "
+#| "of essential work.  But it was work that, in the nature of things, was "
+#| "surely going to be done by someone."
+msgid ""
+"Making them work well together was not a trivial job.  Some GNU "
+"components&#8239;<a class=\"ftn\" href=\"#somecomponents\">[3]</a> needed "
+"substantial change to work with Linux.  Integrating a complete system as a "
+"distribution that would work &ldquo;out of the box&rdquo; was a big job, "
+"too.  It required addressing the issue of how to install and boot the "
+"system&mdash;a problem we had not tackled, because we hadn't yet reached "
+"that point.  Thus, the people who developed the various system distributions "
+"did a lot of essential work.  But it was work that, in the nature of things, "
+"was surely going to be done by someone."
 msgstr ""
 "Δεν ήταν μια τετριμμένη εργασία το να τα 
κάνουμε να δουλεύουν καλά μαζί.  "
 "Μερικά GNU συστατικά<a href=\"#somecomponents\">(3)</a> 
χρειαζόταν "
@@ -517,11 +568,12 @@
 
 #. 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>-]
+# | reference, this page and <a [-href=\"/gnu/the-gnu-project.html\">
+# | http://www.gnu.org/gnu/the-gnu-project.html</a>-]
+# | {+href=\"/gnu/thegnuproject.html\">
+# | https://www.gnu.org/gnu/thegnuproject.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
@@ -534,10 +586,10 @@
 #| "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\"> 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=\"https://";
-"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
+"this page and <a href=\"/gnu/thegnuproject.html\"> https://www.gnu.org/gnu/";
+"thegnuproject.html</a> are good choices.  If you mention Linux, the 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\"> "
@@ -551,13 +603,28 @@
 msgstr "Συμπλήρωμα"
 
 #. 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
+# | the early 90s.  A free operating system that exists [-today<a
+# | href=\"#newersystems\">(4)</a>-] {+today&#8239;<a class=\"ftn\"
+# | href=\"#newersystems\">[4]</a>+} is almost certainly either a variant of
+# | the GNU system, or a kind of BSD system.
+#, fuzzy
+#| 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 UC Berkeley.  It was nonfree in the 80s, but became free in the early "
+#| "90s.  A free operating system that exists today<a href=\"#newersystems\">"
+#| "(4)</a> is almost certainly either a variant of the GNU system, or a kind "
+#| "of BSD system."
 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 "
 "UC Berkeley.  It was nonfree in the 80s, but became free in the early 90s.  "
-"A free operating system that exists today<a href=\"#newersystems\">(4)</a> "
-"is almost certainly either a variant of the GNU system, or a kind of BSD "
-"system."
+"A free operating system that exists today&#8239;<a class=\"ftn\" href="
+"\"#newersystems\">[4]</a> is almost certainly either a variant of the GNU "
+"system, or a kind of BSD system."
 msgstr ""
 "Εκτός από το GNU, ένα ακόμη έργο παρήγαγε 
ανεξάρτητα ένα ελεύθερο, παρόμοιο "
 "με το Unix λειτουργικό σύστημα.  Το σύστημα 
αυτό είναι γνωστό ως BSD και "
@@ -567,6 +634,27 @@
 "είτε μια παραλλαγή του συστήματος GNU, είτε 
ένα είδος του συστήματος BSD."
 
 #. 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
+# | persuade them, but the code had little overlap with GNU.  BSD systems
+# | today use some GNU programs, just as the GNU system and its variants use
+# | some BSD programs; however, taken as wholes, they are two different
+# | systems that evolved separately.  The BSD developers did not write a
+# | kernel and add it to the GNU system, and a name like GNU/BSD would not fit
+# | the [-situation.<a href=\"#gnubsd\">(5)</a>-] {+situation&#8239;<a
+# | class=\"ftn\" href=\"#gnubsd\">[5]</a>.+}
+#, fuzzy
+#| 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 example of the GNU Project, and explicit appeals from GNU "
+#| "activists helped persuade them, but the code had little overlap with "
+#| "GNU.  BSD systems today use some GNU programs, just as the GNU system and "
+#| "its variants use some BSD programs; however, taken as wholes, they are "
+#| "two different systems that evolved separately.  The BSD developers did "
+#| "not write a kernel and add it to the GNU system, and a name like GNU/BSD "
+#| "would not fit the situation.<a href=\"#gnubsd\">(5)</a>"
 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 "
@@ -575,8 +663,8 @@
 "use some GNU programs, just as the GNU system and its variants use some BSD "
 "programs; however, taken as wholes, they are two different systems that "
 "evolved separately.  The BSD developers did not write a kernel and add it to "
-"the GNU system, and a name like GNU/BSD would not fit the situation.<a href="
-"\"#gnubsd\">(5)</a>"
+"the GNU system, and a name like GNU/BSD would not fit the situation&#8239;<a "
+"class=\"ftn\" href=\"#gnubsd\">[5]</a>."
 msgstr ""
 "Ο κόσμος ρωτάει μερικές φορές εάν το BSD 
είναι επίσης μια έκδοση του GNU, "
 "όπως το GNU/Linux.  Οι προγραμματιστές του BSD 
εμπνεύστηκαν να κάνουν τον "

Index: po/linux-and-gnu.es.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.es.po,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- po/linux-and-gnu.es.po      12 Oct 2021 09:34:14 -0000      1.83
+++ po/linux-and-gnu.es.po      2 Nov 2021 14:41:53 -0000       1.84
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-10-11 09:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2021-10-12 10:58+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-11-02 14:27+0000\n"
 "X-Generator: Poedit 2.2.1\n"
 
 # type: Content of: <title>
@@ -228,6 +229,36 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><p>
+# | 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
+# | is <em>an integrated system</em>&mdash;and not just a collection of useful
+# | programs&mdash;is because the GNU Project set out to make it one.  We made
+# | a list of the programs needed to make a <em>complete</em> free system, and
+# | we systematically found, wrote, or found people to write everything on the
+# | list.  We wrote essential but [-unexciting <a
+# | href=\"#unexciting\">(1)</a>-] {+unexciting&#8239;<a class=\"ftn\"
+# | href=\"#unexciting\">[1]</a>+} components because you can't have a system
+# | without them.  Some of our system components, the programming tools,
+# | became popular on their own among programmers, but we wrote many
+# | components that are not [-tools <a href=\"#nottools\">(2)</a>.-]
+# | {+tools&#8239;<a class=\"ftn\" href=\"#nottools\">[2]</a>.+}  We even
+# | developed a chess game, GNU Chess, because a complete system needs games
+# | too.
+#, fuzzy
+#| 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 is <em>an integrated system</em>&mdash;and not just a collection of "
+#| "useful programs&mdash;is because the GNU Project set out to make it one.  "
+#| "We made a list of the programs needed to make a <em>complete</em> free "
+#| "system, and we systematically found, wrote, or found people to write "
+#| "everything on the list.  We wrote essential but unexciting <a href="
+#| "\"#unexciting\">(1)</a> components because you can't have a system "
+#| "without them.  Some of our system components, the programming tools, "
+#| "became popular on their own among programmers, but we wrote many "
+#| "components that are not tools <a href=\"#nottools\">(2)</a>.  We even "
+#| "developed a chess game, GNU Chess, because a complete system needs games "
+#| "too."
 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,12 +266,12 @@
 "programs&mdash;is because the GNU Project set out to make it one.  We made a "
 "list of the programs needed to make a <em>complete</em> free system, and we "
 "systematically found, wrote, or found people to write everything on the "
-"list.  We wrote essential but unexciting <a href=\"#unexciting\">(1)</a> "
-"components because you can't have a system without them.  Some of our system "
-"components, the programming tools, became popular on their own among "
-"programmers, but we wrote many components that are not tools <a href="
-"\"#nottools\">(2)</a>.  We even developed a chess game, GNU Chess, because a "
-"complete system needs games too."
+"list.  We wrote essential but unexciting&#8239;<a class=\"ftn\" href="
+"\"#unexciting\">[1]</a> components because you can't have a system without "
+"them.  Some of our system components, the programming tools, became popular "
+"on their own among programmers, but we wrote many components that are not "
+"tools&#8239;<a class=\"ftn\" href=\"#nottools\">[2]</a>.  We even developed "
+"a chess game, GNU Chess, because a complete system needs games too."
 msgstr ""
 "Mucha gente ha hecho importantes contribuciones al software libre del "
 "sistema, y todos ellos merecen un reconocimiento por su trabajo, pero la "
@@ -277,13 +308,29 @@
 
 # type: Content of: <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=\"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-] {+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=\"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."
 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=\"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."
+"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 ""
 "Afortunadamente no tuvimos que esperar hasta que Hurd estuviera listo, "
 "porque Linux ya estaba disponible. Cuando  Torvalds liberó Linux en 1992, se 
"
@@ -295,16 +342,37 @@
 
 # type: Content of: <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 "
-"Linux.  Integrating a complete system as a distribution that would work "
-"&ldquo;out of the box&rdquo; was a big job, too.  It required addressing the "
-"issue of how to install and boot the system&mdash;a problem we had not "
-"tackled, because we hadn't yet reached that point.  Thus, the people who "
-"developed the various system distributions did a lot of essential work.  But "
-"it was work that, in the nature of things, was surely going to be done by "
-"someone."
+# | Making them work well together was not a trivial job.  Some GNU
+# | [-components<a href=\"#somecomponents\">(3)</a>-] {+components&#8239;<a
+# | class=\"ftn\" href=\"#somecomponents\">[3]</a>+} needed substantial change
+# | to work with Linux.  Integrating a complete system as a distribution that
+# | would work &ldquo;out of the box&rdquo; was a big job, too.  It required
+# | addressing the issue of how to install and boot the system&mdash;a problem
+# | we had not tackled, because we hadn't yet reached that point.  Thus, the
+# | people who developed the various system distributions did a lot of
+# | essential work.  But it was work that, in the nature of things, was surely
+# | going to be done by someone.
+#, fuzzy
+#| 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 Linux.  Integrating a complete system as a distribution that "
+#| "would work &ldquo;out of the box&rdquo; was a big job, too.  It required "
+#| "addressing the issue of how to install and boot the system&mdash;a "
+#| "problem we had not tackled, because we hadn't yet reached that point.  "
+#| "Thus, the people who developed the various system distributions did a lot "
+#| "of essential work.  But it was work that, in the nature of things, was "
+#| "surely going to be done by someone."
+msgid ""
+"Making them work well together was not a trivial job.  Some GNU "
+"components&#8239;<a class=\"ftn\" href=\"#somecomponents\">[3]</a> needed "
+"substantial change to work with Linux.  Integrating a complete system as a "
+"distribution that would work &ldquo;out of the box&rdquo; was a big job, "
+"too.  It required addressing the issue of how to install and boot the "
+"system&mdash;a problem we had not tackled, because we hadn't yet reached "
+"that point.  Thus, the people who developed the various system distributions "
+"did a lot of essential work.  But it was work that, in the nature of things, "
+"was surely going to be done by someone."
 msgstr ""
 "Lograr que ambos funcionasen juntos correctamente no fue una tarea trivial. "
 "Hubo que realizar cambios sustanciales en algunos componentes de GNU <a href="
@@ -393,12 +461,28 @@
 
 # type: Content of: <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\">
+# | https://www.gnu.org/gnu/the-gnu-project.html</a>-]
+# | {+href=\"/gnu/thegnuproject.html\">
+# | https://www.gnu.org/gnu/thegnuproject.html</a>+} are good choices.  If you
+# | mention Linux, the 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.
+#, 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\"> 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=\"https://foldoc.org/linux\";>https://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\"> 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=\"https://";
-"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
+"this page and <a href=\"/gnu/thegnuproject.html\"> https://www.gnu.org/gnu/";
+"thegnuproject.html</a> are good choices.  If you mention Linux, the 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"
@@ -413,13 +497,28 @@
 
 # type: Content of: <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
+# | the early 90s.  A free operating system that exists [-today<a
+# | href=\"#newersystems\">(4)</a>-] {+today&#8239;<a class=\"ftn\"
+# | href=\"#newersystems\">[4]</a>+} is almost certainly either a variant of
+# | the GNU system, or a kind of BSD system.
+#, fuzzy
+#| 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 UC Berkeley.  It was nonfree in the 80s, but became free in the early "
+#| "90s.  A free operating system that exists today<a href=\"#newersystems\">"
+#| "(4)</a> is almost certainly either a variant of the GNU system, or a kind "
+#| "of BSD system."
 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 "
 "UC Berkeley.  It was nonfree in the 80s, but became free in the early 90s.  "
-"A free operating system that exists today<a href=\"#newersystems\">(4)</a> "
-"is almost certainly either a variant of the GNU system, or a kind of BSD "
-"system."
+"A free operating system that exists today&#8239;<a class=\"ftn\" href="
+"\"#newersystems\">[4]</a> is almost certainly either a variant of the GNU "
+"system, or a kind of BSD system."
 msgstr ""
 "Además de GNU, existe otro proyecto que ha producido de forma independiente "
 "un sistema operativo libre de tipo Unix. Ese sistema se conoce como «BSD» y 
"
@@ -431,6 +530,27 @@
 
 # type: Content of: <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
+# | persuade them, but the code had little overlap with GNU.  BSD systems
+# | today use some GNU programs, just as the GNU system and its variants use
+# | some BSD programs; however, taken as wholes, they are two different
+# | systems that evolved separately.  The BSD developers did not write a
+# | kernel and add it to the GNU system, and a name like GNU/BSD would not fit
+# | the [-situation.<a href=\"#gnubsd\">(5)</a>-] {+situation&#8239;<a
+# | class=\"ftn\" href=\"#gnubsd\">[5]</a>.+}
+#, fuzzy
+#| 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 example of the GNU Project, and explicit appeals from GNU "
+#| "activists helped persuade them, but the code had little overlap with "
+#| "GNU.  BSD systems today use some GNU programs, just as the GNU system and "
+#| "its variants use some BSD programs; however, taken as wholes, they are "
+#| "two different systems that evolved separately.  The BSD developers did "
+#| "not write a kernel and add it to the GNU system, and a name like GNU/BSD "
+#| "would not fit the situation.<a href=\"#gnubsd\">(5)</a>"
 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 "
@@ -439,8 +559,8 @@
 "use some GNU programs, just as the GNU system and its variants use some BSD "
 "programs; however, taken as wholes, they are two different systems that "
 "evolved separately.  The BSD developers did not write a kernel and add it to "
-"the GNU system, and a name like GNU/BSD would not fit the situation.<a href="
-"\"#gnubsd\">(5)</a>"
+"the GNU system, and a name like GNU/BSD would not fit the situation&#8239;<a "
+"class=\"ftn\" href=\"#gnubsd\">[5]</a>."
 msgstr ""
 "La gente  a veces pregunta si también BSD es una versión de GNU, como GNU/"
 "Linux. Los desarrolladores de BSD se inspiraron en el Proyecto GNU para "

Index: po/linux-and-gnu.fa.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.fa.po,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- po/linux-and-gnu.fa.po      11 Oct 2021 09:34:51 -0000      1.46
+++ po/linux-and-gnu.fa.po      2 Nov 2021 14:41:53 -0000       1.47
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-10-11 09:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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"
@@ -234,6 +234,21 @@
 "دهد."
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| 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 is <em>an integrated system</em>&mdash;and not just a collection of "
+#| "useful programs&mdash;is because the GNU Project set out to make it one.  "
+#| "We made a list of the programs needed to make a <em>complete</em> free "
+#| "system, and we systematically found, wrote, or found people to write "
+#| "everything on the list.  We wrote essential but unexciting <a href="
+#| "\"#unexciting\">(1)</a> components because you can't have a system "
+#| "without them.  Some of our system components, the programming tools, "
+#| "became popular on their own among programmers, but we wrote many "
+#| "components that are not tools <a href=\"#nottools\">(2)</a>.  We even "
+#| "developed a chess game, GNU Chess, because a complete system needs games "
+#| "too."
 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 "
@@ -241,12 +256,12 @@
 "programs&mdash;is because the GNU Project set out to make it one.  We made a "
 "list of the programs needed to make a <em>complete</em> free system, and we "
 "systematically found, wrote, or found people to write everything on the "
-"list.  We wrote essential but unexciting <a href=\"#unexciting\">(1)</a> "
-"components because you can't have a system without them.  Some of our system "
-"components, the programming tools, became popular on their own among "
-"programmers, but we wrote many components that are not tools <a href="
-"\"#nottools\">(2)</a>.  We even developed a chess game, GNU Chess, because a "
-"complete system needs games too."
+"list.  We wrote essential but unexciting&#8239;<a class=\"ftn\" href="
+"\"#unexciting\">[1]</a> components because you can't have a system without "
+"them.  Some of our system components, the programming tools, became popular "
+"on their own among programmers, but we wrote many components that are not "
+"tools&#8239;<a class=\"ftn\" href=\"#nottools\">[2]</a>.  We even developed "
+"a chess game, GNU Chess, because a complete system needs games too."
 msgstr ""
 "در این سیستم افراد بسیاری کمک‌های زیادی 
به نرم‌افزار آزاد کرده‌اند و همگی "
 "سزاوار اعتبارند. اما دلیل اینکه سیستم گنو 
یک <em>سیستم مجتمع</em> است و فقط "
@@ -290,8 +305,8 @@
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
 "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."
+"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 ""
 "خوشبختانه لازم نبود منتظر هرد بمانیم، 
زیرا لینوکس در دست است. هنگامیکه لینوس "
 "توروالدز لینوکس را نوشت، آخرین خلاء عمده 
را پر کرد. بنابراین افراد توانستند "
@@ -301,16 +316,27 @@
 "لینوکس."
 
 #. 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 "
-"Linux.  Integrating a complete system as a distribution that would work "
-"&ldquo;out of the box&rdquo; was a big job, too.  It required addressing the "
-"issue of how to install and boot the system&mdash;a problem we had not "
-"tackled, because we hadn't yet reached that point.  Thus, the people who "
-"developed the various system distributions did a lot of essential work.  But "
-"it was work that, in the nature of things, was surely going to be done by "
-"someone."
+#, fuzzy
+#| 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 Linux.  Integrating a complete system as a distribution that "
+#| "would work &ldquo;out of the box&rdquo; was a big job, too.  It required "
+#| "addressing the issue of how to install and boot the system&mdash;a "
+#| "problem we had not tackled, because we hadn't yet reached that point.  "
+#| "Thus, the people who developed the various system distributions did a lot "
+#| "of essential work.  But it was work that, in the nature of things, was "
+#| "surely going to be done by someone."
+msgid ""
+"Making them work well together was not a trivial job.  Some GNU "
+"components&#8239;<a class=\"ftn\" href=\"#somecomponents\">[3]</a> needed "
+"substantial change to work with Linux.  Integrating a complete system as a "
+"distribution that would work &ldquo;out of the box&rdquo; was a big job, "
+"too.  It required addressing the issue of how to install and boot the "
+"system&mdash;a problem we had not tackled, because we hadn't yet reached "
+"that point.  Thus, the people who developed the various system distributions "
+"did a lot of essential work.  But it was work that, in the nature of things, "
+"was surely going to be done by someone."
 msgstr ""
 "در کنار هم قرار دادن آنها ساده به نظر م
ی‌رسد اما این یک کار ساده و ناچیز "
 "نیست. بعضی از اجزای گنو <a 
href=\"#somecomponents\">(۳)</a> برای کار کردن با "
@@ -427,10 +453,10 @@
 #| "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\"> 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=\"https://";
-"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
+"this page and <a href=\"/gnu/thegnuproject.html\"> https://www.gnu.org/gnu/";
+"thegnuproject.html</a> are good choices.  If you mention Linux, the 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-";
@@ -455,9 +481,9 @@
 "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 the early 90s.  "
-"A free operating system that exists today<a href=\"#newersystems\">(4)</a> "
-"is almost certainly either a variant of the GNU system, or a kind of BSD "
-"system."
+"A free operating system that exists today&#8239;<a class=\"ftn\" href="
+"\"#newersystems\">[4]</a> is almost certainly either a variant of the GNU "
+"system, or a kind of BSD system."
 msgstr ""
 "بجز گنو، پروژه دیگری بطور مستقل یک سیستم
‌عامل آزاد شبه یونیکس تولید کرده است. "
 "این سیستم با عنوان BSD شناخته می‌شود و در 
دانشگاه برکلی توسعه پیدا می‌کند. این "
@@ -465,6 +491,17 @@
 "آزادِ موجود اغلب یا یک نوع سیستم گنو م
ی‌باشند و یا یک نوع سیستم BSD."
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| 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 example of the GNU Project, and explicit appeals from GNU "
+#| "activists helped persuade them, but the code had little overlap with "
+#| "GNU.  BSD systems today use some GNU programs, just as the GNU system and "
+#| "its variants use some BSD programs; however, taken as wholes, they are "
+#| "two different systems that evolved separately.  The BSD developers did "
+#| "not write a kernel and add it to the GNU system, and a name like GNU/BSD "
+#| "would not fit the situation.<a href=\"#gnubsd\">(5)</a>"
 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,8 +510,8 @@
 "use some GNU programs, just as the GNU system and its variants use some BSD "
 "programs; however, taken as wholes, they are two different systems that "
 "evolved separately.  The BSD developers did not write a kernel and add it to "
-"the GNU system, and a name like GNU/BSD would not fit the situation.<a href="
-"\"#gnubsd\">(5)</a>"
+"the GNU system, and a name like GNU/BSD would not fit the situation&#8239;<a "
+"class=\"ftn\" href=\"#gnubsd\">[5]</a>."
 msgstr ""
 "گاهی اوقات مردم سوال می‌کنند که آیا BSD نیز 
مانند گنو/لینوکس یک نسخه از سیستم "
 "گنو می‌باشد. توسعه‌دهندگان BSD با الهام 
گرفتن از پروژهٔ گنو کدهای خود را آزاد "

Index: po/linux-and-gnu.fr.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.fr.po,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -b -r1.94 -r1.95
--- po/linux-and-gnu.fr.po      11 Oct 2021 10:03:54 -0000      1.94
+++ po/linux-and-gnu.fr.po      2 Nov 2021 14:41:53 -0000       1.95
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-10-11 09:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2021-10-11 12:03+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-11-02 14:27+0000\n"
 "Plural-Forms:  \n"
 "X-Generator: Gtranslator 2.91.5\n"
 
@@ -215,6 +216,36 @@
 "but de développer <em>un système de type Unix, complet et libre</em> : 
GNU."
 
 #. type: Content of: <div><p>
+# | 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
+# | is <em>an integrated system</em>&mdash;and not just a collection of useful
+# | programs&mdash;is because the GNU Project set out to make it one.  We made
+# | a list of the programs needed to make a <em>complete</em> free system, and
+# | we systematically found, wrote, or found people to write everything on the
+# | list.  We wrote essential but [-unexciting <a
+# | href=\"#unexciting\">(1)</a>-] {+unexciting&#8239;<a class=\"ftn\"
+# | href=\"#unexciting\">[1]</a>+} components because you can't have a system
+# | without them.  Some of our system components, the programming tools,
+# | became popular on their own among programmers, but we wrote many
+# | components that are not [-tools <a href=\"#nottools\">(2)</a>.-]
+# | {+tools&#8239;<a class=\"ftn\" href=\"#nottools\">[2]</a>.+}  We even
+# | developed a chess game, GNU Chess, because a complete system needs games
+# | too.
+#, fuzzy
+#| 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 is <em>an integrated system</em>&mdash;and not just a collection of "
+#| "useful programs&mdash;is because the GNU Project set out to make it one.  "
+#| "We made a list of the programs needed to make a <em>complete</em> free "
+#| "system, and we systematically found, wrote, or found people to write "
+#| "everything on the list.  We wrote essential but unexciting <a href="
+#| "\"#unexciting\">(1)</a> components because you can't have a system "
+#| "without them.  Some of our system components, the programming tools, "
+#| "became popular on their own among programmers, but we wrote many "
+#| "components that are not tools <a href=\"#nottools\">(2)</a>.  We even "
+#| "developed a chess game, GNU Chess, because a complete system needs games "
+#| "too."
 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 "
@@ -222,12 +253,12 @@
 "programs&mdash;is because the GNU Project set out to make it one.  We made a "
 "list of the programs needed to make a <em>complete</em> free system, and we "
 "systematically found, wrote, or found people to write everything on the "
-"list.  We wrote essential but unexciting <a href=\"#unexciting\">(1)</a> "
-"components because you can't have a system without them.  Some of our system "
-"components, the programming tools, became popular on their own among "
-"programmers, but we wrote many components that are not tools <a href="
-"\"#nottools\">(2)</a>.  We even developed a chess game, GNU Chess, because a "
-"complete system needs games too."
+"list.  We wrote essential but unexciting&#8239;<a class=\"ftn\" href="
+"\"#unexciting\">[1]</a> components because you can't have a system without "
+"them.  Some of our system components, the programming tools, became popular "
+"on their own among programmers, but we wrote many components that are not "
+"tools&#8239;<a class=\"ftn\" href=\"#nottools\">[2]</a>.  We even developed "
+"a chess game, GNU Chess, because a complete system needs games too."
 msgstr ""
 "Beaucoup de gens ont apporté des contributions majeures aux logiciels libres 
"
 "qu'on trouve dans le système et ils méritent tous de la reconnaissance. 
Mais "
@@ -263,13 +294,29 @@
 "grand public."
 
 #. 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=\"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-] {+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=\"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."
 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=\"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."
+"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 ""
 "Heureusement, nous n'avons pas eu à attendre le Hurd, grâce à Linux. Quand 
"
 "Linus Torvalds a libéré Linux en 1992, il a bouché le dernier trou du "
@@ -279,16 +326,37 @@
 "qui contenait aussi Linux, autrement dit le système GNU/Linux."
 
 #. 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 "
-"Linux.  Integrating a complete system as a distribution that would work "
-"&ldquo;out of the box&rdquo; was a big job, too.  It required addressing the "
-"issue of how to install and boot the system&mdash;a problem we had not "
-"tackled, because we hadn't yet reached that point.  Thus, the people who "
-"developed the various system distributions did a lot of essential work.  But "
-"it was work that, in the nature of things, was surely going to be done by "
-"someone."
+# | Making them work well together was not a trivial job.  Some GNU
+# | [-components<a href=\"#somecomponents\">(3)</a>-] {+components&#8239;<a
+# | class=\"ftn\" href=\"#somecomponents\">[3]</a>+} needed substantial change
+# | to work with Linux.  Integrating a complete system as a distribution that
+# | would work &ldquo;out of the box&rdquo; was a big job, too.  It required
+# | addressing the issue of how to install and boot the system&mdash;a problem
+# | we had not tackled, because we hadn't yet reached that point.  Thus, the
+# | people who developed the various system distributions did a lot of
+# | essential work.  But it was work that, in the nature of things, was surely
+# | going to be done by someone.
+#, fuzzy
+#| 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 Linux.  Integrating a complete system as a distribution that "
+#| "would work &ldquo;out of the box&rdquo; was a big job, too.  It required "
+#| "addressing the issue of how to install and boot the system&mdash;a "
+#| "problem we had not tackled, because we hadn't yet reached that point.  "
+#| "Thus, the people who developed the various system distributions did a lot "
+#| "of essential work.  But it was work that, in the nature of things, was "
+#| "surely going to be done by someone."
+msgid ""
+"Making them work well together was not a trivial job.  Some GNU "
+"components&#8239;<a class=\"ftn\" href=\"#somecomponents\">[3]</a> needed "
+"substantial change to work with Linux.  Integrating a complete system as a "
+"distribution that would work &ldquo;out of the box&rdquo; was a big job, "
+"too.  It required addressing the issue of how to install and boot the "
+"system&mdash;a problem we had not tackled, because we hadn't yet reached "
+"that point.  Thus, the people who developed the various system distributions "
+"did a lot of essential work.  But it was work that, in the nature of things, "
+"was surely going to be done by someone."
 msgstr ""
 "Les faire fonctionner ensemble n'a pas été pas un travail trivial. Certains 
"
 "composants GNU<a href=\"#somecomponents\"><sup>3</sup></a> demandaient des "
@@ -372,12 +440,28 @@
 "de cette combinaison, veuillez l'appeler « GNU/Linux »."
 
 #. 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\">
+# | https://www.gnu.org/gnu/the-gnu-project.html</a>-]
+# | {+href=\"/gnu/thegnuproject.html\">
+# | https://www.gnu.org/gnu/thegnuproject.html</a>+} are good choices.  If you
+# | mention Linux, the 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.
+#, 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\"> 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=\"https://foldoc.org/linux\";>https://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\"> 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=\"https://";
-"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
+"this page and <a href=\"/gnu/thegnuproject.html\"> https://www.gnu.org/gnu/";
+"thegnuproject.html</a> are good choices.  If you mention Linux, the 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\">https://www.gnu.org/gnu/the-gnu-project.";
@@ -390,13 +474,28 @@
 msgstr "Addendum"
 
 #. 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
+# | the early 90s.  A free operating system that exists [-today<a
+# | href=\"#newersystems\">(4)</a>-] {+today&#8239;<a class=\"ftn\"
+# | href=\"#newersystems\">[4]</a>+} is almost certainly either a variant of
+# | the GNU system, or a kind of BSD system.
+#, fuzzy
+#| 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 UC Berkeley.  It was nonfree in the 80s, but became free in the early "
+#| "90s.  A free operating system that exists today<a href=\"#newersystems\">"
+#| "(4)</a> is almost certainly either a variant of the GNU system, or a kind "
+#| "of BSD system."
 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 "
 "UC Berkeley.  It was nonfree in the 80s, but became free in the early 90s.  "
-"A free operating system that exists today<a href=\"#newersystems\">(4)</a> "
-"is almost certainly either a variant of the GNU system, or a kind of BSD "
-"system."
+"A free operating system that exists today&#8239;<a class=\"ftn\" href="
+"\"#newersystems\">[4]</a> is almost certainly either a variant of the GNU "
+"system, or a kind of BSD system."
 msgstr ""
 "Outre GNU, un autre projet a produit de manière indépendante un système "
 "d'exploitation libre de type Unix. Ce système est connu sous le nom de BSD "
@@ -407,6 +506,27 @@
 "système de type BSD."
 
 #. 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
+# | persuade them, but the code had little overlap with GNU.  BSD systems
+# | today use some GNU programs, just as the GNU system and its variants use
+# | some BSD programs; however, taken as wholes, they are two different
+# | systems that evolved separately.  The BSD developers did not write a
+# | kernel and add it to the GNU system, and a name like GNU/BSD would not fit
+# | the [-situation.<a href=\"#gnubsd\">(5)</a>-] {+situation&#8239;<a
+# | class=\"ftn\" href=\"#gnubsd\">[5]</a>.+}
+#, fuzzy
+#| 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 example of the GNU Project, and explicit appeals from GNU "
+#| "activists helped persuade them, but the code had little overlap with "
+#| "GNU.  BSD systems today use some GNU programs, just as the GNU system and "
+#| "its variants use some BSD programs; however, taken as wholes, they are "
+#| "two different systems that evolved separately.  The BSD developers did "
+#| "not write a kernel and add it to the GNU system, and a name like GNU/BSD "
+#| "would not fit the situation.<a href=\"#gnubsd\">(5)</a>"
 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 "
@@ -415,8 +535,8 @@
 "use some GNU programs, just as the GNU system and its variants use some BSD "
 "programs; however, taken as wholes, they are two different systems that "
 "evolved separately.  The BSD developers did not write a kernel and add it to "
-"the GNU system, and a name like GNU/BSD would not fit the situation.<a href="
-"\"#gnubsd\">(5)</a>"
+"the GNU system, and a name like GNU/BSD would not fit the situation&#8239;<a "
+"class=\"ftn\" href=\"#gnubsd\">[5]</a>."
 msgstr ""
 "Quelquefois les gens demandent si BSD est aussi une version de GNU, comme "
 "GNU/Linux. Les développeurs de BSD ont été conduits à rendre leur travail 
"

Index: po/linux-and-gnu.hr-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.hr-diff.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- po/linux-and-gnu.hr-diff.html       11 Oct 2021 09:34:52 -0000      1.19
+++ po/linux-and-gnu.hr-diff.html       2 Nov 2021 14:41:53 -0000       1.20
@@ -12,23 +12,31 @@
 <body><pre>
 &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;!-- This page is derived from /server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="gnulinux" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</em></ins></span> --&gt;
 &lt;title&gt;Linux and GNU
 - GNU Project - Free Software Foundation&lt;/title&gt;
+<span class="inserted"><ins><em>&lt;style type="text/css" 
media="print,screen"&gt;&lt;!--
+a.ftn { font-size: .94em; }
+--&gt;&lt;/style&gt;</em></ins></span>
 &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="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&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 &lt;a 
href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&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"&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="announcement"&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;,
+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;/blockquote&gt;
 &lt;/div&gt;</strong></del></span>
@@ -133,11 +141,12 @@
 to make it one.  We made a list of the programs needed to make
 a &lt;em&gt;complete&lt;/em&gt; free system, and we systematically found, 
wrote,
 or found people to write everything on the list.  We wrote essential
-but unexciting
-&lt;a href="#unexciting"&gt;(1)&lt;/a&gt; components because you can't have a 
system
+but <span class="removed"><del><strong>unexciting
+&lt;a href="#unexciting"&gt;(1)&lt;/a&gt;</strong></del></span> <span 
class="inserted"><ins><em>unexciting&#8239;&lt;a class="ftn" 
href="#unexciting"&gt;[1]&lt;/a&gt;</em></ins></span> components
+because you can't have a system
 without them.  Some of our system components, the programming tools,
 became popular on their own among programmers, but we wrote many
-components that are not tools  &lt;a href="#nottools"&gt;(2)&lt;/a&gt;.  We 
even
+components that are not <span class="removed"><del><strong>tools  &lt;a 
href="#nottools"&gt;(2)&lt;/a&gt;.</strong></del></span> <span 
class="inserted"><ins><em>tools&#8239;&lt;a class="ftn" 
href="#nottools"&gt;[2]&lt;/a&gt;.</em></ins></span>  We even
 developed a chess game, GNU Chess, because a complete system needs
 games too.&lt;/p&gt;
 
@@ -155,13 +164,15 @@
 Once Torvalds freed Linux in 1992, it fit into the last major gap in
 the GNU system.  People could
 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
+combine Linux with the GNU system&lt;/a&gt; to make a complete free <span 
class="removed"><del><strong>system
+&mdash; a</strong></del></span> <span 
class="inserted"><ins><em>system&mdash;a</em></ins></span>
+version of the GNU system which also contained Linux.  The
 GNU/Linux system, in other words.&lt;/p&gt;
 
 &lt;p&gt;
 Making them work well together was not a trivial job.  Some GNU
-components&lt;a href="#somecomponents"&gt;(3)&lt;/a&gt; needed substantial 
change
+<span class="removed"><del><strong>components&lt;a 
href="#somecomponents"&gt;(3)&lt;/a&gt;</strong></del></span>
+<span class="inserted"><ins><em>components&#8239;&lt;a class="ftn" 
href="#somecomponents"&gt;[3]&lt;/a&gt;</em></ins></span> needed substantial 
change
 to work with Linux.  Integrating a complete system as a distribution
 that would work &ldquo;out of the box&rdquo; was a big job, too.  It
 required addressing the issue of how to install and boot the
@@ -209,9 +220,9 @@
 
 &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;
-<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
+reference, this page and &lt;a <span 
class="removed"><del><strong>href="/gnu/the-gnu-project.html"&gt;
+http://www.gnu.org/gnu/the-gnu-project.html&lt;/a&gt;</strong></del></span> 
<span class="inserted"><ins><em>href="/gnu/thegnuproject.html"&gt;
+https://www.gnu.org/gnu/thegnuproject.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 <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;
@@ -226,7 +237,8 @@
 a free Unix-like operating system.  This system is known as BSD, and
 it was developed at UC Berkeley.  It was <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> in the 80s, but
 became free in the early 90s.  A free operating system that exists
-today&lt;a href="#newersystems"&gt;(4)&lt;/a&gt; is almost certainly either a
+<span class="removed"><del><strong>today&lt;a 
href="#newersystems"&gt;(4)&lt;/a&gt;</strong></del></span>
+<span class="inserted"><ins><em>today&#8239;&lt;a class="ftn" 
href="#newersystems"&gt;[4]&lt;/a&gt;</em></ins></span> is almost certainly 
either a
 variant of the GNU system, or a kind of BSD system.&lt;/p&gt;
 
 &lt;p&gt;
@@ -238,11 +250,12 @@
 system and its variants use some BSD programs; however, taken as
 wholes, they are two different systems that evolved separately.  The
 BSD developers did not write a kernel and add it to the GNU system,
-and a name like GNU/BSD would not fit the situation.&lt;a
+and a name like GNU/BSD would not fit the <span 
class="removed"><del><strong>situation.&lt;a
 href="#gnubsd"&gt;(5)&lt;/a&gt;&lt;/p&gt;
 
-<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&gt;Notes:&lt;/h3&gt;</strong></del></span> <span 
class="inserted"><ins><em>situation&#8239;&lt;a class="ftn"
+href="#gnubsd"&gt;[5]&lt;/a&gt;.&lt;/p&gt;
+&lt;div class="column-limit"&gt;&lt;/div&gt;
 
 &lt;h3 class="footnote"&gt;Footnotes&lt;/h3&gt;</em></ins></span>
 &lt;ol&gt;
@@ -350,7 +363,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/10/11 09:34:52 $
+$Date: 2021/11/02 14:41:53 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: po/linux-and-gnu.hr.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.hr.po,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- po/linux-and-gnu.hr.po      11 Oct 2021 09:34:52 -0000      1.22
+++ po/linux-and-gnu.hr.po      2 Nov 2021 14:41:53 -0000       1.23
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-10-11 09:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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"
@@ -268,6 +268,36 @@
 "<em>potpun slobodan sustav nalik Unixu</em>: GNU."
 
 #. type: Content of: <div><p>
+# | 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
+# | is <em>an integrated system</em>&mdash;and not just a collection of useful
+# | programs&mdash;is because the GNU Project set out to make it one.  We made
+# | a list of the programs needed to make a <em>complete</em> free system, and
+# | we systematically found, wrote, or found people to write everything on the
+# | list.  We wrote essential but [-unexciting <a
+# | href=\"#unexciting\">(1)</a>-] {+unexciting&#8239;<a class=\"ftn\"
+# | href=\"#unexciting\">[1]</a>+} components because you can't have a system
+# | without them.  Some of our system components, the programming tools,
+# | became popular on their own among programmers, but we wrote many
+# | components that are not [-tools <a href=\"#nottools\">(2)</a>.-]
+# | {+tools&#8239;<a class=\"ftn\" href=\"#nottools\">[2]</a>.+}  We even
+# | developed a chess game, GNU Chess, because a complete system needs games
+# | too.
+#, fuzzy
+#| 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 is <em>an integrated system</em>&mdash;and not just a collection of "
+#| "useful programs&mdash;is because the GNU Project set out to make it one.  "
+#| "We made a list of the programs needed to make a <em>complete</em> free "
+#| "system, and we systematically found, wrote, or found people to write "
+#| "everything on the list.  We wrote essential but unexciting <a href="
+#| "\"#unexciting\">(1)</a> components because you can't have a system "
+#| "without them.  Some of our system components, the programming tools, "
+#| "became popular on their own among programmers, but we wrote many "
+#| "components that are not tools <a href=\"#nottools\">(2)</a>.  We even "
+#| "developed a chess game, GNU Chess, because a complete system needs games "
+#| "too."
 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 "
@@ -275,12 +305,12 @@
 "programs&mdash;is because the GNU Project set out to make it one.  We made a "
 "list of the programs needed to make a <em>complete</em> free system, and we "
 "systematically found, wrote, or found people to write everything on the "
-"list.  We wrote essential but unexciting <a href=\"#unexciting\">(1)</a> "
-"components because you can't have a system without them.  Some of our system "
-"components, the programming tools, became popular on their own among "
-"programmers, but we wrote many components that are not tools <a href="
-"\"#nottools\">(2)</a>.  We even developed a chess game, GNU Chess, because a "
-"complete system needs games too."
+"list.  We wrote essential but unexciting&#8239;<a class=\"ftn\" href="
+"\"#unexciting\">[1]</a> components because you can't have a system without "
+"them.  Some of our system components, the programming tools, became popular "
+"on their own among programmers, but we wrote many components that are not "
+"tools&#8239;<a class=\"ftn\" href=\"#nottools\">[2]</a>.  We even developed "
+"a chess game, GNU Chess, because a complete system needs games too."
 msgstr ""
 "Mnogo ljudi značajno je pridonijelo slobodnom softveru u sustavu i svi oni "
 "zaslužuju priznanje za svoj softver.Međutim, razlog zbog kojeg je to "
@@ -315,9 +345,9 @@
 # | 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.
+# | combine Linux with the GNU system</a> to make a complete free [-system
+# | &mdash; a-] {+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 "
@@ -332,8 +362,8 @@
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
 "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."
+"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 ""
 "Srećom, zbog Linuxa nismo morali čekati da Hurd bude dovršen. Jednom kada 
je "
 "Torvalds 1992. godine učinio Linux slobodnim, popunio je zadnju veliku "
@@ -343,16 +373,37 @@
 "sustava GNU koja je sadržavala i Linux, drugim riječima, sustav GNU/Linux."
 
 #. 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 "
-"Linux.  Integrating a complete system as a distribution that would work "
-"&ldquo;out of the box&rdquo; was a big job, too.  It required addressing the "
-"issue of how to install and boot the system&mdash;a problem we had not "
-"tackled, because we hadn't yet reached that point.  Thus, the people who "
-"developed the various system distributions did a lot of essential work.  But "
-"it was work that, in the nature of things, was surely going to be done by "
-"someone."
+# | Making them work well together was not a trivial job.  Some GNU
+# | [-components<a href=\"#somecomponents\">(3)</a>-] {+components&#8239;<a
+# | class=\"ftn\" href=\"#somecomponents\">[3]</a>+} needed substantial change
+# | to work with Linux.  Integrating a complete system as a distribution that
+# | would work &ldquo;out of the box&rdquo; was a big job, too.  It required
+# | addressing the issue of how to install and boot the system&mdash;a problem
+# | we had not tackled, because we hadn't yet reached that point.  Thus, the
+# | people who developed the various system distributions did a lot of
+# | essential work.  But it was work that, in the nature of things, was surely
+# | going to be done by someone.
+#, fuzzy
+#| 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 Linux.  Integrating a complete system as a distribution that "
+#| "would work &ldquo;out of the box&rdquo; was a big job, too.  It required "
+#| "addressing the issue of how to install and boot the system&mdash;a "
+#| "problem we had not tackled, because we hadn't yet reached that point.  "
+#| "Thus, the people who developed the various system distributions did a lot "
+#| "of essential work.  But it was work that, in the nature of things, was "
+#| "surely going to be done by someone."
+msgid ""
+"Making them work well together was not a trivial job.  Some GNU "
+"components&#8239;<a class=\"ftn\" href=\"#somecomponents\">[3]</a> needed "
+"substantial change to work with Linux.  Integrating a complete system as a "
+"distribution that would work &ldquo;out of the box&rdquo; was a big job, "
+"too.  It required addressing the issue of how to install and boot the "
+"system&mdash;a problem we had not tackled, because we hadn't yet reached "
+"that point.  Thus, the people who developed the various system distributions "
+"did a lot of essential work.  But it was work that, in the nature of things, "
+"was surely going to be done by someone."
 msgstr ""
 "Postići da zajedno rade nije bio jednostavan posao. Nekim komponentama GNU-"
 "a<a href=\"#somecomponents\">(3)</a> bila je potrebna značajna izmjena kako "
@@ -500,11 +551,12 @@
 
 #. 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>-]
+# | reference, this page and <a [-href=\"/gnu/the-gnu-project.html\">
+# | http://www.gnu.org/gnu/the-gnu-project.html</a>-]
+# | {+href=\"/gnu/thegnuproject.html\">
+# | https://www.gnu.org/gnu/thegnuproject.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
@@ -517,10 +569,10 @@
 #| "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\"> 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=\"https://";
-"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
+"this page and <a href=\"/gnu/thegnuproject.html\"> https://www.gnu.org/gnu/";
+"thegnuproject.html</a> are good choices.  If you mention Linux, the 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://";
@@ -533,13 +585,28 @@
 msgstr "Dopuna"
 
 #. 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
+# | the early 90s.  A free operating system that exists [-today<a
+# | href=\"#newersystems\">(4)</a>-] {+today&#8239;<a class=\"ftn\"
+# | href=\"#newersystems\">[4]</a>+} is almost certainly either a variant of
+# | the GNU system, or a kind of BSD system.
+#, fuzzy
+#| 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 UC Berkeley.  It was nonfree in the 80s, but became free in the early "
+#| "90s.  A free operating system that exists today<a href=\"#newersystems\">"
+#| "(4)</a> is almost certainly either a variant of the GNU system, or a kind "
+#| "of BSD system."
 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 "
 "UC Berkeley.  It was nonfree in the 80s, but became free in the early 90s.  "
-"A free operating system that exists today<a href=\"#newersystems\">(4)</a> "
-"is almost certainly either a variant of the GNU system, or a kind of BSD "
-"system."
+"A free operating system that exists today&#8239;<a class=\"ftn\" href="
+"\"#newersystems\">[4]</a> is almost certainly either a variant of the GNU "
+"system, or a kind of BSD system."
 msgstr ""
 "Uz GNU, još je jedan projekt neovisno proizveo slobodan operativni sustav "
 "nalik Unixu. Taj sustav poznat je kao BSD, a razvijen je na UC Berkeleyu. "
@@ -549,6 +616,27 @@
 "vrsta sustava BSD."
 
 #. 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
+# | persuade them, but the code had little overlap with GNU.  BSD systems
+# | today use some GNU programs, just as the GNU system and its variants use
+# | some BSD programs; however, taken as wholes, they are two different
+# | systems that evolved separately.  The BSD developers did not write a
+# | kernel and add it to the GNU system, and a name like GNU/BSD would not fit
+# | the [-situation.<a href=\"#gnubsd\">(5)</a>-] {+situation&#8239;<a
+# | class=\"ftn\" href=\"#gnubsd\">[5]</a>.+}
+#, fuzzy
+#| 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 example of the GNU Project, and explicit appeals from GNU "
+#| "activists helped persuade them, but the code had little overlap with "
+#| "GNU.  BSD systems today use some GNU programs, just as the GNU system and "
+#| "its variants use some BSD programs; however, taken as wholes, they are "
+#| "two different systems that evolved separately.  The BSD developers did "
+#| "not write a kernel and add it to the GNU system, and a name like GNU/BSD "
+#| "would not fit the situation.<a href=\"#gnubsd\">(5)</a>"
 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 "
@@ -557,8 +645,8 @@
 "use some GNU programs, just as the GNU system and its variants use some BSD "
 "programs; however, taken as wholes, they are two different systems that "
 "evolved separately.  The BSD developers did not write a kernel and add it to "
-"the GNU system, and a name like GNU/BSD would not fit the situation.<a href="
-"\"#gnubsd\">(5)</a>"
+"the GNU system, and a name like GNU/BSD would not fit the situation&#8239;<a "
+"class=\"ftn\" href=\"#gnubsd\">[5]</a>."
 msgstr ""
 "Ponekad ljudi pitaju je li BSD također inačica GNU-a, kao GNU/Linux. "
 "Razvijatelje BSD-a je primjer Projekta GNU nadahnuo da svoj kod učine "

Index: po/linux-and-gnu.id.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.id.po,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- po/linux-and-gnu.id.po      11 Oct 2021 09:34:52 -0000      1.37
+++ po/linux-and-gnu.id.po      2 Nov 2021 14:41:53 -0000       1.38
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-10-11 09:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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"
@@ -294,6 +294,36 @@
 "adalah membangun <em> sistem bebas berbasis Unix yang sempurna</em>: GNU."
 
 #. type: Content of: <div><p>
+# | 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
+# | is <em>an integrated system</em>&mdash;and not just a collection of useful
+# | programs&mdash;is because the GNU Project set out to make it one.  We made
+# | a list of the programs needed to make a <em>complete</em> free system, and
+# | we systematically found, wrote, or found people to write everything on the
+# | list.  We wrote essential but [-unexciting <a
+# | href=\"#unexciting\">(1)</a>-] {+unexciting&#8239;<a class=\"ftn\"
+# | href=\"#unexciting\">[1]</a>+} components because you can't have a system
+# | without them.  Some of our system components, the programming tools,
+# | became popular on their own among programmers, but we wrote many
+# | components that are not [-tools <a href=\"#nottools\">(2)</a>.-]
+# | {+tools&#8239;<a class=\"ftn\" href=\"#nottools\">[2]</a>.+}  We even
+# | developed a chess game, GNU Chess, because a complete system needs games
+# | too.
+#, fuzzy
+#| 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 is <em>an integrated system</em>&mdash;and not just a collection of "
+#| "useful programs&mdash;is because the GNU Project set out to make it one.  "
+#| "We made a list of the programs needed to make a <em>complete</em> free "
+#| "system, and we systematically found, wrote, or found people to write "
+#| "everything on the list.  We wrote essential but unexciting <a href="
+#| "\"#unexciting\">(1)</a> components because you can't have a system "
+#| "without them.  Some of our system components, the programming tools, "
+#| "became popular on their own among programmers, but we wrote many "
+#| "components that are not tools <a href=\"#nottools\">(2)</a>.  We even "
+#| "developed a chess game, GNU Chess, because a complete system needs games "
+#| "too."
 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 "
@@ -301,12 +331,12 @@
 "programs&mdash;is because the GNU Project set out to make it one.  We made a "
 "list of the programs needed to make a <em>complete</em> free system, and we "
 "systematically found, wrote, or found people to write everything on the "
-"list.  We wrote essential but unexciting <a href=\"#unexciting\">(1)</a> "
-"components because you can't have a system without them.  Some of our system "
-"components, the programming tools, became popular on their own among "
-"programmers, but we wrote many components that are not tools <a href="
-"\"#nottools\">(2)</a>.  We even developed a chess game, GNU Chess, because a "
-"complete system needs games too."
+"list.  We wrote essential but unexciting&#8239;<a class=\"ftn\" href="
+"\"#unexciting\">[1]</a> components because you can't have a system without "
+"them.  Some of our system components, the programming tools, became popular "
+"on their own among programmers, but we wrote many components that are not "
+"tools&#8239;<a class=\"ftn\" href=\"#nottools\">[2]</a>.  We even developed "
+"a chess game, GNU Chess, because a complete system needs games too."
 msgstr ""
 "Banyak pihak yang telah mengembangkan program-program yang ada di dalam "
 "sistem, dan mereka semua pantas dihargai atas kontribusinya. Tetapi alasan "
@@ -345,8 +375,8 @@
 # | Torvalds [-wrote Linux,-] {+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:-]
-# | {+system &mdash;+} a [-Linux-based-] version of the GNU [-system; the-]
+# | combine Linux with the GNU system</a> to make a complete free [-system: a
+# | Linux-based-] {+system&mdash;a+} version of the GNU [-system; the-]
 # | {+system which also contained Linux.  The+} GNU/Linux system, [-for
 # | short.-] {+in other words.+}
 #, fuzzy
@@ -362,8 +392,8 @@
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
 "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."
+"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 ""
 "Berkat Linux, kami tidak perlu menunggu rampungnya pengembangan Hurd. Saat "
 "Linux dirilis, secara tidak langsung Torvalds telah membantu penyempurnaan "
@@ -373,16 +403,37 @@
 "singkatnya sistem GNU/Linux."
 
 #. 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 "
-"Linux.  Integrating a complete system as a distribution that would work "
-"&ldquo;out of the box&rdquo; was a big job, too.  It required addressing the "
-"issue of how to install and boot the system&mdash;a problem we had not "
-"tackled, because we hadn't yet reached that point.  Thus, the people who "
-"developed the various system distributions did a lot of essential work.  But "
-"it was work that, in the nature of things, was surely going to be done by "
-"someone."
+# | Making them work well together was not a trivial job.  Some GNU
+# | [-components<a href=\"#somecomponents\">(3)</a>-] {+components&#8239;<a
+# | class=\"ftn\" href=\"#somecomponents\">[3]</a>+} needed substantial change
+# | to work with Linux.  Integrating a complete system as a distribution that
+# | would work &ldquo;out of the box&rdquo; was a big job, too.  It required
+# | addressing the issue of how to install and boot the system&mdash;a problem
+# | we had not tackled, because we hadn't yet reached that point.  Thus, the
+# | people who developed the various system distributions did a lot of
+# | essential work.  But it was work that, in the nature of things, was surely
+# | going to be done by someone.
+#, fuzzy
+#| 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 Linux.  Integrating a complete system as a distribution that "
+#| "would work &ldquo;out of the box&rdquo; was a big job, too.  It required "
+#| "addressing the issue of how to install and boot the system&mdash;a "
+#| "problem we had not tackled, because we hadn't yet reached that point.  "
+#| "Thus, the people who developed the various system distributions did a lot "
+#| "of essential work.  But it was work that, in the nature of things, was "
+#| "surely going to be done by someone."
+msgid ""
+"Making them work well together was not a trivial job.  Some GNU "
+"components&#8239;<a class=\"ftn\" href=\"#somecomponents\">[3]</a> needed "
+"substantial change to work with Linux.  Integrating a complete system as a "
+"distribution that would work &ldquo;out of the box&rdquo; was a big job, "
+"too.  It required addressing the issue of how to install and boot the "
+"system&mdash;a problem we had not tackled, because we hadn't yet reached "
+"that point.  Thus, the people who developed the various system distributions "
+"did a lot of essential work.  But it was work that, in the nature of things, "
+"was surely going to be done by someone."
 msgstr ""
 "Awalnya, proses penggabungan GNU dan Linux tidak mudah. beberapa komponen "
 "GNU <a href=\"#somecomponents\">(3)</a> harus dimodifikasi agar bisa bekerja "
@@ -532,11 +583,12 @@
 
 #. 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>-]
+# | reference, this page and <a [-href=\"/gnu/the-gnu-project.html\">
+# | http://www.gnu.org/gnu/the-gnu-project.html</a>-]
+# | {+href=\"/gnu/thegnuproject.html\">
+# | https://www.gnu.org/gnu/thegnuproject.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
@@ -549,10 +601,10 @@
 #| "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\"> 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=\"https://";
-"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
+"this page and <a href=\"/gnu/thegnuproject.html\"> https://www.gnu.org/gnu/";
+"thegnuproject.html</a> are good choices.  If you mention Linux, the 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-"
@@ -569,9 +621,10 @@
 # | 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
-# | in the early 90s.  A free operating system that exists today<a
-# | href=\"#newersystems\">(4)</a> is almost certainly either a variant of the
-# | GNU system, or a kind of BSD system.
+# | in the early 90s.  A free operating system that exists [-today<a
+# | href=\"#newersystems\">(4)</a>-] {+today&#8239;<a class=\"ftn\"
+# | href=\"#newersystems\">[4]</a>+} is almost certainly either a variant of
+# | the GNU system, or a kind of BSD system.
 #, fuzzy
 #| msgid ""
 #| "Aside from GNU, one other project has independently produced a free Unix-"
@@ -584,9 +637,9 @@
 "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 the early 90s.  "
-"A free operating system that exists today<a href=\"#newersystems\">(4)</a> "
-"is almost certainly either a variant of the GNU system, or a kind of BSD "
-"system."
+"A free operating system that exists today&#8239;<a class=\"ftn\" href="
+"\"#newersystems\">[4]</a> is almost certainly either a variant of the GNU "
+"system, or a kind of BSD system."
 msgstr ""
 "Selain GNU, terdapat sebuah proyek independen lain yang juga membangun "
 "sebuah sistem operasi bebas berbasis Unix. Sistem ini dikenal sebagai BSD, "
@@ -596,6 +649,27 @@
 "dapat dipastikan merupakan varian dari salah satu sistem GNU atau sistem BSD."
 
 #. 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
+# | persuade them, but the code had little overlap with GNU.  BSD systems
+# | today use some GNU programs, just as the GNU system and its variants use
+# | some BSD programs; however, taken as wholes, they are two different
+# | systems that evolved separately.  The BSD developers did not write a
+# | kernel and add it to the GNU system, and a name like GNU/BSD would not fit
+# | the [-situation.<a href=\"#gnubsd\">(5)</a>-] {+situation&#8239;<a
+# | class=\"ftn\" href=\"#gnubsd\">[5]</a>.+}
+#, fuzzy
+#| 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 example of the GNU Project, and explicit appeals from GNU "
+#| "activists helped persuade them, but the code had little overlap with "
+#| "GNU.  BSD systems today use some GNU programs, just as the GNU system and "
+#| "its variants use some BSD programs; however, taken as wholes, they are "
+#| "two different systems that evolved separately.  The BSD developers did "
+#| "not write a kernel and add it to the GNU system, and a name like GNU/BSD "
+#| "would not fit the situation.<a href=\"#gnubsd\">(5)</a>"
 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 "
@@ -604,8 +678,8 @@
 "use some GNU programs, just as the GNU system and its variants use some BSD "
 "programs; however, taken as wholes, they are two different systems that "
 "evolved separately.  The BSD developers did not write a kernel and add it to "
-"the GNU system, and a name like GNU/BSD would not fit the situation.<a href="
-"\"#gnubsd\">(5)</a>"
+"the GNU system, and a name like GNU/BSD would not fit the situation&#8239;<a "
+"class=\"ftn\" href=\"#gnubsd\">[5]</a>."
 msgstr ""
 "Terkadang ada pihak yang bertanya apakah BSD adalah varian dari GNU seperti "
 "GNU/Linux. Para pengembang BSD memang membangun sistem mereka karena "

Index: po/linux-and-gnu.it-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.it-diff.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- po/linux-and-gnu.it-diff.html       29 Oct 2021 13:32:43 -0000      1.4
+++ po/linux-and-gnu.it-diff.html       2 Nov 2021 14:41:53 -0000       1.5
@@ -12,15 +12,23 @@
 <body><pre>
 &lt;!--#include <span 
class="removed"><del><strong>virtual="/server/html5-header.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/header.html"</em></ins></span> --&gt;
 &lt;!-- Parent-Version: 1.96 --&gt;
-<span class="inserted"><ins><em>&lt;!-- This page is derived from 
/server/standards/boilerplate.html --&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;!-- This page is derived from 
/server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="gnulinux" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes" --&gt;</em></ins></span>
 &lt;title&gt;Linux and GNU
 - GNU Project - Free Software Foundation&lt;/title&gt;
+<span class="inserted"><ins><em>&lt;style type="text/css" 
media="print,screen"&gt;&lt;!--
+a.ftn { font-size: .94em; }
+--&gt;&lt;/style&gt;</em></ins></span>
 &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 
class="c"&gt;Linux</strong></del></span>
-<span class="inserted"><ins><em>&lt;div class="article reduced-width"&gt;
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&lt;div class="article reduced-width"&gt;
 &lt;h2&gt;Linux</em></ins></span> and the GNU System&lt;/h2&gt;
 
 &lt;address <span class="removed"><del><strong>class="byline 
c"&gt;by</strong></del></span> <span 
class="inserted"><ins><em>class="byline"&gt;by</em></ins></span> &lt;a
@@ -136,11 +144,12 @@
 to make it one.  We made a list of the programs needed to make
 a &lt;em&gt;complete&lt;/em&gt; free system, and we systematically found, 
wrote,
 or found people to write everything on the list.  We wrote essential
-but unexciting
-&lt;a href="#unexciting"&gt;(1)&lt;/a&gt; components because you can't have a 
system
+but <span class="removed"><del><strong>unexciting
+&lt;a href="#unexciting"&gt;(1)&lt;/a&gt;</strong></del></span> <span 
class="inserted"><ins><em>unexciting&#8239;&lt;a class="ftn" 
href="#unexciting"&gt;[1]&lt;/a&gt;</em></ins></span> components
+because you can't have a system
 without them.  Some of our system components, the programming tools,
 became popular on their own among programmers, but we wrote many
-components that are not tools  &lt;a href="#nottools"&gt;(2)&lt;/a&gt;.  We 
even
+components that are not <span class="removed"><del><strong>tools  &lt;a 
href="#nottools"&gt;(2)&lt;/a&gt;.</strong></del></span> <span 
class="inserted"><ins><em>tools&#8239;&lt;a class="ftn" 
href="#nottools"&gt;[2]&lt;/a&gt;.</em></ins></span>  We even
 developed a chess game, GNU Chess, because a complete system needs
 games too.&lt;/p&gt;
 
@@ -158,13 +167,15 @@
 Once Torvalds freed Linux in 1992, it fit into the last major gap in
 the GNU system.  People could
 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
+combine Linux with the GNU system&lt;/a&gt; to make a complete free <span 
class="removed"><del><strong>system
+&mdash; a</strong></del></span> <span 
class="inserted"><ins><em>system&mdash;a</em></ins></span>
+version of the GNU system which also contained Linux.  The
 GNU/Linux system, in other words.&lt;/p&gt;
 
 &lt;p&gt;
 Making them work well together was not a trivial job.  Some GNU
-components&lt;a href="#somecomponents"&gt;(3)&lt;/a&gt; needed substantial 
change
+<span class="removed"><del><strong>components&lt;a 
href="#somecomponents"&gt;(3)&lt;/a&gt;</strong></del></span>
+<span class="inserted"><ins><em>components&#8239;&lt;a class="ftn" 
href="#somecomponents"&gt;[3]&lt;/a&gt;</em></ins></span> needed substantial 
change
 to work with Linux.  Integrating a complete system as a distribution
 that would work &ldquo;out of the box&rdquo; was a big job, too.  It
 required addressing the issue of how to install and boot the
@@ -211,9 +222,9 @@
 
 &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;
-<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
+reference, this page and &lt;a <span 
class="removed"><del><strong>href="/gnu/the-gnu-project.html"&gt;
+http://www.gnu.org/gnu/the-gnu-project.html&lt;/a&gt;</strong></del></span> 
<span class="inserted"><ins><em>href="/gnu/thegnuproject.html"&gt;
+https://www.gnu.org/gnu/thegnuproject.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 <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;
@@ -226,7 +237,8 @@
 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 the early 90s.  A free operating system that exists
-today&lt;a href="#newersystems"&gt;(4)&lt;/a&gt; is almost certainly either a
+<span class="removed"><del><strong>today&lt;a 
href="#newersystems"&gt;(4)&lt;/a&gt;</strong></del></span>
+<span class="inserted"><ins><em>today&#8239;&lt;a class="ftn" 
href="#newersystems"&gt;[4]&lt;/a&gt;</em></ins></span> is almost certainly 
either a
 variant of the GNU system, or a kind of BSD system.&lt;/p&gt;
 
 &lt;p&gt;
@@ -238,8 +250,9 @@
 system and its variants use some BSD programs; however, taken as
 wholes, they are two different systems that evolved separately.  The
 BSD developers did not write a kernel and add it to the GNU system,
-and a name like GNU/BSD would not fit the situation.&lt;a
-href="#gnubsd"&gt;(5)&lt;/a&gt;&lt;/p&gt;
+and a name like GNU/BSD would not fit the <span 
class="removed"><del><strong>situation.&lt;a
+href="#gnubsd"&gt;(5)&lt;/a&gt;&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>situation&#8239;&lt;a class="ftn"
+href="#gnubsd"&gt;[5]&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
 &lt;div class="column-limit"&gt;&lt;/div&gt;
 
 &lt;h3 <span 
class="removed"><del><strong>class="footnote"&gt;Notes&lt;/h3&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>class="footnote"&gt;Footnotes&lt;/h3&gt;</em></ins></span>
@@ -348,7 +361,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/10/29 13:32:43 $
+$Date: 2021/11/02 14:41:53 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: po/linux-and-gnu.it.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.it.po,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- po/linux-and-gnu.it.po      11 Oct 2021 09:34:52 -0000      1.77
+++ po/linux-and-gnu.it.po      2 Nov 2021 14:41:53 -0000       1.78
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu\n"
-"POT-Creation-Date: 2021-10-11 09:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2021-02-04 19:01-0500\n"
 "Last-Translator: Dora Scilipoti\n"
 "Language-Team: Italian\n"
@@ -282,6 +282,36 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><p>
+# | 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
+# | is <em>an integrated system</em>&mdash;and not just a collection of useful
+# | programs&mdash;is because the GNU Project set out to make it one.  We made
+# | a list of the programs needed to make a <em>complete</em> free system, and
+# | we systematically found, wrote, or found people to write everything on the
+# | list.  We wrote essential but [-unexciting <a
+# | href=\"#unexciting\">(1)</a>-] {+unexciting&#8239;<a class=\"ftn\"
+# | href=\"#unexciting\">[1]</a>+} components because you can't have a system
+# | without them.  Some of our system components, the programming tools,
+# | became popular on their own among programmers, but we wrote many
+# | components that are not [-tools <a href=\"#nottools\">(2)</a>.-]
+# | {+tools&#8239;<a class=\"ftn\" href=\"#nottools\">[2]</a>.+}  We even
+# | developed a chess game, GNU Chess, because a complete system needs games
+# | too.
+#, fuzzy
+#| 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 is <em>an integrated system</em>&mdash;and not just a collection of "
+#| "useful programs&mdash;is because the GNU Project set out to make it one.  "
+#| "We made a list of the programs needed to make a <em>complete</em> free "
+#| "system, and we systematically found, wrote, or found people to write "
+#| "everything on the list.  We wrote essential but unexciting <a href="
+#| "\"#unexciting\">(1)</a> components because you can't have a system "
+#| "without them.  Some of our system components, the programming tools, "
+#| "became popular on their own among programmers, but we wrote many "
+#| "components that are not tools <a href=\"#nottools\">(2)</a>.  We even "
+#| "developed a chess game, GNU Chess, because a complete system needs games "
+#| "too."
 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 "
@@ -289,12 +319,12 @@
 "programs&mdash;is because the GNU Project set out to make it one.  We made a "
 "list of the programs needed to make a <em>complete</em> free system, and we "
 "systematically found, wrote, or found people to write everything on the "
-"list.  We wrote essential but unexciting <a href=\"#unexciting\">(1)</a> "
-"components because you can't have a system without them.  Some of our system "
-"components, the programming tools, became popular on their own among "
-"programmers, but we wrote many components that are not tools <a href="
-"\"#nottools\">(2)</a>.  We even developed a chess game, GNU Chess, because a "
-"complete system needs games too."
+"list.  We wrote essential but unexciting&#8239;<a class=\"ftn\" href="
+"\"#unexciting\">[1]</a> components because you can't have a system without "
+"them.  Some of our system components, the programming tools, became popular "
+"on their own among programmers, but we wrote many components that are not "
+"tools&#8239;<a class=\"ftn\" href=\"#nottools\">[2]</a>.  We even developed "
+"a chess game, GNU Chess, because a complete system needs games too."
 msgstr ""
 "Molte persone hanno dato contributi importanti al software libero presente "
 "nel sistema, e tutti meritano riconoscimento per il lavoro svolto. Ma il "
@@ -336,9 +366,9 @@
 # | 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.
+# | combine Linux with the GNU system</a> to make a complete free [-system
+# | &mdash; a-] {+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 "
@@ -353,8 +383,8 @@
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
 "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."
+"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 ""
 "Per fortuna, non è stato necessario aspettare che Hurd fosse finito. Quando "
 "Torvalds rilasciò Linux come software libero nel 1992, il suo kernel colmò "
@@ -366,16 +396,37 @@
 
 # type: Content of: <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 "
-"Linux.  Integrating a complete system as a distribution that would work "
-"&ldquo;out of the box&rdquo; was a big job, too.  It required addressing the "
-"issue of how to install and boot the system&mdash;a problem we had not "
-"tackled, because we hadn't yet reached that point.  Thus, the people who "
-"developed the various system distributions did a lot of essential work.  But "
-"it was work that, in the nature of things, was surely going to be done by "
-"someone."
+# | Making them work well together was not a trivial job.  Some GNU
+# | [-components<a href=\"#somecomponents\">(3)</a>-] {+components&#8239;<a
+# | class=\"ftn\" href=\"#somecomponents\">[3]</a>+} needed substantial change
+# | to work with Linux.  Integrating a complete system as a distribution that
+# | would work &ldquo;out of the box&rdquo; was a big job, too.  It required
+# | addressing the issue of how to install and boot the system&mdash;a problem
+# | we had not tackled, because we hadn't yet reached that point.  Thus, the
+# | people who developed the various system distributions did a lot of
+# | essential work.  But it was work that, in the nature of things, was surely
+# | going to be done by someone.
+#, fuzzy
+#| 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 Linux.  Integrating a complete system as a distribution that "
+#| "would work &ldquo;out of the box&rdquo; was a big job, too.  It required "
+#| "addressing the issue of how to install and boot the system&mdash;a "
+#| "problem we had not tackled, because we hadn't yet reached that point.  "
+#| "Thus, the people who developed the various system distributions did a lot "
+#| "of essential work.  But it was work that, in the nature of things, was "
+#| "surely going to be done by someone."
+msgid ""
+"Making them work well together was not a trivial job.  Some GNU "
+"components&#8239;<a class=\"ftn\" href=\"#somecomponents\">[3]</a> needed "
+"substantial change to work with Linux.  Integrating a complete system as a "
+"distribution that would work &ldquo;out of the box&rdquo; was a big job, "
+"too.  It required addressing the issue of how to install and boot the "
+"system&mdash;a problem we had not tackled, because we hadn't yet reached "
+"that point.  Thus, the people who developed the various system distributions "
+"did a lot of essential work.  But it was work that, in the nature of things, "
+"was surely going to be done by someone."
 msgstr ""
 "Far funzionare bene i due insieme non fu compito semplice. Alcuni componenti "
 "GNU <a href=\"#somecomponents\">(3)</a> furono modificati considerevolmente "
@@ -509,11 +560,12 @@
 # type: Content of: <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>-]
+# | reference, this page and <a [-href=\"/gnu/the-gnu-project.html\">
+# | http://www.gnu.org/gnu/the-gnu-project.html</a>-]
+# | {+href=\"/gnu/thegnuproject.html\">
+# | https://www.gnu.org/gnu/thegnuproject.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
@@ -526,10 +578,10 @@
 #| "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\"> 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=\"https://";
-"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
+"this page and <a href=\"/gnu/thegnuproject.html\"> https://www.gnu.org/gnu/";
+"thegnuproject.html</a> are good choices.  If you mention Linux, the 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-"
@@ -543,13 +595,28 @@
 
 # type: Content of: <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
+# | the early 90s.  A free operating system that exists [-today<a
+# | href=\"#newersystems\">(4)</a>-] {+today&#8239;<a class=\"ftn\"
+# | href=\"#newersystems\">[4]</a>+} is almost certainly either a variant of
+# | the GNU system, or a kind of BSD system.
+#, fuzzy
+#| 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 UC Berkeley.  It was nonfree in the 80s, but became free in the early "
+#| "90s.  A free operating system that exists today<a href=\"#newersystems\">"
+#| "(4)</a> is almost certainly either a variant of the GNU system, or a kind "
+#| "of BSD system."
 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 "
 "UC Berkeley.  It was nonfree in the 80s, but became free in the early 90s.  "
-"A free operating system that exists today<a href=\"#newersystems\">(4)</a> "
-"is almost certainly either a variant of the GNU system, or a kind of BSD "
-"system."
+"A free operating system that exists today&#8239;<a class=\"ftn\" href="
+"\"#newersystems\">[4]</a> is almost certainly either a variant of the GNU "
+"system, or a kind of BSD system."
 msgstr ""
 "Oltre a GNU, esiste un altro progetto che ha prodotto indipendentemente un "
 "sistema operativo libero simile a Unix. Questo sistema &egrave; conosciuto "
@@ -561,6 +628,27 @@
 
 # type: Content of: <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
+# | persuade them, but the code had little overlap with GNU.  BSD systems
+# | today use some GNU programs, just as the GNU system and its variants use
+# | some BSD programs; however, taken as wholes, they are two different
+# | systems that evolved separately.  The BSD developers did not write a
+# | kernel and add it to the GNU system, and a name like GNU/BSD would not fit
+# | the [-situation.<a href=\"#gnubsd\">(5)</a>-] {+situation&#8239;<a
+# | class=\"ftn\" href=\"#gnubsd\">[5]</a>.+}
+#, fuzzy
+#| 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 example of the GNU Project, and explicit appeals from GNU "
+#| "activists helped persuade them, but the code had little overlap with "
+#| "GNU.  BSD systems today use some GNU programs, just as the GNU system and "
+#| "its variants use some BSD programs; however, taken as wholes, they are "
+#| "two different systems that evolved separately.  The BSD developers did "
+#| "not write a kernel and add it to the GNU system, and a name like GNU/BSD "
+#| "would not fit the situation.<a href=\"#gnubsd\">(5)</a>"
 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 "
@@ -569,8 +657,8 @@
 "use some GNU programs, just as the GNU system and its variants use some BSD "
 "programs; however, taken as wholes, they are two different systems that "
 "evolved separately.  The BSD developers did not write a kernel and add it to "
-"the GNU system, and a name like GNU/BSD would not fit the situation.<a href="
-"\"#gnubsd\">(5)</a>"
+"the GNU system, and a name like GNU/BSD would not fit the situation&#8239;<a "
+"class=\"ftn\" href=\"#gnubsd\">[5]</a>."
 msgstr ""
 "A volte le persone si chiedono se BSD sia una versione di GNU, come GNU/"
 "Linux. Gli sviluppatori di BSD si ispirarono all'esempio fornito dal "

Index: po/linux-and-gnu.ja.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.ja.po,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- po/linux-and-gnu.ja.po      1 Nov 2021 02:13:03 -0000       1.65
+++ po/linux-and-gnu.ja.po      2 Nov 2021 14:41:53 -0000       1.66
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-10-11 09:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2021-11-01 11:02+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-11-02 14:27+0000\n"
 
 #. type: Content of: <title>
 msgid "Linux and GNU - GNU Project - Free Software Foundation"
@@ -207,6 +208,21 @@
 "標としたのです。"
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| 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 is <em>an integrated system</em>&mdash;and not just a collection of "
+#| "useful programs&mdash;is because the GNU Project set out to make it one.  "
+#| "We made a list of the programs needed to make a <em>complete</em> free "
+#| "system, and we systematically found, wrote, or found people to write "
+#| "everything on the list.  We wrote essential but unexciting <a href="
+#| "\"#unexciting\">(1)</a> components because you can't have a system "
+#| "without them.  Some of our system components, the programming tools, "
+#| "became popular on their own among programmers, but we wrote many "
+#| "components that are not tools <a href=\"#nottools\">(2)</a>.  We even "
+#| "developed a chess game, GNU Chess, because a complete system needs games "
+#| "too."
 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 "
@@ -214,12 +230,12 @@
 "programs&mdash;is because the GNU Project set out to make it one.  We made a "
 "list of the programs needed to make a <em>complete</em> free system, and we "
 "systematically found, wrote, or found people to write everything on the "
-"list.  We wrote essential but unexciting <a href=\"#unexciting\">(1)</a> "
-"components because you can't have a system without them.  Some of our system "
-"components, the programming tools, became popular on their own among "
-"programmers, but we wrote many components that are not tools <a href="
-"\"#nottools\">(2)</a>.  We even developed a chess game, GNU Chess, because a "
-"complete system needs games too."
+"list.  We wrote essential but unexciting&#8239;<a class=\"ftn\" href="
+"\"#unexciting\">[1]</a> components because you can't have a system without "
+"them.  Some of our system components, the programming tools, became popular "
+"on their own among programmers, but we wrote many components that are not "
+"tools&#8239;<a class=\"ftn\" href=\"#nottools\">[2]</a>.  We even developed "
+"a chess game, GNU Chess, because a complete system needs games too."
 msgstr ""
 "多くの人々がシステム
の自由ソフトウェアに多大な貢献をしてきましたし、それらは"
 
"みな称賛に値します。しかしそれが単なる有用なプログラãƒ
 ã®å¯„せ集めではなく、"
@@ -251,13 +267,22 @@
 "供するのに十分と言えるまでには、まだまだ
長い道のりがあります。"
 
 #. 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=\"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."
 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=\"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."
+"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 ""
 "幸運なことに、Linuxがあったので、わたしたちはHurdを待
つ必要はありませんでし"
 
"た。1992年にトーバルズがLinuxを自由ソフトウェアとしてから、それはGNUシステãƒ
 "
@@ -267,16 +292,27 @@
 "含んだGNUシステム
のバージョンです。別の言葉で言えば、GNU/Linuxシステム
です。"
 
 #. 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 "
-"Linux.  Integrating a complete system as a distribution that would work "
-"&ldquo;out of the box&rdquo; was a big job, too.  It required addressing the "
-"issue of how to install and boot the system&mdash;a problem we had not "
-"tackled, because we hadn't yet reached that point.  Thus, the people who "
-"developed the various system distributions did a lot of essential work.  But "
-"it was work that, in the nature of things, was surely going to be done by "
-"someone."
+#, fuzzy
+#| 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 Linux.  Integrating a complete system as a distribution that "
+#| "would work &ldquo;out of the box&rdquo; was a big job, too.  It required "
+#| "addressing the issue of how to install and boot the system&mdash;a "
+#| "problem we had not tackled, because we hadn't yet reached that point.  "
+#| "Thus, the people who developed the various system distributions did a lot "
+#| "of essential work.  But it was work that, in the nature of things, was "
+#| "surely going to be done by someone."
+msgid ""
+"Making them work well together was not a trivial job.  Some GNU "
+"components&#8239;<a class=\"ftn\" href=\"#somecomponents\">[3]</a> needed "
+"substantial change to work with Linux.  Integrating a complete system as a "
+"distribution that would work &ldquo;out of the box&rdquo; was a big job, "
+"too.  It required addressing the issue of how to install and boot the "
+"system&mdash;a problem we had not tackled, because we hadn't yet reached "
+"that point.  Thus, the people who developed the various system distributions "
+"did a lot of essential work.  But it was work that, in the nature of things, "
+"was surely going to be done by someone."
 msgstr ""
 
"それらを一緒に動くようにするということは、とるにたらない仕事ではありませんで"
 "した。いくつかのGNUのコンポーネント<a 
href=\"#somecomponents\">(3)</a>は、"
@@ -357,12 +393,20 @@
 "&ldquo;GNU/Linux&rdquo;と呼んでください。"
 
 #. 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\"> 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=\"https://foldoc.org/linux\";>https://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\"> 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=\"https://";
-"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
+"this page and <a href=\"/gnu/thegnuproject.html\"> https://www.gnu.org/gnu/";
+"thegnuproject.html</a> are good choices.  If you mention Linux, the 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\"> 
https://www.gnu.org/gnu/the-";
@@ -375,13 +419,21 @@
 msgstr "あとがき"
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| 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 UC Berkeley.  It was nonfree in the 80s, but became free in the early "
+#| "90s.  A free operating system that exists today<a href=\"#newersystems\">"
+#| "(4)</a> is almost certainly either a variant of the GNU system, or a kind "
+#| "of BSD system."
 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 "
 "UC Berkeley.  It was nonfree in the 80s, but became free in the early 90s.  "
-"A free operating system that exists today<a href=\"#newersystems\">(4)</a> "
-"is almost certainly either a variant of the GNU system, or a kind of BSD "
-"system."
+"A free operating system that exists today&#8239;<a class=\"ftn\" href="
+"\"#newersystems\">[4]</a> is almost certainly either a variant of the GNU "
+"system, or a kind of BSD system."
 msgstr ""
 
"GNUのほかに、別にプロジェクトがもう一つあり、Unixライクなオペレーティング・シ"
 "ステムを独立に作り上げています。このシステム
はBSDとして知られ、カリフォルニア"
@@ -391,6 +443,17 @@
 "てまず間違いありません。"
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| 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 example of the GNU Project, and explicit appeals from GNU "
+#| "activists helped persuade them, but the code had little overlap with "
+#| "GNU.  BSD systems today use some GNU programs, just as the GNU system and "
+#| "its variants use some BSD programs; however, taken as wholes, they are "
+#| "two different systems that evolved separately.  The BSD developers did "
+#| "not write a kernel and add it to the GNU system, and a name like GNU/BSD "
+#| "would not fit the situation.<a href=\"#gnubsd\">(5)</a>"
 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 "
@@ -399,8 +462,8 @@
 "use some GNU programs, just as the GNU system and its variants use some BSD "
 "programs; however, taken as wholes, they are two different systems that "
 "evolved separately.  The BSD developers did not write a kernel and add it to "
-"the GNU system, and a name like GNU/BSD would not fit the situation.<a href="
-"\"#gnubsd\">(5)</a>"
+"the GNU system, and a name like GNU/BSD would not fit the situation&#8239;<a "
+"class=\"ftn\" href=\"#gnubsd\">[5]</a>."
 msgstr ""
 
"BSDはGNUのひとつの版かどうか(GNU/Linuxのように)、と、聞かれることがままありま"
 "す。BSDの開発者
たちは、GNUプロジェクトの例に触発されて、かれらのコードを自由"

Index: po/linux-and-gnu.ko.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.ko.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- po/linux-and-gnu.ko.po      11 Oct 2021 09:34:52 -0000      1.7
+++ po/linux-and-gnu.ko.po      2 Nov 2021 14:41:53 -0000       1.8
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-10-11 09:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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"
@@ -340,16 +340,18 @@
 # | set out to make it one.  We made a list of the programs needed to make a
 # | <em>complete</em> free system, and we systematically found, wrote, or
 # | found people to write everything on the list.  We wrote essential but
-# | unexciting [-major components, such as the assembler and linker,-] {+<a
-# | href=\"#unexciting\">(1)</a> components+} because you can't have a system
-# | without them.  [-A complete-]  {+Some of our+} system [-needs more than
-# | just programming tools; the Bourne Again SHell, the PostScript interpreter
-# | <a href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and-]
+# | [-unexciting major components, such as the assembler and linker,-]
+# | {+unexciting&#8239;<a class=\"ftn\" href=\"#unexciting\">[1]</a>
+# | components+} because you can't have a system without them.  [-A complete-]
+# |  {+Some of our+} system [-needs more than just programming tools; the
+# | Bourne Again SHell, the PostScript interpreter <a
+# | href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and-]
 # | {+components,+} the [-<a href=\"/software/libc/libc.html\">GNU C
 # | library</a>-] {+programming tools, became popular on their own among
 # | programmers, but we wrote many components that+} are [-just as
-# | important.-] {+not tools <a href=\"#nottools\">(2)</a>.  We even developed
-# | a chess game, GNU Chess, because a complete system needs games too.+}
+# | important.-] {+not tools&#8239;<a class=\"ftn\"
+# | href=\"#nottools\">[2]</a>.  We even developed a chess game, GNU Chess,
+# | because a complete system needs games too.+}
 #, fuzzy
 #| msgid ""
 #| "Many people have made major contributions to the free software in the "
@@ -371,12 +373,12 @@
 "programs&mdash;is because the GNU Project set out to make it one.  We made a "
 "list of the programs needed to make a <em>complete</em> free system, and we "
 "systematically found, wrote, or found people to write everything on the "
-"list.  We wrote essential but unexciting <a href=\"#unexciting\">(1)</a> "
-"components because you can't have a system without them.  Some of our system "
-"components, the programming tools, became popular on their own among "
-"programmers, but we wrote many components that are not tools <a href="
-"\"#nottools\">(2)</a>.  We even developed a chess game, GNU Chess, because a "
-"complete system needs games too."
+"list.  We wrote essential but unexciting&#8239;<a class=\"ftn\" href="
+"\"#unexciting\">[1]</a> components because you can't have a system without "
+"them.  Some of our system components, the programming tools, became popular "
+"on their own among programmers, but we wrote many components that are not "
+"tools&#8239;<a class=\"ftn\" href=\"#nottools\">[2]</a>.  We even developed "
+"a chess game, GNU Chess, because a complete system needs games too."
 msgstr ""
 "많은 사람들이 운영체제의 주요 부분들을 작성함으로써 
많은 기여를 했고, 그 프로"
 "그램들은 모두 전체 시스템을 대표할 이름으로 사용될 
만한 충분한 자격이 있습니"
@@ -428,8 +430,8 @@
 # | 
[-href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\";>put-]
 # | 
{+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,
+# | free [-system: a Linux-based-] {+system&mdash;a version of the+} GNU
+# | system [-(or-] {+which also contained Linux.  The+} GNU/Linux system,
 # | [-for short).-] {+in other words.+}
 #, fuzzy
 #| msgid ""
@@ -444,8 +446,8 @@
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
 "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."
+"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 ""
 "다행스럽게도 우리는 리누스 토발즈가 개발한 커널인 리눅
스의 개발이 완료되었다"
 "는 사실을 알게 되었고, 곧이어 자유 소프트웨어인 리눅스 
커널이 <a href="
@@ -457,15 +459,16 @@
 # | [-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
-# | short)-]  {+Some GNU components<a href=\"#somecomponents\">(3)</a>+}
-# | needed substantial [-changes.-] {+change to work with Linux.+} 
-# | Integrating a complete system as a distribution that would work &ldquo;out
-# | of the box&rdquo; was a big job, too.  It required addressing the issue of
-# | how to install and boot the system&mdash;a problem we had not tackled,
-# | because we hadn't yet reached that point.  [-The-]  {+Thus, the+} people
-# | who developed the various system distributions [-made-] {+did+} a
-# | [-substantial contribution.-] {+lot of essential work.  But it was work
-# | that, in the nature of things, was surely going to be done by someone.+}
+# | short)-]  {+Some GNU components&#8239;<a class=\"ftn\"
+# | href=\"#somecomponents\">[3]</a>+} needed substantial [-changes.-]
+# | {+change to work with Linux.+}  Integrating a complete system as a
+# | distribution that would work &ldquo;out of the box&rdquo; was a big job,
+# | too.  It required addressing the issue of how to install and boot the
+# | system&mdash;a problem we had not tackled, because we hadn't yet reached
+# | that point.  [-The-]  {+Thus, the+} people who developed the various
+# | system distributions [-made-] {+did+} a [-substantial contribution.-]
+# | {+lot of essential work.  But it was work that, in the nature of things,
+# | was surely going to be done by someone.+}
 #, fuzzy
 #| msgid ""
 #| "Putting them together sounds simple, but it was not a trivial job.  The "
@@ -477,15 +480,15 @@
 #| "that point.  The people who developed the various system distributions "
 #| "made a substantial contribution."
 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 "
-"Linux.  Integrating a complete system as a distribution that would work "
-"&ldquo;out of the box&rdquo; was a big job, too.  It required addressing the "
-"issue of how to install and boot the system&mdash;a problem we had not "
-"tackled, because we hadn't yet reached that point.  Thus, the people who "
-"developed the various system distributions did a lot of essential work.  But "
-"it was work that, in the nature of things, was surely going to be done by "
-"someone."
+"Making them work well together was not a trivial job.  Some GNU "
+"components&#8239;<a class=\"ftn\" href=\"#somecomponents\">[3]</a> needed "
+"substantial change to work with Linux.  Integrating a complete system as a "
+"distribution that would work &ldquo;out of the box&rdquo; was a big job, "
+"too.  It required addressing the issue of how to install and boot the "
+"system&mdash;a problem we had not tackled, because we hadn't yet reached "
+"that point.  Thus, the people who developed the various system distributions "
+"did a lot of essential work.  But it was work that, in the nature of things, "
+"was surely going to be done by someone."
 msgstr ""
 "그러나 이들을 결합시킨다는 것은 말처럼 간단한 작업이 
아니었습니다. 설치와 함"
 "께 즉시 사용할 수 있는 배포본으로서의 시스템을 
구축하는 것은 무척이나 방대한 "
@@ -582,10 +585,10 @@
 #. 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\"> 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=\"https://";
-"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
+"this page and <a href=\"/gnu/thegnuproject.html\"> https://www.gnu.org/gnu/";
+"thegnuproject.html</a> are good choices.  If you mention Linux, the 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><h3>
@@ -602,8 +605,8 @@
 # | use some GNU software, just as-] {+became free in+} the [-GNU system and
 # | its variants use some BSD software; but taken as wholes, they are two
 # | different systems which evolved separately.-] {+early 90s.+}  A free
-# | operating system that exists [-today-] {+today<a
-# | href=\"#newersystems\">(4)</a>+} is almost certainly either a variant of
+# | operating system that exists [-today-] {+today&#8239;<a class=\"ftn\"
+# | href=\"#newersystems\">[4]</a>+} is almost certainly either a variant of
 # | the GNU system, or a kind of BSD system.
 #, fuzzy
 #| msgid ""
@@ -621,9 +624,9 @@
 "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 the early 90s.  "
-"A free operating system that exists today<a href=\"#newersystems\">(4)</a> "
-"is almost certainly either a variant of the GNU system, or a kind of BSD "
-"system."
+"A free operating system that exists today&#8239;<a class=\"ftn\" href="
+"\"#newersystems\">[4]</a> is almost certainly either a variant of the GNU "
+"system, or a kind of BSD system."
 msgstr ""
 "유닉스 형태의 자유 운영체제를 개발하기 위한 또하나의 
프로젝트로 UC 버클리 대"
 "학의 BSD가 있습니다. BSD의 개발자들은 GNU 프로젝트와 그 
개발자들에게 많은 영"
@@ -642,8 +645,8 @@
 "use some GNU programs, just as the GNU system and its variants use some BSD "
 "programs; however, taken as wholes, they are two different systems that "
 "evolved separately.  The BSD developers did not write a kernel and add it to "
-"the GNU system, and a name like GNU/BSD would not fit the situation.<a href="
-"\"#gnubsd\">(5)</a>"
+"the GNU system, and a name like GNU/BSD would not fit the situation&#8239;<a "
+"class=\"ftn\" href=\"#gnubsd\">[5]</a>."
 msgstr ""
 
 #. type: Content of: <div><h3>

Index: po/linux-and-gnu.lt-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.lt-diff.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- po/linux-and-gnu.lt-diff.html       11 Oct 2021 09:34:53 -0000      1.11
+++ po/linux-and-gnu.lt-diff.html       2 Nov 2021 14:41:53 -0000       1.12
@@ -12,23 +12,31 @@
 <body><pre>
 &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;!-- This page is derived from /server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="gnulinux" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</em></ins></span> --&gt;
 &lt;title&gt;Linux and GNU
 - GNU Project - Free Software Foundation&lt;/title&gt;
+<span class="inserted"><ins><em>&lt;style type="text/css" 
media="print,screen"&gt;&lt;!--
+a.ftn { font-size: .94em; }
+--&gt;&lt;/style&gt;</em></ins></span>
 &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="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&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 &lt;a 
href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&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"&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="announcement"&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;,
+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;/blockquote&gt;
 &lt;/div&gt;</strong></del></span>
@@ -133,11 +141,12 @@
 to make it one.  We made a list of the programs needed to make
 a &lt;em&gt;complete&lt;/em&gt; free system, and we systematically found, 
wrote,
 or found people to write everything on the list.  We wrote essential
-but unexciting
-&lt;a href="#unexciting"&gt;(1)&lt;/a&gt; components because you can't have a 
system
+but <span class="removed"><del><strong>unexciting
+&lt;a href="#unexciting"&gt;(1)&lt;/a&gt;</strong></del></span> <span 
class="inserted"><ins><em>unexciting&#8239;&lt;a class="ftn" 
href="#unexciting"&gt;[1]&lt;/a&gt;</em></ins></span> components
+because you can't have a system
 without them.  Some of our system components, the programming tools,
 became popular on their own among programmers, but we wrote many
-components that are not tools  &lt;a href="#nottools"&gt;(2)&lt;/a&gt;.  We 
even
+components that are not <span class="removed"><del><strong>tools  &lt;a 
href="#nottools"&gt;(2)&lt;/a&gt;.</strong></del></span> <span 
class="inserted"><ins><em>tools&#8239;&lt;a class="ftn" 
href="#nottools"&gt;[2]&lt;/a&gt;.</em></ins></span>  We even
 developed a chess game, GNU Chess, because a complete system needs
 games too.&lt;/p&gt;
 
@@ -155,13 +164,15 @@
 Once Torvalds freed Linux in 1992, it fit into the last major gap in
 the GNU system.  People could
 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
+combine Linux with the GNU system&lt;/a&gt; to make a complete free <span 
class="removed"><del><strong>system
+&mdash; a</strong></del></span> <span 
class="inserted"><ins><em>system&mdash;a</em></ins></span>
+version of the GNU system which also contained Linux.  The
 GNU/Linux system, in other words.&lt;/p&gt;
 
 &lt;p&gt;
 Making them work well together was not a trivial job.  Some GNU
-components&lt;a href="#somecomponents"&gt;(3)&lt;/a&gt; needed substantial 
change
+<span class="removed"><del><strong>components&lt;a 
href="#somecomponents"&gt;(3)&lt;/a&gt;</strong></del></span>
+<span class="inserted"><ins><em>components&#8239;&lt;a class="ftn" 
href="#somecomponents"&gt;[3]&lt;/a&gt;</em></ins></span> needed substantial 
change
 to work with Linux.  Integrating a complete system as a distribution
 that would work &ldquo;out of the box&rdquo; was a big job, too.  It
 required addressing the issue of how to install and boot the
@@ -209,9 +220,9 @@
 
 &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;
-<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
+reference, this page and &lt;a <span 
class="removed"><del><strong>href="/gnu/the-gnu-project.html"&gt;
+http://www.gnu.org/gnu/the-gnu-project.html&lt;/a&gt;</strong></del></span> 
<span class="inserted"><ins><em>href="/gnu/thegnuproject.html"&gt;
+https://www.gnu.org/gnu/thegnuproject.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 <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;
@@ -226,7 +237,8 @@
 a free Unix-like operating system.  This system is known as BSD, and
 it was developed at UC Berkeley.  It was <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> in the 80s, but
 became free in the early 90s.  A free operating system that exists
-today&lt;a href="#newersystems"&gt;(4)&lt;/a&gt; is almost certainly either a
+<span class="removed"><del><strong>today&lt;a 
href="#newersystems"&gt;(4)&lt;/a&gt;</strong></del></span>
+<span class="inserted"><ins><em>today&#8239;&lt;a class="ftn" 
href="#newersystems"&gt;[4]&lt;/a&gt;</em></ins></span> is almost certainly 
either a
 variant of the GNU system, or a kind of BSD system.&lt;/p&gt;
 
 &lt;p&gt;
@@ -238,11 +250,12 @@
 system and its variants use some BSD programs; however, taken as
 wholes, they are two different systems that evolved separately.  The
 BSD developers did not write a kernel and add it to the GNU system,
-and a name like GNU/BSD would not fit the situation.&lt;a
+and a name like GNU/BSD would not fit the <span 
class="removed"><del><strong>situation.&lt;a
 href="#gnubsd"&gt;(5)&lt;/a&gt;&lt;/p&gt;
 
-<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&gt;Notes:&lt;/h3&gt;</strong></del></span> <span 
class="inserted"><ins><em>situation&#8239;&lt;a class="ftn"
+href="#gnubsd"&gt;[5]&lt;/a&gt;.&lt;/p&gt;
+&lt;div class="column-limit"&gt;&lt;/div&gt;
 
 &lt;h3 class="footnote"&gt;Footnotes&lt;/h3&gt;</em></ins></span>
 &lt;ol&gt;
@@ -350,7 +363,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/10/11 09:34:53 $
+$Date: 2021/11/02 14:41:53 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: po/linux-and-gnu.lt.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.lt.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- po/linux-and-gnu.lt.po      11 Oct 2021 09:34:54 -0000      1.14
+++ po/linux-and-gnu.lt.po      2 Nov 2021 14:41:53 -0000       1.15
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-10-11 09:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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"
@@ -270,6 +270,36 @@
 "<em>išbaigtą, laisvą, panašią į Unix sistemą</em>: GNU."
 
 #. type: Content of: <div><p>
+# | 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
+# | is <em>an integrated system</em>&mdash;and not just a collection of useful
+# | programs&mdash;is because the GNU Project set out to make it one.  We made
+# | a list of the programs needed to make a <em>complete</em> free system, and
+# | we systematically found, wrote, or found people to write everything on the
+# | list.  We wrote essential but [-unexciting <a
+# | href=\"#unexciting\">(1)</a>-] {+unexciting&#8239;<a class=\"ftn\"
+# | href=\"#unexciting\">[1]</a>+} components because you can't have a system
+# | without them.  Some of our system components, the programming tools,
+# | became popular on their own among programmers, but we wrote many
+# | components that are not [-tools <a href=\"#nottools\">(2)</a>.-]
+# | {+tools&#8239;<a class=\"ftn\" href=\"#nottools\">[2]</a>.+}  We even
+# | developed a chess game, GNU Chess, because a complete system needs games
+# | too.
+#, fuzzy
+#| 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 is <em>an integrated system</em>&mdash;and not just a collection of "
+#| "useful programs&mdash;is because the GNU Project set out to make it one.  "
+#| "We made a list of the programs needed to make a <em>complete</em> free "
+#| "system, and we systematically found, wrote, or found people to write "
+#| "everything on the list.  We wrote essential but unexciting <a href="
+#| "\"#unexciting\">(1)</a> components because you can't have a system "
+#| "without them.  Some of our system components, the programming tools, "
+#| "became popular on their own among programmers, but we wrote many "
+#| "components that are not tools <a href=\"#nottools\">(2)</a>.  We even "
+#| "developed a chess game, GNU Chess, because a complete system needs games "
+#| "too."
 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 "
@@ -277,12 +307,12 @@
 "programs&mdash;is because the GNU Project set out to make it one.  We made a "
 "list of the programs needed to make a <em>complete</em> free system, and we "
 "systematically found, wrote, or found people to write everything on the "
-"list.  We wrote essential but unexciting <a href=\"#unexciting\">(1)</a> "
-"components because you can't have a system without them.  Some of our system "
-"components, the programming tools, became popular on their own among "
-"programmers, but we wrote many components that are not tools <a href="
-"\"#nottools\">(2)</a>.  We even developed a chess game, GNU Chess, because a "
-"complete system needs games too."
+"list.  We wrote essential but unexciting&#8239;<a class=\"ftn\" href="
+"\"#unexciting\">[1]</a> components because you can't have a system without "
+"them.  Some of our system components, the programming tools, became popular "
+"on their own among programmers, but we wrote many components that are not "
+"tools&#8239;<a class=\"ftn\" href=\"#nottools\">[2]</a>.  We even developed "
+"a chess game, GNU Chess, because a complete system needs games too."
 msgstr ""
 "Daug žmonių padarė svarbių prisidėjimų prie laisvos programinės 
įrangos toje "
 "sistemoje ir jie visi nusipelnė paminėjimo už jų programinę įrangą.  
Bet jos "
@@ -319,9 +349,9 @@
 # | 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.
+# | combine Linux with the GNU system</a> to make a complete free [-system
+# | &mdash; a-] {+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 "
@@ -336,8 +366,8 @@
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
 "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."
+"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 ""
 "Laimei, mums nereikėjo laukti Hurd, dėl Linux.  Kai Torvalds išlaisvino "
 "Linux 1992&nbsp;m., jis užpildė paskutinę didelę GNU sistemos spragą.  "
@@ -347,16 +377,37 @@
 "padarymui.  Kitais žodžiais, GNU/Linux sistema."
 
 #. 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 "
-"Linux.  Integrating a complete system as a distribution that would work "
-"&ldquo;out of the box&rdquo; was a big job, too.  It required addressing the "
-"issue of how to install and boot the system&mdash;a problem we had not "
-"tackled, because we hadn't yet reached that point.  Thus, the people who "
-"developed the various system distributions did a lot of essential work.  But "
-"it was work that, in the nature of things, was surely going to be done by "
-"someone."
+# | Making them work well together was not a trivial job.  Some GNU
+# | [-components<a href=\"#somecomponents\">(3)</a>-] {+components&#8239;<a
+# | class=\"ftn\" href=\"#somecomponents\">[3]</a>+} needed substantial change
+# | to work with Linux.  Integrating a complete system as a distribution that
+# | would work &ldquo;out of the box&rdquo; was a big job, too.  It required
+# | addressing the issue of how to install and boot the system&mdash;a problem
+# | we had not tackled, because we hadn't yet reached that point.  Thus, the
+# | people who developed the various system distributions did a lot of
+# | essential work.  But it was work that, in the nature of things, was surely
+# | going to be done by someone.
+#, fuzzy
+#| 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 Linux.  Integrating a complete system as a distribution that "
+#| "would work &ldquo;out of the box&rdquo; was a big job, too.  It required "
+#| "addressing the issue of how to install and boot the system&mdash;a "
+#| "problem we had not tackled, because we hadn't yet reached that point.  "
+#| "Thus, the people who developed the various system distributions did a lot "
+#| "of essential work.  But it was work that, in the nature of things, was "
+#| "surely going to be done by someone."
+msgid ""
+"Making them work well together was not a trivial job.  Some GNU "
+"components&#8239;<a class=\"ftn\" href=\"#somecomponents\">[3]</a> needed "
+"substantial change to work with Linux.  Integrating a complete system as a "
+"distribution that would work &ldquo;out of the box&rdquo; was a big job, "
+"too.  It required addressing the issue of how to install and boot the "
+"system&mdash;a problem we had not tackled, because we hadn't yet reached "
+"that point.  Thus, the people who developed the various system distributions "
+"did a lot of essential work.  But it was work that, in the nature of things, "
+"was surely going to be done by someone."
 msgstr ""
 "Jų padarymas veikti gerai kartu nebuvo lengvas darbas.  Kai kuriuos GNU "
 "komponentus<a href=\"#somecomponents\">(3)</a> reikėjo reikšmingai pakeisti 
"
@@ -501,11 +552,12 @@
 
 #. 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>-]
+# | reference, this page and <a [-href=\"/gnu/the-gnu-project.html\">
+# | http://www.gnu.org/gnu/the-gnu-project.html</a>-]
+# | {+href=\"/gnu/thegnuproject.html\">
+# | https://www.gnu.org/gnu/thegnuproject.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
@@ -518,10 +570,10 @@
 #| "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\"> 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=\"https://";
-"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
+"this page and <a href=\"/gnu/thegnuproject.html\"> https://www.gnu.org/gnu/";
+"thegnuproject.html</a> are good choices.  If you mention Linux, the 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://";
@@ -538,9 +590,10 @@
 # | 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
-# | in the early 90s.  A free operating system that exists today<a
-# | href=\"#newersystems\">(4)</a> is almost certainly either a variant of the
-# | GNU system, or a kind of BSD system.
+# | in the early 90s.  A free operating system that exists [-today<a
+# | href=\"#newersystems\">(4)</a>-] {+today&#8239;<a class=\"ftn\"
+# | href=\"#newersystems\">[4]</a>+} is almost certainly either a variant of
+# | the GNU system, or a kind of BSD system.
 #, fuzzy
 #| msgid ""
 #| "Aside from GNU, one other project has independently produced a free Unix-"
@@ -553,9 +606,9 @@
 "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 the early 90s.  "
-"A free operating system that exists today<a href=\"#newersystems\">(4)</a> "
-"is almost certainly either a variant of the GNU system, or a kind of BSD "
-"system."
+"A free operating system that exists today&#8239;<a class=\"ftn\" href="
+"\"#newersystems\">[4]</a> is almost certainly either a variant of the GNU "
+"system, or a kind of BSD system."
 msgstr ""
 "Be GNU, vienas kitas projektas nepriklausomai pagamino laisvą, panašią į "
 "Unix operacinę sistemą.  Ši sistema yra žinoma kaip BSD ir ji buvo 
išvystyta "
@@ -565,6 +618,27 @@
 "užtikrintai yra arba GNU sistemos variantas, arba BSD sistemos tipas."
 
 #. 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
+# | persuade them, but the code had little overlap with GNU.  BSD systems
+# | today use some GNU programs, just as the GNU system and its variants use
+# | some BSD programs; however, taken as wholes, they are two different
+# | systems that evolved separately.  The BSD developers did not write a
+# | kernel and add it to the GNU system, and a name like GNU/BSD would not fit
+# | the [-situation.<a href=\"#gnubsd\">(5)</a>-] {+situation&#8239;<a
+# | class=\"ftn\" href=\"#gnubsd\">[5]</a>.+}
+#, fuzzy
+#| 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 example of the GNU Project, and explicit appeals from GNU "
+#| "activists helped persuade them, but the code had little overlap with "
+#| "GNU.  BSD systems today use some GNU programs, just as the GNU system and "
+#| "its variants use some BSD programs; however, taken as wholes, they are "
+#| "two different systems that evolved separately.  The BSD developers did "
+#| "not write a kernel and add it to the GNU system, and a name like GNU/BSD "
+#| "would not fit the situation.<a href=\"#gnubsd\">(5)</a>"
 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 "
@@ -573,8 +647,8 @@
 "use some GNU programs, just as the GNU system and its variants use some BSD "
 "programs; however, taken as wholes, they are two different systems that "
 "evolved separately.  The BSD developers did not write a kernel and add it to "
-"the GNU system, and a name like GNU/BSD would not fit the situation.<a href="
-"\"#gnubsd\">(5)</a>"
+"the GNU system, and a name like GNU/BSD would not fit the situation&#8239;<a "
+"class=\"ftn\" href=\"#gnubsd\">[5]</a>."
 msgstr ""
 "Žmonės kartais klausia ar BSD irgi yra GNU versija, kaip GNU/Linux.  BSD "
 "autoriai buvo įkvėpti jų kodą padaryti laisva programine įranga pagal 
GNU "

Index: po/linux-and-gnu.ml-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.ml-diff.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- po/linux-and-gnu.ml-diff.html       11 Oct 2021 09:34:55 -0000      1.19
+++ po/linux-and-gnu.ml-diff.html       2 Nov 2021 14:41:53 -0000       1.20
@@ -12,24 +12,32 @@
 <body><pre>
 &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;!-- This page is derived from /server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="gnulinux" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</em></ins></span> --&gt;
 &lt;title&gt;Linux and GNU
 - GNU Project - Free Software Foundation&lt;/title&gt;
+<span class="inserted"><ins><em>&lt;style type="text/css" 
media="print,screen"&gt;&lt;!--
+a.ftn { font-size: .94em; }
+--&gt;&lt;/style&gt;</em></ins></span>
 &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="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&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 &lt;a 
href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;
 
 &lt;div class="announcement"&gt;
   &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</strong></del></span>
+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/why-gnu-linux.html"&gt;Why 
GNU/Linux?&lt;/a&gt;&lt;/p&gt;
+<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;
   &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>
@@ -133,11 +141,12 @@
 to make it one.  We made a list of the programs needed to make
 a &lt;em&gt;complete&lt;/em&gt; free system, and we systematically found, 
wrote,
 or found people to write everything on the list.  We wrote essential
-but unexciting
-&lt;a href="#unexciting"&gt;(1)&lt;/a&gt; components because you can't have a 
system
+but <span class="removed"><del><strong>unexciting
+&lt;a href="#unexciting"&gt;(1)&lt;/a&gt;</strong></del></span> <span 
class="inserted"><ins><em>unexciting&#8239;&lt;a class="ftn" 
href="#unexciting"&gt;[1]&lt;/a&gt;</em></ins></span> components
+because you can't have a system
 without them.  Some of our system components, the programming tools,
 became popular on their own among programmers, but we wrote many
-components that are not tools  &lt;a href="#nottools"&gt;(2)&lt;/a&gt;.  We 
even
+components that are not <span class="removed"><del><strong>tools  &lt;a 
href="#nottools"&gt;(2)&lt;/a&gt;.</strong></del></span> <span 
class="inserted"><ins><em>tools&#8239;&lt;a class="ftn" 
href="#nottools"&gt;[2]&lt;/a&gt;.</em></ins></span>  We even
 developed a chess game, GNU Chess, because a complete system needs
 games too.&lt;/p&gt;
 
@@ -155,13 +164,15 @@
 Once Torvalds freed Linux in 1992, it fit into the last major gap in
 the GNU system.  People could
 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
+combine Linux with the GNU system&lt;/a&gt; to make a complete free <span 
class="removed"><del><strong>system
+&mdash; a</strong></del></span> <span 
class="inserted"><ins><em>system&mdash;a</em></ins></span>
+version of the GNU system which also contained Linux.  The
 GNU/Linux system, in other words.&lt;/p&gt;
 
 &lt;p&gt;
 Making them work well together was not a trivial job.  Some GNU
-components&lt;a href="#somecomponents"&gt;(3)&lt;/a&gt; needed substantial 
change
+<span class="removed"><del><strong>components&lt;a 
href="#somecomponents"&gt;(3)&lt;/a&gt;</strong></del></span>
+<span class="inserted"><ins><em>components&#8239;&lt;a class="ftn" 
href="#somecomponents"&gt;[3]&lt;/a&gt;</em></ins></span> needed substantial 
change
 to work with Linux.  Integrating a complete system as a distribution
 that would work &ldquo;out of the box&rdquo; was a big job, too.  It
 required addressing the issue of how to install and boot the
@@ -211,9 +222,9 @@
 
 &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;
-<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
+reference, this page and &lt;a <span 
class="removed"><del><strong>href="/gnu/the-gnu-project.html"&gt;
+http://www.gnu.org/gnu/the-gnu-project.html&lt;/a&gt;</strong></del></span> 
<span class="inserted"><ins><em>href="/gnu/thegnuproject.html"&gt;
+https://www.gnu.org/gnu/thegnuproject.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 <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;
@@ -227,7 +238,8 @@
 a free Unix-like operating system.  This system is known as BSD, and
 it was developed at UC Berkeley.  It was <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> in the 80s, but
 became free in the early 90s.  A free operating system that exists
-today&lt;a href="#newersystems"&gt;(4)&lt;/a&gt; is almost certainly either a
+<span class="removed"><del><strong>today&lt;a 
href="#newersystems"&gt;(4)&lt;/a&gt;</strong></del></span>
+<span class="inserted"><ins><em>today&#8239;&lt;a class="ftn" 
href="#newersystems"&gt;[4]&lt;/a&gt;</em></ins></span> is almost certainly 
either a
 variant of the GNU system, or a kind of BSD system.&lt;/p&gt;
 
 &lt;p&gt;
@@ -239,11 +251,12 @@
 system and its variants use some BSD programs; however, taken as
 wholes, they are two different systems that evolved separately.  The
 BSD developers did not write a kernel and add it to the GNU system,
-and a name like GNU/BSD would not fit the situation.&lt;a
+and a name like GNU/BSD would not fit the <span 
class="removed"><del><strong>situation.&lt;a
 href="#gnubsd"&gt;(5)&lt;/a&gt;&lt;/p&gt;
 
-<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&gt;Notes:&lt;/h3&gt;</strong></del></span> <span 
class="inserted"><ins><em>situation&#8239;&lt;a class="ftn"
+href="#gnubsd"&gt;[5]&lt;/a&gt;.&lt;/p&gt;
+&lt;div class="column-limit"&gt;&lt;/div&gt;
 
 &lt;h3 class="footnote"&gt;Footnotes&lt;/h3&gt;</em></ins></span>
 &lt;ol&gt;
@@ -352,7 +365,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/10/11 09:34:55 $
+$Date: 2021/11/02 14:41:53 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: po/linux-and-gnu.ml.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.ml.po,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- po/linux-and-gnu.ml.po      11 Oct 2021 09:34:55 -0000      1.53
+++ po/linux-and-gnu.ml.po      2 Nov 2021 14:41:53 -0000       1.54
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-10-11 09:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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"
@@ -264,6 +264,36 @@
 "യുണിക്സ്-പോലുള്ളതുമായ ഒരു 
സിസ്റ്റം</em> വികസിപ്പിയ്ക്കുക 
എന്നതായിരുന്നു."
 
 #. type: Content of: <div><p>
+# | 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
+# | is <em>an integrated system</em>&mdash;and not just a collection of useful
+# | programs&mdash;is because the GNU Project set out to make it one.  We made
+# | a list of the programs needed to make a <em>complete</em> free system, and
+# | we systematically found, wrote, or found people to write everything on the
+# | list.  We wrote essential but [-unexciting <a
+# | href=\"#unexciting\">(1)</a>-] {+unexciting&#8239;<a class=\"ftn\"
+# | href=\"#unexciting\">[1]</a>+} components because you can't have a system
+# | without them.  Some of our system components, the programming tools,
+# | became popular on their own among programmers, but we wrote many
+# | components that are not [-tools <a href=\"#nottools\">(2)</a>.-]
+# | {+tools&#8239;<a class=\"ftn\" href=\"#nottools\">[2]</a>.+}  We even
+# | developed a chess game, GNU Chess, because a complete system needs games
+# | too.
+#, fuzzy
+#| 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 is <em>an integrated system</em>&mdash;and not just a collection of "
+#| "useful programs&mdash;is because the GNU Project set out to make it one.  "
+#| "We made a list of the programs needed to make a <em>complete</em> free "
+#| "system, and we systematically found, wrote, or found people to write "
+#| "everything on the list.  We wrote essential but unexciting <a href="
+#| "\"#unexciting\">(1)</a> components because you can't have a system "
+#| "without them.  Some of our system components, the programming tools, "
+#| "became popular on their own among programmers, but we wrote many "
+#| "components that are not tools <a href=\"#nottools\">(2)</a>.  We even "
+#| "developed a chess game, GNU Chess, because a complete system needs games "
+#| "too."
 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 "
@@ -271,12 +301,12 @@
 "programs&mdash;is because the GNU Project set out to make it one.  We made a "
 "list of the programs needed to make a <em>complete</em> free system, and we "
 "systematically found, wrote, or found people to write everything on the "
-"list.  We wrote essential but unexciting <a href=\"#unexciting\">(1)</a> "
-"components because you can't have a system without them.  Some of our system "
-"components, the programming tools, became popular on their own among "
-"programmers, but we wrote many components that are not tools <a href="
-"\"#nottools\">(2)</a>.  We even developed a chess game, GNU Chess, because a "
-"complete system needs games too."
+"list.  We wrote essential but unexciting&#8239;<a class=\"ftn\" href="
+"\"#unexciting\">[1]</a> components because you can't have a system without "
+"them.  Some of our system components, the programming tools, became popular "
+"on their own among programmers, but we wrote many components that are not "
+"tools&#8239;<a class=\"ftn\" href=\"#nottools\">[2]</a>.  We even developed "
+"a chess game, GNU Chess, because a complete system needs games too."
 msgstr ""
 "സിസ്റ്റത്തിലെ സ്വതന്ത്ര 
സോഫ്റ്റ്‌വെയറിലേയ്ക്കു് 
പലരും വിലപ്പെട്ട സംഭാവനകള്‍ 
നല്‍കിയിട്ടുണ്ടു്, "
 "അവരെല്ലാവരും ഇതിനു് അ
ംഗികാരം അ
ര്‍ഹിയ്ക്കുന്നുണ്ടു്. പക്ഷേ 
ഉപയോഗപ്രദമായ ഒരു കൂട്ടം 
പ്രോഗ്രാമുകളുടെ "
@@ -312,9 +342,9 @@
 # | 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.
+# | combine Linux with the GNU system</a> to make a complete free [-system
+# | &mdash; a-] {+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 "
@@ -329,8 +359,8 @@
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
 "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."
+"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 ""
 "ഭാഗ്യത്തിനു്, ലിനക്സ് 
ലഭ്യമായിരുന്നതു് കാരണം, 
ഞങ്ങള്‍ക്കു് ഹര്‍ഡിനായി 
കാത്തിരിയ്ക്കേണ്ടി 
വന്നില്ല. "
 "1992 ല്‍ ലിനസ് ടോര്‍വാള്‍ഡ്സ് 
ലിനക്സ് 
സ്വതന്ത്രമാക്കിയതോടെ അ
ദ്ദേഹം അവസാനത്തെ വലിയ വിടവും "
@@ -340,16 +370,37 @@
 "സാധിച്ചു. ചുരുക്കത്തില്‍ 
ഗ്നു/ലിനക്സ്."
 
 #. 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 "
-"Linux.  Integrating a complete system as a distribution that would work "
-"&ldquo;out of the box&rdquo; was a big job, too.  It required addressing the "
-"issue of how to install and boot the system&mdash;a problem we had not "
-"tackled, because we hadn't yet reached that point.  Thus, the people who "
-"developed the various system distributions did a lot of essential work.  But "
-"it was work that, in the nature of things, was surely going to be done by "
-"someone."
+# | Making them work well together was not a trivial job.  Some GNU
+# | [-components<a href=\"#somecomponents\">(3)</a>-] {+components&#8239;<a
+# | class=\"ftn\" href=\"#somecomponents\">[3]</a>+} needed substantial change
+# | to work with Linux.  Integrating a complete system as a distribution that
+# | would work &ldquo;out of the box&rdquo; was a big job, too.  It required
+# | addressing the issue of how to install and boot the system&mdash;a problem
+# | we had not tackled, because we hadn't yet reached that point.  Thus, the
+# | people who developed the various system distributions did a lot of
+# | essential work.  But it was work that, in the nature of things, was surely
+# | going to be done by someone.
+#, fuzzy
+#| 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 Linux.  Integrating a complete system as a distribution that "
+#| "would work &ldquo;out of the box&rdquo; was a big job, too.  It required "
+#| "addressing the issue of how to install and boot the system&mdash;a "
+#| "problem we had not tackled, because we hadn't yet reached that point.  "
+#| "Thus, the people who developed the various system distributions did a lot "
+#| "of essential work.  But it was work that, in the nature of things, was "
+#| "surely going to be done by someone."
+msgid ""
+"Making them work well together was not a trivial job.  Some GNU "
+"components&#8239;<a class=\"ftn\" href=\"#somecomponents\">[3]</a> needed "
+"substantial change to work with Linux.  Integrating a complete system as a "
+"distribution that would work &ldquo;out of the box&rdquo; was a big job, "
+"too.  It required addressing the issue of how to install and boot the "
+"system&mdash;a problem we had not tackled, because we hadn't yet reached "
+"that point.  Thus, the people who developed the various system distributions "
+"did a lot of essential work.  But it was work that, in the nature of things, "
+"was surely going to be done by someone."
 msgstr ""
 "അവ ചേര്‍ത്തു് 
വയ്ക്കുന്നതൊരു നിസാര 
പണിയായിരുന്നില്ല. ചില ഗ്നു 
ഘടകങ്ങള്‍ക്കു്&nbsp;<a href="
 "\"#somecomponents\">(3)</a> ലിനക്സുമായി 
ചേര്‍ന്നു് 
പ്രവര്‍ത്തിയ്ക്കുന്നതിനു് 
വേcണ്ടി സാരമായ "
@@ -497,11 +548,12 @@
 
 #. 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>-]
+# | reference, this page and <a [-href=\"/gnu/the-gnu-project.html\">
+# | http://www.gnu.org/gnu/the-gnu-project.html</a>-]
+# | {+href=\"/gnu/thegnuproject.html\">
+# | https://www.gnu.org/gnu/thegnuproject.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
@@ -514,10 +566,10 @@
 #| "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\"> 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=\"https://";
-"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
+"this page and <a href=\"/gnu/thegnuproject.html\"> https://www.gnu.org/gnu/";
+"thegnuproject.html</a> are good choices.  If you mention Linux, the 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-";
@@ -533,9 +585,10 @@
 # | 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
-# | in the early 90s.  A free operating system that exists today<a
-# | href=\"#newersystems\">(4)</a> is almost certainly either a variant of the
-# | GNU system, or a kind of BSD system.
+# | in the early 90s.  A free operating system that exists [-today<a
+# | href=\"#newersystems\">(4)</a>-] {+today&#8239;<a class=\"ftn\"
+# | href=\"#newersystems\">[4]</a>+} is almost certainly either a variant of
+# | the GNU system, or a kind of BSD system.
 #, fuzzy
 #| msgid ""
 #| "Aside from GNU, one other project has independently produced a free Unix-"
@@ -548,9 +601,9 @@
 "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 the early 90s.  "
-"A free operating system that exists today<a href=\"#newersystems\">(4)</a> "
-"is almost certainly either a variant of the GNU system, or a kind of BSD "
-"system."
+"A free operating system that exists today&#8239;<a class=\"ftn\" href="
+"\"#newersystems\">[4]</a> is almost certainly either a variant of the GNU "
+"system, or a kind of BSD system."
 msgstr ""
 "ഗ്നുവിനു് പുറമേ വേരൊരു 
സംരംഭവും ഒരു സ്വതന്ത്രമായ 
യുണിക്സ്-പോലുള്ള 
പ്രവര്‍ത്തക സംവിധാനം 
ഒറ്റയ്ക്കു് "
 "നിര്‍മ്മിച്ചിട്ടുണ്ടു്. 
യുസി ബെര്‍ക്കിലിയില്‍ 
വികസിപ്പിച്ചെടുത്ത ഈ 
സിസ്റ്റം ബിഎസ്ഡി "
@@ -560,6 +613,27 @@
 "സിസ്റ്റമോ ആണു്."
 
 #. 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
+# | persuade them, but the code had little overlap with GNU.  BSD systems
+# | today use some GNU programs, just as the GNU system and its variants use
+# | some BSD programs; however, taken as wholes, they are two different
+# | systems that evolved separately.  The BSD developers did not write a
+# | kernel and add it to the GNU system, and a name like GNU/BSD would not fit
+# | the [-situation.<a href=\"#gnubsd\">(5)</a>-] {+situation&#8239;<a
+# | class=\"ftn\" href=\"#gnubsd\">[5]</a>.+}
+#, fuzzy
+#| 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 example of the GNU Project, and explicit appeals from GNU "
+#| "activists helped persuade them, but the code had little overlap with "
+#| "GNU.  BSD systems today use some GNU programs, just as the GNU system and "
+#| "its variants use some BSD programs; however, taken as wholes, they are "
+#| "two different systems that evolved separately.  The BSD developers did "
+#| "not write a kernel and add it to the GNU system, and a name like GNU/BSD "
+#| "would not fit the situation.<a href=\"#gnubsd\">(5)</a>"
 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 "
@@ -568,8 +642,8 @@
 "use some GNU programs, just as the GNU system and its variants use some BSD "
 "programs; however, taken as wholes, they are two different systems that "
 "evolved separately.  The BSD developers did not write a kernel and add it to "
-"the GNU system, and a name like GNU/BSD would not fit the situation.<a href="
-"\"#gnubsd\">(5)</a>"
+"the GNU system, and a name like GNU/BSD would not fit the situation&#8239;<a "
+"class=\"ftn\" href=\"#gnubsd\">[5]</a>."
 msgstr ""
 "ഗ്നു/ലിനക്സ് പോലെ 
ബിഎസ്ഡിയും ഗ്നുവിന്റെ ഒരു 
പതിപ്പാണോ എന്നു് ആളുകള്‍ 
ചിലപ്പോള്‍ 
ചോദിയ്ക്കാറുണ്ടു്. ഗ്നു "
 "സംരംഭത്തിന്റെ മാതൃകയില്‍ 
നിന്നു് ആവേശമുള്‍ക്കൊണ്ടും, 
ഗ്നു പ്രവര്‍ത്തകരുടെ തുറന്ന 
അഭ്യര്‍ത്ഥനമാനിച്ചും ആണു് "

Index: po/linux-and-gnu.nl-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.nl-diff.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- po/linux-and-gnu.nl-diff.html       29 Oct 2021 13:32:43 -0000      1.26
+++ po/linux-and-gnu.nl-diff.html       2 Nov 2021 14:41:53 -0000       1.27
@@ -12,15 +12,23 @@
 <body><pre>
 &lt;!--#include <span 
class="removed"><del><strong>virtual="/server/html5-header.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/header.html"</em></ins></span> --&gt;
 &lt;!-- Parent-Version: 1.96 --&gt;
-<span class="inserted"><ins><em>&lt;!-- This page is derived from 
/server/standards/boilerplate.html --&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;!-- This page is derived from 
/server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="gnulinux" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes" --&gt;</em></ins></span>
 &lt;title&gt;Linux and GNU
 - GNU Project - Free Software Foundation&lt;/title&gt;
+<span class="inserted"><ins><em>&lt;style type="text/css" 
media="print,screen"&gt;&lt;!--
+a.ftn { font-size: .94em; }
+--&gt;&lt;/style&gt;</em></ins></span>
 &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 
class="c"&gt;Linux</strong></del></span>
-<span class="inserted"><ins><em>&lt;div class="article reduced-width"&gt;
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&lt;div class="article reduced-width"&gt;
 &lt;h2&gt;Linux</em></ins></span> and the GNU System&lt;/h2&gt;
 
 &lt;address <span class="removed"><del><strong>class="byline 
c"&gt;by</strong></del></span> <span 
class="inserted"><ins><em>class="byline"&gt;by</em></ins></span> &lt;a
@@ -136,11 +144,12 @@
 to make it one.  We made a list of the programs needed to make
 a &lt;em&gt;complete&lt;/em&gt; free system, and we systematically found, 
wrote,
 or found people to write everything on the list.  We wrote essential
-but unexciting
-&lt;a href="#unexciting"&gt;(1)&lt;/a&gt; components because you can't have a 
system
+but <span class="removed"><del><strong>unexciting
+&lt;a href="#unexciting"&gt;(1)&lt;/a&gt;</strong></del></span> <span 
class="inserted"><ins><em>unexciting&#8239;&lt;a class="ftn" 
href="#unexciting"&gt;[1]&lt;/a&gt;</em></ins></span> components
+because you can't have a system
 without them.  Some of our system components, the programming tools,
 became popular on their own among programmers, but we wrote many
-components that are not tools  &lt;a href="#nottools"&gt;(2)&lt;/a&gt;.  We 
even
+components that are not <span class="removed"><del><strong>tools  &lt;a 
href="#nottools"&gt;(2)&lt;/a&gt;.</strong></del></span> <span 
class="inserted"><ins><em>tools&#8239;&lt;a class="ftn" 
href="#nottools"&gt;[2]&lt;/a&gt;.</em></ins></span>  We even
 developed a chess game, GNU Chess, because a complete system needs
 games too.&lt;/p&gt;
 
@@ -158,13 +167,15 @@
 Once Torvalds freed Linux in 1992, it fit into the last major gap in
 the GNU system.  People could
 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
+combine Linux with the GNU system&lt;/a&gt; to make a complete free <span 
class="removed"><del><strong>system
+&mdash; a</strong></del></span> <span 
class="inserted"><ins><em>system&mdash;a</em></ins></span>
+version of the GNU system which also contained Linux.  The
 GNU/Linux system, in other words.&lt;/p&gt;
 
 &lt;p&gt;
 Making them work well together was not a trivial job.  Some GNU
-components&lt;a href="#somecomponents"&gt;(3)&lt;/a&gt; needed substantial 
change
+<span class="removed"><del><strong>components&lt;a 
href="#somecomponents"&gt;(3)&lt;/a&gt;</strong></del></span>
+<span class="inserted"><ins><em>components&#8239;&lt;a class="ftn" 
href="#somecomponents"&gt;[3]&lt;/a&gt;</em></ins></span> needed substantial 
change
 to work with Linux.  Integrating a complete system as a distribution
 that would work &ldquo;out of the box&rdquo; was a big job, too.  It
 required addressing the issue of how to install and boot the
@@ -211,9 +222,9 @@
 
 &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;
-<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
+reference, this page and &lt;a <span 
class="removed"><del><strong>href="/gnu/the-gnu-project.html"&gt;
+http://www.gnu.org/gnu/the-gnu-project.html&lt;/a&gt;</strong></del></span> 
<span class="inserted"><ins><em>href="/gnu/thegnuproject.html"&gt;
+https://www.gnu.org/gnu/thegnuproject.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 <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;
@@ -226,7 +237,8 @@
 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 the early 90s.  A free operating system that exists
-today&lt;a href="#newersystems"&gt;(4)&lt;/a&gt; is almost certainly either a
+<span class="removed"><del><strong>today&lt;a 
href="#newersystems"&gt;(4)&lt;/a&gt;</strong></del></span>
+<span class="inserted"><ins><em>today&#8239;&lt;a class="ftn" 
href="#newersystems"&gt;[4]&lt;/a&gt;</em></ins></span> is almost certainly 
either a
 variant of the GNU system, or a kind of BSD system.&lt;/p&gt;
 
 &lt;p&gt;
@@ -238,8 +250,9 @@
 system and its variants use some BSD programs; however, taken as
 wholes, they are two different systems that evolved separately.  The
 BSD developers did not write a kernel and add it to the GNU system,
-and a name like GNU/BSD would not fit the situation.&lt;a
-href="#gnubsd"&gt;(5)&lt;/a&gt;&lt;/p&gt;
+and a name like GNU/BSD would not fit the <span 
class="removed"><del><strong>situation.&lt;a
+href="#gnubsd"&gt;(5)&lt;/a&gt;&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>situation&#8239;&lt;a class="ftn"
+href="#gnubsd"&gt;[5]&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
 &lt;div class="column-limit"&gt;&lt;/div&gt;
 
 &lt;h3 <span 
class="removed"><del><strong>class="footnote"&gt;Notes&lt;/h3&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>class="footnote"&gt;Footnotes&lt;/h3&gt;</em></ins></span>
@@ -348,7 +361,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/10/29 13:32:43 $
+$Date: 2021/11/02 14:41:53 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: po/linux-and-gnu.nl.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.nl.po,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- po/linux-and-gnu.nl.po      11 Oct 2021 09:34:55 -0000      1.40
+++ po/linux-and-gnu.nl.po      2 Nov 2021 14:41:53 -0000       1.41
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-10-11 09:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Justin van Steijn <jvs@fsfe.org>\n"
 "Language-Team: Dutch\n"
@@ -262,6 +262,36 @@
 "om <em>een compleet vrij systeem te ontwikkelen, lijkend op Unix</em>: GNU."
 
 #. type: Content of: <div><p>
+# | 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
+# | is <em>an integrated system</em>&mdash;and not just a collection of useful
+# | programs&mdash;is because the GNU Project set out to make it one.  We made
+# | a list of the programs needed to make a <em>complete</em> free system, and
+# | we systematically found, wrote, or found people to write everything on the
+# | list.  We wrote essential but [-unexciting <a
+# | href=\"#unexciting\">(1)</a>-] {+unexciting&#8239;<a class=\"ftn\"
+# | href=\"#unexciting\">[1]</a>+} components because you can't have a system
+# | without them.  Some of our system components, the programming tools,
+# | became popular on their own among programmers, but we wrote many
+# | components that are not [-tools <a href=\"#nottools\">(2)</a>.-]
+# | {+tools&#8239;<a class=\"ftn\" href=\"#nottools\">[2]</a>.+}  We even
+# | developed a chess game, GNU Chess, because a complete system needs games
+# | too.
+#, fuzzy
+#| 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 is <em>an integrated system</em>&mdash;and not just a collection of "
+#| "useful programs&mdash;is because the GNU Project set out to make it one.  "
+#| "We made a list of the programs needed to make a <em>complete</em> free "
+#| "system, and we systematically found, wrote, or found people to write "
+#| "everything on the list.  We wrote essential but unexciting <a href="
+#| "\"#unexciting\">(1)</a> components because you can't have a system "
+#| "without them.  Some of our system components, the programming tools, "
+#| "became popular on their own among programmers, but we wrote many "
+#| "components that are not tools <a href=\"#nottools\">(2)</a>.  We even "
+#| "developed a chess game, GNU Chess, because a complete system needs games "
+#| "too."
 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 "
@@ -269,12 +299,12 @@
 "programs&mdash;is because the GNU Project set out to make it one.  We made a "
 "list of the programs needed to make a <em>complete</em> free system, and we "
 "systematically found, wrote, or found people to write everything on the "
-"list.  We wrote essential but unexciting <a href=\"#unexciting\">(1)</a> "
-"components because you can't have a system without them.  Some of our system "
-"components, the programming tools, became popular on their own among "
-"programmers, but we wrote many components that are not tools <a href="
-"\"#nottools\">(2)</a>.  We even developed a chess game, GNU Chess, because a "
-"complete system needs games too."
+"list.  We wrote essential but unexciting&#8239;<a class=\"ftn\" href="
+"\"#unexciting\">[1]</a> components because you can't have a system without "
+"them.  Some of our system components, the programming tools, became popular "
+"on their own among programmers, but we wrote many components that are not "
+"tools&#8239;<a class=\"ftn\" href=\"#nottools\">[2]</a>.  We even developed "
+"a chess game, GNU Chess, because a complete system needs games too."
 msgstr ""
 "Velen hebben enorm bijgedragen aan de vrije software in het systeem en "
 "allemaal verdienen ze het om genoemd te worden. Maar de reden waarom het "
@@ -310,9 +340,9 @@
 # | 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.
+# | combine Linux with the GNU system</a> to make a complete free [-system
+# | &mdash; a-] {+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 "
@@ -327,8 +357,8 @@
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
 "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."
+"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 ""
 "Gelukkig hoefden we door toedoen van Linux niet te wachten op de Hurd. Nadat "
 "Torvalds Linux in 1992 had bevrijd vormde dit het laatste stukje van de "
@@ -339,16 +369,37 @@
 "systeem."
 
 #. 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 "
-"Linux.  Integrating a complete system as a distribution that would work "
-"&ldquo;out of the box&rdquo; was a big job, too.  It required addressing the "
-"issue of how to install and boot the system&mdash;a problem we had not "
-"tackled, because we hadn't yet reached that point.  Thus, the people who "
-"developed the various system distributions did a lot of essential work.  But "
-"it was work that, in the nature of things, was surely going to be done by "
-"someone."
+# | Making them work well together was not a trivial job.  Some GNU
+# | [-components<a href=\"#somecomponents\">(3)</a>-] {+components&#8239;<a
+# | class=\"ftn\" href=\"#somecomponents\">[3]</a>+} needed substantial change
+# | to work with Linux.  Integrating a complete system as a distribution that
+# | would work &ldquo;out of the box&rdquo; was a big job, too.  It required
+# | addressing the issue of how to install and boot the system&mdash;a problem
+# | we had not tackled, because we hadn't yet reached that point.  Thus, the
+# | people who developed the various system distributions did a lot of
+# | essential work.  But it was work that, in the nature of things, was surely
+# | going to be done by someone.
+#, fuzzy
+#| 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 Linux.  Integrating a complete system as a distribution that "
+#| "would work &ldquo;out of the box&rdquo; was a big job, too.  It required "
+#| "addressing the issue of how to install and boot the system&mdash;a "
+#| "problem we had not tackled, because we hadn't yet reached that point.  "
+#| "Thus, the people who developed the various system distributions did a lot "
+#| "of essential work.  But it was work that, in the nature of things, was "
+#| "surely going to be done by someone."
+msgid ""
+"Making them work well together was not a trivial job.  Some GNU "
+"components&#8239;<a class=\"ftn\" href=\"#somecomponents\">[3]</a> needed "
+"substantial change to work with Linux.  Integrating a complete system as a "
+"distribution that would work &ldquo;out of the box&rdquo; was a big job, "
+"too.  It required addressing the issue of how to install and boot the "
+"system&mdash;a problem we had not tackled, because we hadn't yet reached "
+"that point.  Thus, the people who developed the various system distributions "
+"did a lot of essential work.  But it was work that, in the nature of things, "
+"was surely going to be done by someone."
 msgstr ""
 "De twee combineren klinkt eenvoudig genoeg maar was niet zo makkelijk. "
 "Sommige onderdelen<a href=\"#somecomponents\">(3)</a> van GNU moesten "
@@ -475,11 +526,12 @@
 
 #. 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>-]
+# | reference, this page and <a [-href=\"/gnu/the-gnu-project.html\">
+# | http://www.gnu.org/gnu/the-gnu-project.html</a>-]
+# | {+href=\"/gnu/thegnuproject.html\">
+# | https://www.gnu.org/gnu/thegnuproject.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
@@ -492,10 +544,10 @@
 #| "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\"> 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=\"https://";
-"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
+"this page and <a href=\"/gnu/thegnuproject.html\"> https://www.gnu.org/gnu/";
+"thegnuproject.html</a> are good choices.  If you mention Linux, the 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\"> "
@@ -509,13 +561,28 @@
 msgstr "Aanvullingen"
 
 #. 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
+# | the early 90s.  A free operating system that exists [-today<a
+# | href=\"#newersystems\">(4)</a>-] {+today&#8239;<a class=\"ftn\"
+# | href=\"#newersystems\">[4]</a>+} is almost certainly either a variant of
+# | the GNU system, or a kind of BSD system.
+#, fuzzy
+#| 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 UC Berkeley.  It was nonfree in the 80s, but became free in the early "
+#| "90s.  A free operating system that exists today<a href=\"#newersystems\">"
+#| "(4)</a> is almost certainly either a variant of the GNU system, or a kind "
+#| "of BSD system."
 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 "
 "UC Berkeley.  It was nonfree in the 80s, but became free in the early 90s.  "
-"A free operating system that exists today<a href=\"#newersystems\">(4)</a> "
-"is almost certainly either a variant of the GNU system, or a kind of BSD "
-"system."
+"A free operating system that exists today&#8239;<a class=\"ftn\" href="
+"\"#newersystems\">[4]</a> is almost certainly either a variant of the GNU "
+"system, or a kind of BSD system."
 msgstr ""
 "Behalve GNU is er nog &eacute;&eacute;n ander project dat onafhankelijk een "
 "vrij besturingssysteem heeft gemaakt dat lijkt op Unix. Dit systeem kent men "
@@ -525,6 +592,27 @@
 "tegenwoordig altijd een variant op het GNU systeem of op BSD."
 
 #. 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
+# | persuade them, but the code had little overlap with GNU.  BSD systems
+# | today use some GNU programs, just as the GNU system and its variants use
+# | some BSD programs; however, taken as wholes, they are two different
+# | systems that evolved separately.  The BSD developers did not write a
+# | kernel and add it to the GNU system, and a name like GNU/BSD would not fit
+# | the [-situation.<a href=\"#gnubsd\">(5)</a>-] {+situation&#8239;<a
+# | class=\"ftn\" href=\"#gnubsd\">[5]</a>.+}
+#, fuzzy
+#| 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 example of the GNU Project, and explicit appeals from GNU "
+#| "activists helped persuade them, but the code had little overlap with "
+#| "GNU.  BSD systems today use some GNU programs, just as the GNU system and "
+#| "its variants use some BSD programs; however, taken as wholes, they are "
+#| "two different systems that evolved separately.  The BSD developers did "
+#| "not write a kernel and add it to the GNU system, and a name like GNU/BSD "
+#| "would not fit the situation.<a href=\"#gnubsd\">(5)</a>"
 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 "
@@ -533,8 +621,8 @@
 "use some GNU programs, just as the GNU system and its variants use some BSD "
 "programs; however, taken as wholes, they are two different systems that "
 "evolved separately.  The BSD developers did not write a kernel and add it to "
-"the GNU system, and a name like GNU/BSD would not fit the situation.<a href="
-"\"#gnubsd\">(5)</a>"
+"the GNU system, and a name like GNU/BSD would not fit the situation&#8239;<a "
+"class=\"ftn\" href=\"#gnubsd\">[5]</a>."
 msgstr ""
 "Mensen vragen weleens of BSD ook een versie van GNU is, net als GNU/Linux. "
 "De ontwikkelaars van BSD werden ge&iuml;nspireerd door het voorbeeld van het "

Index: po/linux-and-gnu.pl-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.pl-diff.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- po/linux-and-gnu.pl-diff.html       29 Oct 2021 13:32:43 -0000      1.7
+++ po/linux-and-gnu.pl-diff.html       2 Nov 2021 14:41:53 -0000       1.8
@@ -12,15 +12,23 @@
 <body><pre>
 &lt;!--#include <span 
class="removed"><del><strong>virtual="/server/html5-header.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/header.html"</em></ins></span> --&gt;
 &lt;!-- Parent-Version: 1.96 --&gt;
-<span class="inserted"><ins><em>&lt;!-- This page is derived from 
/server/standards/boilerplate.html --&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;!-- This page is derived from 
/server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="gnulinux" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes" --&gt;</em></ins></span>
 &lt;title&gt;Linux and GNU
 - GNU Project - Free Software Foundation&lt;/title&gt;
+<span class="inserted"><ins><em>&lt;style type="text/css" 
media="print,screen"&gt;&lt;!--
+a.ftn { font-size: .94em; }
+--&gt;&lt;/style&gt;</em></ins></span>
 &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 
class="c"&gt;Linux</strong></del></span>
-<span class="inserted"><ins><em>&lt;div class="article reduced-width"&gt;
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&lt;div class="article reduced-width"&gt;
 &lt;h2&gt;Linux</em></ins></span> and the GNU System&lt;/h2&gt;
 
 &lt;address <span class="removed"><del><strong>class="byline 
c"&gt;by</strong></del></span> <span 
class="inserted"><ins><em>class="byline"&gt;by</em></ins></span> &lt;a
@@ -136,11 +144,12 @@
 to make it one.  We made a list of the programs needed to make
 a &lt;em&gt;complete&lt;/em&gt; free system, and we systematically found, 
wrote,
 or found people to write everything on the list.  We wrote essential
-but unexciting
-&lt;a href="#unexciting"&gt;(1)&lt;/a&gt; components because you can't have a 
system
+but <span class="removed"><del><strong>unexciting
+&lt;a href="#unexciting"&gt;(1)&lt;/a&gt;</strong></del></span> <span 
class="inserted"><ins><em>unexciting&#8239;&lt;a class="ftn" 
href="#unexciting"&gt;[1]&lt;/a&gt;</em></ins></span> components
+because you can't have a system
 without them.  Some of our system components, the programming tools,
 became popular on their own among programmers, but we wrote many
-components that are not tools  &lt;a href="#nottools"&gt;(2)&lt;/a&gt;.  We 
even
+components that are not <span class="removed"><del><strong>tools  &lt;a 
href="#nottools"&gt;(2)&lt;/a&gt;.</strong></del></span> <span 
class="inserted"><ins><em>tools&#8239;&lt;a class="ftn" 
href="#nottools"&gt;[2]&lt;/a&gt;.</em></ins></span>  We even
 developed a chess game, GNU Chess, because a complete system needs
 games too.&lt;/p&gt;
 
@@ -158,13 +167,15 @@
 Once Torvalds freed Linux in 1992, it fit into the last major gap in
 the GNU system.  People could
 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
+combine Linux with the GNU system&lt;/a&gt; to make a complete free <span 
class="removed"><del><strong>system
+&mdash; a</strong></del></span> <span 
class="inserted"><ins><em>system&mdash;a</em></ins></span>
+version of the GNU system which also contained Linux.  The
 GNU/Linux system, in other words.&lt;/p&gt;
 
 &lt;p&gt;
 Making them work well together was not a trivial job.  Some GNU
-components&lt;a href="#somecomponents"&gt;(3)&lt;/a&gt; needed substantial 
change
+<span class="removed"><del><strong>components&lt;a 
href="#somecomponents"&gt;(3)&lt;/a&gt;</strong></del></span>
+<span class="inserted"><ins><em>components&#8239;&lt;a class="ftn" 
href="#somecomponents"&gt;[3]&lt;/a&gt;</em></ins></span> needed substantial 
change
 to work with Linux.  Integrating a complete system as a distribution
 that would work &ldquo;out of the box&rdquo; was a big job, too.  It
 required addressing the issue of how to install and boot the
@@ -211,9 +222,9 @@
 
 &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;
-<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
+reference, this page and &lt;a <span 
class="removed"><del><strong>href="/gnu/the-gnu-project.html"&gt;
+http://www.gnu.org/gnu/the-gnu-project.html&lt;/a&gt;</strong></del></span> 
<span class="inserted"><ins><em>href="/gnu/thegnuproject.html"&gt;
+https://www.gnu.org/gnu/thegnuproject.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 <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;
@@ -226,7 +237,8 @@
 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 the early 90s.  A free operating system that exists
-today&lt;a href="#newersystems"&gt;(4)&lt;/a&gt; is almost certainly either a
+<span class="removed"><del><strong>today&lt;a 
href="#newersystems"&gt;(4)&lt;/a&gt;</strong></del></span>
+<span class="inserted"><ins><em>today&#8239;&lt;a class="ftn" 
href="#newersystems"&gt;[4]&lt;/a&gt;</em></ins></span> is almost certainly 
either a
 variant of the GNU system, or a kind of BSD system.&lt;/p&gt;
 
 &lt;p&gt;
@@ -238,8 +250,9 @@
 system and its variants use some BSD programs; however, taken as
 wholes, they are two different systems that evolved separately.  The
 BSD developers did not write a kernel and add it to the GNU system,
-and a name like GNU/BSD would not fit the situation.&lt;a
-href="#gnubsd"&gt;(5)&lt;/a&gt;&lt;/p&gt;
+and a name like GNU/BSD would not fit the <span 
class="removed"><del><strong>situation.&lt;a
+href="#gnubsd"&gt;(5)&lt;/a&gt;&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>situation&#8239;&lt;a class="ftn"
+href="#gnubsd"&gt;[5]&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
 &lt;div class="column-limit"&gt;&lt;/div&gt;
 
 &lt;h3 <span 
class="removed"><del><strong>class="footnote"&gt;Notes&lt;/h3&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>class="footnote"&gt;Footnotes&lt;/h3&gt;</em></ins></span>
@@ -348,7 +361,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/10/29 13:32:43 $
+$Date: 2021/11/02 14:41:53 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: po/linux-and-gnu.pl.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.pl.po,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- po/linux-and-gnu.pl.po      11 Oct 2021 09:34:55 -0000      1.56
+++ po/linux-and-gnu.pl.po      2 Nov 2021 14:41:53 -0000       1.57
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-11 09:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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"
@@ -268,6 +268,36 @@
 "zaprojektować <em>kompletny wolny system uniksopodobny</em>: GNU."
 
 #. type: Content of: <div><p>
+# | 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
+# | is <em>an integrated system</em>&mdash;and not just a collection of useful
+# | programs&mdash;is because the GNU Project set out to make it one.  We made
+# | a list of the programs needed to make a <em>complete</em> free system, and
+# | we systematically found, wrote, or found people to write everything on the
+# | list.  We wrote essential but [-unexciting <a
+# | href=\"#unexciting\">(1)</a>-] {+unexciting&#8239;<a class=\"ftn\"
+# | href=\"#unexciting\">[1]</a>+} components because you can't have a system
+# | without them.  Some of our system components, the programming tools,
+# | became popular on their own among programmers, but we wrote many
+# | components that are not [-tools <a href=\"#nottools\">(2)</a>.-]
+# | {+tools&#8239;<a class=\"ftn\" href=\"#nottools\">[2]</a>.+}  We even
+# | developed a chess game, GNU Chess, because a complete system needs games
+# | too.
+#, fuzzy
+#| 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 is <em>an integrated system</em>&mdash;and not just a collection of "
+#| "useful programs&mdash;is because the GNU Project set out to make it one.  "
+#| "We made a list of the programs needed to make a <em>complete</em> free "
+#| "system, and we systematically found, wrote, or found people to write "
+#| "everything on the list.  We wrote essential but unexciting <a href="
+#| "\"#unexciting\">(1)</a> components because you can't have a system "
+#| "without them.  Some of our system components, the programming tools, "
+#| "became popular on their own among programmers, but we wrote many "
+#| "components that are not tools <a href=\"#nottools\">(2)</a>.  We even "
+#| "developed a chess game, GNU Chess, because a complete system needs games "
+#| "too."
 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 "
@@ -275,12 +305,12 @@
 "programs&mdash;is because the GNU Project set out to make it one.  We made a "
 "list of the programs needed to make a <em>complete</em> free system, and we "
 "systematically found, wrote, or found people to write everything on the "
-"list.  We wrote essential but unexciting <a href=\"#unexciting\">(1)</a> "
-"components because you can't have a system without them.  Some of our system "
-"components, the programming tools, became popular on their own among "
-"programmers, but we wrote many components that are not tools <a href="
-"\"#nottools\">(2)</a>.  We even developed a chess game, GNU Chess, because a "
-"complete system needs games too."
+"list.  We wrote essential but unexciting&#8239;<a class=\"ftn\" href="
+"\"#unexciting\">[1]</a> components because you can't have a system without "
+"them.  Some of our system components, the programming tools, became popular "
+"on their own among programmers, but we wrote many components that are not "
+"tools&#8239;<a class=\"ftn\" href=\"#nottools\">[2]</a>.  We even developed "
+"a chess game, GNU Chess, because a complete system needs games too."
 msgstr ""
 "Wiele osób wniosło istotny wkład w&nbsp;wolne oprogramowanie 
w&nbsp;systemie "
 "i&nbsp;wszyscy oni zasługują za&nbsp;to na&nbsp;uznanie. Lecz&nbsp;powodem "
@@ -318,9 +348,9 @@
 # | 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.
+# | combine Linux with the GNU system</a> to make a complete free [-system
+# | &mdash; a-] {+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 "
@@ -335,8 +365,8 @@
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
 "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."
+"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 ""
 "Na&nbsp;szczęście nie musieliśmy czekać na&nbsp;Hurd, 
ponieważ&nbsp;powstał "
 "Linux. Gdy Torvalds uwolnił Linuksa&nbsp;w 1992 roku, zapełnił ostatnią 
dużą "
@@ -347,16 +377,37 @@
 "system GNU/Linux."
 
 #. 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 "
-"Linux.  Integrating a complete system as a distribution that would work "
-"&ldquo;out of the box&rdquo; was a big job, too.  It required addressing the "
-"issue of how to install and boot the system&mdash;a problem we had not "
-"tackled, because we hadn't yet reached that point.  Thus, the people who "
-"developed the various system distributions did a lot of essential work.  But "
-"it was work that, in the nature of things, was surely going to be done by "
-"someone."
+# | Making them work well together was not a trivial job.  Some GNU
+# | [-components<a href=\"#somecomponents\">(3)</a>-] {+components&#8239;<a
+# | class=\"ftn\" href=\"#somecomponents\">[3]</a>+} needed substantial change
+# | to work with Linux.  Integrating a complete system as a distribution that
+# | would work &ldquo;out of the box&rdquo; was a big job, too.  It required
+# | addressing the issue of how to install and boot the system&mdash;a problem
+# | we had not tackled, because we hadn't yet reached that point.  Thus, the
+# | people who developed the various system distributions did a lot of
+# | essential work.  But it was work that, in the nature of things, was surely
+# | going to be done by someone.
+#, fuzzy
+#| 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 Linux.  Integrating a complete system as a distribution that "
+#| "would work &ldquo;out of the box&rdquo; was a big job, too.  It required "
+#| "addressing the issue of how to install and boot the system&mdash;a "
+#| "problem we had not tackled, because we hadn't yet reached that point.  "
+#| "Thus, the people who developed the various system distributions did a lot "
+#| "of essential work.  But it was work that, in the nature of things, was "
+#| "surely going to be done by someone."
+msgid ""
+"Making them work well together was not a trivial job.  Some GNU "
+"components&#8239;<a class=\"ftn\" href=\"#somecomponents\">[3]</a> needed "
+"substantial change to work with Linux.  Integrating a complete system as a "
+"distribution that would work &ldquo;out of the box&rdquo; was a big job, "
+"too.  It required addressing the issue of how to install and boot the "
+"system&mdash;a problem we had not tackled, because we hadn't yet reached "
+"that point.  Thus, the people who developed the various system distributions "
+"did a lot of essential work.  But it was work that, in the nature of things, "
+"was surely going to be done by someone."
 msgstr ""
 "Połączenie całej pracy nie było trywialną rzeczą. Niektóre komponenty 
GNU <a "
 "href=\"#somecomponents\">(3)</a> potrzebowały istotnych zmian do&nbsp;"
@@ -485,11 +536,12 @@
 
 #. 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>-]
+# | reference, this page and <a [-href=\"/gnu/the-gnu-project.html\">
+# | http://www.gnu.org/gnu/the-gnu-project.html</a>-]
+# | {+href=\"/gnu/thegnuproject.html\">
+# | https://www.gnu.org/gnu/thegnuproject.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
@@ -502,10 +554,10 @@
 #| "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\"> 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=\"https://";
-"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
+"this page and <a href=\"/gnu/thegnuproject.html\"> https://www.gnu.org/gnu/";
+"thegnuproject.html</a> are good choices.  If you mention Linux, the 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"
@@ -519,13 +571,28 @@
 msgstr "Postscriptum"
 
 #. 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
+# | the early 90s.  A free operating system that exists [-today<a
+# | href=\"#newersystems\">(4)</a>-] {+today&#8239;<a class=\"ftn\"
+# | href=\"#newersystems\">[4]</a>+} is almost certainly either a variant of
+# | the GNU system, or a kind of BSD system.
+#, fuzzy
+#| 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 UC Berkeley.  It was nonfree in the 80s, but became free in the early "
+#| "90s.  A free operating system that exists today<a href=\"#newersystems\">"
+#| "(4)</a> is almost certainly either a variant of the GNU system, or a kind "
+#| "of BSD system."
 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 "
 "UC Berkeley.  It was nonfree in the 80s, but became free in the early 90s.  "
-"A free operating system that exists today<a href=\"#newersystems\">(4)</a> "
-"is almost certainly either a variant of the GNU system, or a kind of BSD "
-"system."
+"A free operating system that exists today&#8239;<a class=\"ftn\" href="
+"\"#newersystems\">[4]</a> is almost certainly either a variant of the GNU "
+"system, or a kind of BSD system."
 msgstr ""
 "Odbiegając od&nbsp;GNU, pewien inny projekt został niezależnie 
wyprodukowany "
 "jako wolny system operacyjny uniksopodobny. System znany jest jako BSD "
@@ -536,6 +603,27 @@
 "systemu BSD."
 
 #. 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
+# | persuade them, but the code had little overlap with GNU.  BSD systems
+# | today use some GNU programs, just as the GNU system and its variants use
+# | some BSD programs; however, taken as wholes, they are two different
+# | systems that evolved separately.  The BSD developers did not write a
+# | kernel and add it to the GNU system, and a name like GNU/BSD would not fit
+# | the [-situation.<a href=\"#gnubsd\">(5)</a>-] {+situation&#8239;<a
+# | class=\"ftn\" href=\"#gnubsd\">[5]</a>.+}
+#, fuzzy
+#| 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 example of the GNU Project, and explicit appeals from GNU "
+#| "activists helped persuade them, but the code had little overlap with "
+#| "GNU.  BSD systems today use some GNU programs, just as the GNU system and "
+#| "its variants use some BSD programs; however, taken as wholes, they are "
+#| "two different systems that evolved separately.  The BSD developers did "
+#| "not write a kernel and add it to the GNU system, and a name like GNU/BSD "
+#| "would not fit the situation.<a href=\"#gnubsd\">(5)</a>"
 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 "
@@ -544,8 +632,8 @@
 "use some GNU programs, just as the GNU system and its variants use some BSD "
 "programs; however, taken as wholes, they are two different systems that "
 "evolved separately.  The BSD developers did not write a kernel and add it to "
-"the GNU system, and a name like GNU/BSD would not fit the situation.<a href="
-"\"#gnubsd\">(5)</a>"
+"the GNU system, and a name like GNU/BSD would not fit the situation&#8239;<a "
+"class=\"ftn\" href=\"#gnubsd\">[5]</a>."
 msgstr ""
 "Ludzie zazwyczaj pytają, czy&nbsp;BSD jest także wersją GNU, coś jak GNU/"
 "Linux. Deweloperzy BSD zostali zainspirowani aby&nbsp;uwolnić ich kod "

Index: po/linux-and-gnu.pot
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.pot,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- po/linux-and-gnu.pot        11 Oct 2021 09:34:55 -0000      1.40
+++ po/linux-and-gnu.pot        2 Nov 2021 14:41:53 -0000       1.41
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-10-11 09:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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"
@@ -146,12 +146,13 @@
 "programs&mdash;is because the GNU Project set out to make it one.  We made a "
 "list of the programs needed to make a <em>complete</em> free system, and we "
 "systematically found, wrote, or found people to write everything on the "
-"list.  We wrote essential but unexciting <a href=\"#unexciting\">(1)</a> "
-"components because you can't have a system without them.  Some of our system "
-"components, the programming tools, became popular on their own among "
-"programmers, but we wrote many components that are not tools <a "
-"href=\"#nottools\">(2)</a>.  We even developed a chess game, GNU Chess, "
-"because a complete system needs games too."
+"list.  We wrote essential but unexciting&#8239;<a class=\"ftn\" "
+"href=\"#unexciting\">[1]</a> components because you can't have a system "
+"without them.  Some of our system components, the programming tools, became "
+"popular on their own among programmers, but we wrote many components that "
+"are not tools&#8239;<a class=\"ftn\" href=\"#nottools\">[2]</a>.  We even "
+"developed a chess game, GNU Chess, because a complete system needs games "
+"too."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -171,22 +172,22 @@
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
 "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."
+"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><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 "
-"Linux.  Integrating a complete system as a distribution that would work "
-"&ldquo;out of the box&rdquo; was a big job, too.  It required addressing the "
-"issue of how to install and boot the system&mdash;a problem we had not "
-"tackled, because we hadn't yet reached that point.  Thus, the people who "
-"developed the various system distributions did a lot of essential work.  But "
-"it was work that, in the nature of things, was surely going to be done by "
-"someone."
+"Making them work well together was not a trivial job.  Some GNU "
+"components&#8239;<a class=\"ftn\" href=\"#somecomponents\">[3]</a> needed "
+"substantial change to work with Linux.  Integrating a complete system as a "
+"distribution that would work &ldquo;out of the box&rdquo; was a big job, "
+"too.  It required addressing the issue of how to install and boot the "
+"system&mdash;a problem we had not tackled, because we hadn't yet reached "
+"that point.  Thus, the people who developed the various system distributions "
+"did a lot of essential work.  But it was work that, in the nature of things, "
+"was surely going to be done by someone."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -236,8 +237,8 @@
 #. 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\"> "
-"https://www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If you "
+"this page and <a href=\"/gnu/thegnuproject.html\"> "
+"https://www.gnu.org/gnu/thegnuproject.html</a> are good choices.  If you "
 "mention Linux, the 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."
@@ -252,8 +253,8 @@
 "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 the "
-"early 90s.  A free operating system that exists today<a "
-"href=\"#newersystems\">(4)</a> is almost certainly either a variant of the "
+"early 90s.  A free operating system that exists today&#8239;<a class=\"ftn\" "
+"href=\"#newersystems\">[4]</a> is almost certainly either a variant of the "
 "GNU system, or a kind of BSD system."
 msgstr ""
 
@@ -266,8 +267,8 @@
 "use some GNU programs, just as the GNU system and its variants use some BSD "
 "programs; however, taken as wholes, they are two different systems that "
 "evolved separately.  The BSD developers did not write a kernel and add it to "
-"the GNU system, and a name like GNU/BSD would not fit the situation.<a "
-"href=\"#gnubsd\">(5)</a>"
+"the GNU system, and a name like GNU/BSD would not fit the situation&#8239;<a "
+"class=\"ftn\" href=\"#gnubsd\">[5]</a>."
 msgstr ""
 
 #. type: Content of: <div><h3>

Index: po/linux-and-gnu.pt-br.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.pt-br.po,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- po/linux-and-gnu.pt-br.po   11 Oct 2021 09:34:55 -0000      1.31
+++ po/linux-and-gnu.pt-br.po   2 Nov 2021 14:41:53 -0000       1.32
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-10-11 09:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2021-09-05 09:14-0300\n"
 "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
 "Language-Team: Brazilian Portuguese <www-pt-br-general@gnu.org>\n"
@@ -208,6 +208,21 @@
 "desenvolver <em>um sistema operacional livre similar ao Unix</em>: GNU."
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| 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 is <em>an integrated system</em>&mdash;and not just a collection of "
+#| "useful programs&mdash;is because the GNU Project set out to make it one.  "
+#| "We made a list of the programs needed to make a <em>complete</em> free "
+#| "system, and we systematically found, wrote, or found people to write "
+#| "everything on the list.  We wrote essential but unexciting <a href="
+#| "\"#unexciting\">(1)</a> components because you can't have a system "
+#| "without them.  Some of our system components, the programming tools, "
+#| "became popular on their own among programmers, but we wrote many "
+#| "components that are not tools <a href=\"#nottools\">(2)</a>.  We even "
+#| "developed a chess game, GNU Chess, because a complete system needs games "
+#| "too."
 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 "
@@ -215,12 +230,12 @@
 "programs&mdash;is because the GNU Project set out to make it one.  We made a "
 "list of the programs needed to make a <em>complete</em> free system, and we "
 "systematically found, wrote, or found people to write everything on the "
-"list.  We wrote essential but unexciting <a href=\"#unexciting\">(1)</a> "
-"components because you can't have a system without them.  Some of our system "
-"components, the programming tools, became popular on their own among "
-"programmers, but we wrote many components that are not tools <a href="
-"\"#nottools\">(2)</a>.  We even developed a chess game, GNU Chess, because a "
-"complete system needs games too."
+"list.  We wrote essential but unexciting&#8239;<a class=\"ftn\" href="
+"\"#unexciting\">[1]</a> components because you can't have a system without "
+"them.  Some of our system components, the programming tools, became popular "
+"on their own among programmers, but we wrote many components that are not "
+"tools&#8239;<a class=\"ftn\" href=\"#nottools\">[2]</a>.  We even developed "
+"a chess game, GNU Chess, because a complete system needs games too."
 msgstr ""
 "Muitas pessoas fizeram grandes contribuições para o software livre no "
 "sistema, e todos eles merecem crédito por seus softwares. Mas a razão pela "
@@ -254,13 +269,22 @@
 "de forma geral."
 
 #. 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=\"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."
 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=\"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."
+"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 ""
 "Felizmente, não precisamos esperar pelo Hurd, por causa do Linux. Assim que "
 "Torvalds escreveu o Linux, este preencheu a última grande lacuna no sistema "
@@ -270,16 +294,27 @@
 "sistema GNU contendo também o Linux. O sistema GNU/Linux, em outras 
palavras."
 
 #. 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 "
-"Linux.  Integrating a complete system as a distribution that would work "
-"&ldquo;out of the box&rdquo; was a big job, too.  It required addressing the "
-"issue of how to install and boot the system&mdash;a problem we had not "
-"tackled, because we hadn't yet reached that point.  Thus, the people who "
-"developed the various system distributions did a lot of essential work.  But "
-"it was work that, in the nature of things, was surely going to be done by "
-"someone."
+#, fuzzy
+#| 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 Linux.  Integrating a complete system as a distribution that "
+#| "would work &ldquo;out of the box&rdquo; was a big job, too.  It required "
+#| "addressing the issue of how to install and boot the system&mdash;a "
+#| "problem we had not tackled, because we hadn't yet reached that point.  "
+#| "Thus, the people who developed the various system distributions did a lot "
+#| "of essential work.  But it was work that, in the nature of things, was "
+#| "surely going to be done by someone."
+msgid ""
+"Making them work well together was not a trivial job.  Some GNU "
+"components&#8239;<a class=\"ftn\" href=\"#somecomponents\">[3]</a> needed "
+"substantial change to work with Linux.  Integrating a complete system as a "
+"distribution that would work &ldquo;out of the box&rdquo; was a big job, "
+"too.  It required addressing the issue of how to install and boot the "
+"system&mdash;a problem we had not tackled, because we hadn't yet reached "
+"that point.  Thus, the people who developed the various system distributions "
+"did a lot of essential work.  But it was work that, in the nature of things, "
+"was surely going to be done by someone."
 msgstr ""
 "Fazer os dois funcionarem bem juntos não foi uma tarefa trivial. Alguns "
 "componentes GNU<a href=\"#somecomponents\">(3)</a> precisaram de alterações 
"
@@ -369,12 +404,20 @@
 "por favor chame-a de “GNU/Linux”."
 
 #. 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\"> 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=\"https://foldoc.org/linux\";>https://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\"> 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=\"https://";
-"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
+"this page and <a href=\"/gnu/thegnuproject.html\"> https://www.gnu.org/gnu/";
+"thegnuproject.html</a> are good choices.  If you mention Linux, the 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\">https://www.gnu.org/gnu/";
@@ -388,13 +431,21 @@
 msgstr "Observações"
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| 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 UC Berkeley.  It was nonfree in the 80s, but became free in the early "
+#| "90s.  A free operating system that exists today<a href=\"#newersystems\">"
+#| "(4)</a> is almost certainly either a variant of the GNU system, or a kind "
+#| "of BSD system."
 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 "
 "UC Berkeley.  It was nonfree in the 80s, but became free in the early 90s.  "
-"A free operating system that exists today<a href=\"#newersystems\">(4)</a> "
-"is almost certainly either a variant of the GNU system, or a kind of BSD "
-"system."
+"A free operating system that exists today&#8239;<a class=\"ftn\" href="
+"\"#newersystems\">[4]</a> is almost certainly either a variant of the GNU "
+"system, or a kind of BSD system."
 msgstr ""
 "À parte do GNU, um outro projeto desenvolveu um sistema livre similar ao "
 "Unix. Este sistema é conhecido como BSD, e foi desenvolvido na Universidade "
@@ -404,6 +455,17 @@
 "ou um tipo de sistema BSD."
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| 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 example of the GNU Project, and explicit appeals from GNU "
+#| "activists helped persuade them, but the code had little overlap with "
+#| "GNU.  BSD systems today use some GNU programs, just as the GNU system and "
+#| "its variants use some BSD programs; however, taken as wholes, they are "
+#| "two different systems that evolved separately.  The BSD developers did "
+#| "not write a kernel and add it to the GNU system, and a name like GNU/BSD "
+#| "would not fit the situation.<a href=\"#gnubsd\">(5)</a>"
 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,8 +474,8 @@
 "use some GNU programs, just as the GNU system and its variants use some BSD "
 "programs; however, taken as wholes, they are two different systems that "
 "evolved separately.  The BSD developers did not write a kernel and add it to "
-"the GNU system, and a name like GNU/BSD would not fit the situation.<a href="
-"\"#gnubsd\">(5)</a>"
+"the GNU system, and a name like GNU/BSD would not fit the situation&#8239;<a "
+"class=\"ftn\" href=\"#gnubsd\">[5]</a>."
 msgstr ""
 "Pessoas algumas vezes perguntam se BSD também é uma versão do GNU, como o "
 "GNU/Linux. Os desenvolvedores do BSD se inspiraram para fazer o código de "

Index: po/linux-and-gnu.ro.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.ro.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- po/linux-and-gnu.ro.po      11 Oct 2021 09:34:55 -0000      1.17
+++ po/linux-and-gnu.ro.po      2 Nov 2021 14:41:53 -0000       1.18
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-10-11 09:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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"
@@ -337,12 +337,14 @@
 # | make it one.  We made a list of the programs needed to make a
 # | <em>complete</em> free system, and we systematically found, wrote, or
 # | found people to write everything on the list.  We wrote essential but
-# | unexciting <a href=\"#unexciting\">(1)</a> components because you can't
+# | [-unexciting <a href=\"#unexciting\">(1)</a>-] {+unexciting&#8239;<a
+# | class=\"ftn\" href=\"#unexciting\">[1]</a>+} components because you can't
 # | have a system without them.  Some of our system components, the
 # | programming tools, became popular on their own among programmers, but we
-# | wrote many components that are not tools <a href=\"#nottools\">(2)</a>. 
-# | We even developed a chess game, GNU Chess, because a complete system needs
-# | games too.
+# | wrote many components that are not [-tools <a
+# | href=\"#nottools\">(2)</a>.-] {+tools&#8239;<a class=\"ftn\"
+# | href=\"#nottools\">[2]</a>.+}  We even developed a chess game, GNU Chess,
+# | because a complete system needs games too.
 #, fuzzy
 #| msgid ""
 #| "Many people have made major contributions to the free software in the "
@@ -365,12 +367,12 @@
 "programs&mdash;is because the GNU Project set out to make it one.  We made a "
 "list of the programs needed to make a <em>complete</em> free system, and we "
 "systematically found, wrote, or found people to write everything on the "
-"list.  We wrote essential but unexciting <a href=\"#unexciting\">(1)</a> "
-"components because you can't have a system without them.  Some of our system "
-"components, the programming tools, became popular on their own among "
-"programmers, but we wrote many components that are not tools <a href="
-"\"#nottools\">(2)</a>.  We even developed a chess game, GNU Chess, because a "
-"complete system needs games too."
+"list.  We wrote essential but unexciting&#8239;<a class=\"ftn\" href="
+"\"#unexciting\">[1]</a> components because you can't have a system without "
+"them.  Some of our system components, the programming tools, became popular "
+"on their own among programmers, but we wrote many components that are not "
+"tools&#8239;<a class=\"ftn\" href=\"#nottools\">[2]</a>.  We even developed "
+"a chess game, GNU Chess, because a complete system needs games too."
 msgstr ""
 "Mulți oameni au făcut contribuții majore la software-ul liber din sistem 
și "
 "ei toți merită să le acordăm credit. Dar motivul pentru care el este 
<em>un "
@@ -427,9 +429,9 @@
 # | [-gap.-] {+gap in the GNU system.+}  People could then  [-put-] {+<a
 # | 
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. 
-# | The+} GNU/Linux system, [-for short.  The <a
+# | make a complete free [-system: a Linux-based-] {+system&mdash;a+} version
+# | of the GNU [-system; the-] {+system which also contained Linux.  The+}
+# | GNU/Linux system, [-for short.  The <a
 # | 
href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\";>
 # | earliest Linux release notes</a> recognized that Linux was a kernel, used
 # | with parts of GNU: &ldquo;Most of the tools used with linux are GNU
@@ -452,8 +454,8 @@
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
 "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."
+"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 ""
 "Din fericire d-voastră nu a trebuit să așteptați pentru Hurd, pentru că "
 "Linux a fost disponibil. Când Linus Torvalds a scris Linux el a umplut "
@@ -469,8 +471,9 @@
 
 #. 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
+# | it-] was not a trivial job.  Some GNU [-components<a
+# | href=\"#somecomponents\">(3)</a>-] {+components&#8239;<a class=\"ftn\"
+# | href=\"#somecomponents\">[3]</a>+} needed substantial change to work with
 # | Linux.  Integrating a complete system as a distribution that would work
 # | &ldquo;out of the box&rdquo; was a big job, too.  It required addressing
 # | the issue of how to install and boot the system&mdash;a problem we had not
@@ -489,15 +492,15 @@
 #| "that point.  The people who developed the various system distributions "
 #| "made a substantial contribution."
 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 "
-"Linux.  Integrating a complete system as a distribution that would work "
-"&ldquo;out of the box&rdquo; was a big job, too.  It required addressing the "
-"issue of how to install and boot the system&mdash;a problem we had not "
-"tackled, because we hadn't yet reached that point.  Thus, the people who "
-"developed the various system distributions did a lot of essential work.  But "
-"it was work that, in the nature of things, was surely going to be done by "
-"someone."
+"Making them work well together was not a trivial job.  Some GNU "
+"components&#8239;<a class=\"ftn\" href=\"#somecomponents\">[3]</a> needed "
+"substantial change to work with Linux.  Integrating a complete system as a "
+"distribution that would work &ldquo;out of the box&rdquo; was a big job, "
+"too.  It required addressing the issue of how to install and boot the "
+"system&mdash;a problem we had not tackled, because we hadn't yet reached "
+"that point.  Thus, the people who developed the various system distributions "
+"did a lot of essential work.  But it was work that, in the nature of things, "
+"was surely going to be done by someone."
 msgstr ""
 "A le pune laolaltă sună simplu, dar nu a fost o treabă elementară. Unele "
 "componente GNU <a href=\"#somecomponents\">(3)</a> au avut nevoie de "
@@ -574,11 +577,12 @@
 
 #. 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>-]
+# | reference, this page and <a [-href=\"/gnu/the-gnu-project.html\">
+# | http://www.gnu.org/gnu/the-gnu-project.html</a>-]
+# | {+href=\"/gnu/thegnuproject.html\">
+# | https://www.gnu.org/gnu/thegnuproject.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
@@ -591,10 +595,10 @@
 #| "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\"> 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=\"https://";
-"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
+"this page and <a href=\"/gnu/thegnuproject.html\"> https://www.gnu.org/gnu/";
+"thegnuproject.html</a> are good choices.  If you mention Linux, the 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://";
@@ -612,9 +616,9 @@
 # | 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
-# | in the early 90s.  A free operating system that exists [-today-] {+today<a
-# | href=\"#newersystems\">(4)</a>+} is almost certainly either a variant of
-# | the GNU system, or a kind of BSD system.
+# | in the early 90s.  A free operating system that exists [-today-]
+# | {+today&#8239;<a class=\"ftn\" href=\"#newersystems\">[4]</a>+} is almost
+# | certainly either a variant of the GNU system, or a kind of BSD system.
 #, fuzzy
 #| msgid ""
 #| "Aside from GNU, one other project has independently produced a free Unix-"
@@ -626,9 +630,9 @@
 "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 the early 90s.  "
-"A free operating system that exists today<a href=\"#newersystems\">(4)</a> "
-"is almost certainly either a variant of the GNU system, or a kind of BSD "
-"system."
+"A free operating system that exists today&#8239;<a class=\"ftn\" href="
+"\"#newersystems\">[4]</a> is almost certainly either a variant of the GNU "
+"system, or a kind of BSD system."
 msgstr ""
 "Pe lângă GNU, un alt proiect a dezvoltat în mod independent un sistem de "
 "operare similar Unix-ului. Acest sistem este cunoscut ca BSD, și a fost "
@@ -645,7 +649,8 @@
 # | some BSD programs; however, taken as wholes, they are two different
 # | systems that evolved separately.  The BSD developers did not write a
 # | kernel and add it to the GNU system, and a name like GNU/BSD would not fit
-# | the [-situation.-] {+situation.<a href=\"#gnubsd\">(5)</a>+}
+# | the [-situation.-] {+situation&#8239;<a class=\"ftn\"
+# | href=\"#gnubsd\">[5]</a>.+}
 #, fuzzy
 #| msgid ""
 #| "People sometimes ask whether BSD too is a version of GNU, like GNU/"
@@ -665,8 +670,8 @@
 "use some GNU programs, just as the GNU system and its variants use some BSD "
 "programs; however, taken as wholes, they are two different systems that "
 "evolved separately.  The BSD developers did not write a kernel and add it to "
-"the GNU system, and a name like GNU/BSD would not fit the situation.<a href="
-"\"#gnubsd\">(5)</a>"
+"the GNU system, and a name like GNU/BSD would not fit the situation&#8239;<a "
+"class=\"ftn\" href=\"#gnubsd\">[5]</a>."
 msgstr ""
 "Oamenii întreabă uneori dacă BSD este de asemenea o versiune de GNU, cum "
 "este GNU/Linux. Programatorii BSD au fost inspirați să facă codul lor "

Index: po/linux-and-gnu.ru.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.ru.po,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- po/linux-and-gnu.ru.po      11 Oct 2021 10:32:10 -0000      1.77
+++ po/linux-and-gnu.ru.po      2 Nov 2021 14:41:53 -0000       1.78
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-10-11 09:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2021-10-11 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-11-02 14:27+0000\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
@@ -224,6 +225,36 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><p>
+# | 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
+# | is <em>an integrated system</em>&mdash;and not just a collection of useful
+# | programs&mdash;is because the GNU Project set out to make it one.  We made
+# | a list of the programs needed to make a <em>complete</em> free system, and
+# | we systematically found, wrote, or found people to write everything on the
+# | list.  We wrote essential but [-unexciting <a
+# | href=\"#unexciting\">(1)</a>-] {+unexciting&#8239;<a class=\"ftn\"
+# | href=\"#unexciting\">[1]</a>+} components because you can't have a system
+# | without them.  Some of our system components, the programming tools,
+# | became popular on their own among programmers, but we wrote many
+# | components that are not [-tools <a href=\"#nottools\">(2)</a>.-]
+# | {+tools&#8239;<a class=\"ftn\" href=\"#nottools\">[2]</a>.+}  We even
+# | developed a chess game, GNU Chess, because a complete system needs games
+# | too.
+#, fuzzy
+#| 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 is <em>an integrated system</em>&mdash;and not just a collection of "
+#| "useful programs&mdash;is because the GNU Project set out to make it one.  "
+#| "We made a list of the programs needed to make a <em>complete</em> free "
+#| "system, and we systematically found, wrote, or found people to write "
+#| "everything on the list.  We wrote essential but unexciting <a href="
+#| "\"#unexciting\">(1)</a> components because you can't have a system "
+#| "without them.  Some of our system components, the programming tools, "
+#| "became popular on their own among programmers, but we wrote many "
+#| "components that are not tools <a href=\"#nottools\">(2)</a>.  We even "
+#| "developed a chess game, GNU Chess, because a complete system needs games "
+#| "too."
 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,12 +262,12 @@
 "programs&mdash;is because the GNU Project set out to make it one.  We made a "
 "list of the programs needed to make a <em>complete</em> free system, and we "
 "systematically found, wrote, or found people to write everything on the "
-"list.  We wrote essential but unexciting <a href=\"#unexciting\">(1)</a> "
-"components because you can't have a system without them.  Some of our system "
-"components, the programming tools, became popular on their own among "
-"programmers, but we wrote many components that are not tools <a href="
-"\"#nottools\">(2)</a>.  We even developed a chess game, GNU Chess, because a "
-"complete system needs games too."
+"list.  We wrote essential but unexciting&#8239;<a class=\"ftn\" href="
+"\"#unexciting\">[1]</a> components because you can't have a system without "
+"them.  Some of our system components, the programming tools, became popular "
+"on their own among programmers, but we wrote many components that are not "
+"tools&#8239;<a class=\"ftn\" href=\"#nottools\">[2]</a>.  We even developed "
+"a chess game, GNU Chess, because a complete system needs games too."
 msgstr ""
 "Многие сделали серьезный вклад в 
свободные программы этой системы, и все они 
"
 "заслуживают признательности за свои 
программы. Но причина, по которой это "
@@ -270,13 +301,29 @@
 
 # type: Content of: <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=\"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-] {+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=\"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."
 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=\"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."
+"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 ""
 "К счастью, благодаря Linux нам не пришлось 
ждать Hurd. Когда Торвальдс "
 "освободил Linux в 1992&nbsp;году, это заполнило 
последний серьезный пробел в "
@@ -286,16 +333,37 @@
 
 # type: Content of: <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 "
-"Linux.  Integrating a complete system as a distribution that would work "
-"&ldquo;out of the box&rdquo; was a big job, too.  It required addressing the "
-"issue of how to install and boot the system&mdash;a problem we had not "
-"tackled, because we hadn't yet reached that point.  Thus, the people who "
-"developed the various system distributions did a lot of essential work.  But "
-"it was work that, in the nature of things, was surely going to be done by "
-"someone."
+# | Making them work well together was not a trivial job.  Some GNU
+# | [-components<a href=\"#somecomponents\">(3)</a>-] {+components&#8239;<a
+# | class=\"ftn\" href=\"#somecomponents\">[3]</a>+} needed substantial change
+# | to work with Linux.  Integrating a complete system as a distribution that
+# | would work &ldquo;out of the box&rdquo; was a big job, too.  It required
+# | addressing the issue of how to install and boot the system&mdash;a problem
+# | we had not tackled, because we hadn't yet reached that point.  Thus, the
+# | people who developed the various system distributions did a lot of
+# | essential work.  But it was work that, in the nature of things, was surely
+# | going to be done by someone.
+#, fuzzy
+#| 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 Linux.  Integrating a complete system as a distribution that "
+#| "would work &ldquo;out of the box&rdquo; was a big job, too.  It required "
+#| "addressing the issue of how to install and boot the system&mdash;a "
+#| "problem we had not tackled, because we hadn't yet reached that point.  "
+#| "Thus, the people who developed the various system distributions did a lot "
+#| "of essential work.  But it was work that, in the nature of things, was "
+#| "surely going to be done by someone."
+msgid ""
+"Making them work well together was not a trivial job.  Some GNU "
+"components&#8239;<a class=\"ftn\" href=\"#somecomponents\">[3]</a> needed "
+"substantial change to work with Linux.  Integrating a complete system as a "
+"distribution that would work &ldquo;out of the box&rdquo; was a big job, "
+"too.  It required addressing the issue of how to install and boot the "
+"system&mdash;a problem we had not tackled, because we hadn't yet reached "
+"that point.  Thus, the people who developed the various system distributions "
+"did a lot of essential work.  But it was work that, in the nature of things, "
+"was surely going to be done by someone."
 msgstr ""
 "Заставить их как следует работать вместе 
не было простой задачей. Некоторые "
 "компоненты GNU<a href=\"#somecomponents\">(3)</a> 
требовали существенных "
@@ -385,12 +453,28 @@
 
 # type: Content of: <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\">
+# | https://www.gnu.org/gnu/the-gnu-project.html</a>-]
+# | {+href=\"/gnu/thegnuproject.html\">
+# | https://www.gnu.org/gnu/thegnuproject.html</a>+} are good choices.  If you
+# | mention Linux, the 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.
+#, 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\"> 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=\"https://foldoc.org/linux\";>https://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\"> 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=\"https://";
-"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
+"this page and <a href=\"/gnu/thegnuproject.html\"> https://www.gnu.org/gnu/";
+"thegnuproject.html</a> are good choices.  If you mention Linux, the 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-";
@@ -405,13 +489,28 @@
 
 # type: Content of: <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
+# | the early 90s.  A free operating system that exists [-today<a
+# | href=\"#newersystems\">(4)</a>-] {+today&#8239;<a class=\"ftn\"
+# | href=\"#newersystems\">[4]</a>+} is almost certainly either a variant of
+# | the GNU system, or a kind of BSD system.
+#, fuzzy
+#| 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 UC Berkeley.  It was nonfree in the 80s, but became free in the early "
+#| "90s.  A free operating system that exists today<a href=\"#newersystems\">"
+#| "(4)</a> is almost certainly either a variant of the GNU system, or a kind "
+#| "of BSD system."
 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 "
 "UC Berkeley.  It was nonfree in the 80s, but became free in the early 90s.  "
-"A free operating system that exists today<a href=\"#newersystems\">(4)</a> "
-"is almost certainly either a variant of the GNU system, or a kind of BSD "
-"system."
+"A free operating system that exists today&#8239;<a class=\"ftn\" href="
+"\"#newersystems\">[4]</a> is almost certainly either a variant of the GNU "
+"system, or a kind of BSD system."
 msgstr ""
 "Кроме GNU был еще один проект, который 
независимо произвел свободную "
 "операционную систему типа Unix. Эта система 
известна как BSD, она была "
@@ -423,6 +522,27 @@
 
 # type: Content of: <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
+# | persuade them, but the code had little overlap with GNU.  BSD systems
+# | today use some GNU programs, just as the GNU system and its variants use
+# | some BSD programs; however, taken as wholes, they are two different
+# | systems that evolved separately.  The BSD developers did not write a
+# | kernel and add it to the GNU system, and a name like GNU/BSD would not fit
+# | the [-situation.<a href=\"#gnubsd\">(5)</a>-] {+situation&#8239;<a
+# | class=\"ftn\" href=\"#gnubsd\">[5]</a>.+}
+#, fuzzy
+#| 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 example of the GNU Project, and explicit appeals from GNU "
+#| "activists helped persuade them, but the code had little overlap with "
+#| "GNU.  BSD systems today use some GNU programs, just as the GNU system and "
+#| "its variants use some BSD programs; however, taken as wholes, they are "
+#| "two different systems that evolved separately.  The BSD developers did "
+#| "not write a kernel and add it to the GNU system, and a name like GNU/BSD "
+#| "would not fit the situation.<a href=\"#gnubsd\">(5)</a>"
 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 "
@@ -431,8 +551,8 @@
 "use some GNU programs, just as the GNU system and its variants use some BSD "
 "programs; however, taken as wholes, they are two different systems that "
 "evolved separately.  The BSD developers did not write a kernel and add it to "
-"the GNU system, and a name like GNU/BSD would not fit the situation.<a href="
-"\"#gnubsd\">(5)</a>"
+"the GNU system, and a name like GNU/BSD would not fit the situation&#8239;<a "
+"class=\"ftn\" href=\"#gnubsd\">[5]</a>."
 msgstr ""
 "Иногда спрашивают, является ли BSD тоже 
версией GNU, подобно GNU/Linux. "
 "Разработчики BSD сделали свои программы 
свободными, следуя примеру проекта "

Index: po/linux-and-gnu.sq.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.sq.po,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- po/linux-and-gnu.sq.po      11 Oct 2021 09:34:55 -0000      1.86
+++ po/linux-and-gnu.sq.po      2 Nov 2021 14:41:53 -0000       1.87
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2021-10-11 09:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2021-09-07 14:06+0300\n"
 "Last-Translator: Besnik Bleta <besnik@programeshqip.org>\n"
 "Language-Team: \n"
@@ -207,6 +207,21 @@
 "të ndërtuar <em>një sistem krejt të lirë të ngjashëm me Unix-in</em>: 
GNU."
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| 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 is <em>an integrated system</em>&mdash;and not just a collection of "
+#| "useful programs&mdash;is because the GNU Project set out to make it one.  "
+#| "We made a list of the programs needed to make a <em>complete</em> free "
+#| "system, and we systematically found, wrote, or found people to write "
+#| "everything on the list.  We wrote essential but unexciting <a href="
+#| "\"#unexciting\">(1)</a> components because you can't have a system "
+#| "without them.  Some of our system components, the programming tools, "
+#| "became popular on their own among programmers, but we wrote many "
+#| "components that are not tools <a href=\"#nottools\">(2)</a>.  We even "
+#| "developed a chess game, GNU Chess, because a complete system needs games "
+#| "too."
 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 "
@@ -214,12 +229,12 @@
 "programs&mdash;is because the GNU Project set out to make it one.  We made a "
 "list of the programs needed to make a <em>complete</em> free system, and we "
 "systematically found, wrote, or found people to write everything on the "
-"list.  We wrote essential but unexciting <a href=\"#unexciting\">(1)</a> "
-"components because you can't have a system without them.  Some of our system "
-"components, the programming tools, became popular on their own among "
-"programmers, but we wrote many components that are not tools <a href="
-"\"#nottools\">(2)</a>.  We even developed a chess game, GNU Chess, because a "
-"complete system needs games too."
+"list.  We wrote essential but unexciting&#8239;<a class=\"ftn\" href="
+"\"#unexciting\">[1]</a> components because you can't have a system without "
+"them.  Some of our system components, the programming tools, became popular "
+"on their own among programmers, but we wrote many components that are not "
+"tools&#8239;<a class=\"ftn\" href=\"#nottools\">[2]</a>.  We even developed "
+"a chess game, GNU Chess, because a complete system needs games too."
 msgstr ""
 "Mjaft vetë kanë dhënë kontribut të rëndësishëm për software-in e 
lirë te "
 "sistemi, dhe të tërë e meritojnë t’u jepet haka për software-in e 
tyre.  Por "
@@ -252,13 +267,22 @@
 "rrugë derisa të jetë gati për përdorim të përgjithshëm."
 
 #. 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=\"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."
 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=\"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."
+"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 ""
 "Për fat, falë Linux-it, s’na u desh të pritnim Hurd-in.  Sapo Torvalds e 
"
 "kaloi të lirë Linux-in, më 1992, ky zinte vendin e fundit të zbrazët te "
@@ -269,16 +293,27 @@
 "sistemin GNU/Linux."
 
 #. 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 "
-"Linux.  Integrating a complete system as a distribution that would work "
-"&ldquo;out of the box&rdquo; was a big job, too.  It required addressing the "
-"issue of how to install and boot the system&mdash;a problem we had not "
-"tackled, because we hadn't yet reached that point.  Thus, the people who "
-"developed the various system distributions did a lot of essential work.  But "
-"it was work that, in the nature of things, was surely going to be done by "
-"someone."
+#, fuzzy
+#| 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 Linux.  Integrating a complete system as a distribution that "
+#| "would work &ldquo;out of the box&rdquo; was a big job, too.  It required "
+#| "addressing the issue of how to install and boot the system&mdash;a "
+#| "problem we had not tackled, because we hadn't yet reached that point.  "
+#| "Thus, the people who developed the various system distributions did a lot "
+#| "of essential work.  But it was work that, in the nature of things, was "
+#| "surely going to be done by someone."
+msgid ""
+"Making them work well together was not a trivial job.  Some GNU "
+"components&#8239;<a class=\"ftn\" href=\"#somecomponents\">[3]</a> needed "
+"substantial change to work with Linux.  Integrating a complete system as a "
+"distribution that would work &ldquo;out of the box&rdquo; was a big job, "
+"too.  It required addressing the issue of how to install and boot the "
+"system&mdash;a problem we had not tackled, because we hadn't yet reached "
+"that point.  Thus, the people who developed the various system distributions "
+"did a lot of essential work.  But it was work that, in the nature of things, "
+"was surely going to be done by someone."
 msgstr ""
 "Përputhja e tyre, që të punonin mirë tok, nuk qe punë e lehtë.  Disa "
 "përbërës GNU<a href=\"#somecomponents\">(3)</a> lypnin ndryshime 
thelbësore "
@@ -369,12 +404,20 @@
 "ndërthurje, ju lutemi, quajeni “GNU/Linux”."
 
 #. 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\"> 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=\"https://foldoc.org/linux\";>https://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\"> 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=\"https://";
-"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
+"this page and <a href=\"/gnu/thegnuproject.html\"> https://www.gnu.org/gnu/";
+"thegnuproject.html</a> are good choices.  If you mention Linux, the 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 “GNU/Linux”, për referencë të 
mëtejshme, "
 "kjo faqe dhe <a href=\"/gnu/the-gnu-project.html\"> https://www.gnu.org/gnu/";
@@ -388,13 +431,21 @@
 msgstr "PS"
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| 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 UC Berkeley.  It was nonfree in the 80s, but became free in the early "
+#| "90s.  A free operating system that exists today<a href=\"#newersystems\">"
+#| "(4)</a> is almost certainly either a variant of the GNU system, or a kind "
+#| "of BSD system."
 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 "
 "UC Berkeley.  It was nonfree in the 80s, but became free in the early 90s.  "
-"A free operating system that exists today<a href=\"#newersystems\">(4)</a> "
-"is almost certainly either a variant of the GNU system, or a kind of BSD "
-"system."
+"A free operating system that exists today&#8239;<a class=\"ftn\" href="
+"\"#newersystems\">[4]</a> is almost certainly either a variant of the GNU "
+"system, or a kind of BSD system."
 msgstr ""
 "Përveç GNU-së, një tjetër projekt ka prodhuar në mënyrë të pavarur 
një "
 "sistem operativ të lirë të ngjashëm me Unix-in.  Ky sistem njihet si BSD, 
"
@@ -404,6 +455,17 @@
 "GNU, ose ndonjë lloj sistemi BSD."
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| 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 example of the GNU Project, and explicit appeals from GNU "
+#| "activists helped persuade them, but the code had little overlap with "
+#| "GNU.  BSD systems today use some GNU programs, just as the GNU system and "
+#| "its variants use some BSD programs; however, taken as wholes, they are "
+#| "two different systems that evolved separately.  The BSD developers did "
+#| "not write a kernel and add it to the GNU system, and a name like GNU/BSD "
+#| "would not fit the situation.<a href=\"#gnubsd\">(5)</a>"
 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,8 +474,8 @@
 "use some GNU programs, just as the GNU system and its variants use some BSD "
 "programs; however, taken as wholes, they are two different systems that "
 "evolved separately.  The BSD developers did not write a kernel and add it to "
-"the GNU system, and a name like GNU/BSD would not fit the situation.<a href="
-"\"#gnubsd\">(5)</a>"
+"the GNU system, and a name like GNU/BSD would not fit the situation&#8239;<a "
+"class=\"ftn\" href=\"#gnubsd\">[5]</a>."
 msgstr ""
 "Ndonjëherë njerëzit pyesin nëse edhe BSD-ja është version i GNU-së, si 
GNU/"
 "Linux-i.  Zhvilluesit e BSD-së u frymëzuan nga shembulli i Projektit GNU 
kur "

Index: po/linux-and-gnu.sr.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.sr.po,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- po/linux-and-gnu.sr.po      11 Oct 2021 09:34:55 -0000      1.54
+++ po/linux-and-gnu.sr.po      2 Nov 2021 14:41:53 -0000       1.55
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-10-11 09:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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"
@@ -240,6 +240,21 @@
 "систем</em>: ГНУ."
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| 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 is <em>an integrated system</em>&mdash;and not just a collection of "
+#| "useful programs&mdash;is because the GNU Project set out to make it one.  "
+#| "We made a list of the programs needed to make a <em>complete</em> free "
+#| "system, and we systematically found, wrote, or found people to write "
+#| "everything on the list.  We wrote essential but unexciting <a href="
+#| "\"#unexciting\">(1)</a> components because you can't have a system "
+#| "without them.  Some of our system components, the programming tools, "
+#| "became popular on their own among programmers, but we wrote many "
+#| "components that are not tools <a href=\"#nottools\">(2)</a>.  We even "
+#| "developed a chess game, GNU Chess, because a complete system needs games "
+#| "too."
 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 "
@@ -247,12 +262,12 @@
 "programs&mdash;is because the GNU Project set out to make it one.  We made a "
 "list of the programs needed to make a <em>complete</em> free system, and we "
 "systematically found, wrote, or found people to write everything on the "
-"list.  We wrote essential but unexciting <a href=\"#unexciting\">(1)</a> "
-"components because you can't have a system without them.  Some of our system "
-"components, the programming tools, became popular on their own among "
-"programmers, but we wrote many components that are not tools <a href="
-"\"#nottools\">(2)</a>.  We even developed a chess game, GNU Chess, because a "
-"complete system needs games too."
+"list.  We wrote essential but unexciting&#8239;<a class=\"ftn\" href="
+"\"#unexciting\">[1]</a> components because you can't have a system without "
+"them.  Some of our system components, the programming tools, became popular "
+"on their own among programmers, but we wrote many components that are not "
+"tools&#8239;<a class=\"ftn\" href=\"#nottools\">[2]</a>.  We even developed "
+"a chess game, GNU Chess, because a complete system needs games too."
 msgstr ""
 "Многи људи су значајно допринели 
слободном софтверу који чини систем, и сви "
 "они заслужују да им се ода признање. Али 
разлог због кога је ГНУ "
@@ -305,8 +320,8 @@
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
 "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."
+"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 ""
 "Срећом, нисмо морали да чекамо Крдо, јер 
већ био доступан Линукс. Написавши "
 "Линукс, Линус Торвалдс је попунио 
значајну празнину у систему ГНУ. Људи су "
@@ -316,16 +331,27 @@
 "систем ГНУ са Линуксом."
 
 #. 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 "
-"Linux.  Integrating a complete system as a distribution that would work "
-"&ldquo;out of the box&rdquo; was a big job, too.  It required addressing the "
-"issue of how to install and boot the system&mdash;a problem we had not "
-"tackled, because we hadn't yet reached that point.  Thus, the people who "
-"developed the various system distributions did a lot of essential work.  But "
-"it was work that, in the nature of things, was surely going to be done by "
-"someone."
+#, fuzzy
+#| 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 Linux.  Integrating a complete system as a distribution that "
+#| "would work &ldquo;out of the box&rdquo; was a big job, too.  It required "
+#| "addressing the issue of how to install and boot the system&mdash;a "
+#| "problem we had not tackled, because we hadn't yet reached that point.  "
+#| "Thus, the people who developed the various system distributions did a lot "
+#| "of essential work.  But it was work that, in the nature of things, was "
+#| "surely going to be done by someone."
+msgid ""
+"Making them work well together was not a trivial job.  Some GNU "
+"components&#8239;<a class=\"ftn\" href=\"#somecomponents\">[3]</a> needed "
+"substantial change to work with Linux.  Integrating a complete system as a "
+"distribution that would work &ldquo;out of the box&rdquo; was a big job, "
+"too.  It required addressing the issue of how to install and boot the "
+"system&mdash;a problem we had not tackled, because we hadn't yet reached "
+"that point.  Thus, the people who developed the various system distributions "
+"did a lot of essential work.  But it was work that, in the nature of things, "
+"was surely going to be done by someone."
 msgstr ""
 "Омогућавање да они добро функционишу 
заједно није био лак посао. Неке делове "
 "ГНУ-а <a href=\"#somecomponents\">(3)</a> је било потребно 
коренито мењати "
@@ -463,10 +489,10 @@
 #| "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\"> 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=\"https://";
-"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
+"this page and <a href=\"/gnu/thegnuproject.html\"> https://www.gnu.org/gnu/";
+"thegnuproject.html</a> are good choices.  If you mention Linux, the 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-"
@@ -482,13 +508,21 @@
 msgstr "Додатак"
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| 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 UC Berkeley.  It was nonfree in the 80s, but became free in the early "
+#| "90s.  A free operating system that exists today<a href=\"#newersystems\">"
+#| "(4)</a> is almost certainly either a variant of the GNU system, or a kind "
+#| "of BSD system."
 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 "
 "UC Berkeley.  It was nonfree in the 80s, but became free in the early 90s.  "
-"A free operating system that exists today<a href=\"#newersystems\">(4)</a> "
-"is almost certainly either a variant of the GNU system, or a kind of BSD "
-"system."
+"A free operating system that exists today&#8239;<a class=\"ftn\" href="
+"\"#newersystems\">[4]</a> is almost certainly either a variant of the GNU "
+"system, or a kind of BSD system."
 msgstr ""
 "Поред ГНУ-а, још један пројекат је 
независно произвео слободан униксолики "
 "оперативни систем. Овај систем је познат 
под називом БСД, а развијен је на "
@@ -498,6 +532,17 @@
 "система БСД."
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| 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 example of the GNU Project, and explicit appeals from GNU "
+#| "activists helped persuade them, but the code had little overlap with "
+#| "GNU.  BSD systems today use some GNU programs, just as the GNU system and "
+#| "its variants use some BSD programs; however, taken as wholes, they are "
+#| "two different systems that evolved separately.  The BSD developers did "
+#| "not write a kernel and add it to the GNU system, and a name like GNU/BSD "
+#| "would not fit the situation.<a href=\"#gnubsd\">(5)</a>"
 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 "
@@ -506,8 +551,8 @@
 "use some GNU programs, just as the GNU system and its variants use some BSD "
 "programs; however, taken as wholes, they are two different systems that "
 "evolved separately.  The BSD developers did not write a kernel and add it to "
-"the GNU system, and a name like GNU/BSD would not fit the situation.<a href="
-"\"#gnubsd\">(5)</a>"
+"the GNU system, and a name like GNU/BSD would not fit the situation&#8239;<a "
+"class=\"ftn\" href=\"#gnubsd\">[5]</a>."
 msgstr ""
 "Људи нас понекад питају да ли је и БСД 
једна верзија ГНУ-а, као што је то "
 "ГНУ са Линуксом. Пример Пројекта ГНУ је 
инспирисао градитеље БСД-а да њихов "

Index: po/linux-and-gnu.ta.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.ta.po,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- po/linux-and-gnu.ta.po      11 Oct 2021 09:34:55 -0000      1.11
+++ po/linux-and-gnu.ta.po      2 Nov 2021 14:41:53 -0000       1.12
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-10-11 09:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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"
@@ -328,12 +328,14 @@
 # | make it one.  We made a list of the programs needed to make a
 # | <em>complete</em> free system, and we systematically found, wrote, or
 # | found people to write everything on the list.  We wrote essential but
-# | unexciting <a href=\"#unexciting\">(1)</a> components because you can't
+# | [-unexciting <a href=\"#unexciting\">(1)</a>-] {+unexciting&#8239;<a
+# | class=\"ftn\" href=\"#unexciting\">[1]</a>+} components because you can't
 # | have a system without them.  Some of our system components, the
 # | programming tools, became popular on their own among programmers, but we
-# | wrote many components that are not tools <a href=\"#nottools\">(2)</a>. 
-# | We even developed a chess game, GNU Chess, because a complete system needs
-# | [-good-] games too.
+# | wrote many components that are not [-tools <a
+# | href=\"#nottools\">(2)</a>.-] {+tools&#8239;<a class=\"ftn\"
+# | href=\"#nottools\">[2]</a>.+}  We even developed a chess game, GNU Chess,
+# | because a complete system needs [-good-] games too.
 #, fuzzy
 #| msgid ""
 #| "Many people have made major contributions to the free software in the "
@@ -356,12 +358,12 @@
 "programs&mdash;is because the GNU Project set out to make it one.  We made a "
 "list of the programs needed to make a <em>complete</em> free system, and we "
 "systematically found, wrote, or found people to write everything on the "
-"list.  We wrote essential but unexciting <a href=\"#unexciting\">(1)</a> "
-"components because you can't have a system without them.  Some of our system "
-"components, the programming tools, became popular on their own among "
-"programmers, but we wrote many components that are not tools <a href="
-"\"#nottools\">(2)</a>.  We even developed a chess game, GNU Chess, because a "
-"complete system needs games too."
+"list.  We wrote essential but unexciting&#8239;<a class=\"ftn\" href="
+"\"#unexciting\">[1]</a> components because you can't have a system without "
+"them.  Some of our system components, the programming tools, became popular "
+"on their own among programmers, but we wrote many components that are not "
+"tools&#8239;<a class=\"ftn\" href=\"#nottools\">[2]</a>.  We even developed "
+"a chess game, GNU Chess, because a complete system needs games too."
 msgstr ""
 "அமைப்பிலுள்ள கட்டற்ற 
மென்பொருட்களுக்கு பலர் 
பங்களித்துள்ளனர். அவர்கள் அ
னைவருக்கும் நன்மதிப்பில் "
 "பங்குண்டு. குனு திட்டம் ஒரு 
ஒருங்கிணைக்கப் பட்ட அ
மைப்பினை உருவாக்க முனைந்த 
காரணத்தால் அது "
@@ -414,9 +416,9 @@
 # | 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.
+# | combine Linux with the GNU system</a> to make a complete free [-system
+# | &mdash; a-] {+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 "
@@ -431,8 +433,8 @@
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
 "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."
+"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 ""
 "லினக்ஸ் கிடைத்த 
காரணத்தினால், அதிருஷ்ட வசமாக, 
நாங்கள் ஹர்ட்டுக்காக 
காத்திருக்க வேண்டிய "
 "அவசியம் இல்லாது போனது. 
லினக்ஸினை லைனஸ் 
டோர்வால்ட்ஸ் இயற்றியப் 
பொழுது கடைசியாக இருந்த "
@@ -447,8 +449,9 @@
 
 #. 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
+# | it-] was not a trivial job.  Some GNU [-components<a
+# | href=\"#somecomponents\">(3)</a>-] {+components&#8239;<a class=\"ftn\"
+# | href=\"#somecomponents\">[3]</a>+} needed substantial change to work with
 # | Linux.  Integrating a complete system as a distribution that would work
 # | &ldquo;out of the box&rdquo; was a big job, too.  It required addressing
 # | the issue of how to install and boot the system&mdash;a problem we had not
@@ -467,15 +470,15 @@
 #| "that point.  The people who developed the various system distributions "
 #| "made a substantial contribution."
 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 "
-"Linux.  Integrating a complete system as a distribution that would work "
-"&ldquo;out of the box&rdquo; was a big job, too.  It required addressing the "
-"issue of how to install and boot the system&mdash;a problem we had not "
-"tackled, because we hadn't yet reached that point.  Thus, the people who "
-"developed the various system distributions did a lot of essential work.  But "
-"it was work that, in the nature of things, was surely going to be done by "
-"someone."
+"Making them work well together was not a trivial job.  Some GNU "
+"components&#8239;<a class=\"ftn\" href=\"#somecomponents\">[3]</a> needed "
+"substantial change to work with Linux.  Integrating a complete system as a "
+"distribution that would work &ldquo;out of the box&rdquo; was a big job, "
+"too.  It required addressing the issue of how to install and boot the "
+"system&mdash;a problem we had not tackled, because we hadn't yet reached "
+"that point.  Thus, the people who developed the various system distributions "
+"did a lot of essential work.  But it was work that, in the nature of things, "
+"was surely going to be done by someone."
 msgstr ""
 "இவற்றை ஒன்றாக கோர்ப்பது 
கேட்பதற்குச் சுலமாக 
இருக்கலாம், அது அதிக 
முக்கியத்துவம் இல்லாத "
 "பணியாக இருந்து விடவில்லை. 
லினக்ஸுடன் பணியாற்றும் 
பொருட்டு சில குனு 
பாகங்களில்<a href="
@@ -596,11 +599,12 @@
 
 #. 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.doc.ic.ac.uk/foldoc/foldoc.cgi?Linux\";>
+# | reference, this page and <a [-href=\"/gnu/the-gnu-project.html\">
+# | http://www.gnu.org/gnu/the-gnu-project.html</a>-]
+# | {+href=\"/gnu/thegnuproject.html\">
+# | https://www.gnu.org/gnu/thegnuproject.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=\"https://foldoc.org/linux\";>https://foldoc.org/linux</a>+} is a
 # | good URL to use.
@@ -614,10 +618,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\"> 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=\"https://";
-"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
+"this page and <a href=\"/gnu/thegnuproject.html\"> https://www.gnu.org/gnu/";
+"thegnuproject.html</a> are good choices.  If you mention Linux, the 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-";
@@ -636,9 +640,9 @@
 # | 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
-# | the early 90s.  A free operating system that exists [-today-] {+today<a
-# | href=\"#newersystems\">(4)</a>+} is almost certainly either a variant of
-# | the GNU system, or a kind of BSD system.
+# | the early 90s.  A free operating system that exists [-today-]
+# | {+today&#8239;<a class=\"ftn\" href=\"#newersystems\">[4]</a>+} is almost
+# | certainly either a variant of the GNU system, or a kind of BSD system.
 #, fuzzy
 #| msgid ""
 #| "Aside from GNU, one other project has independently produced a free Unix-"
@@ -650,9 +654,9 @@
 "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 the early 90s.  "
-"A free operating system that exists today<a href=\"#newersystems\">(4)</a> "
-"is almost certainly either a variant of the GNU system, or a kind of BSD "
-"system."
+"A free operating system that exists today&#8239;<a class=\"ftn\" href="
+"\"#newersystems\">[4]</a> is almost certainly either a variant of the GNU "
+"system, or a kind of BSD system."
 msgstr ""
 "குனுவினைத் தவிர, வேறொருத் 
திட்டமும் சுயேச்சையாக 
கட்டற்ற யுனிக்ஸ் போன்றதொரு "
 "இயங்குதளத்தினைப் 
உருவாக்கியுள்ளது. இது 
பி.எஸ்.டி என வழங்கப் 
படுகின்றது. இது யு.சி "
@@ -669,7 +673,8 @@
 # | some BSD programs; however, taken as wholes, they are two different
 # | systems that evolved separately.  The BSD developers did not write a
 # | kernel and add it to the GNU system, and a name like GNU/BSD would not fit
-# | the situation.<a href=\"#gnubsd\">([-4-]{+5+})</a>
+# | the [-situation.<a href=\"#gnubsd\">(4)</a>-] {+situation&#8239;<a
+# | class=\"ftn\" href=\"#gnubsd\">[5]</a>.+}
 #, fuzzy
 #| msgid ""
 #| "People sometimes ask whether BSD too is a version of GNU, like GNU/"
@@ -689,8 +694,8 @@
 "use some GNU programs, just as the GNU system and its variants use some BSD "
 "programs; however, taken as wholes, they are two different systems that "
 "evolved separately.  The BSD developers did not write a kernel and add it to "
-"the GNU system, and a name like GNU/BSD would not fit the situation.<a href="
-"\"#gnubsd\">(5)</a>"
+"the GNU system, and a name like GNU/BSD would not fit the situation&#8239;<a "
+"class=\"ftn\" href=\"#gnubsd\">[5]</a>."
 msgstr ""
 "பி.எஸ்.டியும் குனுவின் 
வழிவகைதானா என மக்கள் சிலச் 
சமயங்களில் கேட்பதுண்டு. 
தங்களின் "
 "நிரல்களை கட்டற்றதாக்க 
பி.எஸ்.டியை உருவாக்குவோர் 
குனு திட்டத்தின் 
உதாரணத்தினால் உந்தப் "

Index: po/linux-and-gnu.tr.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.tr.po,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- po/linux-and-gnu.tr.po      14 Oct 2021 19:42:21 -0000      1.12
+++ po/linux-and-gnu.tr.po      2 Nov 2021 14:41:53 -0000       1.13
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-10-11 09:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2021-10-14 21:17+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-11-02 14:27+0000\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Poedit 2.4.2\n"
 
@@ -203,6 +204,21 @@
 "benzeri sistem</em> geliştirmeyi amaçlıyordu: GNU'yu."
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| 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 is <em>an integrated system</em>&mdash;and not just a collection of "
+#| "useful programs&mdash;is because the GNU Project set out to make it one.  "
+#| "We made a list of the programs needed to make a <em>complete</em> free "
+#| "system, and we systematically found, wrote, or found people to write "
+#| "everything on the list.  We wrote essential but unexciting <a href="
+#| "\"#unexciting\">(1)</a> components because you can't have a system "
+#| "without them.  Some of our system components, the programming tools, "
+#| "became popular on their own among programmers, but we wrote many "
+#| "components that are not tools <a href=\"#nottools\">(2)</a>.  We even "
+#| "developed a chess game, GNU Chess, because a complete system needs games "
+#| "too."
 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 "
@@ -210,12 +226,12 @@
 "programs&mdash;is because the GNU Project set out to make it one.  We made a "
 "list of the programs needed to make a <em>complete</em> free system, and we "
 "systematically found, wrote, or found people to write everything on the "
-"list.  We wrote essential but unexciting <a href=\"#unexciting\">(1)</a> "
-"components because you can't have a system without them.  Some of our system "
-"components, the programming tools, became popular on their own among "
-"programmers, but we wrote many components that are not tools <a href="
-"\"#nottools\">(2)</a>.  We even developed a chess game, GNU Chess, because a "
-"complete system needs games too."
+"list.  We wrote essential but unexciting&#8239;<a class=\"ftn\" href="
+"\"#unexciting\">[1]</a> components because you can't have a system without "
+"them.  Some of our system components, the programming tools, became popular "
+"on their own among programmers, but we wrote many components that are not "
+"tools&#8239;<a class=\"ftn\" href=\"#nottools\">[2]</a>.  We even developed "
+"a chess game, GNU Chess, because a complete system needs games too."
 msgstr ""
 "Birçok kişi sistemdeki özgür yazılıma büyük katkılarda bulundu ve 
hepsi "
 "kendi yazılımları için övgüyü hak ediyor. Ancak bunun sadece yararlı "
@@ -247,13 +263,22 @@
 "başladı</a> ancak insanların genel kullanımına hazır olmaktan çok 
uzaktı."
 
 #. 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=\"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."
 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=\"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."
+"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 ""
 "Neyse ki Linux sayesinde Hurd'u beklemek zorunda değildik. Torvalds 1992'de "
 "Linux'u yayımladıktan sonra GNU sistemindeki son büyük boşluğu 
kapatmış "
@@ -263,16 +288,27 @@
 "GNU sistemi sürümü. Başka bir deyişle GNU/Linux sistemi."
 
 #. 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 "
-"Linux.  Integrating a complete system as a distribution that would work "
-"&ldquo;out of the box&rdquo; was a big job, too.  It required addressing the "
-"issue of how to install and boot the system&mdash;a problem we had not "
-"tackled, because we hadn't yet reached that point.  Thus, the people who "
-"developed the various system distributions did a lot of essential work.  But "
-"it was work that, in the nature of things, was surely going to be done by "
-"someone."
+#, fuzzy
+#| 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 Linux.  Integrating a complete system as a distribution that "
+#| "would work &ldquo;out of the box&rdquo; was a big job, too.  It required "
+#| "addressing the issue of how to install and boot the system&mdash;a "
+#| "problem we had not tackled, because we hadn't yet reached that point.  "
+#| "Thus, the people who developed the various system distributions did a lot "
+#| "of essential work.  But it was work that, in the nature of things, was "
+#| "surely going to be done by someone."
+msgid ""
+"Making them work well together was not a trivial job.  Some GNU "
+"components&#8239;<a class=\"ftn\" href=\"#somecomponents\">[3]</a> needed "
+"substantial change to work with Linux.  Integrating a complete system as a "
+"distribution that would work &ldquo;out of the box&rdquo; was a big job, "
+"too.  It required addressing the issue of how to install and boot the "
+"system&mdash;a problem we had not tackled, because we hadn't yet reached "
+"that point.  Thus, the people who developed the various system distributions "
+"did a lot of essential work.  But it was work that, in the nature of things, "
+"was surely going to be done by someone."
 msgstr ""
 "Birlikte iyi çalışmalarını sağlamak önemsiz bir iş değildi. Bazı 
GNU "
 "bileşenleri<a href=\"#somecomponents\">(3)</a> Linux ile çalışmak için "
@@ -354,12 +390,20 @@
 "lütfen &ldquo;GNU/Linux&rdquo; olarak adlandırın."
 
 #. 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\"> 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=\"https://foldoc.org/linux\";>https://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\"> 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=\"https://";
-"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
+"this page and <a href=\"/gnu/thegnuproject.html\"> https://www.gnu.org/gnu/";
+"thegnuproject.html</a> are good choices.  If you mention Linux, the 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://";
@@ -373,13 +417,21 @@
 msgstr "Dipnotlar"
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| 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 UC Berkeley.  It was nonfree in the 80s, but became free in the early "
+#| "90s.  A free operating system that exists today<a href=\"#newersystems\">"
+#| "(4)</a> is almost certainly either a variant of the GNU system, or a kind "
+#| "of BSD system."
 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 "
 "UC Berkeley.  It was nonfree in the 80s, but became free in the early 90s.  "
-"A free operating system that exists today<a href=\"#newersystems\">(4)</a> "
-"is almost certainly either a variant of the GNU system, or a kind of BSD "
-"system."
+"A free operating system that exists today&#8239;<a class=\"ftn\" href="
+"\"#newersystems\">[4]</a> is almost certainly either a variant of the GNU "
+"system, or a kind of BSD system."
 msgstr ""
 "GNU dışında başka bir proje de bağımsız olarak özgür bir Unix 
benzeri "
 "işletim sistemi üretti. Bu sistem BSD olarak bilinir ve UC Berkeley'de "
@@ -389,6 +441,17 @@
 "sistemidir."
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| 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 example of the GNU Project, and explicit appeals from GNU "
+#| "activists helped persuade them, but the code had little overlap with "
+#| "GNU.  BSD systems today use some GNU programs, just as the GNU system and "
+#| "its variants use some BSD programs; however, taken as wholes, they are "
+#| "two different systems that evolved separately.  The BSD developers did "
+#| "not write a kernel and add it to the GNU system, and a name like GNU/BSD "
+#| "would not fit the situation.<a href=\"#gnubsd\">(5)</a>"
 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 "
@@ -397,8 +460,8 @@
 "use some GNU programs, just as the GNU system and its variants use some BSD "
 "programs; however, taken as wholes, they are two different systems that "
 "evolved separately.  The BSD developers did not write a kernel and add it to "
-"the GNU system, and a name like GNU/BSD would not fit the situation.<a href="
-"\"#gnubsd\">(5)</a>"
+"the GNU system, and a name like GNU/BSD would not fit the situation&#8239;<a "
+"class=\"ftn\" href=\"#gnubsd\">[5]</a>."
 msgstr ""
 "İnsanlar bazen BSD'nin de GNU/Linux gibi bir GNU sürümü olup 
olmadığını "
 "soruyorlar. BSD geliştiricileri; GNU Projesi örneğinden, kodlarını 
özgür bir "

Index: po/linux-and-gnu.uk-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.uk-diff.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- po/linux-and-gnu.uk-diff.html       11 Oct 2021 09:34:56 -0000      1.10
+++ po/linux-and-gnu.uk-diff.html       2 Nov 2021 14:41:53 -0000       1.11
@@ -12,23 +12,31 @@
 <body><pre>
 &lt;!--#include virtual="/server/header.html" --&gt;
 &lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.84</strong></del></span> <span 
class="inserted"><ins><em>1.96 --&gt;
-&lt;!-- This page is derived from 
/server/standards/boilerplate.html</em></ins></span> --&gt;
+&lt;!-- This page is derived from /server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="gnulinux" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</em></ins></span> --&gt;
 &lt;title&gt;Linux and GNU
 - GNU Project - Free Software Foundation&lt;/title&gt;
+<span class="inserted"><ins><em>&lt;style type="text/css" 
media="print,screen"&gt;&lt;!--
+a.ftn { font-size: .94em; }
+--&gt;&lt;/style&gt;</em></ins></span>
 &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="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&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 &lt;a 
href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&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"&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="announcement"&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;,
+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;/blockquote&gt;
 &lt;/div&gt;</strong></del></span>
@@ -133,11 +141,12 @@
 to make it one.  We made a list of the programs needed to make
 a &lt;em&gt;complete&lt;/em&gt; free system, and we systematically found, 
wrote,
 or found people to write everything on the list.  We wrote essential
-but unexciting
-&lt;a href="#unexciting"&gt;(1)&lt;/a&gt; components because you can't have a 
system
+but <span class="removed"><del><strong>unexciting
+&lt;a href="#unexciting"&gt;(1)&lt;/a&gt;</strong></del></span> <span 
class="inserted"><ins><em>unexciting&#8239;&lt;a class="ftn" 
href="#unexciting"&gt;[1]&lt;/a&gt;</em></ins></span> components
+because you can't have a system
 without them.  Some of our system components, the programming tools,
 became popular on their own among programmers, but we wrote many
-components that are not tools  &lt;a href="#nottools"&gt;(2)&lt;/a&gt;.  We 
even
+components that are not <span class="removed"><del><strong>tools  &lt;a 
href="#nottools"&gt;(2)&lt;/a&gt;.</strong></del></span> <span 
class="inserted"><ins><em>tools&#8239;&lt;a class="ftn" 
href="#nottools"&gt;[2]&lt;/a&gt;.</em></ins></span>  We even
 developed a chess game, GNU Chess, because a complete system needs
 games too.&lt;/p&gt;
 
@@ -155,13 +164,15 @@
 Once Torvalds freed Linux in 1992, it fit into the last major gap in
 the GNU system.  People could
 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
+combine Linux with the GNU system&lt;/a&gt; to make a complete free <span 
class="removed"><del><strong>system
+&mdash; a</strong></del></span> <span 
class="inserted"><ins><em>system&mdash;a</em></ins></span>
+version of the GNU system which also contained Linux.  The
 GNU/Linux system, in other words.&lt;/p&gt;
 
 &lt;p&gt;
 Making them work well together was not a trivial job.  Some GNU
-components&lt;a href="#somecomponents"&gt;(3)&lt;/a&gt; needed substantial 
change
+<span class="removed"><del><strong>components&lt;a 
href="#somecomponents"&gt;(3)&lt;/a&gt;</strong></del></span>
+<span class="inserted"><ins><em>components&#8239;&lt;a class="ftn" 
href="#somecomponents"&gt;[3]&lt;/a&gt;</em></ins></span> needed substantial 
change
 to work with Linux.  Integrating a complete system as a distribution
 that would work &ldquo;out of the box&rdquo; was a big job, too.  It
 required addressing the issue of how to install and boot the
@@ -209,9 +220,9 @@
 
 &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;
-<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
+reference, this page and &lt;a <span 
class="removed"><del><strong>href="/gnu/the-gnu-project.html"&gt;
+http://www.gnu.org/gnu/the-gnu-project.html&lt;/a&gt;</strong></del></span> 
<span class="inserted"><ins><em>href="/gnu/thegnuproject.html"&gt;
+https://www.gnu.org/gnu/thegnuproject.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 <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;
@@ -226,7 +237,8 @@
 a free Unix-like operating system.  This system is known as BSD, and
 it was developed at UC Berkeley.  It was <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> in the 80s, but
 became free in the early 90s.  A free operating system that exists
-today&lt;a href="#newersystems"&gt;(4)&lt;/a&gt; is almost certainly either a
+<span class="removed"><del><strong>today&lt;a 
href="#newersystems"&gt;(4)&lt;/a&gt;</strong></del></span>
+<span class="inserted"><ins><em>today&#8239;&lt;a class="ftn" 
href="#newersystems"&gt;[4]&lt;/a&gt;</em></ins></span> is almost certainly 
either a
 variant of the GNU system, or a kind of BSD system.&lt;/p&gt;
 
 &lt;p&gt;
@@ -238,11 +250,12 @@
 system and its variants use some BSD programs; however, taken as
 wholes, they are two different systems that evolved separately.  The
 BSD developers did not write a kernel and add it to the GNU system,
-and a name like GNU/BSD would not fit the situation.&lt;a
+and a name like GNU/BSD would not fit the <span 
class="removed"><del><strong>situation.&lt;a
 href="#gnubsd"&gt;(5)&lt;/a&gt;&lt;/p&gt;
 
-<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&gt;Notes:&lt;/h3&gt;</strong></del></span> <span 
class="inserted"><ins><em>situation&#8239;&lt;a class="ftn"
+href="#gnubsd"&gt;[5]&lt;/a&gt;.&lt;/p&gt;
+&lt;div class="column-limit"&gt;&lt;/div&gt;
 
 &lt;h3 class="footnote"&gt;Footnotes&lt;/h3&gt;</em></ins></span>
 &lt;ol&gt;
@@ -350,7 +363,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/10/11 09:34:56 $
+$Date: 2021/11/02 14:41:53 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: po/linux-and-gnu.uk.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.uk.po,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- po/linux-and-gnu.uk.po      11 Oct 2021 09:34:56 -0000      1.32
+++ po/linux-and-gnu.uk.po      2 Nov 2021 14:41:53 -0000       1.33
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-10-11 09:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2017-12-10 09:03+0200\n"
 "Last-Translator: Andriy Bandura <andriykopanytsia@gmail.com>\n"
 "Language-Team: Ukrainian <>\n"
@@ -236,6 +236,21 @@
 "розробити <em>повну вільну операційну 
систему типу Unix</em>: GNU."
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| 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 is <em>an integrated system</em>&mdash;and not just a collection of "
+#| "useful programs&mdash;is because the GNU Project set out to make it one.  "
+#| "We made a list of the programs needed to make a <em>complete</em> free "
+#| "system, and we systematically found, wrote, or found people to write "
+#| "everything on the list.  We wrote essential but unexciting <a href="
+#| "\"#unexciting\">(1)</a> components because you can't have a system "
+#| "without them.  Some of our system components, the programming tools, "
+#| "became popular on their own among programmers, but we wrote many "
+#| "components that are not tools <a href=\"#nottools\">(2)</a>.  We even "
+#| "developed a chess game, GNU Chess, because a complete system needs games "
+#| "too."
 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,12 +258,12 @@
 "programs&mdash;is because the GNU Project set out to make it one.  We made a "
 "list of the programs needed to make a <em>complete</em> free system, and we "
 "systematically found, wrote, or found people to write everything on the "
-"list.  We wrote essential but unexciting <a href=\"#unexciting\">(1)</a> "
-"components because you can't have a system without them.  Some of our system "
-"components, the programming tools, became popular on their own among "
-"programmers, but we wrote many components that are not tools <a href="
-"\"#nottools\">(2)</a>.  We even developed a chess game, GNU Chess, because a "
-"complete system needs games too."
+"list.  We wrote essential but unexciting&#8239;<a class=\"ftn\" href="
+"\"#unexciting\">[1]</a> components because you can't have a system without "
+"them.  Some of our system components, the programming tools, became popular "
+"on their own among programmers, but we wrote many components that are not "
+"tools&#8239;<a class=\"ftn\" href=\"#nottools\">[2]</a>.  We even developed "
+"a chess game, GNU Chess, because a complete system needs games too."
 msgstr ""
 "Багато осіб зробили серйозний внесок у 
вільні програми цієї системи, і всі "
 "вони заслуговують вдячності за свої 
програми. Але причина, по якій це є "
@@ -295,8 +310,8 @@
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
 "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."
+"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 ""
 "На щастя, завдяки Linux нам не довелося 
чекати Hurd. Коли Торвальдс випустив "
 "Linux в 1992&nbsp;році, це заповнило останній 
серйозний пробіл у системі "
@@ -305,16 +320,27 @@
 "Linux; іншими словами, систему GNU/Linux. "
 
 #. 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 "
-"Linux.  Integrating a complete system as a distribution that would work "
-"&ldquo;out of the box&rdquo; was a big job, too.  It required addressing the "
-"issue of how to install and boot the system&mdash;a problem we had not "
-"tackled, because we hadn't yet reached that point.  Thus, the people who "
-"developed the various system distributions did a lot of essential work.  But "
-"it was work that, in the nature of things, was surely going to be done by "
-"someone."
+#, fuzzy
+#| 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 Linux.  Integrating a complete system as a distribution that "
+#| "would work &ldquo;out of the box&rdquo; was a big job, too.  It required "
+#| "addressing the issue of how to install and boot the system&mdash;a "
+#| "problem we had not tackled, because we hadn't yet reached that point.  "
+#| "Thus, the people who developed the various system distributions did a lot "
+#| "of essential work.  But it was work that, in the nature of things, was "
+#| "surely going to be done by someone."
+msgid ""
+"Making them work well together was not a trivial job.  Some GNU "
+"components&#8239;<a class=\"ftn\" href=\"#somecomponents\">[3]</a> needed "
+"substantial change to work with Linux.  Integrating a complete system as a "
+"distribution that would work &ldquo;out of the box&rdquo; was a big job, "
+"too.  It required addressing the issue of how to install and boot the "
+"system&mdash;a problem we had not tackled, because we hadn't yet reached "
+"that point.  Thus, the people who developed the various system distributions "
+"did a lot of essential work.  But it was work that, in the nature of things, "
+"was surely going to be done by someone."
 msgstr ""
 "Змусити їх працювати разом не було 
простою задачею. Деякі компоненти GNU<a "
 "href=\"#somecomponents\">(3)</a> вимагали істотних змін, 
щоб вони працювати "
@@ -435,10 +461,10 @@
 #| "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\"> 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=\"https://";
-"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
+"this page and <a href=\"/gnu/thegnuproject.html\"> https://www.gnu.org/gnu/";
+"thegnuproject.html</a> are good choices.  If you mention Linux, the 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-";
@@ -463,9 +489,9 @@
 "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 the early 90s.  "
-"A free operating system that exists today<a href=\"#newersystems\">(4)</a> "
-"is almost certainly either a variant of the GNU system, or a kind of BSD "
-"system."
+"A free operating system that exists today&#8239;<a class=\"ftn\" href="
+"\"#newersystems\">[4]</a> is almost certainly either a variant of the GNU "
+"system, or a kind of BSD system."
 msgstr ""
 "Крім GNU, був ще один проект, який створив 
незалежно вільну операційну "
 "систему типу Unix. Ця система відома як BSD. 
Вона була розроблена в "
@@ -475,6 +501,17 @@
 "майже напевно є варіантом системи GNU, або 
різновидом системи BSD."
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| 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 example of the GNU Project, and explicit appeals from GNU "
+#| "activists helped persuade them, but the code had little overlap with "
+#| "GNU.  BSD systems today use some GNU programs, just as the GNU system and "
+#| "its variants use some BSD programs; however, taken as wholes, they are "
+#| "two different systems that evolved separately.  The BSD developers did "
+#| "not write a kernel and add it to the GNU system, and a name like GNU/BSD "
+#| "would not fit the situation.<a href=\"#gnubsd\">(5)</a>"
 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 "
@@ -483,8 +520,8 @@
 "use some GNU programs, just as the GNU system and its variants use some BSD "
 "programs; however, taken as wholes, they are two different systems that "
 "evolved separately.  The BSD developers did not write a kernel and add it to "
-"the GNU system, and a name like GNU/BSD would not fit the situation.<a href="
-"\"#gnubsd\">(5)</a>"
+"the GNU system, and a name like GNU/BSD would not fit the situation&#8239;<a "
+"class=\"ftn\" href=\"#gnubsd\">[5]</a>."
 msgstr ""
 "Іноді запитують, чи є BSD також версією GNU, 
подібно GNU/Linux. Розробники "
 "BSD зробили свої програми вільними, 
наслідуючи приклад проекту GNU, і "

Index: po/linux-and-gnu.zh-cn.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.zh-cn.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- po/linux-and-gnu.zh-cn.po   12 Oct 2021 02:31:34 -0000      1.15
+++ po/linux-and-gnu.zh-cn.po   2 Nov 2021 14:41:53 -0000       1.16
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-10-11 09:26+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2021-10-12 09:55+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-11-02 14:27+0000\n"
 
 #. type: Content of: <title>
 msgid "Linux and GNU - GNU Project - Free Software Foundation"
@@ -182,6 +183,21 @@
 "个完全自由的类似Unix的系统</em>:GNU。"
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| 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 is <em>an integrated system</em>&mdash;and not just a collection of "
+#| "useful programs&mdash;is because the GNU Project set out to make it one.  "
+#| "We made a list of the programs needed to make a <em>complete</em> free "
+#| "system, and we systematically found, wrote, or found people to write "
+#| "everything on the list.  We wrote essential but unexciting <a href="
+#| "\"#unexciting\">(1)</a> components because you can't have a system "
+#| "without them.  Some of our system components, the programming tools, "
+#| "became popular on their own among programmers, but we wrote many "
+#| "components that are not tools <a href=\"#nottools\">(2)</a>.  We even "
+#| "developed a chess game, GNU Chess, because a complete system needs games "
+#| "too."
 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 "
@@ -189,12 +205,12 @@
 "programs&mdash;is because the GNU Project set out to make it one.  We made a "
 "list of the programs needed to make a <em>complete</em> free system, and we "
 "systematically found, wrote, or found people to write everything on the "
-"list.  We wrote essential but unexciting <a href=\"#unexciting\">(1)</a> "
-"components because you can't have a system without them.  Some of our system "
-"components, the programming tools, became popular on their own among "
-"programmers, but we wrote many components that are not tools <a href="
-"\"#nottools\">(2)</a>.  We even developed a chess game, GNU Chess, because a "
-"complete system needs games too."
+"list.  We wrote essential but unexciting&#8239;<a class=\"ftn\" href="
+"\"#unexciting\">[1]</a> components because you can't have a system without "
+"them.  Some of our system components, the programming tools, became popular "
+"on their own among programmers, but we wrote many components that are not "
+"tools&#8239;<a class=\"ftn\" href=\"#nottools\">[2]</a>.  We even developed "
+"a chess game, GNU Chess, because a complete system needs games too."
 msgstr ""
 
"许多人已经为系统中的自由软件作出了重大贡献,他们都应该获得荣誉。但GNU是<em>一"
 "个整合系统</em>&mdash;而不是一些实用程序集合的原因
是,GNU工程的最初目标就是做"
@@ -221,13 +237,22 @@
 
"可以稳定工作</a>,但是距离能够被人们正常使用还有很长的路要走。"
 
 #. 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=\"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."
 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=\"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."
+"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 ""
 "庆幸的是,我们不必再等 Hurd 了,因为有了 Linux。当 Linus 
Torvalds 在 1992 年"
 "使 Linux 成了自由软件,它填补了 GNU 
系统的一个重要空白。人们可以 <a href="
@@ -236,16 +261,27 @@
 "&mdash;一个带有 Linux 的 GNU 系统。换句话说,就是 
GNU/Linux系统。"
 
 #. 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 "
-"Linux.  Integrating a complete system as a distribution that would work "
-"&ldquo;out of the box&rdquo; was a big job, too.  It required addressing the "
-"issue of how to install and boot the system&mdash;a problem we had not "
-"tackled, because we hadn't yet reached that point.  Thus, the people who "
-"developed the various system distributions did a lot of essential work.  But "
-"it was work that, in the nature of things, was surely going to be done by "
-"someone."
+#, fuzzy
+#| 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 Linux.  Integrating a complete system as a distribution that "
+#| "would work &ldquo;out of the box&rdquo; was a big job, too.  It required "
+#| "addressing the issue of how to install and boot the system&mdash;a "
+#| "problem we had not tackled, because we hadn't yet reached that point.  "
+#| "Thus, the people who developed the various system distributions did a lot "
+#| "of essential work.  But it was work that, in the nature of things, was "
+#| "surely going to be done by someone."
+msgid ""
+"Making them work well together was not a trivial job.  Some GNU "
+"components&#8239;<a class=\"ftn\" href=\"#somecomponents\">[3]</a> needed "
+"substantial change to work with Linux.  Integrating a complete system as a "
+"distribution that would work &ldquo;out of the box&rdquo; was a big job, "
+"too.  It required addressing the issue of how to install and boot the "
+"system&mdash;a problem we had not tackled, because we hadn't yet reached "
+"that point.  Thus, the people who developed the various system distributions "
+"did a lot of essential work.  But it was work that, in the nature of things, "
+"was surely going to be done by someone."
 msgstr ""
 "把它们组合到一起并不是一个简单的工作。有些GNU部件<a 
href=\"#somecomponents\">"
 
"(3)</a>需要作大量的修改才能适应Linux。把系统集成到一个完整的发行版本中、使之"
@@ -315,12 +351,20 @@
 "统,加上 Linux。如果你
说的是这个组合,请称之为&ldquo;GNU/Linux&rdquo;。"
 
 #. 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\"> 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=\"https://foldoc.org/linux\";>https://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\"> 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=\"https://";
-"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
+"this page and <a href=\"/gnu/thegnuproject.html\"> https://www.gnu.org/gnu/";
+"thegnuproject.html</a> are good choices.  If you mention Linux, the 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\">https://www.gnu.org/gnu/the-gnu-project.html</a> 
是好的选"
@@ -332,13 +376,21 @@
 msgstr "后记"
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| 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 UC Berkeley.  It was nonfree in the 80s, but became free in the early "
+#| "90s.  A free operating system that exists today<a href=\"#newersystems\">"
+#| "(4)</a> is almost certainly either a variant of the GNU system, or a kind "
+#| "of BSD system."
 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 "
 "UC Berkeley.  It was nonfree in the 80s, but became free in the early 90s.  "
-"A free operating system that exists today<a href=\"#newersystems\">(4)</a> "
-"is almost certainly either a variant of the GNU system, or a kind of BSD "
-"system."
+"A free operating system that exists today&#8239;<a class=\"ftn\" href="
+"\"#newersystems\">[4]</a> is almost certainly either a variant of the GNU "
+"system, or a kind of BSD system."
 msgstr ""
 
"除了GNU,还有一个独立进行的工程开发了一个自由的类似Unix的操作系统。这个系统是"
 "BSD,它是由UC 
Berkeley开发的。在80年代,BSD还不是自由的,但是它在90年代初变成"
@@ -346,6 +398,17 @@
 "果不是GNU系统的派生版本,就是BSD系统的派生版本。"
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| 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 example of the GNU Project, and explicit appeals from GNU "
+#| "activists helped persuade them, but the code had little overlap with "
+#| "GNU.  BSD systems today use some GNU programs, just as the GNU system and "
+#| "its variants use some BSD programs; however, taken as wholes, they are "
+#| "two different systems that evolved separately.  The BSD developers did "
+#| "not write a kernel and add it to the GNU system, and a name like GNU/BSD "
+#| "would not fit the situation.<a href=\"#gnubsd\">(5)</a>"
 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 "
@@ -354,8 +417,8 @@
 "use some GNU programs, just as the GNU system and its variants use some BSD "
 "programs; however, taken as wholes, they are two different systems that "
 "evolved separately.  The BSD developers did not write a kernel and add it to "
-"the GNU system, and a name like GNU/BSD would not fit the situation.<a href="
-"\"#gnubsd\">(5)</a>"
+"the GNU system, and a name like GNU/BSD would not fit the situation&#8239;<a "
+"class=\"ftn\" href=\"#gnubsd\">[5]</a>."
 msgstr ""
 "人们有时会问BSD是否也是一个GNU的派生版本,像GNU/Linux那æ 
·ã€‚BSD的开发者受到GNU"
 "工程的激励而将他们的代码变成了自由软件,尤å…
¶å—到来自GNU的活动家的明确吸引和帮"

Index: po/manifesto.ar.po
===================================================================
RCS file: /web/www/www/gnu/po/manifesto.ar.po,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- po/manifesto.ar.po  29 May 2021 08:12:53 -0000      1.33
+++ po/manifesto.ar.po  2 Nov 2021 14:41:53 -0000       1.34
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manifesto.html\n"
-"POT-Creation-Date: 2015-06-02 12:55+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2009-09-21 10:50+0200\n"
 "Last-Translator: Hossam Hossny <hossam@gnu.org>\n"
 "Language-Team: Arabic\n"
@@ -27,19 +27,20 @@
 msgid "The GNU Manifesto - GNU Project - Free Software Foundation"
 msgstr "بيان مشروع غنو - مشروع غنو - مؤسسة البرم
جيات الحرة"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "The GNU Manifesto"
 msgstr "بيان مشروع غنو"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 # | The GNU Manifesto (which appears below) was written by <a
-# | href=\"http://www.stallman.org/\";>Richard Stallman</a> [-at the beginning
-# | of the GNU Project,-] {+in 1985+} to ask for [-participation and support. 
-# | For-] {+support in developing+} the [-first few years,-] {+GNU operating
-# | system.  Part of the text was taken from the original announcement of
-# | 1983.  Through 1987,+} it was updated in minor ways to account for
-# | [-developments, but now-] {+developments; since then,+} it seems best to
-# | leave it [-unchanged as most people have seen it.-] {+unchanged.+}
+# | href=\"http{+s+}://www.stallman.org/\">Richard Stallman</a> [-at the
+# | beginning of the GNU Project,-] {+in 1985+} to ask for [-participation and
+# | support.  For-] {+support in developing+} the [-first few years,-] {+GNU
+# | operating system.  Part of the text was taken from the original
+# | announcement of 1983.  Through 1987,+} it was updated in minor ways to
+# | account for [-developments, but now-] {+developments; since then,+} it
+# | seems best to leave it [-unchanged as most people have seen it.-]
+# | {+unchanged.+}
 #, fuzzy
 #| msgid ""
 #| "The GNU Manifesto (which appears below) was written by <a href=\"http://";
@@ -48,7 +49,7 @@
 #| "it was updated in minor ways to account for developments, but now it "
 #| "seems best to leave it unchanged as most people have seen it."
 msgid ""
-"The GNU Manifesto (which appears below) was written by <a href=\"http://www.";
+"The GNU Manifesto (which appears below) was written by <a href=\"https://www.";
 "stallman.org/\">Richard Stallman</a> in 1985 to ask for support in "
 "developing the GNU operating system.  Part of the text was taken from the "
 "original announcement of 1983.  Through 1987, it was updated in minor ways "
@@ -59,7 +60,7 @@
 "طفيف في السنوات القليلة الأولى، لكننا نرى 
الآن أنه من الأفضل إبقاؤه غير معدّل "
 "كما شاهده معظم الناس."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 # | Since that time, we have learned about certain common misunderstandings
 # | that different wording could help avoid.  Footnotes added [-in-] {+since+}
 # | 1993 help clarify these points.
@@ -76,7 +77,7 @@
 "ومنذ ذلك الحين، اكتشفنا إساءة فهم معينة 
ناتجة عن صياغة يمكن تفاديها. أضيفت "
 "هوامش في عام 1993 للمساعدة في توضيح تلك 
النقاط."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 # | [-For up-to-date information about-]{+If you want to install+} the
 # | [-available GNU software, please see-] {+GNU/Linux system, we recommend
 # | you use one of+} the [-information available on our <a
@@ -103,7 +104,7 @@
 "\">قائمة البرمجيات</a>.  ولمعلومات عن كيفية 
المساهمة، راجع <a href=\"/help/"
 "help.html\">http://www.gnu.org/help</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The GNU Project is part of the Free Software Movement, a campaign for <a "
 "href=\"/philosophy/free-sw.html\">freedom for users of software</a>.  It is "
@@ -113,24 +114,37 @@
 "open-source-misses-the-point.html\">amoral approach</a> to the same field."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "What's GNU? Gnu's Not Unix!"
 msgstr "ما هو غنو؟ غنو ليس يونكس!"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | GNU, which stands for Gnu's Not Unix, is the name for the complete
+# | Unix-compatible software system which I am writing so that I can give it
+# | away free to everyone who can use [-it.<a href=\"#f1\">(1)</a>-]
+# | {+it&#8239;<a class=\"ftn\" href=\"#f1\">[1]</a>.+} Several other
+# | volunteers are helping me.  Contributions of time, money, programs and
+# | equipment are greatly needed.
+#, fuzzy
+#| msgid ""
+#| "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
+#| "compatible software system which I am writing so that I can give it away "
+#| "free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
+#| "volunteers are helping me.  Contributions of time, money, programs and "
+#| "equipment are greatly needed."
 msgid ""
 "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
 "compatible software system which I am writing so that I can give it away "
-"free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
-"volunteers are helping me.  Contributions of time, money, programs and "
-"equipment are greatly needed."
+"free to everyone who can use it&#8239;<a class=\"ftn\" href=\"#f1\">[1]</a>. "
+"Several other volunteers are helping me.  Contributions of time, money, "
+"programs and equipment are greatly needed."
 msgstr ""
 "غنو -المشتق من غنو ليس يونكس- اسم نظام 
التشغيل البرمجي الكامل المتوافق مع "
 "يونكس الذي أقوم بكتابته لأوزعه بالمجان 
على أي شخص يستطيع استخدامه.<a href="
 "\"#f1\">(1)</a> يقوم عدد من المتطوعين بمساعدتي. 
نحن بأمس الحاجة إلى المساهمة "
 "بالوقت والمال والبرامج والمعدات."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So far we have an Emacs text editor with Lisp for writing editor commands, a "
 "source level debugger, a yacc-compatible parser generator, a linker, and "
@@ -155,7 +169,7 @@
 "إمبراطوريات وبرنامج جداول ومئات الأشياء 
الأخرى بالإضافة إلى توثيق بهيئة "
 "إلكترونية. نأمل أخيرًا أن نوفر كل شيء مفيد 
يأتي عادة مع نظام يونكس وأكثر."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU will be able to run Unix programs, but will not be identical to Unix.  "
 "We will make all improvements that are convenient, based on our experience "
@@ -175,7 +189,7 @@
 "سوف تكون C و Lisp لغتي برمجة النظام. سوف نعمل 
على دعم UUCP و MIT Chaosnet "
 "وموافيق الإنترنت كوسيلة للاتصال."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is aimed initially at machines in the 68000/16000 class with virtual "
 "memory, because they are the easiest machines to make it run on.  The extra "
@@ -186,7 +200,7 @@
 "يمكن تشغيله عليها. سوف يُترك تشغيله على 
الأجهزة الأصغر للأشخاص الذين يريدون "
 "تشغيله عليها."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid horrible confusion, please pronounce the <em>g</em> in the word "
 "&ldquo;GNU&rdquo; when it is the name of this project."
@@ -194,11 +208,11 @@
 "لتفادي لغط كبير، من فضلك انطق حرف <em>g</em> في 
الاسم الإنجليزي &rdquo;"
 "GNU&ldquo; عندما يكون في سياق اسم هذا المشروع."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why I Must Write GNU"
 msgstr "لماذا تتحتم علي كتابة غنو"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I consider that the Golden Rule requires that if I like a program I must "
 "share it with other people who like it.  Software sellers want to divide the "
@@ -218,12 +232,12 @@
 "كنت أعمل في مختبر الذكاء الاصطناعي، لكنهم 
تمادوا لدرجة أنني لم أستطع أن أبقى "
 "في معهد يتبع هذه الأساليب معي وبرفض مني."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | So that I can continue to use computers without dishonor, I have decided
 # | to put together a sufficient body of free software so that I will be able
 # | to get along without any software that is not free.  I have resigned from
 # | the AI Lab to deny MIT any legal excuse to prevent me from giving GNU
-# | [-away.-] {+away.<a href=\"#f2a\">(2)</a>+}
+# | [-away.-] {+away&#8239;<a class=\"ftn\" href=\"#f2a\">[2]</a>.+}
 #, fuzzy
 #| msgid ""
 #| "So that I can continue to use computers without dishonor, I have decided "
@@ -235,18 +249,18 @@
 "So that I can continue to use computers without dishonor, I have decided to "
 "put together a sufficient body of free software so that I will be able to "
 "get along without any software that is not free.  I have resigned from the "
-"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away.<a "
-"href=\"#f2a\">(2)</a>"
+"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away&#8239;"
+"<a class=\"ftn\" href=\"#f2a\">[2]</a>."
 msgstr ""
 "ولأستمر في استخدام الحواسيب دون عار، 
قرّرت أن أضع كيانًا كافيًا للبرمجيات الحرة "
 "لأتمكن من المضي قدمًا بدون أي برمجيات غير 
حرة. استقلت من معهد الذكاء "
 "الاصطناعي لأحجب أي سلطة قانونية لMIT تمنعني 
من نشر غنو."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why GNU Will Be Compatible with Unix"
 msgstr "لماذا سيتوافق غنو مع يونكس"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Unix is not my ideal system, but it is not too bad.  The essential features "
 "of Unix seem to be good ones, and I think I can fill in what Unix lacks "
@@ -257,11 +271,11 @@
 "وأعتقد أنني أستطيع شغل ما يفقده يونكس بدون 
تشويهه. إن الأنظمة المتوافقة مع "
 "يونكس تُسهّل على كثيرين اعتماد النظام."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How GNU Will Be Available"
 msgstr "كيف سيتوفر غنو"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is not in the public domain.  Everyone will be permitted to modify and "
 "redistribute GNU, but no distributor will be allowed to restrict its further "
@@ -274,17 +288,17 @@
 "categories.html#ProprietarySoftware\">المحتكرة</a> لن يُسمح 
بها. أريد أن أضمن "
 "أن جميع نسخ غنو تظل حرة."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why Many Other Programmers Want to Help"
 msgstr "لماذا سيرغب مبرمجون آخرون كثر بالم
ساعدة"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found many other programmers who are excited about GNU and want to "
 "help."
 msgstr "وجدت أن مبرمجين كثر آخرين متحمسون 
لفكرة غنو وأنهم يريدون المساعدة."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Many programmers are unhappy about the commercialization of system "
 "software.  It may enable them to make more money, but it requires them to "
@@ -305,7 +319,7 @@
 "أهم. لكن المؤمنين بالقانون يجدون صعوبة في 
الاختيار؛ بل إنهم صاروا يعتقدون أن "
 "البرمجة ما هي إلا وسيلة لجني المال."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By working on and using GNU rather than proprietary programs, we can be "
 "hospitable to everyone and obey the law.  In addition, GNU serves as an "
@@ -320,11 +334,11 @@
 "غير الحرة أن تمنحنا إياه. يُعد هذا الأمر 
بالنسبة لما يقارب نصف المبرمجين "
 "الذين تحدثت معهم سعادة لا يمكن للمال أن 
يحل محالها."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How You Can Contribute"
 msgstr "كيف تستطيع المساهمة"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><p>
 # | (Nowadays, for software tasks to work on, see {+the+} <a
 # | 
[-href=\"http://fsf.org/campaigns/priority-projects\";>http://fsf.org/campaigns/priority-projects</a>-]
 # | {+href=\"http://fsf.org/campaigns/priority-projects\";>High Priority
@@ -357,7 +371,7 @@
 "للمهمات البرمجية. راجع <a 
href=\"/help/help.html\">http://www.gnu.org/help/";
 "help.html</a> لطرق المساهمة الأخرى.)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am asking computer manufacturers for donations of machines and money.  I'm "
 "asking individuals for donations of programs and work."
@@ -365,7 +379,7 @@
 "إنني أطلب من مصانع الحواسيب أن تتبرع 
بالأجهزة والمال؛ وإني أطلب من الأفراد "
 "أن يتبرعوا بالبرامج والجهد."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One consequence you can expect if you donate machines is that GNU will run "
 "on them at an early date.  The machines should be complete, ready to use "
@@ -376,7 +390,7 @@
 "تستطيعون توقعها إذا تبرعتم بالأجهزة أن 
غنو سيعمل في موعد أبكر. يفضل أن يكون "
 "الجهاز قادرًا على العمل في منطقة سكنية ولا 
يحتاج تبريدًا أو طاقة مكلفة."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found very many programmers eager to contribute part-time work for "
 "GNU.  For most projects, such part-time distributed work would be very hard "
@@ -401,7 +415,7 @@
 "بعض المشاكل غير المتوقعة، فإن جمع هذه الم
كونات ستكون مهمة مجدية. (سوف يتطلب "
 "العمل على النواة اتصالات أقرب وسوف تعمل م
جموعة صغيرة عليها)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If I get donations of money, I may be able to hire a few people full or part "
 "time.  The salary won't be high by programmers' standards, but I'm looking "
@@ -415,25 +429,26 @@
 "أهمية عن المال. إنني أعتبر هذه طريقة 
لإيجاد أناس يكرسون كل طاقتهم للعمل على "
 "غنو بدون الحاجة إلى طريقة أخرى لجني المال."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why All Computer Users Will Benefit"
 msgstr "لماذا سيستفيد كل مستخدمي الحاسوب"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Once GNU is written, everyone will be able to obtain good system software
-# | free, just like air.<a href=\"#f2\">([-2-]{+3+})</a>
+# | free, just like [-air.<a href=\"#f2\">(2)</a>-] {+air&#8239;<a
+# | class=\"ftn\" href=\"#f2\">[3]</a>.+}
 #, fuzzy
 #| msgid ""
 #| "Once GNU is written, everyone will be able to obtain good system software "
 #| "free, just like air.<a href=\"#f2\">(2)</a>"
 msgid ""
 "Once GNU is written, everyone will be able to obtain good system software "
-"free, just like air.<a href=\"#f2\">(3)</a>"
+"free, just like air&#8239;<a class=\"ftn\" href=\"#f2\">[3]</a>."
 msgstr ""
 "عندما ننتهي من كتابة غنو، سوف يتمكن الجميع 
من الحصول على نظام تشغيل برمجي "
 "جيد مجاني كالهواء.<a href=\"#f2\">(2)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This means much more than just saving everyone the price of a Unix license.  "
 "It means that much wasteful duplication of system programming effort will be "
@@ -443,7 +458,7 @@
 "الضائع لبرمجة نظام تشغيل [من الصفر] سوف 
ينتهي. يمكن أن يتحول هذا الجهد إلى "
 "تحسين في مستوى الأنظمة الموجودة."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Complete system sources will be available to everyone.  As a result, a user "
 "who needs changes in the system will always be free to make them himself, or "
@@ -456,7 +471,7 @@
 "لتجري التعديلات له. لن يكون المستخدمون تحت 
رحمة مبرمج أو شركة واحدة تملك "
 "المصادر وهي وحدها تستطيع إجراء التعديلات."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Schools will be able to provide a much more educational environment by "
 "encouraging all students to study and improve the system code.  Harvard's "
@@ -470,7 +485,7 @@
 "أي برنامج على النظام ما لم تُعرض مصادره 
للعامة، ولقد أثبتوا قولهم برفضهم "
 "تثبيت برامج معينة. لقد احتذيت بهذا التصرف 
كثيرًا."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Finally, the overhead of considering who owns the system software and what "
 "one is or is not entitled to do with it will be lifted."
@@ -478,7 +493,7 @@
 "وأخيرًا سوف تُنسى المبالغة في ملكية النظام
 البرمجي وما يُسمح وما لا يُسمح للشخص "
 "أن يفعله به."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Arrangements to make people pay for using a program, including licensing of "
 "copies, always incur a tremendous cost to society through the cumbersome "
@@ -500,7 +515,7 @@
 "تعتبر الكاميرات التلفزيونية المُثبّتة في 
كل مكان للتأكد من أنك لا تنزع القناع "
 "أبدًا أمرًا فضيعًا. من الأفضل دعم نباتات 
هوائية بضريبة رئيسية ونزع الأقنعة."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copying all or parts of a program is as natural to a programmer as "
 "breathing, and as productive.  It ought to be as free."
@@ -508,11 +523,11 @@
 "نسخ كل أو جزء من البرنامج أمر طبيعي للمبرم
جين تمامًا كالتنفس، وهو أمر مُثمر. "
 "ولقد اعتادوا أن يكون مجانيًا."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Some Easily Rebutted Objections to GNU's Goals"
 msgstr "بعض الردود اليسيرة على اعتراضات على 
أهداف غنو"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Nobody will use it if it is free, because that means they "
 "can't rely on any support.&rdquo;</strong>"
@@ -520,7 +535,7 @@
 "<strong>&rdquo;لن يستخدمه أحد ما دام بالمجان، لأن 
هذا يعني أنك لا تستطيع "
 "الاعتماد على أي دعم.&ldquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You have to charge for the program to pay for providing the "
 "support.&rdquo;</strong>"
@@ -528,10 +543,11 @@
 "<strong>&rdquo;يجب أن تبيعوا البرنامج بمقابل م
ادي لتدفعوا قيمة تقديم الدعم."
 "&ldquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 # | If people would rather pay for GNU plus service than get GNU free without
 # | service, a company to provide just service to people who have obtained GNU
-# | free ought to be profitable.<a href=\"#f3\">([-3-]{+4+})</a>
+# | free ought to be [-profitable.<a href=\"#f3\">(3)</a>-]
+# | {+profitable&#8239;<a class=\"ftn\" href=\"#f3\">[4]</a>.+}
 #, fuzzy
 #| msgid ""
 #| "If people would rather pay for GNU plus service than get GNU free without "
@@ -540,13 +556,13 @@
 msgid ""
 "If people would rather pay for GNU plus service than get GNU free without "
 "service, a company to provide just service to people who have obtained GNU "
-"free ought to be profitable.<a href=\"#f3\">(4)</a>"
+"free ought to be profitable&#8239;<a class=\"ftn\" href=\"#f3\">[4]</a>."
 msgstr ""
 "إذا فضّل الناس الدفع مقابل غنو زائدًا 
الخدمة بدلًا من الحصول عليه بالمجان بدون "
 "الخدمة، فسوف تفي بالغرض شركة تقدم الخدمة 
للذين حصلوا عليه بالمجان وسوف تكون "
 "مُربحة.<a href=\"#f3\">(3)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We must distinguish between support in the form of real programming work and "
 "mere handholding.  The former is something one cannot rely on from a "
@@ -557,7 +573,7 @@
 "يستطيع المرؤ الاعتماد على الأخير من بائع 
البرنامج، لأنه إذا لم يكن أشخاص كثر "
 "يشاطرونك نفس المشكلة فلن يلقي لك البائع 
اهتمامًا."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If your business needs to be able to rely on support, the only way is to "
 "have all the necessary sources and tools.  Then you can hire any available "
@@ -575,7 +591,7 @@
 "يمكن لوم شروط التوزيع على هذه المشكلة. لا 
يحل غنو كل مشاكل العالم، فقط بعضًا "
 "منها!"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Meanwhile, the users who know nothing about computers need handholding: "
 "doing things for them which they could easily do themselves but don't know "
@@ -584,7 +600,7 @@
 "في الوقت ذاته، يكفي الدعم الشخصي المستخدم
ين الذين لا يعرفون شيئًا عن الحاسوب "
 "ليقوموا بأمور سهلٌ عليهم القيام بها 
بأنفسهم لكنهم لا يعرفون كيف يقومون بها."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Such services could be provided by companies that sell just handholding and "
 "repair service.  If it is true that users would rather spend money and get a "
@@ -600,7 +616,7 @@
 "المستخدمون بشركة معينة. وفي نفس الوقت سيتم
كن الذين لا يريدون الخدمة من "
 "استخدام البرنامج بدون الدفع للخدمة."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You cannot reach many people without advertising, and you "
 "must charge for the program to support that.&rdquo;</strong>"
@@ -608,7 +624,7 @@
 "<strong>&rdquo;لا يمكن الوصول إلى أشخاص كثر بدون 
الإعلان، ويجب أن تبيع "
 "البرنامج لتدعم الإعلان.&ldquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;It's no use advertising a program people can get free.&rdquo;"
 "</strong>"
@@ -616,7 +632,7 @@
 "<strong>&rdquo;الدعاية لبرنامج يمكن الحصول عليه 
بالمجان غير مجدية.&ldquo;</"
 "strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are various forms of free or very cheap publicity that can be used to "
 "inform numbers of computer users about something like GNU.  But it may be "
@@ -631,11 +647,12 @@
 "نسخ عبر البريد بمقابل بنجاح من القيام بذلك 
وأكثر. وبهذه الطريقة، سوف يدفع "
 "المستخدمون الذين يستفيدون من الإعلانات 
لها."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 # | On the other hand, if many people get GNU from their friends, and such
 # | companies don't succeed, this will show that advertising was not really
 # | necessary to spread GNU.  Why is it that free market advocates don't want
-# | to let the free market decide this?<a href=\"#f4\">([-4-]{+5+})</a>
+# | to let the free market decide [-this?<a href=\"#f4\">(4)</a>-]
+# | {+this?&#8239;<a class=\"ftn\" href=\"#f4\">[5]</a>+}
 #, fuzzy
 #| msgid ""
 #| "On the other hand, if many people get GNU from their friends, and such "
@@ -646,13 +663,13 @@
 "On the other hand, if many people get GNU from their friends, and such "
 "companies don't succeed, this will show that advertising was not really "
 "necessary to spread GNU.  Why is it that free market advocates don't want to "
-"let the free market decide this?<a href=\"#f4\">(5)</a>"
+"let the free market decide this?&#8239;<a class=\"ftn\" href=\"#f4\">[5]</a>"
 msgstr ""
 "في المقابل، إذا حصل أشخاص كثر على غنو من 
أصدقائهم، ولم تنجح مثل هذه الشركات، "
 "فهذا سيثبت أن الإعلان ليس ضروريًا لنجاح 
غنو. لماذا لا يريد مؤيدو السوق الحرة "
 "للسوق الحرة أن تقرر؟<a href=\"#f4\">(4)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;My company needs a proprietary operating system to get a "
 "competitive edge.&rdquo;</strong>"
@@ -660,7 +677,7 @@
 "<strong>&rdquo;شركتي تحتاج نظام تشغيل احتكاري 
لتنافس في السوق.&ldquo;</"
 "strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU will remove operating system software from the realm of competition.  "
 "You will not be able to get an edge in this area, but neither will your "
@@ -676,29 +693,31 @@
 "هذا سيكون صعبًا عليك. إذا كان شركتك تقوم 
بشيء آخر، فسوف يحميك غنو من الوقوع "
 "في تجارة بيع أنظمة التشغيل المُكلفة."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 # | I would like to see GNU development supported by gifts from many
-# | manufacturers and users, reducing the cost to each.<a
-# | href=\"#f5\">([-5-]{+6+})</a>
+# | manufacturers and users, reducing the cost to [-each.<a
+# | href=\"#f5\">(5)</a>-] {+each&#8239;<a class=\"ftn\"
+# | href=\"#f5\">[6]</a>.+}
 #, fuzzy
 #| msgid ""
 #| "I would like to see GNU development supported by gifts from many "
 #| "manufacturers and users, reducing the cost to each.<a href=\"#f5\">(5)</a>"
 msgid ""
 "I would like to see GNU development supported by gifts from many "
-"manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
+"manufacturers and users, reducing the cost to each&#8239;<a class=\"ftn\" "
+"href=\"#f5\">[6]</a>."
 msgstr ""
 "إنني أتمنى أن أرى تطوير غنو مدعومًا بهبات م
ن المصانع والمستخدمين، بحيث تقل "
 "التكلفة على الجميع.<a href=\"#f5\">(5)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't programmers deserve a reward for their creativity?"
 "&rdquo;</strong>"
 msgstr ""
 "<strong>&rdquo;ألا يستحق المبرمجون مكافأة لهم 
على إبداعهم؟&ldquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If anything deserves a reward, it is social contribution.  Creativity can be "
 "a social contribution, but only in so far as society is free to use the "
@@ -711,7 +730,7 @@
 "إذا كان المبرمجون يستحقون المكافأة على 
إنشاء برامج مبتكرة، فهم يستحقون "
 "العقاب بالمعيار ذاته إذا قيدوا استخدام 
هذه البرامج."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Shouldn't a programmer be able to ask for a reward for his "
 "creativity?&rdquo;</strong>"
@@ -719,7 +738,7 @@
 "<strong>&rdquo;ألا ينبغي أن يتمكن المبرمج من الم
طالبة بمكافأة لإبداعه؟&ldquo;"
 "</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is nothing wrong with wanting pay for work, or seeking to maximize "
 "one's income, as long as one does not use means that are destructive.  But "
@@ -728,7 +747,7 @@
 "لا عيب في طلب المال مقابل العمل أو السعي 
لتوسيع الدخل، ما دام ذلك لا يتم "
 "بأساليبس هدّامة. لكن الأساليب المعروفة في 
حقل البرمجيات اليوم مبنية على الهدم."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Extracting money from users of a program by restricting their use of it is "
 "destructive because the restrictions reduce the amount and the ways that the "
@@ -740,7 +759,7 @@
 "التي يمكن بها الاستفادة من البرنامج، وهذا 
يقلل مقدار ما تجنيه الإنسانية منه. "
 "عندما يوجد قرار عمدي لتقييد الاستخدام، 
فإن الضرر الناتج يعتبر هدمًا عمديًا."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The reason a good citizen does not use such destructive means to become "
 "wealthier is that, if everyone did so, we would all become poorer from the "
@@ -756,11 +775,11 @@
 "مطالب بأن أرفض أن يقوم شخص واحد بذلك. بشكل 
أدق، إن الرغبة في مكافأة الإبداع "
 "لا تبرر حرمان العالم أجمع من كل أو جزء من 
هذا الإبداع."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid "<strong>&ldquo;Won't programmers starve?&rdquo;</strong>"
 msgstr "<strong>&rdquo;ألن يجوع المبرمجون؟&ldquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "I could answer that nobody is forced to be a programmer.  Most of us cannot "
 "manage to get any money for standing on the street and making faces.  But we "
@@ -772,7 +791,7 @@
 "لسنا (بذلك) مجبرون على قضاء أوقاتنا في 
الشارع مُحدّقين جوعى. لكننا نفعل شيئًا "
 "مختلفًا."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But that is the wrong answer because it accepts the questioner's implicit "
 "assumption: that without ownership of software, programmers cannot possibly "
@@ -781,7 +800,7 @@
 "لكن هذه إجابة خاطئة لأنها تقبل افتراض 
السائل الضمني: أنه بدون ملكية "
 "البرنامج، لا يمكن للبرمجين جني شيئًا. على 
الافتراض أخذ الكل أو ترك الكل."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The real reason programmers will not starve is that it will still be "
 "possible for them to get paid for programming; just not paid as much as now."
@@ -789,13 +808,13 @@
 "السبب الحقيقي أن المبرمجين لن يجوعوا أنه 
سيكون بإمكانهم جني المال مقابل "
 "البرمجة؛ لكن ليس بالقدر الذي يجنونه اليوم."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 # | Restricting copying is not the only basis for business in software.  It is
-# | the most common [-basis-] {+basis<a href=\"#f8\">(7)</a>+} because it
-# | brings in the most money.  If it were prohibited, or rejected by the
-# | customer, software business would move to other bases of organization
-# | which are now used less often.  There are always numerous ways to organize
-# | any kind of business.
+# | the most common [-basis-] {+basis&#8239;<a class=\"ftn\"
+# | href=\"#f8\">[7]</a>+} because it brings in the most money.  If it were
+# | prohibited, or rejected by the customer, software business would move to
+# | other bases of organization which are now used less often.  There are
+# | always numerous ways to organize any kind of business.
 #, fuzzy
 #| msgid ""
 #| "Restricting copying is not the only basis for business in software.  It "
@@ -805,17 +824,18 @@
 #| "always numerous ways to organize any kind of business."
 msgid ""
 "Restricting copying is not the only basis for business in software.  It is "
-"the most common basis<a href=\"#f8\">(7)</a> because it brings in the most "
-"money.  If it were prohibited, or rejected by the customer, software "
-"business would move to other bases of organization which are now used less "
-"often.  There are always numerous ways to organize any kind of business."
+"the most common basis&#8239;<a class=\"ftn\" href=\"#f8\">[7]</a> because it "
+"brings in the most money.  If it were prohibited, or rejected by the "
+"customer, software business would move to other bases of organization which "
+"are now used less often.  There are always numerous ways to organize any "
+"kind of business."
 msgstr ""
 "تقييد النسخ ليس الأساس الوحيد لتجارة البرم
جيات. يعتبر أكثر الأسس شيوعًا لأنه "
 "الأكثر جذبًا للمال. لو أن هذا الأسلوب مم
نوع أو يرفضه الزبائن فإن تجارة "
 "البرمجيات سوف تنتقل إلى مجال آخر أقل 
انتشارًا اليوم. توجد دائمًا وسائل شتى "
 "لتنظيم أي نوع من التجارة."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Probably programming will not be as lucrative on the new basis as it is "
 "now.  But that is not an argument against the change.  It is not considered "
@@ -828,7 +848,7 @@
 "المبرمجون المقدار ذاته، فلن يكون ذلك ظلم
ًا لهم أيضًا (بل من ناحية عملية سوف "
 "يجنون أكثر بكثير مما يجنيه المندوبون)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't people have a right to control how their creativity is "
 "used?&rdquo;</strong>"
@@ -836,7 +856,7 @@
 "<strong>&rdquo;أليس للناس حق في أن يتحكموا في 
كيفية استخدام إبداعاتهم؟&ldquo;"
 "</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "&ldquo;Control over the use of one's ideas&rdquo; really constitutes control "
 "over other people's lives; and it is usually used to make their lives more "
@@ -845,10 +865,11 @@
 "&rdquo;تحكم الشخص في استخدام أفكاره&ldquo; يتطلب 
بالضرورة التحكم في حياة "
 "أشخاص آخرين؛ وهو غالبًا يجعل حياة الأخرين 
أصعب."
 
-#. type: Content of: <p>
-# | People who have studied the issue of intellectual property rights<a
-# | href=\"#f6\">([-6-]{+8+})</a> carefully (such as lawyers) say that there
-# | is no intrinsic right to intellectual property.  The kinds of supposed
+#. type: Content of: <div><dl><dd><p>
+# | People who have studied the issue of intellectual property [-rights<a
+# | href=\"#f6\">(6)</a>-] {+rights&#8239;<a class=\"ftn\"
+# | href=\"#f6\">[8]</a>+} carefully (such as lawyers) say that there is no
+# | intrinsic right to intellectual property.  The kinds of supposed
 # | intellectual property rights that the government recognizes were created
 # | by specific acts of legislation for specific purposes.
 #, fuzzy
@@ -859,17 +880,17 @@
 #| "intellectual property rights that the government recognizes were created "
 #| "by specific acts of legislation for specific purposes."
 msgid ""
-"People who have studied the issue of intellectual property rights<a href="
-"\"#f6\">(8)</a> carefully (such as lawyers) say that there is no intrinsic "
-"right to intellectual property.  The kinds of supposed intellectual property "
-"rights that the government recognizes were created by specific acts of "
-"legislation for specific purposes."
+"People who have studied the issue of intellectual property rights&#8239;<a "
+"class=\"ftn\" href=\"#f6\">[8]</a> carefully (such as lawyers) say that "
+"there is no intrinsic right to intellectual property.  The kinds of supposed "
+"intellectual property rights that the government recognizes were created by "
+"specific acts of legislation for specific purposes."
 msgstr ""
 "يقول الذين درسوا قضية الملكية الفكرية<a 
href=\"#f6\">(6)</a> بعناية "
 "(كالمحامين) بعدم وجود أصل حقيقي للملكية 
الفكرية. أنواع الملكية الفكرية "
 "المفترضة التي تعترف الحكومة بها أُحدِثت 
بقوانين خاصة تشريعية لأغراض خاصة."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For example, the patent system was established to encourage inventors to "
 "disclose the details of their inventions.  Its purpose was to help society "
@@ -888,7 +909,7 @@
 "فهي لا تشكل عائقًا أمام معظم الأفراد الذين 
يستخدمون منتجات مغطاة ببراءات "
 "اختراع."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The idea of copyright did not exist in ancient times, when authors "
 "frequently copied other authors at length in works of nonfiction.  This "
@@ -906,7 +927,7 @@
 "بكميات تجارية يتطلب مطبعة متخصصة)، ولم يم
ثل عقبة في طريق الأفراد الذي كانوا "
 "يقرؤون الكتب."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "All intellectual property rights are just licenses granted by society "
 "because it was thought, rightly or wrongly, that society as a whole would "
@@ -919,7 +940,7 @@
 "مُحدّد: هل نحن في الحقيقة أحسن حالا بدون م
نح هذه الرخص؟ ما التصرفات التي نرخص "
 "لها؟"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The case of programs today is very different from that of books a hundred "
 "years ago.  The fact that the easiest way to copy a program is from one "
@@ -936,12 +957,12 @@
 "حالة يصبح معها فرض حقوق النشر ضارًا على الم
جتمع بأسره من ناحية مادية وروحية "
 "يجب ألا يسببها أي شخص حتى ولو كان القانون 
يسمح له ذلك."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Competition makes things get done better.&rdquo;</strong>"
 msgstr "<strong>&rdquo;تجعل المنافسة الأمور في حال 
أفضل.&ldquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The paradigm of competition is a race: by rewarding the winner, we encourage "
 "everyone to run faster.  When capitalism really works this way, it does a "
@@ -958,7 +979,7 @@
 "فقد يجدون استرتيجيات أخرى مثل مهاجمة الم
تسابقين الآخرين. إذا دخل جميع "
 "المتسابقين في معركة فسيصل الجميع متأخرًا."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Proprietary and secret software is the moral equivalent of runners in a fist "
 "fight.  Sad to say, the only referee we've got does not seem to object to "
@@ -971,7 +992,7 @@
 "(&rdquo;تستطيع إطلاق رصاصة واحدة كل عشر 
ياردات تجريها&ldquo;). كان ينبغي "
 "عليه أن يوقفهم، بل وأن يعاقب المتسابقين 
الذي يحاولون التعارك."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Won't everyone stop programming without a monetary incentive?"
 "&rdquo;</strong>"
@@ -979,7 +1000,7 @@
 "<strong>&rdquo;ألن يتوقف الجميع عن البرمجة إذا لم 
يوجد حافز مادي؟&ldquo;</"
 "strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually, many people will program with absolutely no monetary incentive.  "
 "Programming has an irresistible fascination for some people, usually the "
@@ -990,7 +1011,7 @@
 "يقاوم على بعضنا، وهم غالبًا أفضل الناس برم
جة. لا عيب في عزف موسيقي محترف حتى "
 "لو لم يأمل مطلقًا أن يجني مالًا بعزفه."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But really this question, though commonly asked, is not appropriate to the "
 "situation.  Pay for programmers will not disappear, only become less.  So "
@@ -1001,7 +1022,7 @@
 "للمبرمجين، لكنه سيكون أقل. لذا فإن السؤال 
الأنسب، هل سيبرمج أحد مع حافز مالي "
 "أقل؟ خبرتي تفيد بأن كثيرين سيبرمجون."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For more than ten years, many of the world's best programmers worked at the "
 "Artificial Intelligence Lab for far less money than they could have had "
@@ -1012,7 +1033,7 @@
 "أقل بكثير مما يستطيعون جنيه في أي مكان آخر. 
لكنهم جنوا مكافآت غير مالية "
 "كثيرة: كالسمعة والتقدير مثلًا. والإبداع 
أيضًا ممتبع، وهو مكافأة بذاته."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Then most of them left when offered a chance to do the same interesting work "
 "for a lot of money."
@@ -1020,7 +1041,7 @@
 "بعد ذلك غادر معظمهم عندما عُرض عليهم 
القيام بنفس العمل الممتع مقابل مرتب عالٍ "
 "جدًا."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "What the facts show is that people will program for reasons other than "
 "riches; but if given a chance to make a lot of money as well, they will come "
@@ -1033,7 +1054,7 @@
 "ضعيفة إذا ما قورنت بالمنظمات التي تدفع 
أجرًا مرتفعًا، لكن إذا اختفت المرتبات "
 "العالية فلن تكون المنظمات قليلة الأجر 
ضعيفة بالضرورة."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;We need the programmers desperately.  If they demand that we "
 "stop helping our neighbors, we have to obey.&rdquo;</strong>"
@@ -1041,20 +1062,20 @@
 "<strong>&rdquo;نحن بحاجة ماسة إلى المبرمجين. إذا 
طلبوا منا ألا نساعد جيرننا "
 "فيتحتم علينا أن نطيعهم.&ldquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "You're never so desperate that you have to obey this sort of demand.  "
 "Remember: millions for defense, but not a cent for tribute!"
 msgstr ""
 "لا يمكن أن تكون في حاجة ماسة لدرجة تدفعك 
إلى القبول بمثل هذه المطالب. [...]"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Programmers need to make a living somehow.&rdquo;</strong>"
 msgstr ""
 "<strong>&rdquo;يجيب أن يجني المبرمجون قوتهم 
بطريقة أو بأخرى.&ldquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In the short run, this is true.  However, there are plenty of ways that "
 "programmers could make a living without selling the right to use a program.  "
@@ -1067,7 +1088,7 @@
 "الطرق كسبًا للمال للمبرمجين ورجال الأعم
ال، ولكن ليس لأنها الطريقة الوحيدة. من "
 "السهل أن تجد طرقًا أخرى إذا أردت ذلك. هنا 
بعض الأمثلة:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A manufacturer introducing a new computer will pay for the porting of "
 "operating systems onto the new hardware."
@@ -1075,16 +1096,17 @@
 "سوف تدفع مصانع الحاسوب التي تنشئ حواسيب 
جديدة لتكييف أنظمة التشغيل على "
 "العتاد الجديد."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The sale of teaching, handholding and maintenance services could also employ "
 "programmers."
 msgstr "يمكن أيضًا أن يُوَظّف المبرمجون في خدم
ات التعليم والدعم الشخصي والصيانة."
 
-#. type: Content of: <p>
-# | People with new ideas could distribute programs as freeware<a
-# | href=\"#f7\">([-7-]{+9+})</a>, asking for donations from satisfied users,
-# | or selling hand[---]holding services.  I have met people who are already
+#. type: Content of: <div><dl><dd><p>
+# | People with new ideas could distribute programs as [-freeware<a
+# | href=\"#f7\">(7)</a>,-] {+freeware&#8239;<a class=\"ftn\"
+# | href=\"#f7\">[9]</a>,+} asking for donations from satisfied users, or
+# | selling hand[---]holding services.  I have met people who are already
 # | working this way successfully.
 #, fuzzy
 #| msgid ""
@@ -1093,15 +1115,16 @@
 #| "hand-holding services.  I have met people who are already working this "
 #| "way successfully."
 msgid ""
-"People with new ideas could distribute programs as freeware<a href=\"#f7\">"
-"(9)</a>, asking for donations from satisfied users, or selling handholding "
-"services.  I have met people who are already working this way successfully."
+"People with new ideas could distribute programs as freeware&#8239;<a class="
+"\"ftn\" href=\"#f7\">[9]</a>, asking for donations from satisfied users, or "
+"selling handholding services.  I have met people who are already working "
+"this way successfully."
 msgstr ""
 "يستطيع الأشخاص الذين لديهم أفكار جديد 
توزيع البرامج كبرمجيات مجانية<a href="
 "\"#f7\">(7)</a>، وطلب تبرعات من المستخدمين 
الراضين أو بيع خدمات دعم شخصي. "
 "لقد التقيت أشخاصًا يعملون بهذه الطريقة 
بنجاح."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Users with related needs can form users' groups, and pay dues.  A group "
 "would contract with programming companies to write programs that the group's "
@@ -1110,11 +1133,11 @@
 "يستطيع المستخدمون الذين لهم احتياجات م
تقاربة تشكيل مجموعات مستخدمين تدفع "
 "المصاريف. يمكن للمجموعة أن تتعاقد مع شركات 
برمجة لكتابة برامج يريدها أعضاؤها."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "All sorts of development can be funded with a Software Tax:"
 msgstr "يمكن لكل أنواع التطوير أن تمولها ضريبة 
برمجيات:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Suppose everyone who buys a computer has to pay x percent of the price as a "
 "software tax.  The government gives this to an agency like the NSF to spend "
@@ -1124,7 +1147,7 @@
 "تعطي الحكومة هذه الضرائب إلى وكالة مثل م
ؤسسة العلم الوطني (NSF) لتنفقها على "
 "تطوير البرمجيات."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But if the computer buyer makes a donation to software development himself, "
 "he can take a credit against the tax.  He can donate to the project of his "
@@ -1137,7 +1160,7 @@
 "الذي يأمل أن يجني نتائجه عندما ينتهي. يمكن 
للمستخدم أن يحصل على إقصاء لأي "
 "قيمة تبرع تزيد عن مجموع الضريبة التي عليه 
دفعها."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The total tax rate could be decided by a vote of the payers of the tax, "
 "weighted according to the amount they will be taxed on."
@@ -1145,26 +1168,26 @@
 "يمكن أن تُحدّد نسبة الضريبة الكلية عبر 
تصويت لدفاعي الضرائب، يحدد مقدار "
 "الضريبة التي سيتعين عليهم دفعها."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "The consequences:"
 msgstr "النتائج:"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "The computer-using community supports software development."
 msgstr "سوف يدعم المجتمع الذي يستخدم الحاسوب 
تطوير البرامج."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "This community decides what level of support is needed."
 msgstr "سوف يقرر ذلك المجتمع مستوى الدعم الم
طلوب."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "Users who care which projects their share is spent on can choose this for "
 "themselves."
 msgstr ""
 "سوف يتمكن المستخدمون المهتمون بالمشاريع 
التي تنال حصتهم من اختيارها بأنفسهم."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the long run, making programs free is a step toward the postscarcity "
 "world, where nobody will have to work very hard just to make a living.  "
@@ -1180,7 +1203,7 @@
 "في الأسبوع لينهوا المهمات المطلوبة منهم 
كالتشريع ونصح العائلة وإصلاح الروبوت "
 "والبحث عن الكويكبات. لن يُضطر أحد لأن يجني 
قوته من البرمجة."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We have already greatly reduced the amount of work that the whole society "
 "must do for its actual productivity, but only a little of this has "
@@ -1198,11 +1221,11 @@
 "حقل إنتاج البرمجيات. علينا القيام بذلك، 
لنحقق مكاسب في الإنتاجية التقنية "
 "ولنترجمها إلى عمل أقل علينا."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "هوامش"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The wording here was careless.  The intention was that nobody would have to "
 "pay for <b>permission</b> to use the GNU system.  But the words don't make "
@@ -1229,7 +1252,7 @@
 "يهم هو أن كل شخص لديه نسخة [من البرنامج] 
لديه حرية التعاون مع الآخرين الذين "
 "يستخدمونه."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The expression &ldquo;give away&rdquo; is another indication that I had not "
 "yet clearly separated the issue of price from that of freedom.  We now "
@@ -1238,10 +1261,21 @@
 "\">Confusing Words and Phrases</a>&rdquo; for more explanation."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+# | This is another place I failed to distinguish carefully between the two
+# | different meanings of [-&ldquo;free&rdquo;.-] {+&ldquo;free.&rdquo;+} The
+# | statement as it stands is not false&mdash;you can get copies of GNU
+# | software at no charge, from your friends or over the net.  But it does
+# | suggest the wrong idea.
+#, fuzzy
+#| msgid ""
+#| "This is another place I failed to distinguish carefully between the two "
+#| "different meanings of &ldquo;free&rdquo;.  The statement as it stands is "
+#| "not false&mdash;you can get copies of GNU software at no charge, from "
+#| "your friends or over the net.  But it does suggest the wrong idea."
 msgid ""
 "This is another place I failed to distinguish carefully between the two "
-"different meanings of &ldquo;free&rdquo;.  The statement as it stands is not "
+"different meanings of &ldquo;free.&rdquo; The statement as it stands is not "
 "false&mdash;you can get copies of GNU software at no charge, from your "
 "friends or over the net.  But it does suggest the wrong idea."
 msgstr ""
@@ -1250,11 +1284,11 @@
 "الحصول على نسخ من برمجيات غنو بلا مقابل، م
ن أصدقائك أو عبر الشبكة؛ لكنها لا "
 "تنفي الفهم الخاطئ."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid "Several such companies now exist."
 msgstr "توجد شركات عديدة كهذه اليوم."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Although it is a charity rather than a company, the Free Software Foundation "
 "for 10 years raised most of its funds from its distribution service.  You "
@@ -1265,14 +1299,14 @@
 "التوزيع، على الرغم من أنها مؤسسة خيرية 
وليست شركة. تستطيع <a href=\"/order/"
 "order.html\">طلب بضائع من المؤسسة</a>."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "A group of computer companies pooled funds around 1991 to support "
 "maintenance of the GNU C Compiler."
 msgstr ""
 "ساهمت مجموعة من شركات الحاسوب قرابة عام 1991 
في تمويل صيانة مصرّف غنو للسي."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "I think I was mistaken in saying that proprietary software was the most "
 "common basis for making money in software.  It seems that actually the most "
@@ -1284,10 +1318,31 @@
 "less in a free software world."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+# | In the 1980s I had not yet realized how confusing it was to speak of
+# | &ldquo;the issue&rdquo; of &ldquo;intellectual [-property&rdquo;.-]
+# | {+property.&rdquo;+} That term is obviously biased; more subtle is the
+# | fact that it lumps together various disparate laws which raise very
+# | different issues.  Nowadays I urge people to reject the term
+# | &ldquo;intellectual property&rdquo; entirely, lest it lead others to
+# | suppose that those laws form one coherent issue.  The way to be clear is
+# | to discuss patents, copyrights, and trademarks separately.  See <a
+# | href=\"/philosophy/not-ipr.html\">further explanation</a> of how this term
+# | spreads confusion and bias.
+#, fuzzy
+#| msgid ""
+#| "In the 1980s I had not yet realized how confusing it was to speak of "
+#| "&ldquo;the issue&rdquo; of &ldquo;intellectual property&rdquo;.  That "
+#| "term is obviously biased; more subtle is the fact that it lumps together "
+#| "various disparate laws which raise very different issues.  Nowadays I "
+#| "urge people to reject the term &ldquo;intellectual property&rdquo; "
+#| "entirely, lest it lead others to suppose that those laws form one "
+#| "coherent issue.  The way to be clear is to discuss patents, copyrights, "
+#| "and trademarks separately.  See <a href=\"/philosophy/not-ipr.html"
+#| "\">further explanation</a> of how this term spreads confusion and bias."
 msgid ""
 "In the 1980s I had not yet realized how confusing it was to speak of &ldquo;"
-"the issue&rdquo; of &ldquo;intellectual property&rdquo;.  That term is "
+"the issue&rdquo; of &ldquo;intellectual property.&rdquo; That term is "
 "obviously biased; more subtle is the fact that it lumps together various "
 "disparate laws which raise very different issues.  Nowadays I urge people to "
 "reject the term &ldquo;intellectual property&rdquo; entirely, lest it lead "
@@ -1305,10 +1360,26 @@
 "philosophy/not-ipr.html\">الشرح الأطول</a> لتعرف كيف 
ينشر هذا المصطلح اللغط "
 "والانحياز."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+# | Subsequently we learned to distinguish between &ldquo;free software&rdquo;
+# | and [-&ldquo;freeware&rdquo;.-] {+&ldquo;freeware.&rdquo;+} The term
+# | &ldquo;freeware&rdquo; means software you are free to redistribute, but
+# | usually you are not free to study and change the source code, so most of
+# | it is not free software.  See &ldquo;<a
+# | href=\"/philosophy/words-to-avoid.html#Freeware\">Confusing Words and
+# | Phrases</a>&rdquo; for more explanation.
+#, fuzzy
+#| msgid ""
+#| "Subsequently we learned to distinguish between &ldquo;free "
+#| "software&rdquo; and &ldquo;freeware&rdquo;.  The term &ldquo;"
+#| "freeware&rdquo; means software you are free to redistribute, but usually "
+#| "you are not free to study and change the source code, so most of it is "
+#| "not free software.  See &ldquo;<a href=\"/philosophy/words-to-avoid."
+#| "html#Freeware\">Confusing Words and Phrases</a>&rdquo; for more "
+#| "explanation."
 msgid ""
 "Subsequently we learned to distinguish between &ldquo;free software&rdquo; "
-"and &ldquo;freeware&rdquo;.  The term &ldquo;freeware&rdquo; means software "
+"and &ldquo;freeware.&rdquo; The term &ldquo;freeware&rdquo; means software "
 "you are free to redistribute, but usually you are not free to study and "
 "change the source code, so most of it is not free software.  See &ldquo;<a "
 "href=\"/philosophy/words-to-avoid.html#Freeware\">Confusing Words and "
@@ -1340,6 +1411,7 @@
 "يرجى إرسال الوصلات المنقطعة وأي تصحيحات 
أو اقتراحات إلى <a href=\"mailto:";
 "webmasters@gnu.org\">&lt;webmasters@gnu.org&gt;</a>."
 
+# TODO: submitting -> contributing.
 #.  TRANSLATORS: Ignore the original text in this paragraph,
 #.         replace it with the translation of these two:
 #.         We work hard and do our best to provide accurate, good quality
@@ -1347,14 +1419,20 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "رغم بذلنا قصارى جهدنا لتوفير ترجمات دقيقة 
ذات جودة عالية، فإننا لا ندعي كمال "
@@ -1365,15 +1443,15 @@
 "href=\"/server/standards/README.translations.html\">دليل الترجم
Ø©</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 1985, 1993, 2003, 2005, 2007, [-2008-] {+2008, 2009,
-# | 2010, 2014, 2015+} Free Software Foundation, Inc.
+# | Copyright &copy; 1985, 1993, 200[-3-]{+4+}, 2005, 2007, [-2008-] {+2009,
+# | 2010, 2015, 2021+} Free Software Foundation, Inc.
 #, fuzzy
 #| msgid ""
 #| "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008 Free Software "
 #| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 1985, 1993, 2004, 2005, 2007, 2009, 2010, 2015, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
 "حقوق النشر:</p><p style=\"direction: ltr\">\n"
 "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008 Free Software "
@@ -1407,6 +1485,19 @@
 msgstr "حُدّثت:"
 
 #~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "رغم بذلنا قصارى جهدنا لتوفير ترجمات 
دقيقة ذات جودة عالية، فإننا لا ندعي "
+#~ "كمال النصوص وخلوها من الأخطاء. يرجي 
إرسال التعليقات والمقترحات المتعلقة "
+#~ "بهذا الشأن إلى عنوان البريد الإلكتروني <a 
href=\"mailto:web-";
+#~ "translators@gnu.org\"> &lt;web-translators@gnu.org&gt;</a>.</p> 
<p>للحصول "
+#~ "على أي معلومات بشأن تنسيق وتقديم ترجمات م
وقعنا الإلكتروني، يرجى الاطلاع "
+#~ "على الرابط التالي <a 
href=\"/server/standards/README.translations.html"
+#~ "\">دليل الترجمة</a>."
+
+#~ msgid ""
 #~ "For up-to-date information about the available GNU software, please see "
 #~ "the information available on our <a href=\"/home.html\">web server</a>, "
 #~ "in particular our <a href=\"/software/software.html\">list of software</"

Index: po/manifesto.ca.po
===================================================================
RCS file: /web/www/www/gnu/po/manifesto.ca.po,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- po/manifesto.ca.po  2 Nov 2021 13:56:41 -0000       1.36
+++ po/manifesto.ca.po  2 Nov 2021 14:41:53 -0000       1.37
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: manifesto.ca\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-02 12:55+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2015-09-07 10:57+0200\n"
 "Last-Translator: Miquel Puigpelat <mpuigpe1@xtec.cat>\n"
 "Language-Team: Catalan <www-ca-traductors@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-11-02 14:27+0000\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
@@ -22,14 +23,28 @@
 msgstr "El manifest GNU - Projecte GNU - Free Software Foundation"
 
 # type: Content of: <h2>
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "The GNU Manifesto"
 msgstr "El manifest GNU"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
+# | The GNU Manifesto (which appears below) was written by <a
+# | href=\"http{+s+}://www.stallman.org/\">Richard Stallman</a> in 1985 to ask
+# | for support in developing the GNU operating system.  Part of the text was
+# | taken from the original announcement of 1983.  Through 1987, it was
+# | updated in minor ways to account for developments; since then, it seems
+# | best to leave it unchanged.
+#, fuzzy
+#| msgid ""
+#| "The GNU Manifesto (which appears below) was written by <a href=\"http://";
+#| "www.stallman.org/\">Richard Stallman</a> in 1985 to ask for support in "
+#| "developing the GNU operating system.  Part of the text was taken from the "
+#| "original announcement of 1983.  Through 1987, it was updated in minor "
+#| "ways to account for developments; since then, it seems best to leave it "
+#| "unchanged."
 msgid ""
-"The GNU Manifesto (which appears below) was written by <a href=\"http://www.";
+"The GNU Manifesto (which appears below) was written by <a href=\"https://www.";
 "stallman.org/\">Richard Stallman</a> in 1985 to ask for support in "
 "developing the GNU operating system.  Part of the text was taken from the "
 "original announcement of 1983.  Through 1987, it was updated in minor ways "
@@ -43,7 +58,7 @@
 "lo sense modificar."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Since that time, we have learned about certain common misunderstandings that "
 "different wording could help avoid.  Footnotes added since 1993 help clarify "
@@ -53,7 +68,7 @@
 "comuns amb un canvi en l'elecció de paraules. Les notes a peu de pàgina van 
"
 "ser afegides el 1993 per ajudar a aclarir aquests punts."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If you want to install the GNU/Linux system, we recommend you use one of the "
 "<a href=\"/distros\">100% free software GNU/Linux distributions</a>.  For "
@@ -65,7 +80,7 @@
 "lliure</a>.  Per saber com contribuir, vegeu <a href=\"/help/help.html"
 "\">http://www.gnu.org/help</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The GNU Project is part of the Free Software Movement, a campaign for <a "
 "href=\"/philosophy/free-sw.html\">freedom for users of software</a>.  It is "
@@ -83,18 +98,31 @@
 "\">enfocament amoral</a> sobre el mateix camp."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "What's GNU? Gnu's Not Unix!"
 msgstr "Què és GNU? GNU no és Unix!"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | GNU, which stands for Gnu's Not Unix, is the name for the complete
+# | Unix-compatible software system which I am writing so that I can give it
+# | away free to everyone who can use [-it.<a href=\"#f1\">(1)</a>-]
+# | {+it&#8239;<a class=\"ftn\" href=\"#f1\">[1]</a>.+} Several other
+# | volunteers are helping me.  Contributions of time, money, programs and
+# | equipment are greatly needed.
+#, fuzzy
+#| msgid ""
+#| "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
+#| "compatible software system which I am writing so that I can give it away "
+#| "free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
+#| "volunteers are helping me.  Contributions of time, money, programs and "
+#| "equipment are greatly needed."
 msgid ""
 "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
 "compatible software system which I am writing so that I can give it away "
-"free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
-"volunteers are helping me.  Contributions of time, money, programs and "
-"equipment are greatly needed."
+"free to everyone who can use it&#8239;<a class=\"ftn\" href=\"#f1\">[1]</a>. "
+"Several other volunteers are helping me.  Contributions of time, money, "
+"programs and equipment are greatly needed."
 msgstr ""
 "GNU, que prové de <i>GNU's Not Unix</i> (GNU no és Unix, en català), és 
el "
 "nom per a un sistema complet compatible amb Unix que estic escrivint per tal "
@@ -103,7 +131,7 @@
 "de programes i equipament són molt necessàries."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So far we have an Emacs text editor with Lisp for writing editor commands, a "
 "source level debugger, a yacc-compatible parser generator, a linker, and "
@@ -134,7 +162,7 @@
 "més."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU will be able to run Unix programs, but will not be identical to Unix.  "
 "We will make all improvements that are convenient, based on our experience "
@@ -159,7 +187,7 @@
 "del MIT i els protocols de comunicació d'Internet."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is aimed initially at machines in the 68000/16000 class with virtual "
 "memory, because they are the easiest machines to make it run on.  The extra "
@@ -172,7 +200,7 @@
 "el deixarem per algú que el vulga fer servir en aquestes."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid horrible confusion, please pronounce the <em>g</em> in the word "
 "&ldquo;GNU&rdquo; when it is the name of this project."
@@ -182,12 +210,12 @@
 "'nyu')."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why I Must Write GNU"
 msgstr "Per què haig d'escriure el GNU"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I consider that the Golden Rule requires that if I like a program I must "
 "share it with other people who like it.  Software sellers want to divide the "
@@ -211,13 +239,26 @@
 "terme contra la meva voluntat."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | So that I can continue to use computers without dishonor, I have decided
+# | to put together a sufficient body of free software so that I will be able
+# | to get along without any software that is not free.  I have resigned from
+# | the AI Lab to deny MIT any legal excuse to prevent me from giving GNU
+# | [-away.<a href=\"#f2a\">(2)</a>-] {+away&#8239;<a class=\"ftn\"
+# | href=\"#f2a\">[2]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "So that I can continue to use computers without dishonor, I have decided "
+#| "to put together a sufficient body of free software so that I will be able "
+#| "to get along without any software that is not free.  I have resigned from "
+#| "the AI Lab to deny MIT any legal excuse to prevent me from giving GNU "
+#| "away.<a href=\"#f2a\">(2)</a>"
 msgid ""
 "So that I can continue to use computers without dishonor, I have decided to "
 "put together a sufficient body of free software so that I will be able to "
 "get along without any software that is not free.  I have resigned from the "
-"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away.<a "
-"href=\"#f2a\">(2)</a>"
+"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away&#8239;"
+"<a class=\"ftn\" href=\"#f2a\">[2]</a>."
 msgstr ""
 "Com que vull continuar emprant ordinadors sense perdre el meu honor, he "
 "decidit agrupar un cos suficient de programari lliure per tal de ser capaç "
@@ -227,12 +268,12 @@
 "(2)</a>"
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why GNU Will Be Compatible with Unix"
 msgstr "Per què el GNU serà compatible amb l'Unix"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Unix is not my ideal system, but it is not too bad.  The essential features "
 "of Unix seem to be good ones, and I think I can fill in what Unix lacks "
@@ -245,12 +286,12 @@
 "l'Unix seria molt útil perquè molta gent l'adoptés."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How GNU Will Be Available"
 msgstr "Com estarà disponible el GNU"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is not in the public domain.  Everyone will be permitted to modify and "
 "redistribute GNU, but no distributor will be allowed to restrict its further "
@@ -265,12 +306,12 @@
 "versions del GNU continuen sent lliures."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why Many Other Programmers Want to Help"
 msgstr "Per què volen cooperar molts altres programadors"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found many other programmers who are excited about GNU and want to "
 "help."
@@ -279,7 +320,7 @@
 "ajudar."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Many programmers are unhappy about the commercialization of system "
 "software.  It may enable them to make more money, but it requires them to "
@@ -304,7 +345,7 @@
 "pensen que programar és sols una forma de fer diners."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By working on and using GNU rather than proprietary programs, we can be "
 "hospitable to everyone and obey the law.  In addition, GNU serves as an "
@@ -322,12 +363,12 @@
 "diners no poden reemplaçar."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How You Can Contribute"
 msgstr "Com pots contribuir"
 
 # type: Content of: <blockquote><p>
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "(Nowadays, for software tasks to work on, see the <a href=\"http://fsf.org/";
 "campaigns/priority-projects\">High Priority Projects list</a> and the <a "
@@ -344,7 +385,7 @@
 "help.html\">la guia per ajudar al sistema operatiu GNU</a>.)"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am asking computer manufacturers for donations of machines and money.  I'm "
 "asking individuals for donations of programs and work."
@@ -353,7 +394,7 @@
 "diners. Demano també donacions individuals en forma de programes i treball."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One consequence you can expect if you donate machines is that GNU will run "
 "on them at an early date.  The machines should be complete, ready to use "
@@ -367,7 +408,7 @@
 "sofisticades."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found very many programmers eager to contribute part-time work for "
 "GNU.  For most projects, such part-time distributed work would be very hard "
@@ -398,7 +439,7 @@
 "pròxima entre els desenvolupadors i treballarem en un grup més petit i 
unit.)"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If I get donations of money, I may be able to hire a few people full or part "
 "time.  The salary won't be high by programmers' standards, but I'm looking "
@@ -416,22 +457,29 @@
 "necessitat de viure d'una altra manera."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why All Computer Users Will Benefit"
 msgstr "Per què tots els usuaris d'ordinador se'n sortiran beneficiats"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Once GNU is written, everyone will be able to obtain good system software
+# | free, just like [-air.<a href=\"#f2\">(3)</a>-] {+air&#8239;<a
+# | class=\"ftn\" href=\"#f2\">[3]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "Once GNU is written, everyone will be able to obtain good system software "
+#| "free, just like air.<a href=\"#f2\">(3)</a>"
 msgid ""
 "Once GNU is written, everyone will be able to obtain good system software "
-"free, just like air.<a href=\"#f2\">(3)</a>"
+"free, just like air&#8239;<a class=\"ftn\" href=\"#f2\">[3]</a>."
 msgstr ""
 "Una vegada el GNU estiga escrit, qualsevol serà capaç d'obtenir un bon "
 "sistema de programari lliure, igual que disposem d'aire per respirar. <a "
 "href=\"#f2\">(3)</a>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This means much more than just saving everyone the price of a Unix license.  "
 "It means that much wasteful duplication of system programming effort will be "
@@ -443,7 +491,7 @@
 "la tècnica."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Complete system sources will be available to everyone.  As a result, a user "
 "who needs changes in the system will always be free to make them himself, or "
@@ -459,7 +507,7 @@
 "únics que estan en la posició de fer canvis."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Schools will be able to provide a much more educational environment by "
 "encouraging all students to study and improve the system code.  Harvard's "
@@ -476,7 +524,7 @@
 "per a mi."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Finally, the overhead of considering who owns the system software and what "
 "one is or is not entitled to do with it will be lifted."
@@ -486,7 +534,7 @@
 "desapareixerà."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Arrangements to make people pay for using a program, including licensing of "
 "copies, always incur a tremendous cost to society through the cumbersome "
@@ -512,7 +560,7 @@
 "desfer-se de les màscares."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copying all or parts of a program is as natural to a programmer as "
 "breathing, and as productive.  It ought to be as free."
@@ -521,13 +569,13 @@
 "per a un programador com respirar. Hauria de ser igual de lliure."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Some Easily Rebutted Objections to GNU's Goals"
 msgstr ""
 "Algunes objeccions als objectius del GNU que es poden rebatre fàcilment"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Nobody will use it if it is free, because that means they "
 "can't rely on any support.&rdquo;</strong>"
@@ -536,7 +584,7 @@
 "s'oferirà assistència tècnica.”</strong>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You have to charge for the program to pay for providing the "
 "support.&rdquo;</strong>"
@@ -545,11 +593,20 @@
 "strong>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | If people would rather pay for GNU plus service than get GNU free without
+# | service, a company to provide just service to people who have obtained GNU
+# | free ought to be [-profitable.<a href=\"#f3\">(4)</a>-]
+# | {+profitable&#8239;<a class=\"ftn\" href=\"#f3\">[4]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "If people would rather pay for GNU plus service than get GNU free without "
+#| "service, a company to provide just service to people who have obtained "
+#| "GNU free ought to be profitable.<a href=\"#f3\">(4)</a>"
 msgid ""
 "If people would rather pay for GNU plus service than get GNU free without "
 "service, a company to provide just service to people who have obtained GNU "
-"free ought to be profitable.<a href=\"#f3\">(4)</a>"
+"free ought to be profitable&#8239;<a class=\"ftn\" href=\"#f3\">[4]</a>."
 msgstr ""
 "Si la gent preferís pagar per tenir el GNU més assistència tècnica que "
 "obtenir el GNU de franc sense assistència, una empresa que oferís només "
@@ -557,7 +614,7 @@
 "hauria de tenir èxit.<a href=\"#f3\">(4)</a>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We must distinguish between support in the form of real programming work and "
 "mere handholding.  The former is something one cannot rely on from a "
@@ -570,7 +627,7 @@
 "número suficient de clients, el venedor l'ignorarà."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If your business needs to be able to rely on support, the only way is to "
 "have all the necessary sources and tools.  Then you can hire any available "
@@ -592,7 +649,7 @@
 "d'ells."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Meanwhile, the users who know nothing about computers need handholding: "
 "doing things for them which they could easily do themselves but don't know "
@@ -603,7 +660,7 @@
 "que encara no saben com."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Such services could be provided by companies that sell just handholding and "
 "repair service.  If it is true that users would rather spend money and get a "
@@ -623,7 +680,7 @@
 "programa sense pagar pel servei."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You cannot reach many people without advertising, and you "
 "must charge for the program to support that.&rdquo;</strong>"
@@ -632,7 +689,7 @@
 "pel programa per poder finançar-la.”</strong>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;It's no use advertising a program people can get free.&rdquo;"
 "</strong>"
@@ -641,7 +698,7 @@
 "gratuïtament.”</strong>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are various forms of free or very cheap publicity that can be used to "
 "inform numbers of computer users about something like GNU.  But it may be "
@@ -659,12 +716,23 @@
 "reben benefici de la publicitat paguen per ella."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | On the other hand, if many people get GNU from their friends, and such
+# | companies don't succeed, this will show that advertising was not really
+# | necessary to spread GNU.  Why is it that free market advocates don't want
+# | to let the free market decide [-this?<a href=\"#f4\">(5)</a>-]
+# | {+this?&#8239;<a class=\"ftn\" href=\"#f4\">[5]</a>+}
+#, fuzzy
+#| msgid ""
+#| "On the other hand, if many people get GNU from their friends, and such "
+#| "companies don't succeed, this will show that advertising was not really "
+#| "necessary to spread GNU.  Why is it that free market advocates don't want "
+#| "to let the free market decide this?<a href=\"#f4\">(5)</a>"
 msgid ""
 "On the other hand, if many people get GNU from their friends, and such "
 "companies don't succeed, this will show that advertising was not really "
 "necessary to spread GNU.  Why is it that free market advocates don't want to "
-"let the free market decide this?<a href=\"#f4\">(5)</a>"
+"let the free market decide this?&#8239;<a class=\"ftn\" href=\"#f4\">[5]</a>"
 msgstr ""
 "D'altra banda, si molta gent obté el GNU dels seus amics i aquestes "
 "companyies no tenen èxit, això mostrarà que la publicitat no era realment "
@@ -673,7 +741,7 @@
 "</a>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;My company needs a proprietary operating system to get a "
 "competitive edge.&rdquo;</strong>"
@@ -682,7 +750,7 @@
 "estar davant la competència.”</strong>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU will remove operating system software from the realm of competition.  "
 "You will not be able to get an edge in this area, but neither will your "
@@ -701,17 +769,26 @@
 "empès dins del costós negoci de la venta de sistemes operatius."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | I would like to see GNU development supported by gifts from many
+# | manufacturers and users, reducing the cost to [-each.<a
+# | href=\"#f5\">(6)</a>-] {+each&#8239;<a class=\"ftn\"
+# | href=\"#f5\">[6]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "I would like to see GNU development supported by gifts from many "
+#| "manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
 msgid ""
 "I would like to see GNU development supported by gifts from many "
-"manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
+"manufacturers and users, reducing the cost to each&#8239;<a class=\"ftn\" "
+"href=\"#f5\">[6]</a>."
 msgstr ""
 "M'agradaria veure que el desenvolupament del GNU és finançat amb donacions "
 "de molts fabricants i usuaris, reduint els costos per a ells mateixos. <a "
 "href=\"#f5\">(6)</a>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't programmers deserve a reward for their creativity?"
 "&rdquo;</strong>"
@@ -720,7 +797,7 @@
 "creativitat?”</strong>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If anything deserves a reward, it is social contribution.  Creativity can be "
 "a social contribution, but only in so far as society is free to use the "
@@ -735,7 +812,7 @@
 "ser castigats si restringeixen l'ús d'aquests programes."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Shouldn't a programmer be able to ask for a reward for his "
 "creativity?&rdquo;</strong>"
@@ -744,7 +821,7 @@
 "creativitat?”</strong>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is nothing wrong with wanting pay for work, or seeking to maximize "
 "one's income, as long as one does not use means that are destructive.  But "
@@ -756,7 +833,7 @@
 "programari estan basats en la destrucció."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Extracting money from users of a program by restricting their use of it is "
 "destructive because the restrictions reduce the amount and the ways that the "
@@ -772,7 +849,7 @@
 "deliberada."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The reason a good citizen does not use such destructive means to become "
 "wealthier is that, if everyone did so, we would all become poorer from the "
@@ -791,12 +868,12 @@
 "de tota o part d'eixa creativitat."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid "<strong>&ldquo;Won't programmers starve?&rdquo;</strong>"
 msgstr "<strong>“No passaran gana els programadors?”</strong>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "I could answer that nobody is forced to be a programmer.  Most of us cannot "
 "manage to get any money for standing on the street and making faces.  But we "
@@ -809,7 +886,7 @@
 "al carrer i passant gana. Fem altres coses."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But that is the wrong answer because it accepts the questioner's implicit "
 "assumption: that without ownership of software, programmers cannot possibly "
@@ -820,7 +897,7 @@
 "no se'ls pot pagar un cèntim. Suposadament és tot o res."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The real reason programmers will not starve is that it will still be "
 "possible for them to get paid for programming; just not paid as much as now."
@@ -830,13 +907,28 @@
 "com ara."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | Restricting copying is not the only basis for business in software.  It is
+# | the most common [-basis<a href=\"#f8\">(7)</a>-] {+basis&#8239;<a
+# | class=\"ftn\" href=\"#f8\">[7]</a>+} because it brings in the most money. 
+# | If it were prohibited, or rejected by the customer, software business
+# | would move to other bases of organization which are now used less often. 
+# | There are always numerous ways to organize any kind of business.
+#, fuzzy
+#| msgid ""
+#| "Restricting copying is not the only basis for business in software.  It "
+#| "is the most common basis<a href=\"#f8\">(7)</a> because it brings in the "
+#| "most money.  If it were prohibited, or rejected by the customer, software "
+#| "business would move to other bases of organization which are now used "
+#| "less often.  There are always numerous ways to organize any kind of "
+#| "business."
 msgid ""
 "Restricting copying is not the only basis for business in software.  It is "
-"the most common basis<a href=\"#f8\">(7)</a> because it brings in the most "
-"money.  If it were prohibited, or rejected by the customer, software "
-"business would move to other bases of organization which are now used less "
-"often.  There are always numerous ways to organize any kind of business."
+"the most common basis&#8239;<a class=\"ftn\" href=\"#f8\">[7]</a> because it "
+"brings in the most money.  If it were prohibited, or rejected by the "
+"customer, software business would move to other bases of organization which "
+"are now used less often.  There are always numerous ways to organize any "
+"kind of business."
 msgstr ""
 "Restringir la còpia no és l'única base per al negoci del programari. És 
la "
 "més comuna <a href=\"#f8\">(7)</a> perquè permet guanyar molts diners. Si "
@@ -845,7 +937,7 @@
 "Sempre hi ha nombroses maneres d'organitzar qualsevol tipus de negoci."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Probably programming will not be as lucrative on the new basis as it is "
 "now.  But that is not an argument against the change.  It is not considered "
@@ -860,7 +952,7 @@
 "injustícia. (En la pràctica continuarien guanyant molt més que els 
venedors)."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't people have a right to control how their creativity is "
 "used?&rdquo;</strong>"
@@ -869,7 +961,7 @@
 "strong>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "&ldquo;Control over the use of one's ideas&rdquo; really constitutes control "
 "over other people's lives; and it is usually used to make their lives more "
@@ -880,13 +972,26 @@
 "les seves vides."
 
 # type: Content of: <p>
-#. type: Content of: <p>
-msgid ""
-"People who have studied the issue of intellectual property rights<a href="
-"\"#f6\">(8)</a> carefully (such as lawyers) say that there is no intrinsic "
-"right to intellectual property.  The kinds of supposed intellectual property "
-"rights that the government recognizes were created by specific acts of "
-"legislation for specific purposes."
+#. type: Content of: <div><dl><dd><p>
+# | People who have studied the issue of intellectual property [-rights<a
+# | href=\"#f6\">(8)</a>-] {+rights&#8239;<a class=\"ftn\"
+# | href=\"#f6\">[8]</a>+} carefully (such as lawyers) say that there is no
+# | intrinsic right to intellectual property.  The kinds of supposed
+# | intellectual property rights that the government recognizes were created
+# | by specific acts of legislation for specific purposes.
+#, fuzzy
+#| msgid ""
+#| "People who have studied the issue of intellectual property rights<a href="
+#| "\"#f6\">(8)</a> carefully (such as lawyers) say that there is no "
+#| "intrinsic right to intellectual property.  The kinds of supposed "
+#| "intellectual property rights that the government recognizes were created "
+#| "by specific acts of legislation for specific purposes."
+msgid ""
+"People who have studied the issue of intellectual property rights&#8239;<a "
+"class=\"ftn\" href=\"#f6\">[8]</a> carefully (such as lawyers) say that "
+"there is no intrinsic right to intellectual property.  The kinds of supposed "
+"intellectual property rights that the government recognizes were created by "
+"specific acts of legislation for specific purposes."
 msgstr ""
 "La gent que ha estudiat amb cura el tòpic dels drets de la propietat "
 "intel·lectual <a href=\"#f6\">(8)</a> (com els advocats) diuen que no hi ha "
@@ -895,7 +1000,7 @@
 "específiques de legislació per a propòsits específics."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For example, the patent system was established to encourage inventors to "
 "disclose the details of their inventions.  Its purpose was to help society "
@@ -917,7 +1022,7 @@
 "patentats."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The idea of copyright did not exist in ancient times, when authors "
 "frequently copied other authors at length in works of nonfiction.  This "
@@ -938,7 +1043,7 @@
 "la major part dels individus que llegien els llibres. "
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "All intellectual property rights are just licenses granted by society "
 "because it was thought, rightly or wrongly, that society as a whole would "
@@ -953,7 +1058,7 @@
 "llicència? Quin tipus d'acte estem permetent que faci la persona?"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The case of programs today is very different from that of books a hundred "
 "years ago.  The fact that the easiest way to copy a program is from one "
@@ -974,13 +1079,13 @@
 "llei li ho permetés."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Competition makes things get done better.&rdquo;</strong>"
 msgstr "<strong>“La competència fa que les coses es facin 
millor.”</strong>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The paradigm of competition is a race: by rewarding the winner, we encourage "
 "everyone to run faster.  When capitalism really works this way, it does a "
@@ -1000,7 +1105,7 @@
 "tots arribaran tard a la meta."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Proprietary and secret software is the moral equivalent of runners in a fist "
 "fight.  Sad to say, the only referee we've got does not seem to object to "
@@ -1015,7 +1120,7 @@
 "és separar-los i penalitzar als corredors pel simple fet d'intentar lluitar."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Won't everyone stop programming without a monetary incentive?"
 "&rdquo;</strong>"
@@ -1024,7 +1129,7 @@
 "strong>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually, many people will program with absolutely no monetary incentive.  "
 "Programming has an irresistible fascination for some people, usually the "
@@ -1038,7 +1143,7 @@
 "vivint d'aquesta forma."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But really this question, though commonly asked, is not appropriate to the "
 "situation.  Pay for programmers will not disappear, only become less.  So "
@@ -1051,7 +1156,7 @@
 "reducció del seu salari? La meva experiència em demostra que sí."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For more than ten years, many of the world's best programmers worked at the "
 "Artificial Intelligence Lab for far less money than they could have had "
@@ -1065,7 +1170,7 @@
 "gaudeix, és un premi per si mateixa."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Then most of them left when offered a chance to do the same interesting work "
 "for a lot of money."
@@ -1074,7 +1179,7 @@
 "mateix treball interessant per un gran sou."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "What the facts show is that people will program for reasons other than "
 "riches; but if given a chance to make a lot of money as well, they will come "
@@ -1089,7 +1194,7 @@
 "ser necessàriament dolent si les companyies que paguen molt són prohibides."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;We need the programmers desperately.  If they demand that we "
 "stop helping our neighbors, we have to obey.&rdquo;</strong>"
@@ -1098,7 +1203,7 @@
 "d'ajudar als nostres veïns, haurem d'obeir.”</strong>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "You're never so desperate that you have to obey this sort of demand.  "
 "Remember: millions for defense, but not a cent for tribute!"
@@ -1108,7 +1213,7 @@
 "tributs!"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Programmers need to make a living somehow.&rdquo;</strong>"
 msgstr ""
@@ -1116,7 +1221,7 @@
 "strong>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In the short run, this is true.  However, there are plenty of ways that "
 "programmers could make a living without selling the right to use a program.  "
@@ -1132,7 +1237,7 @@
 "maneres si vols trobar-les. Ací hi han nombrosos exemples."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A manufacturer introducing a new computer will pay for the porting of "
 "operating systems onto the new hardware."
@@ -1141,7 +1246,7 @@
 "sistemes operatius a la nova màquina."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The sale of teaching, handholding and maintenance services could also employ "
 "programmers."
@@ -1150,11 +1255,23 @@
 "donar feina també als programadors."
 
 # type: Content of: <p>
-#. type: Content of: <p>
-msgid ""
-"People with new ideas could distribute programs as freeware<a href=\"#f7\">"
-"(9)</a>, asking for donations from satisfied users, or selling handholding "
-"services.  I have met people who are already working this way successfully."
+#. type: Content of: <div><dl><dd><p>
+# | People with new ideas could distribute programs as [-freeware<a
+# | href=\"#f7\">(9)</a>,-] {+freeware&#8239;<a class=\"ftn\"
+# | href=\"#f7\">[9]</a>,+} asking for donations from satisfied users, or
+# | selling handholding services.  I have met people who are already working
+# | this way successfully.
+#, fuzzy
+#| msgid ""
+#| "People with new ideas could distribute programs as freeware<a href="
+#| "\"#f7\">(9)</a>, asking for donations from satisfied users, or selling "
+#| "handholding services.  I have met people who are already working this way "
+#| "successfully."
+msgid ""
+"People with new ideas could distribute programs as freeware&#8239;<a class="
+"\"ftn\" href=\"#f7\">[9]</a>, asking for donations from satisfied users, or "
+"selling handholding services.  I have met people who are already working "
+"this way successfully."
 msgstr ""
 "La gent amb idees noves podria distribuir programes com programari gratuït "
 "<a href=\"#f7\">(9)</a>, demanant donacions dels usuaris satisfets, o venent "
@@ -1162,7 +1279,7 @@
 "manera."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Users with related needs can form users' groups, and pay dues.  A group "
 "would contract with programming companies to write programs that the group's "
@@ -1173,14 +1290,14 @@
 "programes que els membres del grup volguessin emprar."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "All sorts of development can be funded with a Software Tax:"
 msgstr ""
 "Tot tipus de desenvolupament podria ser finançat amb un Impost sobre el "
 "Programari:"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Suppose everyone who buys a computer has to pay x percent of the price as a "
 "software tax.  The government gives this to an agency like the NSF to spend "
@@ -1192,7 +1309,7 @@
 "desenvolupament de programari."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But if the computer buyer makes a donation to software development himself, "
 "he can take a credit against the tax.  He can donate to the project of his "
@@ -1208,7 +1325,7 @@
 "sigut pagat."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The total tax rate could be decided by a vote of the payers of the tax, "
 "weighted according to the amount they will be taxed on."
@@ -1217,24 +1334,24 @@
 "sospesat d'acord amb la quantitat per la qual s'aplicarà l'impost."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "The consequences:"
 msgstr "Les conseqüències:"
 
 # type: Content of: <ul><li>
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "The computer-using community supports software development."
 msgstr ""
 "La comunitat que utilitza els ordinadors dóna suport al desenvolupament de "
 "programari."
 
 # type: Content of: <ul><li>
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "This community decides what level of support is needed."
 msgstr "Aquesta comunitat decideix quin nivell de suport és necessari."
 
 # type: Content of: <ul><li>
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "Users who care which projects their share is spent on can choose this for "
 "themselves."
@@ -1243,7 +1360,7 @@
 "podran escollir-los per si mateixos."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the long run, making programs free is a step toward the postscarcity "
 "world, where nobody will have to work very hard just to make a living.  "
@@ -1262,7 +1379,7 @@
 "guanyar-se la vida programant."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We have already greatly reduced the amount of work that the whole society "
 "must do for its actual productivity, but only a little of this has "
@@ -1283,12 +1400,12 @@
 "fer això, per tal d'assolir avanços tècnics en productivitat que es "
 "tradueixin en menys treball per a nosaltres."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "Notes"
 
 # type: Content of: <ol><li>
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The wording here was careless.  The intention was that nobody would have to "
 "pay for <b>permission</b> to use the GNU system.  But the words don't make "
@@ -1319,7 +1436,7 @@
 "amb altres al utilitzar-lo."
 
 # type: Content of: <ol><li>
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The expression &ldquo;give away&rdquo; is another indication that I had not "
 "yet clearly separated the issue of price from that of freedom.  We now "
@@ -1334,10 +1451,21 @@
 "explicacions."
 
 # type: Content of: <ol><li>
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+# | This is another place I failed to distinguish carefully between the two
+# | different meanings of [-&ldquo;free&rdquo;.-] {+&ldquo;free.&rdquo;+} The
+# | statement as it stands is not false&mdash;you can get copies of GNU
+# | software at no charge, from your friends or over the net.  But it does
+# | suggest the wrong idea.
+#, fuzzy
+#| msgid ""
+#| "This is another place I failed to distinguish carefully between the two "
+#| "different meanings of &ldquo;free&rdquo;.  The statement as it stands is "
+#| "not false&mdash;you can get copies of GNU software at no charge, from "
+#| "your friends or over the net.  But it does suggest the wrong idea."
 msgid ""
 "This is another place I failed to distinguish carefully between the two "
-"different meanings of &ldquo;free&rdquo;.  The statement as it stands is not "
+"different meanings of &ldquo;free.&rdquo; The statement as it stands is not "
 "false&mdash;you can get copies of GNU software at no charge, from your "
 "friends or over the net.  But it does suggest the wrong idea."
 msgstr ""
@@ -1348,12 +1476,12 @@
 "la idea equivocada."
 
 # type: Content of: <ol><li>
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid "Several such companies now exist."
 msgstr "Ja existeixen moltes d'aquestes companyies."
 
 # type: Content of: <ol><li>
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Although it is a charity rather than a company, the Free Software Foundation "
 "for 10 years raised most of its funds from its distribution service.  You "
@@ -1366,7 +1494,7 @@
 "per donar suport a la seva tasca."
 
 # type: Content of: <ol><li>
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "A group of computer companies pooled funds around 1991 to support "
 "maintenance of the GNU C Compiler."
@@ -1375,7 +1503,7 @@
 "per donar suport al manteniment del Compilador C de GNU."
 
 # type: Content of: <ol><li>
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "I think I was mistaken in saying that proprietary software was the most "
 "common basis for making money in software.  It seems that actually the most "
@@ -1396,10 +1524,31 @@
 "guanyessin menys en un món amb programari lliure."
 
 # type: Content of: <ol><li>
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+# | In the 1980s I had not yet realized how confusing it was to speak of
+# | &ldquo;the issue&rdquo; of &ldquo;intellectual [-property&rdquo;.-]
+# | {+property.&rdquo;+} That term is obviously biased; more subtle is the
+# | fact that it lumps together various disparate laws which raise very
+# | different issues.  Nowadays I urge people to reject the term
+# | &ldquo;intellectual property&rdquo; entirely, lest it lead others to
+# | suppose that those laws form one coherent issue.  The way to be clear is
+# | to discuss patents, copyrights, and trademarks separately.  See <a
+# | href=\"/philosophy/not-ipr.html\">further explanation</a> of how this term
+# | spreads confusion and bias.
+#, fuzzy
+#| msgid ""
+#| "In the 1980s I had not yet realized how confusing it was to speak of "
+#| "&ldquo;the issue&rdquo; of &ldquo;intellectual property&rdquo;.  That "
+#| "term is obviously biased; more subtle is the fact that it lumps together "
+#| "various disparate laws which raise very different issues.  Nowadays I "
+#| "urge people to reject the term &ldquo;intellectual property&rdquo; "
+#| "entirely, lest it lead others to suppose that those laws form one "
+#| "coherent issue.  The way to be clear is to discuss patents, copyrights, "
+#| "and trademarks separately.  See <a href=\"/philosophy/not-ipr.html"
+#| "\">further explanation</a> of how this term spreads confusion and bias."
 msgid ""
 "In the 1980s I had not yet realized how confusing it was to speak of &ldquo;"
-"the issue&rdquo; of &ldquo;intellectual property&rdquo;.  That term is "
+"the issue&rdquo; of &ldquo;intellectual property.&rdquo; That term is "
 "obviously biased; more subtle is the fact that it lumps together various "
 "disparate laws which raise very different issues.  Nowadays I urge people to "
 "reject the term &ldquo;intellectual property&rdquo; entirely, lest it lead "
@@ -1419,10 +1568,26 @@
 "aquest terme provoca confusió i biaix."
 
 # type: Content of: <ol><li>
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+# | Subsequently we learned to distinguish between &ldquo;free software&rdquo;
+# | and [-&ldquo;freeware&rdquo;.-] {+&ldquo;freeware.&rdquo;+} The term
+# | &ldquo;freeware&rdquo; means software you are free to redistribute, but
+# | usually you are not free to study and change the source code, so most of
+# | it is not free software.  See &ldquo;<a
+# | href=\"/philosophy/words-to-avoid.html#Freeware\">Confusing Words and
+# | Phrases</a>&rdquo; for more explanation.
+#, fuzzy
+#| msgid ""
+#| "Subsequently we learned to distinguish between &ldquo;free "
+#| "software&rdquo; and &ldquo;freeware&rdquo;.  The term &ldquo;"
+#| "freeware&rdquo; means software you are free to redistribute, but usually "
+#| "you are not free to study and change the source code, so most of it is "
+#| "not free software.  See &ldquo;<a href=\"/philosophy/words-to-avoid."
+#| "html#Freeware\">Confusing Words and Phrases</a>&rdquo; for more "
+#| "explanation."
 msgid ""
 "Subsequently we learned to distinguish between &ldquo;free software&rdquo; "
-"and &ldquo;freeware&rdquo;.  The term &ldquo;freeware&rdquo; means software "
+"and &ldquo;freeware.&rdquo; The term &ldquo;freeware&rdquo; means software "
 "you are free to redistribute, but usually you are not free to study and "
 "change the source code, so most of it is not free software.  See &ldquo;<a "
 "href=\"/philosophy/words-to-avoid.html#Freeware\">Confusing Words and "
@@ -1462,14 +1627,20 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Vegeu la <a href=\"/server/standards/README.translations.html\">Guia de "
@@ -1480,9 +1651,15 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
+# | Copyright &copy; 1985, 1993, 200[-3-]{+4+}, 2005, 2007, [-2008,-] 2009,
+# | 2010, [-2014, 2015-] {+2015, 2021+} Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, "
+#| "2015 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 1985, 1993, 2004, 2005, 2007, 2009, 2010, 2015, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015 "
 "Free Software Foundation, Inc."
@@ -1518,14 +1695,24 @@
 msgid "Updated:"
 msgstr "Updated:"
 
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "Vegeu la <a href=\"/server/standards/README.translations.html\">Guia de "
+#~ "traducció</a> per informar-vos sobre la coordinació i publicació de les 
"
+#~ "traduccions d'aquest article. <br />Contacteu amb l'<a href=\"/server/"
+#~ "standards/translations/ca/\">Equip de traducció</a> per col·laborar en 
la "
+#~ "traducció al català del web de GNU."
+
 # type: Content of: <div><p>
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015, "
-"2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015, "
-"2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, "
+#~ "2015, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, "
+#~ "2015, 2021 Free Software Foundation, Inc."
 
 # type: Content of: <p>
 #~ msgid ""

Index: po/manifesto.cs.po
===================================================================
RCS file: /web/www/www/gnu/po/manifesto.cs.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- po/manifesto.cs.po  27 Oct 2019 09:59:48 -0000      1.3
+++ po/manifesto.cs.po  2 Nov 2021 14:41:53 -0000       1.4
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manifesto.html\n"
-"POT-Creation-Date: 2015-06-02 12:55+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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"
@@ -21,19 +21,20 @@
 msgid "The GNU Manifesto - GNU Project - Free Software Foundation"
 msgstr "GNU Manifest – Projekt GNU – Nadace pro svobodný software"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "The GNU Manifesto"
 msgstr "GNU Manifest"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 # | The GNU Manifesto (which appears below) was written by <a
-# | href=\"http://www.stallman.org/\";>Richard Stallman</a> [-at the beginning
-# | of the GNU Project,-] {+in 1985+} to ask for [-participation and support. 
-# | For-] {+support in developing+} the [-first few years,-] {+GNU operating
-# | system.  Part of the text was taken from the original announcement of
-# | 1983.  Through 1987,+} it was updated in minor ways to account for
-# | [-developments, but now-] {+developments; since then,+} it seems best to
-# | leave it [-unchanged as most people have seen it.-] {+unchanged.+}
+# | href=\"http{+s+}://www.stallman.org/\">Richard Stallman</a> [-at the
+# | beginning of the GNU Project,-] {+in 1985+} to ask for [-participation and
+# | support.  For-] {+support in developing+} the [-first few years,-] {+GNU
+# | operating system.  Part of the text was taken from the original
+# | announcement of 1983.  Through 1987,+} it was updated in minor ways to
+# | account for [-developments, but now-] {+developments; since then,+} it
+# | seems best to leave it [-unchanged as most people have seen it.-]
+# | {+unchanged.+}
 #, fuzzy
 #| msgid ""
 #| "The GNU Manifesto (which appears below) was written by <a href=\"http://";
@@ -42,7 +43,7 @@
 #| "it was updated in minor ways to account for developments, but now it "
 #| "seems best to leave it unchanged as most people have seen it. "
 msgid ""
-"The GNU Manifesto (which appears below) was written by <a href=\"http://www.";
+"The GNU Manifesto (which appears below) was written by <a href=\"https://www.";
 "stallman.org/\">Richard Stallman</a> in 1985 to ask for support in "
 "developing the GNU operating system.  Part of the text was taken from the "
 "original announcement of 1983.  Through 1987, it was updated in minor ways "
@@ -53,7 +54,7 @@
 "podporu. Několik prvních let byl obnovován tak, aby odpovídal vývoji, 
ale "
 "nyní se zdá nejlepší nechat jej nezměněný tak, jak jej zná většina 
lidí."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 #, fuzzy
 msgid ""
 "Since that time, we have learned about certain common misunderstandings that "
@@ -64,7 +65,7 @@
 "názvosloví. Od roku 1993 byly přidány poznámky pod čarou, aby 
vysvětlily "
 "tyto problémy."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 # | [-For up-to-date information about-]{+If you want to install the GNU/Linux
 # | system, we recommend you use one of+} the [-available GNU software,
 # | please-] {+<a href=\"/distros\">100% free software GNU/Linux
@@ -84,7 +85,7 @@
 "Aktuání informace o dostupném GNU softwaru najdete na našem v <a href=\"/"
 "software/software.html\">seznamu software</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The GNU Project is part of the Free Software Movement, a campaign for <a "
 "href=\"/philosophy/free-sw.html\">freedom for users of software</a>.  It is "
@@ -94,17 +95,30 @@
 "open-source-misses-the-point.html\">amoral approach</a> to the same field."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "What's GNU? Gnu's Not Unix!"
 msgstr "Co je to GNU? GNU Není Unix!"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | GNU, which stands for Gnu's Not Unix, is the name for the complete
+# | Unix-compatible software system which I am writing so that I can give it
+# | away free to everyone who can use [-it.<a href=\"#f1\">(1)</a>-]
+# | {+it&#8239;<a class=\"ftn\" href=\"#f1\">[1]</a>.+} Several other
+# | volunteers are helping me.  Contributions of time, money, programs and
+# | equipment are greatly needed.
+#, fuzzy
+#| msgid ""
+#| "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
+#| "compatible software system which I am writing so that I can give it away "
+#| "free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
+#| "volunteers are helping me.  Contributions of time, money, programs and "
+#| "equipment are greatly needed."
 msgid ""
 "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
 "compatible software system which I am writing so that I can give it away "
-"free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
-"volunteers are helping me.  Contributions of time, money, programs and "
-"equipment are greatly needed."
+"free to everyone who can use it&#8239;<a class=\"ftn\" href=\"#f1\">[1]</a>. "
+"Several other volunteers are helping me.  Contributions of time, money, "
+"programs and equipment are greatly needed."
 msgstr ""
 "Zkratka GNU znamená Gnu's Not Unix. Je to jméno kompletního softwarového "
 "systému kompatibilního s Unixem, který píši proto, abych ho dal 
svobodně k "
@@ -112,7 +126,7 @@
 "také někteří další dobrovolníci. Příspěvky ve formě času, peněz, 
programů a "
 "vybavení jsou též vítány."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So far we have an Emacs text editor with Lisp for writing editor commands, a "
 "source level debugger, a yacc-compatible parser generator, a linker, and "
@@ -140,7 +154,7 @@
 "dokumentací. Doufáme, že nakonec dodáme vše užitečné ze systému Unix 
a ještě "
 "více."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU will be able to run Unix programs, but will not be identical to Unix.  "
 "We will make all improvements that are convenient, based on our experience "
@@ -162,7 +176,7 @@
 "systémové programovací jazyky. Pokusíme se podporovat UUCP, MIT Chaosnet 
a "
 "internetové protokoly pro komunikaci."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is aimed initially at machines in the 68000/16000 class with virtual "
 "memory, because they are the easiest machines to make it run on.  The extra "
@@ -174,7 +188,7 @@
 "menší počítače bude ponechána těm, kteří jej budou na dané 
platformě "
 "používat."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid horrible confusion, please pronounce the <em>g</em> in the word "
 "&ldquo;GNU&rdquo; when it is the name of this project."
@@ -183,11 +197,11 @@
 "li slovo „GNU“ jako jméno tohoto projektu. (Výslovnost v češtině je 
tedy "
 "[gňú] &ndash; pozn. korek.)"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why I Must Write GNU"
 msgstr "Proč musím napsat GNU?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I consider that the Golden Rule requires that if I like a program I must "
 "share it with other people who like it.  Software sellers want to divide the "
@@ -208,12 +222,12 @@
 "snahám. Tyto snahy však nakonec zašly přiliš daleko a já nemohl zůstat 
v "
 "instituci, kde se takové věci děly proti mé vůli."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | So that I can continue to use computers without dishonor, I have decided
 # | to put together a sufficient body of free software so that I will be able
 # | to get along without any software that is not free.  I have resigned from
 # | the AI Lab to deny MIT any legal excuse to prevent me from giving GNU
-# | [-away.-] {+away.<a href=\"#f2a\">(2)</a>+}
+# | [-away.-] {+away&#8239;<a class=\"ftn\" href=\"#f2a\">[2]</a>.+}
 #, fuzzy
 #| msgid ""
 #| "So that I can continue to use computers without dishonor, I have decided "
@@ -225,19 +239,19 @@
 "So that I can continue to use computers without dishonor, I have decided to "
 "put together a sufficient body of free software so that I will be able to "
 "get along without any software that is not free.  I have resigned from the "
-"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away.<a "
-"href=\"#f2a\">(2)</a>"
+"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away&#8239;"
+"<a class=\"ftn\" href=\"#f2a\">[2]</a>."
 msgstr ""
 "Abych mohl dál používat počítače a nemusel se stydět, rozhodl jsem se "
 "sestavit postačující základ svobodného softwaru tak, abych nemusel 
používat "
 "žádné programy, které svobodné nejsou. Opustil jsem laboratoř, abych 
zamezil "
 "všem případným legálním snahám MIT zabránit mi ve vývoji GNU."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why GNU Will Be Compatible with Unix"
 msgstr "Proč bude GNU kompatibilní s Unixem"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Unix is not my ideal system, but it is not too bad.  The essential features "
 "of Unix seem to be good ones, and I think I can fill in what Unix lacks "
@@ -249,11 +263,11 @@
 "slabiny Unixu, aniž bych tyto vlastnosti pokazil. Domnívám se také, že "
 "systém kompatibilní s Unixem může být pro mnoho lidí přijatelnější."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How GNU Will Be Available"
 msgstr "Jak bude GNU dostupné"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is not in the public domain.  Everyone will be permitted to modify and "
 "redistribute GNU, but no distributor will be allowed to restrict its further "
@@ -268,11 +282,11 @@
 "modifikoval, a proto považoval za vlastní majetek). Chci zajistit, aby "
 "všechny verze zůstaly svobodné."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why Many Other Programmers Want to Help"
 msgstr "Proč chtějí ostatní programátoři pomoci"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found many other programmers who are excited about GNU and want to "
 "help."
@@ -280,7 +294,7 @@
 "Našel jsem mnoho dalších programátoru, kteří jsou GNU projektem 
nadšeni a "
 "chtějí pomoci."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Many programmers are unhappy about the commercialization of system "
 "software.  It may enable them to make more money, but it requires them to "
@@ -303,7 +317,7 @@
 "důležitější. Ale ti, co věří zákonům, nemají jednoduchý výběr. 
Zatrpknou a "
 "začnou považovat programování pouze za cestu jak vydělat peníze."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By working on and using GNU rather than proprietary programs, we can be "
 "hospitable to everyone and obey the law.  In addition, GNU serves as an "
@@ -319,11 +333,11 @@
 "komerčních programů. Přibližně pro polovinu programátorů, se kterými 
jsem "
 "mluvil, je to důležitý pocit, který nemůže být nahrazen penězi."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How You Can Contribute"
 msgstr "Jak můžete přispět"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "(Nowadays, for software tasks to work on, see the <a href=\"http://fsf.org/";
 "campaigns/priority-projects\">High Priority Projects list</a> and the <a "
@@ -333,7 +347,7 @@
 "a>.)"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am asking computer manufacturers for donations of machines and money.  I'm "
 "asking individuals for donations of programs and work."
@@ -341,7 +355,7 @@
 "Žádám výrobce počítačů o věnování počítačů a peněz. Žádám 
jednotlivce, aby "
 "pomohli svými programy a prací."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One consequence you can expect if you donate machines is that GNU will run "
 "on them at an early date.  The machines should be complete, ready to use "
@@ -353,7 +367,7 @@
 "programů, rozumně velké k použití v obytných prostorách a aby 
nevyžadovaly "
 "komplikované chlazení nebo napájení."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found very many programmers eager to contribute part-time work for "
 "GNU.  For most projects, such part-time distributed work would be very hard "
@@ -380,7 +394,7 @@
 "stále řešitelný úkol. (Jádro bude vyžadovat lepší komunikaci a bude "
 "vytvořeno malou skupinou.)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If I get donations of money, I may be able to hire a few people full or part "
 "time.  The salary won't be high by programmers' standards, but I'm looking "
@@ -396,25 +410,26 @@
 "nadšeným pro věc věnovat veškerý čas práci na GNU a ušetřit je 
nutnosti "
 "živit se jiným způsobem."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why All Computer Users Will Benefit"
 msgstr "Proč budou mít všichni počítačoví uživatelé z GNU prospěch"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Once GNU is written, everyone will be able to obtain good system software
-# | free, just like air.<a href=\"#f2\">([-2-]{+3+})</a>
+# | free, just like [-air.<a href=\"#f2\">(2)</a>-] {+air&#8239;<a
+# | class=\"ftn\" href=\"#f2\">[3]</a>.+}
 #, fuzzy
 #| msgid ""
 #| "Once GNU is written, everyone will be able to obtain good system software "
 #| "free, just like air.<a href=\"#f2\">(2)</a>"
 msgid ""
 "Once GNU is written, everyone will be able to obtain good system software "
-"free, just like air.<a href=\"#f2\">(3)</a>"
+"free, just like air&#8239;<a class=\"ftn\" href=\"#f2\">[3]</a>."
 msgstr ""
 "Jakmile bude projekt dokončen, každý bude moci volně získat dobrý 
systém, "
 "stejně jako vzduch. <a href=\"#f2\">[2]</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This means much more than just saving everyone the price of a Unix license.  "
 "It means that much wasteful duplication of system programming effort will be "
@@ -425,7 +440,7 @@
 "způsobeno duplicitou při programování systémů. Toto úsilí může být 
místo "
 "toho zaměřeno na zdokonalování systému."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Complete system sources will be available to everyone.  As a result, a user "
 "who needs changes in the system will always be free to make them himself, or "
@@ -439,7 +454,7 @@
 "realizovala. Uživatelé nebudou závislí na jednom programátorovi nebo "
 "společnosti, která vlastní zdrojové kódy a jediná může změny 
provádět."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Schools will be able to provide a much more educational environment by "
 "encouraging all students to study and improve the system code.  Harvard's "
@@ -455,7 +470,7 @@
 "pravidlo dodržovala odmítáním instalace určitých programů. Byl jsem 
tím "
 "velmi inspirován."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Finally, the overhead of considering who owns the system software and what "
 "one is or is not entitled to do with it will be lifted."
@@ -463,7 +478,7 @@
 "Konečně nebudeme muset zbytečně přemýšlet nad tím, kdo vlastní 
systémový "
 "software a kdo vlastně má či nemá právo jej měnit."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Arrangements to make people pay for using a program, including licensing of "
 "copies, always incur a tremendous cost to society through the cumbersome "
@@ -487,7 +502,7 @@
 "všude sledují, jestli si nesundáváte masku, jsou neúnosné. Je lepší 
platit "
 "továrnu na vzduch z daní a zahodit masky."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copying all or parts of a program is as natural to a programmer as "
 "breathing, and as productive.  It ought to be as free."
@@ -496,11 +511,11 @@
 "přirozené jako dýchání a je i stejně produktivní. Proto by mělo být 
také tak "
 "svobodné."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Some Easily Rebutted Objections to GNU's Goals"
 msgstr "Některé snadno vyvratitelné námitky proti cílům GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Nobody will use it if it is free, because that means they "
 "can't rely on any support.&rdquo;</strong>"
@@ -508,7 +523,7 @@
 "<strong>„Nikdo to nebude používat, když je to zdarma, protože to také "
 "znamená, že se nemůže spolehnout na technickou podporu.“</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You have to charge for the program to pay for providing the "
 "support.&rdquo;</strong>"
@@ -516,10 +531,11 @@
 "<strong>„Musíte účtovat za program, aby se vám zaplatilo poskytování "
 "podpory.“</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 # | If people would rather pay for GNU plus service than get GNU free without
 # | service, a company to provide just service to people who have obtained GNU
-# | free ought to be profitable.<a href=\"#f3\">([-3-]{+4+})</a>
+# | free ought to be [-profitable.<a href=\"#f3\">(3)</a>-]
+# | {+profitable&#8239;<a class=\"ftn\" href=\"#f3\">[4]</a>.+}
 #, fuzzy
 #| msgid ""
 #| "If people would rather pay for GNU plus service than get GNU free without "
@@ -528,13 +544,13 @@
 msgid ""
 "If people would rather pay for GNU plus service than get GNU free without "
 "service, a company to provide just service to people who have obtained GNU "
-"free ought to be profitable.<a href=\"#f3\">(4)</a>"
+"free ought to be profitable&#8239;<a class=\"ftn\" href=\"#f3\">[4]</a>."
 msgstr ""
 "Kdyby lidé raději platili za GNU se službami, než aby získali GNU 
zdarma, "
 "ale bez servisu, pak by měla pro lidi, kteří získali GNU zdarma, 
existovat "
 "výdělečná společnost poskytující technickou podporu <a 
href=\"#f3\">[3]</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We must distinguish between support in the form of real programming work and "
 "mere handholding.  The former is something one cannot rely on from a "
@@ -546,7 +562,7 @@
 "na žádného prodejce softwaru. Pokud nemá příslušný problém ještě 
dostatečný "
 "počet dalších lidí, máte smůlu."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If your business needs to be able to rely on support, the only way is to "
 "have all the necessary sources and tools.  Then you can hire any available "
@@ -565,7 +581,7 @@
 "vašeho problému, to však nemůže být sváděno na distribuční metody 
GNU. GNU "
 "neodstraňuje všechny problémy světa, jenom některé."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Meanwhile, the users who know nothing about computers need handholding: "
 "doing things for them which they could easily do themselves but don't know "
@@ -575,7 +591,7 @@
 "vedeni: dělají se pro ně věci, které by snadno mohli zvládnout sami, 
ale "
 "neví jak."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Such services could be provided by companies that sell just handholding and "
 "repair service.  If it is true that users would rather spend money and get a "
@@ -593,7 +609,7 @@
 "nebudou vydáni na milost a nemilost pouze jedné z nich. Ti, kteří servis "
 "nepotřebují, budou moci používat programy úplně zdarma."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You cannot reach many people without advertising, and you "
 "must charge for the program to support that.&rdquo;</strong>"
@@ -601,7 +617,7 @@
 "<strong>„Nemůžete získat mnoho uživatelů bez reklamy, a proto musíte 
účtovat "
 "za program, abyste získali potřebné prostředky.“</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;It's no use advertising a program people can get free.&rdquo;"
 "</strong>"
@@ -609,7 +625,7 @@
 "<strong>„Nemá smysl propagovat program, který mohou lidé získat 
zdarma.“</"
 "strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are various forms of free or very cheap publicity that can be used to "
 "inform numbers of computer users about something like GNU.  But it may be "
@@ -624,11 +640,12 @@
 "společnostem komerčně distribuujícím GNU vyplatí, ale platit za ni 
budou "
 "pouze uživatelé, kteří služeb takových společností využívají."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 # | On the other hand, if many people get GNU from their friends, and such
 # | companies don't succeed, this will show that advertising was not really
 # | necessary to spread GNU.  Why is it that free market advocates don't want
-# | to let the free market decide this?<a href=\"#f4\">([-4-]{+5+})</a>
+# | to let the free market decide [-this?<a href=\"#f4\">(4)</a>-]
+# | {+this?&#8239;<a class=\"ftn\" href=\"#f4\">[5]</a>+}
 #, fuzzy
 #| msgid ""
 #| "On the other hand, if many people get GNU from their friends, and such "
@@ -639,14 +656,14 @@
 "On the other hand, if many people get GNU from their friends, and such "
 "companies don't succeed, this will show that advertising was not really "
 "necessary to spread GNU.  Why is it that free market advocates don't want to "
-"let the free market decide this?<a href=\"#f4\">(5)</a>"
+"let the free market decide this?&#8239;<a class=\"ftn\" href=\"#f4\">[5]</a>"
 msgstr ""
 "Na druhou stranu, pokud vetšina lidí získá GNU od svých přátel, a tyto 
"
 "společnosti tedy neuspějí, pak se jen ukáže, že reklama pro 
rozšíření GNU "
 "důležitá nebyla. Proč nechtějí advokáti volného trhu o tomto nechat "
 "rozhodnout samotný volný trh? <a href=\"#f4\">[4]</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;My company needs a proprietary operating system to get a "
 "competitive edge.&rdquo;</strong>"
@@ -654,7 +671,7 @@
 "<strong>„Moje společnost potřebuje vlastní operační systém, aby byla "
 "konkurenceschopná.“</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU will remove operating system software from the realm of competition.  "
 "You will not be able to get an edge in this area, but neither will your "
@@ -672,29 +689,31 @@
 "Obchodujete-li s něčím jiným, GNU vás uchrání před nákladným 
obchodováním s "
 "operačními systémy."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 # | I would like to see GNU development supported by gifts from many
-# | manufacturers and users, reducing the cost to each.<a
-# | href=\"#f5\">([-5-]{+6+})</a>
+# | manufacturers and users, reducing the cost to [-each.<a
+# | href=\"#f5\">(5)</a>-] {+each&#8239;<a class=\"ftn\"
+# | href=\"#f5\">[6]</a>.+}
 #, fuzzy
 #| msgid ""
 #| "I would like to see GNU development supported by gifts from many "
 #| "manufacturers and users, reducing the cost to each.<a href=\"#f5\">(5)</a>"
 msgid ""
 "I would like to see GNU development supported by gifts from many "
-"manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
+"manufacturers and users, reducing the cost to each&#8239;<a class=\"ftn\" "
+"href=\"#f5\">[6]</a>."
 msgstr ""
 "Byl bych rád, kdyby vývoj GNU byl podporován dary výrobců a uživatelů, 
které "
 "tak sniží cenu pro každého. <a href=\"#f5\">[5]</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't programmers deserve a reward for their creativity?"
 "&rdquo;</strong>"
 msgstr ""
 "<strong>„Nezaslouží si programátoři odměnu za svoji 
tvořivost?“</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If anything deserves a reward, it is social contribution.  Creativity can be "
 "a social contribution, but only in so far as society is free to use the "
@@ -708,7 +727,7 @@
 "nových programů, pak by si stejně měli zasloužit trest za omezování "
 "používání těchto programů."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Shouldn't a programmer be able to ask for a reward for his "
 "creativity?&rdquo;</strong>"
@@ -716,7 +735,7 @@
 "<strong>„Neměl by mít programátor možnost žádat odměnu za svou 
práci?“</"
 "strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is nothing wrong with wanting pay for work, or seeking to maximize "
 "one's income, as long as one does not use means that are destructive.  But "
@@ -726,7 +745,7 @@
 "pokud se k tomu nepoužívají ničivé prostředky. Ale prostředky, dnes 
obvykle "
 "používané v oblasti softwaru, jsou založeny na destrukci."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Extracting money from users of a program by restricting their use of it is "
 "destructive because the restrictions reduce the amount and the ways that the "
@@ -739,7 +758,7 @@
 "možno využít. To snižuje velikost bohatství, které lidstvo z programu 
získá. "
 "Škodlivým důsledkem záměrného omezování je záměrná destrukce."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The reason a good citizen does not use such destructive means to become "
 "wealthier is that, if everyone did so, we would all become poorer from the "
@@ -757,11 +776,11 @@
 "odměněn za svoji tvořivost, neospravedlňuje odmítnutí sdílet se 
světem "
 "všechny nebo jen část výsledků své tvořivosti."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid "<strong>&ldquo;Won't programmers starve?&rdquo;</strong>"
 msgstr "<strong>„Nebudou programátoři hladovět?“</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "I could answer that nobody is forced to be a programmer.  Most of us cannot "
 "manage to get any money for standing on the street and making faces.  But we "
@@ -772,7 +791,7 @@
 "nedokáže vydělávat peníze žebráním na ulici. Ale nejsme odsouzeni k 
tomu, "
 "abychom žebrali po ulicích. My můžeme dělat něco jiného."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But that is the wrong answer because it accepts the questioner's implicit "
 "assumption: that without ownership of software, programmers cannot possibly "
@@ -782,7 +801,7 @@
 "předpoklad, že bez vlastnictví softwaru nemohou být programátoři 
zaplaceni "
 "ani halířem. To je vlastně předpoklad typu: všechno nebo nic."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The real reason programmers will not starve is that it will still be "
 "possible for them to get paid for programming; just not paid as much as now."
@@ -790,13 +809,13 @@
 "Skutečným důvodem, proč programátoři nebudou hladovět, je to, že bude 
stále "
 "možno být za programování placen, jenom ne tolik jako nyní."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 # | Restricting copying is not the only basis for business in software.  It is
-# | the most common [-basis-] {+basis<a href=\"#f8\">(7)</a>+} because it
-# | brings in the most money.  If it were prohibited, or rejected by the
-# | customer, software business would move to other bases of organization
-# | which are now used less often.  There are always numerous ways to organize
-# | any kind of business.
+# | the most common [-basis-] {+basis&#8239;<a class=\"ftn\"
+# | href=\"#f8\">[7]</a>+} because it brings in the most money.  If it were
+# | prohibited, or rejected by the customer, software business would move to
+# | other bases of organization which are now used less often.  There are
+# | always numerous ways to organize any kind of business.
 #, fuzzy
 #| msgid ""
 #| "Restricting copying is not the only basis for business in software. It is "
@@ -806,17 +825,18 @@
 #| "always numerous ways to organize any kind of business."
 msgid ""
 "Restricting copying is not the only basis for business in software.  It is "
-"the most common basis<a href=\"#f8\">(7)</a> because it brings in the most "
-"money.  If it were prohibited, or rejected by the customer, software "
-"business would move to other bases of organization which are now used less "
-"often.  There are always numerous ways to organize any kind of business."
+"the most common basis&#8239;<a class=\"ftn\" href=\"#f8\">[7]</a> because it "
+"brings in the most money.  If it were prohibited, or rejected by the "
+"customer, software business would move to other bases of organization which "
+"are now used less often.  There are always numerous ways to organize any "
+"kind of business."
 msgstr ""
 "Omezování kopírování není jediným základem obchodování se 
softwarem. Je "
 "nejběžnější, protože to přináší nejvíce peněz. Pokud by to bylo 
zakázáno "
 "nebo odmítnuto zákazníky, softwarový trh by přešel na jiný základ, 
který "
 "nyní není tak častý. Je mnoho cest jak organizovat jakékoliv 
obchodování."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Probably programming will not be as lucrative on the new basis as it is "
 "now.  But that is not an argument against the change.  It is not considered "
@@ -830,7 +850,7 @@
 "nebyla nespravedlnost. (Ve skutečnosti by stále ještě vydělali 
podstatně "
 "více.)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't people have a right to control how their creativity is "
 "used?&rdquo;</strong>"
@@ -838,7 +858,7 @@
 "<strong>„Nemají lidé právo mít kontrolu nad tím, jak jsou jejich 
výtvory "
 "používány?“</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "&ldquo;Control over the use of one's ideas&rdquo; really constitutes control "
 "over other people's lives; and it is usually used to make their lives more "
@@ -847,12 +867,13 @@
 "„Kontrola nad používáním nečích nápadů“ ve skutečnosti znamená 
kontrolu nad "
 "životy ostatních lidí; obyčejně je využita tak, že činí život 
složitějším."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 # | People who have studied the issue of intellectual property [-rights-]
-# | {+rights<a href=\"#f6\">(8)</a>+} carefully (such as lawyers) say that
-# | there is no intrinsic right to intellectual property.  The kinds of
-# | supposed intellectual property rights that the government recognizes were
-# | created by specific acts of legislation for specific purposes.
+# | {+rights&#8239;<a class=\"ftn\" href=\"#f6\">[8]</a>+} carefully (such as
+# | lawyers) say that there is no intrinsic right to intellectual property. 
+# | The kinds of supposed intellectual property rights that the government
+# | recognizes were created by specific acts of legislation for specific
+# | purposes.
 #, fuzzy
 #| msgid ""
 #| "People who have studied the issue of intellectual property rights "
@@ -861,18 +882,18 @@
 #| "rights that the government recognizes were created by specific acts of "
 #| "legislation for specific purposes."
 msgid ""
-"People who have studied the issue of intellectual property rights<a href="
-"\"#f6\">(8)</a> carefully (such as lawyers) say that there is no intrinsic "
-"right to intellectual property.  The kinds of supposed intellectual property "
-"rights that the government recognizes were created by specific acts of "
-"legislation for specific purposes."
+"People who have studied the issue of intellectual property rights&#8239;<a "
+"class=\"ftn\" href=\"#f6\">[8]</a> carefully (such as lawyers) say that "
+"there is no intrinsic right to intellectual property.  The kinds of supposed "
+"intellectual property rights that the government recognizes were created by "
+"specific acts of legislation for specific purposes."
 msgstr ""
 "Lidé, kteří pozorně sledovali záležitosti práv na intelektuální 
vlastnictví "
 "(jako např. právníci), říkají, že vlastně žádné takové právo 
neexistuje. "
 "Druhy předpokládaných práv na intelektuální vlastnictví, které vláda 
uznává, "
 "byly určeny specifickými rozhodnutími legislativy pro specifické účely."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For example, the patent system was established to encourage inventors to "
 "disclose the details of their inventions.  Its purpose was to help society "
@@ -891,7 +912,7 @@
 "náklady na zavedení produkce, nepůsobí patenty příliš mnoho zla. 
Nejsou "
 "překážkou pro většinu jednotlivců, kteří používají patentované 
produkty."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The idea of copyright did not exist in ancient times, when authors "
 "frequently copied other authors at length in works of nonfiction.  This "
@@ -910,7 +931,7 @@
 "knihtiskem – nepůsobila škodlivě a neomezovala většinu jednotlivců, 
kteří "
 "knihy čtou."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "All intellectual property rights are just licenses granted by society "
 "because it was thought, rightly or wrongly, that society as a whole would "
@@ -924,7 +945,7 @@
 "ptát: Jsme na tom opravdu lépe, když udílíme takové licence? Pro jaký 
druh "
 "činnosti je jednotlivec licencován?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The case of programs today is very different from that of books a hundred "
 "years ago.  The fact that the easiest way to copy a program is from one "
@@ -943,12 +964,12 @@
 "práv, škodí společnosti jako celku jak hmotně, tak duchovně; v této 
situaci "
 "by tak člověk činit neměl, ať už mu to zákon umožňuje či nikoliv."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Competition makes things get done better.&rdquo;</strong>"
 msgstr "<strong>„Soutěživost způsobuje, že se věci dělají 
lépe.“</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The paradigm of competition is a race: by rewarding the winner, we encourage "
 "everyone to run faster.  When capitalism really works this way, it does a "
@@ -966,7 +987,7 @@
 "ostatní běžce. Pokud se dostanou do pěstního zápasu, všichni doběhnou 
"
 "později."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Proprietary and secret software is the moral equivalent of runners in a fist "
 "fight.  Sad to say, the only referee we've got does not seem to object to "
@@ -980,7 +1001,7 @@
 "vystřelit.) Správně by je měl rozehnat a pokutovat běžce za každý 
pokus o "
 "rvačku."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Won't everyone stop programming without a monetary incentive?"
 "&rdquo;</strong>"
@@ -988,7 +1009,7 @@
 "<strong>„Nepřestanou lidé programovat, pokud nebudou povzbuzováni 
peněžní "
 "odměnou?“</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually, many people will program with absolutely no monetary incentive.  "
 "Programming has an irresistible fascination for some people, usually the "
@@ -1000,7 +1021,7 @@
 "jsou v tom nejlepší. Není nedostatek profesionálních hudebníku, kteří 
se "
 "drží hudby, i když nemají naději se tím uživit."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But really this question, though commonly asked, is not appropriate to the "
 "situation.  Pay for programmers will not disappear, only become less.  So "
@@ -1012,7 +1033,7 @@
 "by tedy měla znít: „Bude někdo programovat se sníženou peněžní 
odměnou?“ "
 "Moje zkušenosti ukazují, že bude."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For more than ten years, many of the world's best programmers worked at the "
 "Artificial Intelligence Lab for far less money than they could have had "
@@ -1024,7 +1045,7 @@
 "získat jinde. Obdrželi mnoho druhů nepeněžních odměn – například 
slávu a "
 "ocenění. Tvořivá práce je též ocenění, odměna sama za sebe."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Then most of them left when offered a chance to do the same interesting work "
 "for a lot of money."
@@ -1032,7 +1053,7 @@
 "Mnoho z nich odešlo, když jim byla nabídnuta možnost dělat stejnou 
práci za "
 "více peněz."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "What the facts show is that people will program for reasons other than "
 "riches; but if given a chance to make a lot of money as well, they will come "
@@ -1046,7 +1067,7 @@
 "jsou na tom v soutěži s dobře platícími bídně, nemusely by však být, 
kdyby "
 "dobře platící společnosti byly zakázány."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;We need the programmers desperately.  If they demand that we "
 "stop helping our neighbors, we have to obey.&rdquo;</strong>"
@@ -1054,7 +1075,7 @@
 "<strong>„Potřebujeme nutně programátory. Pokud oni na nás chtějí, 
abychom "
 "přestali pomáhat sousedům, musíme poslechnout.“</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "You're never so desperate that you have to obey this sort of demand.  "
 "Remember: millions for defense, but not a cent for tribute!"
@@ -1062,12 +1083,12 @@
 "Nikdy není člověk v takové situaci, aby musel uposlechnout takový druh "
 "příkazu. Pamatujte: miliony na obranu, ale ani halíř na uctívání."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Programmers need to make a living somehow.&rdquo;</strong>"
 msgstr "<strong>„Programátoři musí z něčeho žít.“</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In the short run, this is true.  However, there are plenty of ways that "
 "programmers could make a living without selling the right to use a program.  "
@@ -1081,7 +1102,7 @@
 "to však cesta jediná. Je snadné najít jiné cesty, pokud máte snahu je "
 "hledat. Tady je několik příkladů."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A manufacturer introducing a new computer will pay for the porting of "
 "operating systems onto the new hardware."
@@ -1089,7 +1110,7 @@
 "Výrobce, který vytvořil nový počítač, zaplatí za přenesení 
operačního "
 "systému na nový hardware."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The sale of teaching, handholding and maintenance services could also employ "
 "programmers."
@@ -1097,26 +1118,27 @@
 "Firmy obchodující s výukovými, poradenskými a udržbářskými službami 
mohou "
 "zaměstnávat také programátory."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 # | People with new ideas could distribute programs as [-freeware,-]
-# | {+freeware<a href=\"#f7\">(9)</a>,+} asking for donations from satisfied
-# | users, or selling handholding services.  I have met people who are already
-# | working this way successfully.
+# | {+freeware&#8239;<a class=\"ftn\" href=\"#f7\">[9]</a>,+} asking for
+# | donations from satisfied users, or selling handholding services.  I have
+# | met people who are already working this way successfully.
 #, fuzzy
 #| msgid ""
 #| "People with new ideas could distribute programs as freeware, asking for "
 #| "donations from satisfied users, or selling handholding services. I have "
 #| "met people who are already working this way successfully."
 msgid ""
-"People with new ideas could distribute programs as freeware<a href=\"#f7\">"
-"(9)</a>, asking for donations from satisfied users, or selling handholding "
-"services.  I have met people who are already working this way successfully."
+"People with new ideas could distribute programs as freeware&#8239;<a class="
+"\"ftn\" href=\"#f7\">[9]</a>, asking for donations from satisfied users, or "
+"selling handholding services.  I have met people who are already working "
+"this way successfully."
 msgstr ""
 "Lidé s novými nápady mohou distribuovat programy jako freeware a žádat o 
"
 "dary od spokojených uživatelů nebo si nechat platit za poradenské 
služby. "
 "Poznal jsem se s lidmi, kteří si úspěšně tímto způsobem 
vydělávají."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Users with related needs can form users' groups, and pay dues.  A group "
 "would contract with programming companies to write programs that the group's "
@@ -1126,11 +1148,11 @@
 "členské příspěvky. Taková skupina potom může najmout programátorskou 
"
 "společnost, aby napsala program, který potřebuje."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "All sorts of development can be funded with a Software Tax:"
 msgstr "Všechen vývoj může být placen ze softwarové daně:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Suppose everyone who buys a computer has to pay x percent of the price as a "
 "software tax.  The government gives this to an agency like the NSF to spend "
@@ -1140,7 +1162,7 @@
 "softwarovou daň. Vláda dá tyto protředky agentuře jako FSF, která je 
utratí "
 "za vývoj softwaru."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But if the computer buyer makes a donation to software development himself, "
 "he can take a credit against the tax.  He can donate to the project of his "
@@ -1153,7 +1175,7 @@
 "výběru podle toho, jaké programy potřebuje. Z daně může odepsat 
libovolnou "
 "částku, kterou věnuje, až do celkové výše daně."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The total tax rate could be decided by a vote of the payers of the tax, "
 "weighted according to the amount they will be taxed on."
@@ -1161,19 +1183,19 @@
 "Velikost daně může být rozhodnuta přímo volbami mezi plátci daně, 
přičemž "
 "váha každého hlasu by byla stanovena sumou, kterou plátce na dani odvedl."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "The consequences:"
 msgstr "Důsledky:"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "The computer-using community supports software development."
 msgstr "Uživatelé počítačů budou podporovat vývoj softwaru."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "This community decides what level of support is needed."
 msgstr "Uživatelé sami rozhodnou, jaké úrovně podpory je třeba."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "Users who care which projects their share is spent on can choose this for "
 "themselves."
@@ -1181,7 +1203,7 @@
 "Uživatelé budou moci rozhodnout, na které projekty bude použit jejich "
 "příspěvek."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the long run, making programs free is a step toward the postscarcity "
 "world, where nobody will have to work very hard just to make a living.  "
@@ -1198,7 +1220,7 @@
 "a průzkum asteroidů – se budou moci věnovat aktivitám, které budou 
potěšením "
 "– jako třeba programování. Nebude třeba se živit programováním."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We have already greatly reduced the amount of work that the whole society "
 "must do for its actual productivity, but only a little of this has "
@@ -1217,14 +1239,14 @@
 "softwarové produkce. Musíme to dělat proto, aby se technický nárůst v "
 "produktivitě odrazil v menším množství naší práce."
 
-#. type: Content of: <h3>
+#. 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: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The wording here was careless.  The intention was that nobody would have to "
 "pay for <b>permission</b> to use the GNU system.  But the words don't make "
@@ -1254,7 +1276,7 @@
 "dokumentu http://svobodnysoft.zde.cz a trošku úsilí používání 
jednoznačného "
 "termínu „svobodný software“ v českém jazyce. – pozn. korek.]"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The expression &ldquo;give away&rdquo; is another indication that I had not "
 "yet clearly separated the issue of price from that of freedom.  We now "
@@ -1263,10 +1285,21 @@
 "\">Confusing Words and Phrases</a>&rdquo; for more explanation."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+# | This is another place I failed to distinguish carefully between the two
+# | different meanings of [-&ldquo;free&rdquo;.-] {+&ldquo;free.&rdquo;+} The
+# | statement as it stands is not false&mdash;you can get copies of GNU
+# | software at no charge, from your friends or over the net.  But it does
+# | suggest the wrong idea.
+#, fuzzy
+#| msgid ""
+#| "This is another place I failed to distinguish carefully between the two "
+#| "different meanings of &ldquo;free&rdquo;.  The statement as it stands is "
+#| "not false&mdash;you can get copies of GNU software at no charge, from "
+#| "your friends or over the net.  But it does suggest the wrong idea."
 msgid ""
 "This is another place I failed to distinguish carefully between the two "
-"different meanings of &ldquo;free&rdquo;.  The statement as it stands is not "
+"different meanings of &ldquo;free.&rdquo; The statement as it stands is not "
 "false&mdash;you can get copies of GNU software at no charge, from your "
 "friends or over the net.  But it does suggest the wrong idea."
 msgstr ""
@@ -1275,11 +1308,11 @@
 "softwaru zdarma, od kamarádů nebo přes síť. Je však přece jen poněkud 
"
 "zavádějící."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid "Several such companies now exist."
 msgstr "Takové společnosti už existují."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 # | Although it is a charity rather than a company, the Free Software
 # | Foundation for 10 years raised most of its funds from its {+distribution
 # | service.  You can+} <a [-href=\"/order/order.html\">distribution
@@ -1300,7 +1333,7 @@
 "peněz z <a href=\"/order/order.html\">distribučních služeb</a> na 10 let, 
"
 "ale jedná se spíše o charitu, než o společnost."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 #, fuzzy
 msgid ""
 "A group of computer companies pooled funds around 1991 to support "
@@ -1309,7 +1342,7 @@
 "Skupina společností vytvořila fondy kolem roku 1991, k podpoře GNU C "
 "Compileru."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "I think I was mistaken in saying that proprietary software was the most "
 "common basis for making money in software.  It seems that actually the most "
@@ -1321,10 +1354,10 @@
 "less in a free software world."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "In the 1980s I had not yet realized how confusing it was to speak of &ldquo;"
-"the issue&rdquo; of &ldquo;intellectual property&rdquo;.  That term is "
+"the issue&rdquo; of &ldquo;intellectual property.&rdquo; That term is "
 "obviously biased; more subtle is the fact that it lumps together various "
 "disparate laws which raise very different issues.  Nowadays I urge people to "
 "reject the term &ldquo;intellectual property&rdquo; entirely, lest it lead "
@@ -1334,10 +1367,10 @@
 "spreads confusion and bias."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Subsequently we learned to distinguish between &ldquo;free software&rdquo; "
-"and &ldquo;freeware&rdquo;.  The term &ldquo;freeware&rdquo; means software "
+"and &ldquo;freeware.&rdquo; The term &ldquo;freeware&rdquo; means software "
 "you are free to redistribute, but usually you are not free to study and "
 "change the source code, so most of it is not free software.  See &ldquo;<a "
 "href=\"/philosophy/words-to-avoid.html#Freeware\">Confusing Words and "
@@ -1370,14 +1403,20 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Pracujeme tvrdě a děláme to nejlepší, abychom vám přinesli přesné a 
kvalitní "
@@ -1388,13 +1427,13 @@
 "se dozvíte, jak koordinovat svoji práci a posílat překlady tohoto 
článku."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 1985, [-1993-] {+1993, 2003, 2005, 2007, 2008, 2009,
-# | 2010, 2014, 2015+} Free Software Foundation, Inc.
+# | Copyright &copy; 1985, [-1993-] {+1993, 2004, 2005, 2007, 2009, 2010,
+# | 2015, 2021+} Free Software Foundation, Inc.
 #, fuzzy
 #| msgid "Copyright &copy; 1985, 1993 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 1985, 1993, 2004, 2005, 2007, 2009, 2010, 2015, 2021 Free "
+"Software Foundation, Inc."
 msgstr "Copyright &copy; 1985, 1993 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
@@ -1423,6 +1462,19 @@
 msgid "Updated:"
 msgstr "Aktualizováno:"
 
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "Pracujeme tvrdě a děláme to nejlepší, abychom vám přinesli přesné 
a "
+#~ "kvalitní překlady. Nicméně i my můžeme udělat chybu. Vaše 
komentáře a "
+#~ "návrhy na vylepšení vítáme na adrese <a 
href=\"mailto:web-translators@gnu.";
+#~ "org\"> &lt;web-translators@gnu.org&gt;</a>.</p> <p>Přečtěte si prosím  
<a "
+#~ "href=\"/server/standards/README.translations.html\">Příručku "
+#~ "překladatele</a>, kde se dozvíte, jak koordinovat svoji práci a 
posílat "
+#~ "překlady tohoto článku."
+
 #~ msgid "<a href=\"/philosophy/philosophy.html\">Other Texts to Read</a>"
 #~ msgstr "<a href=\"/philosophy/philosophy.html\">Outros textos para ler</a>"
 

Index: po/manifesto.de.po
===================================================================
RCS file: /web/www/www/gnu/po/manifesto.de.po,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- po/manifesto.de.po  2 Nov 2021 13:56:41 -0000       1.60
+++ po/manifesto.de.po  2 Nov 2021 14:41:53 -0000       1.61
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: manifesto.html\n"
 "Report-Msgid-Bugs-To: webmasters@gnu.org\n"
-"POT-Creation-Date: 2015-06-02 12:55+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2015-06-02 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"
@@ -16,19 +16,34 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-11-02 14:27+0000\n"
 
 #. type: Content of: <title>
 msgid "The GNU Manifesto - GNU Project - Free Software Foundation"
 msgstr "GNU-Manifest - GNU-Projekt - Free Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "The GNU Manifesto"
 msgstr "GNU-Manifest"
 
 # (/gnu/initial-announcement) Verweis hinzugefügt
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
+# | The GNU Manifesto (which appears below) was written by <a
+# | href=\"http{+s+}://www.stallman.org/\">Richard Stallman</a> in 1985 to ask
+# | for support in developing the GNU operating system.  Part of the text was
+# | taken from the original announcement of 1983.  Through 1987, it was
+# | updated in minor ways to account for developments; since then, it seems
+# | best to leave it unchanged.
+#, fuzzy
+#| msgid ""
+#| "The GNU Manifesto (which appears below) was written by <a href=\"http://";
+#| "www.stallman.org/\">Richard Stallman</a> in 1985 to ask for support in "
+#| "developing the GNU operating system.  Part of the text was taken from the "
+#| "original announcement of 1983.  Through 1987, it was updated in minor "
+#| "ways to account for developments; since then, it seems best to leave it "
+#| "unchanged."
 msgid ""
-"The GNU Manifesto (which appears below) was written by <a href=\"http://www.";
+"The GNU Manifesto (which appears below) was written by <a href=\"https://www.";
 "stallman.org/\">Richard Stallman</a> in 1985 to ask for support in "
 "developing the GNU operating system.  Part of the text was taken from the "
 "original announcement of 1983.  Through 1987, it was updated in minor ways "
@@ -42,7 +57,7 @@
 "angepasst, um neue Entwicklungen zu berücksichtigen; seither scheint es am "
 "besten, den Text unverändert zu belassen.</span>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Since that time, we have learned about certain common misunderstandings that "
 "different wording could help avoid.  Footnotes added since 1993 help clarify "
@@ -53,7 +68,7 @@
 "werden können. Seit 1993 hinzugefügte Kommentare helfen diese Punkte zu "
 "klären.</span>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If you want to install the GNU/Linux system, we recommend you use one of the "
 "<a href=\"/distros\">100% free software GNU/Linux distributions</a>.  For "
@@ -68,7 +83,7 @@
 
 # ??? the project is the GNU Project project ???
 # (Irrtum) sinngemäß ‚danebengegriffen‘?
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The GNU Project is part of the Free Software Movement, a campaign for <a "
 "href=\"/philosophy/free-sw.html\">freedom for users of software</a>.  It is "
@@ -86,18 +101,31 @@
 "href=\"/philosophy/open-source-misses-the-point\">unmoralischen Ansatz</a> "
 "auf dem gleichen Gebiet zu fördern.</span>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "What's GNU? Gnu's Not Unix!"
 msgstr "Was ist GNU? Gnu ist Nicht Unix!"
 
 # #f1 /1
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | GNU, which stands for Gnu's Not Unix, is the name for the complete
+# | Unix-compatible software system which I am writing so that I can give it
+# | away free to everyone who can use [-it.<a href=\"#f1\">(1)</a>-]
+# | {+it&#8239;<a class=\"ftn\" href=\"#f1\">[1]</a>.+} Several other
+# | volunteers are helping me.  Contributions of time, money, programs and
+# | equipment are greatly needed.
+#, fuzzy
+#| msgid ""
+#| "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
+#| "compatible software system which I am writing so that I can give it away "
+#| "free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
+#| "volunteers are helping me.  Contributions of time, money, programs and "
+#| "equipment are greatly needed."
 msgid ""
 "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
 "compatible software system which I am writing so that I can give it away "
-"free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
-"volunteers are helping me.  Contributions of time, money, programs and "
-"equipment are greatly needed."
+"free to everyone who can use it&#8239;<a class=\"ftn\" href=\"#f1\">[1]</a>. "
+"Several other volunteers are helping me.  Contributions of time, money, "
+"programs and equipment are greatly needed."
 msgstr ""
 "<i>GNU</i>, was für <em><span xml:lang=\"en\" lang=\"en\">Gnu's Not Unix</"
 "span></em> (‚Gnu ist Nicht Unix‘) steht, ist der Name für das 
vollständig "
@@ -107,7 +135,7 @@
 "in Form von Zeit, Geld, Programmen und Ausstattung werden dringend benötigt."
 
 # (Nroff) „Newer ‚roff‘“
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So far we have an Emacs text editor with Lisp for writing editor commands, a "
 "source level debugger, a yacc-compatible parser generator, a linker, and "
@@ -140,7 +168,7 @@
 "Dokumentation. Wir hoffen, schließlich alles Nützliche bereitstellen zu "
 "können, was normalerweise zu einem Unix-System gehört und vieles mehr."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU will be able to run Unix programs, but will not be identical to Unix.  "
 "We will make all improvements that are convenient, based on our experience "
@@ -164,7 +192,7 @@
 "beabsichtigen wir UUCP, MIT Chaosnet sowie Internetprotokolle zu "
 "unterstützen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is aimed initially at machines in the 68000/16000 class with virtual "
 "memory, because they are the easiest machines to make it run on.  The extra "
@@ -176,7 +204,7 @@
 "Den zusätzlichen Aufwand, es auf kleinere Rechner zu portieren, überlassen "
 "wir jemandem, der es auf diesen verwenden will."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid horrible confusion, please pronounce the <em>g</em> in the word "
 "&ldquo;GNU&rdquo; when it is the name of this project."
@@ -185,11 +213,11 @@
 "em> im Wort <em>GNU</em> mit aus, wenn es sich dabei um den Namen dieses "
 "Projekts handelt."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why I Must Write GNU"
 msgstr "Warum ich GNU schreiben muss"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I consider that the Golden Rule requires that if I like a program I must "
 "share it with other people who like it.  Software sellers want to divide the "
@@ -214,13 +242,26 @@
 "gegen meinen Willen geschehen."
 
 # #f2a /2
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | So that I can continue to use computers without dishonor, I have decided
+# | to put together a sufficient body of free software so that I will be able
+# | to get along without any software that is not free.  I have resigned from
+# | the AI Lab to deny MIT any legal excuse to prevent me from giving GNU
+# | [-away.<a href=\"#f2a\">(2)</a>-] {+away&#8239;<a class=\"ftn\"
+# | href=\"#f2a\">[2]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "So that I can continue to use computers without dishonor, I have decided "
+#| "to put together a sufficient body of free software so that I will be able "
+#| "to get along without any software that is not free.  I have resigned from "
+#| "the AI Lab to deny MIT any legal excuse to prevent me from giving GNU "
+#| "away.<a href=\"#f2a\">(2)</a>"
 msgid ""
 "So that I can continue to use computers without dishonor, I have decided to "
 "put together a sufficient body of free software so that I will be able to "
 "get along without any software that is not free.  I have resigned from the "
-"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away.<a "
-"href=\"#f2a\">(2)</a>"
+"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away&#8239;"
+"<a class=\"ftn\" href=\"#f2a\">[2]</a>."
 msgstr ""
 "Damit ich weiterhin Rechner ohne Schmach benutzen kann, habe ich "
 "beschlossen, eine genügend große Sammlung von freier Software "
@@ -229,11 +270,11 @@
 "rechtlichen Vorwand zu bieten, mich daran zu hindern, GNU zu verschenken.<a "
 "href=\"#f2a\" id=\"f2a-ref\" class=\"transnote\">(2)</a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why GNU Will Be Compatible with Unix"
 msgstr "Warum wird GNU mit Unix kompatibel sein"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Unix is not my ideal system, but it is not too bad.  The essential features "
 "of Unix seem to be good ones, and I think I can fill in what Unix lacks "
@@ -246,11 +287,11 @@
 "Und ein mit Unix kompatibles System wäre für viele Menschen angenehm zu "
 "übernehmen."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How GNU Will Be Available"
 msgstr "Wie GNU erhältlich sein wird"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is not in the public domain.  Everyone will be permitted to modify and "
 "redistribute GNU, but no distributor will be allowed to restrict its further "
@@ -265,11 +306,11 @@
 "erlaubt sein. Ich möchte damit sicherstellen, dass alle Varianten von GNU "
 "frei bleiben."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why Many Other Programmers Want to Help"
 msgstr "Warum viele andere Programmierer mithelfen wollen"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found many other programmers who are excited about GNU and want to "
 "help."
@@ -277,7 +318,7 @@
 "Ich habe viele andere Programmierer gefunden, die von GNU begeistert sind "
 "und helfen wollen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Many programmers are unhappy about the commercialization of system "
 "software.  It may enable them to make more money, but it requires them to "
@@ -302,7 +343,7 @@
 "Gesetz glauben, haben eine schwere Entscheidung. Sie werden zynisch und "
 "betrachten Programmierung nur noch als eine Möglichkeit, Geld zu verdienen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By working on and using GNU rather than proprietary programs, we can be "
 "hospitable to everyone and obey the law.  In addition, GNU serves as an "
@@ -319,11 +360,11 @@
 "rund die Hälfte der Programmierer, mit denen ich sprach, ist dies ein "
 "entscheidendes Glücksgefühl, das durch Geld nicht ersetzt werden kann."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How You Can Contribute"
 msgstr "Wie Sie beitragen können"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "(Nowadays, for software tasks to work on, see the <a href=\"http://fsf.org/";
 "campaigns/priority-projects\">High Priority Projects list</a> and the <a "
@@ -340,7 +381,7 @@
 "<cite><a href=\"/help/\">Ein Leitfaden zur Unterstützung des Betriebssystems 
"
 "GNU</a></cite>.)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am asking computer manufacturers for donations of machines and money.  I'm "
 "asking individuals for donations of programs and work."
@@ -348,7 +389,7 @@
 "Ich bitte Rechnerhersteller um Rechner- und Geldspenden. Einzelpersonen "
 "bitte ich um Spenden in Form von Programmen und Mitwirkung."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One consequence you can expect if you donate machines is that GNU will run "
 "on them at an early date.  The machines should be complete, ready to use "
@@ -360,7 +401,7 @@
 "gebrauchsfertige Systeme sein, in einer Wohnung benutzt werden können und "
 "keine außergewöhnliche Kühlung oder Stromversorgung benötigen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found very many programmers eager to contribute part-time work for "
 "GNU.  For most projects, such part-time distributed work would be very hard "
@@ -391,7 +432,7 @@
 "Systemkern erfordert eine genauere Kommunikation und wird von einer kleinen, "
 "festen Gruppe bearbeitet)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If I get donations of money, I may be able to hire a few people full or part "
 "time.  The salary won't be high by programmers' standards, but I'm looking "
@@ -409,21 +450,28 @@
 "von der Notwendigkeit freimache, ihren Lebensunterhalt auf andere Weise zu "
 "verdienen."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why All Computer Users Will Benefit"
 msgstr "Warum alle Rechnerbenutzer profitieren"
 
 # #f2 /3
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Once GNU is written, everyone will be able to obtain good system software
+# | free, just like [-air.<a href=\"#f2\">(3)</a>-] {+air&#8239;<a
+# | class=\"ftn\" href=\"#f2\">[3]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "Once GNU is written, everyone will be able to obtain good system software "
+#| "free, just like air.<a href=\"#f2\">(3)</a>"
 msgid ""
 "Once GNU is written, everyone will be able to obtain good system software "
-"free, just like air.<a href=\"#f2\">(3)</a>"
+"free, just like air&#8239;<a class=\"ftn\" href=\"#f2\">[3]</a>."
 msgstr ""
 "Sobald GNU geschrieben ist, wird jedermann in der Lage sein, gute "
 "Systemsoftware frei zu erhalten, so wie Luft.<a href=\"#f2\" id=\"f2-ref\" "
 "class=\"transnote\">(3)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This means much more than just saving everyone the price of a Unix license.  "
 "It means that much wasteful duplication of system programming effort will be "
@@ -434,7 +482,7 @@
 "Programmieraufwand vermieden werden kann. Diese Anstrengungen können "
 "stattdessen eingesetzt werden, um den Stand der Technik voranzubringen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Complete system sources will be available to everyone.  As a result, a user "
 "who needs changes in the system will always be free to make them himself, or "
@@ -449,7 +497,7 @@
 "einzelner Programmierer oder Unternehmen abhängig sein, welche den Quelltext 
"
 "besitzen und daher als einzige Änderungen vornehmen können."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Schools will be able to provide a much more educational environment by "
 "encouraging all students to study and improve the system code.  Harvard's "
@@ -466,7 +514,7 @@
 "bestimmte Programme tatsächlich nicht installiert wurden. Ich war sehr "
 "begeistert."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Finally, the overhead of considering who owns the system software and what "
 "one is or is not entitled to do with it will be lifted."
@@ -474,7 +522,7 @@
 "Und schließlich wird auch der Verwaltungsaufwand vermieden, zu überlegen, "
 "wem die Systemsoftware gehört und was man damit tun darf und was nicht."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Arrangements to make people pay for using a program, including licensing of "
 "copies, always incur a tremendous cost to society through the cumbersome "
@@ -501,7 +549,7 @@
 "ungeheuerlich. Es ist besser, die Luftanlage mit einer Pro-Kopf-Steuer zu "
 "finanzieren und die Masken wegzuwerfen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copying all or parts of a program is as natural to a programmer as "
 "breathing, and as productive.  It ought to be as free."
@@ -510,12 +558,12 @@
 "ebenso selbstverständlich wie das Atmen, und genauso nutzbringend. Es sollte 
"
 "genauso frei sein."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Some Easily Rebutted Objections to GNU's Goals"
 msgstr "Einige leicht zu entkräftende Einwände gegen die Ziele von GNU"
 
 # (free) within the meaning of gratis (‚umsonst‘, ‚kostenlos‘)
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Nobody will use it if it is free, because that means they "
 "can't rely on any support.&rdquo;</strong>"
@@ -524,7 +572,7 @@
 "bedeutet, sich nicht auf Unterstützung verlassen zu können.</q></cite></"
 "strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You have to charge for the program to pay for providing the "
 "support.&rdquo;</strong>"
@@ -533,11 +581,20 @@
 "anbieten zu können.</q></cite></strong>"
 
 # #f3 /4
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | If people would rather pay for GNU plus service than get GNU free without
+# | service, a company to provide just service to people who have obtained GNU
+# | free ought to be [-profitable.<a href=\"#f3\">(4)</a>-]
+# | {+profitable&#8239;<a class=\"ftn\" href=\"#f3\">[4]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "If people would rather pay for GNU plus service than get GNU free without "
+#| "service, a company to provide just service to people who have obtained "
+#| "GNU free ought to be profitable.<a href=\"#f3\">(4)</a>"
 msgid ""
 "If people would rather pay for GNU plus service than get GNU free without "
 "service, a company to provide just service to people who have obtained GNU "
-"free ought to be profitable.<a href=\"#f3\">(4)</a>"
+"free ought to be profitable&#8239;<a class=\"ftn\" href=\"#f3\">[4]</a>."
 msgstr ""
 "Wenn man für GNU mit Dienstleistung eher bezahlen würde als GNU ohne "
 "Dienstleistung umsonst zu erhalten, sollte ein Unternehmen, dass diese "
@@ -545,7 +602,7 @@
 "haben, profitabel sein.<a href=\"#f3\" id=\"f3-ref\" class=\"transnote\">(4)"
 "</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We must distinguish between support in the form of real programming work and "
 "mere handholding.  The former is something one cannot rely on from a "
@@ -557,7 +614,7 @@
 "Softwarehändler erwarten kann. Wenn Ihr Problem nicht von genügend Personen 
"
 "geteilt wird, wird der Händler Ihnen sagen, Sie hätten sich verlaufen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If your business needs to be able to rely on support, the only way is to "
 "have all the necessary sources and tools.  Then you can hire any available "
@@ -578,7 +635,7 @@
 "liegt dann nicht an den Vertriebsbedingungen. GNU beseitigt nicht alle "
 "Probleme der Welt, sondern nur bestimmte."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Meanwhile, the users who know nothing about computers need handholding: "
 "doing things for them which they could easily do themselves but don't know "
@@ -587,7 +644,7 @@
 "Gleichzeitig sind Anwender ohne Rechnerwissen auf Hilfe angewiesen: Dinge "
 "erledigen, die sie leicht selbst tun könnten, aber nicht wissen, wie."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Such services could be provided by companies that sell just handholding and "
 "repair service.  If it is true that users would rather spend money and get a "
@@ -607,7 +664,7 @@
 "Dienstleistung nicht benötigen, in der Lage sein, das Programm zu benutzen, "
 "ohne die Dienstleistung bezahlen zu müssen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You cannot reach many people without advertising, and you "
 "must charge for the program to support that.&rdquo;</strong>"
@@ -616,7 +673,7 @@
 "man muss etwas für das Programm berechnen, um dies zu ermöglichen.</q></"
 "cite></strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;It's no use advertising a program people can get free.&rdquo;"
 "</strong>"
@@ -624,7 +681,7 @@
 "<strong><cite><q>Es bringt nichts Werbung für ein Programm zu machen, was "
 "man umsonst bekommen kann.</q></cite></strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are various forms of free or very cheap publicity that can be used to "
 "inform numbers of computer users about something like GNU.  But it may be "
@@ -643,12 +700,23 @@
 "profitieren."
 
 # #f4 /5
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | On the other hand, if many people get GNU from their friends, and such
+# | companies don't succeed, this will show that advertising was not really
+# | necessary to spread GNU.  Why is it that free market advocates don't want
+# | to let the free market decide [-this?<a href=\"#f4\">(5)</a>-]
+# | {+this?&#8239;<a class=\"ftn\" href=\"#f4\">[5]</a>+}
+#, fuzzy
+#| msgid ""
+#| "On the other hand, if many people get GNU from their friends, and such "
+#| "companies don't succeed, this will show that advertising was not really "
+#| "necessary to spread GNU.  Why is it that free market advocates don't want "
+#| "to let the free market decide this?<a href=\"#f4\">(5)</a>"
 msgid ""
 "On the other hand, if many people get GNU from their friends, and such "
 "companies don't succeed, this will show that advertising was not really "
 "necessary to spread GNU.  Why is it that free market advocates don't want to "
-"let the free market decide this?<a href=\"#f4\">(5)</a>"
+"let the free market decide this?&#8239;<a class=\"ftn\" href=\"#f4\">[5]</a>"
 msgstr ""
 "Wenn andererseits viele Personen GNU von ihren Freunden erhalten und solche "
 "Unternehmen keinen Erfolg haben, zeigt dies, dass Werbung in Wirklichkeit "
@@ -656,7 +724,7 @@
 "freien Marktwirtschaft nicht den freien Markt darüber entscheiden lassen?<a "
 "href=\"#f4\" id=\"f4-ref\" class=\"transnote\">(5)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;My company needs a proprietary operating system to get a "
 "competitive edge.&rdquo;</strong>"
@@ -664,7 +732,7 @@
 "<strong><cite><q>Mein Unternehmen benötigt ein proprietäres Betriebssystem, 
"
 "um einen Wettbewerbsvorteil zu bekommen.</q></cite></strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU will remove operating system software from the realm of competition.  "
 "You will not be able to get an edge in this area, but neither will your "
@@ -684,16 +752,25 @@
 "gedrängt zu werden, Betriebssysteme zu verkaufen."
 
 # #f5 /6
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | I would like to see GNU development supported by gifts from many
+# | manufacturers and users, reducing the cost to [-each.<a
+# | href=\"#f5\">(6)</a>-] {+each&#8239;<a class=\"ftn\"
+# | href=\"#f5\">[6]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "I would like to see GNU development supported by gifts from many "
+#| "manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
 msgid ""
 "I would like to see GNU development supported by gifts from many "
-"manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
+"manufacturers and users, reducing the cost to each&#8239;<a class=\"ftn\" "
+"href=\"#f5\">[6]</a>."
 msgstr ""
 "Ich würde es gerne sehen, wenn viele Hersteller und Benutzer die Entwicklung 
"
 "von GNU durch Spenden unterstützen würden, um die Kosten für jeden 
einzelnen "
 "zu senken.<a href=\"#f5\" id=\"f5-ref\" class=\"transnote\">(6)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't programmers deserve a reward for their creativity?"
 "&rdquo;</strong>"
@@ -701,7 +778,7 @@
 "<strong><cite><q>Verdienen Programmierer nicht eine Belohnung für ihre "
 "Kreativität?</q></cite></strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If anything deserves a reward, it is social contribution.  Creativity can be "
 "a social contribution, but only in so far as society is free to use the "
@@ -715,7 +792,7 @@
 "für das Schreiben innovativer Programme verdienen, müssten sie aus 
demselben "
 "Grunde bestraft werden, wenn sie die Nutzung dieser Programme einschränken."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Shouldn't a programmer be able to ask for a reward for his "
 "creativity?&rdquo;</strong>"
@@ -723,7 +800,7 @@
 "<strong><cite><q>Sollte ein Programmierer nicht eine Belohnung für seine "
 "Kreativität verlangen dürfen?</q></cite></strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is nothing wrong with wanting pay for work, or seeking to maximize "
 "one's income, as long as one does not use means that are destructive.  But "
@@ -734,7 +811,7 @@
 "Zeit auf diesem Gebiet gebräuchlichen Mittel basieren auf einer Form von "
 "Zerstörung."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Extracting money from users of a program by restricting their use of it is "
 "destructive because the restrictions reduce the amount and the ways that the "
@@ -749,7 +826,7 @@
 "Beschränkung eine bewusste Entscheidung, sind die schädlichen Auswirkungen "
 "absichtliche Zerstörung."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The reason a good citizen does not use such destructive means to become "
 "wealthier is that, if everyone did so, we would all become poorer from the "
@@ -768,12 +845,12 @@
 "eigene Kreativität belohnt zu werden, rechtfertigt nicht die Welt im "
 "allgemeinen von allen oder einem Teil dieser Kreativität zu berauben."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid "<strong>&ldquo;Won't programmers starve?&rdquo;</strong>"
 msgstr ""
 "<strong><cite><q>Werden Programmierer nicht verhungern?</q></cite></strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "I could answer that nobody is forced to be a programmer.  Most of us cannot "
 "manage to get any money for standing on the street and making faces.  But we "
@@ -786,7 +863,7 @@
 "verurteilt, unser Leben stehend auf der Straße zu verbringen, Grimassen "
 "schneidend und verhungernd. Wir tun etwas anderes."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But that is the wrong answer because it accepts the questioner's implicit "
 "assumption: that without ownership of software, programmers cannot possibly "
@@ -797,7 +874,7 @@
 "möglicherweise kein Cent bezahlt werden würde. Vermeintlich Alles oder "
 "Nichts."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The real reason programmers will not starve is that it will still be "
 "possible for them to get paid for programming; just not paid as much as now."
@@ -807,13 +884,28 @@
 "nur halt nicht ganz so viel wie jetzt."
 
 # #f8 /7
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | Restricting copying is not the only basis for business in software.  It is
+# | the most common [-basis<a href=\"#f8\">(7)</a>-] {+basis&#8239;<a
+# | class=\"ftn\" href=\"#f8\">[7]</a>+} because it brings in the most money. 
+# | If it were prohibited, or rejected by the customer, software business
+# | would move to other bases of organization which are now used less often. 
+# | There are always numerous ways to organize any kind of business.
+#, fuzzy
+#| msgid ""
+#| "Restricting copying is not the only basis for business in software.  It "
+#| "is the most common basis<a href=\"#f8\">(7)</a> because it brings in the "
+#| "most money.  If it were prohibited, or rejected by the customer, software "
+#| "business would move to other bases of organization which are now used "
+#| "less often.  There are always numerous ways to organize any kind of "
+#| "business."
 msgid ""
 "Restricting copying is not the only basis for business in software.  It is "
-"the most common basis<a href=\"#f8\">(7)</a> because it brings in the most "
-"money.  If it were prohibited, or rejected by the customer, software "
-"business would move to other bases of organization which are now used less "
-"often.  There are always numerous ways to organize any kind of business."
+"the most common basis&#8239;<a class=\"ftn\" href=\"#f8\">[7]</a> because it "
+"brings in the most money.  If it were prohibited, or rejected by the "
+"customer, software business would move to other bases of organization which "
+"are now used less often.  There are always numerous ways to organize any "
+"kind of business."
 msgstr ""
 "Eingeschränktes Kopieren ist nicht die einzige Grundlage für geschäftliche 
"
 "Software. Es ist die üblichste Basis<a href=\"#f8\" id=\"f8-ref\" class="
@@ -822,7 +914,7 @@
 "organisatorische Grundlagen bewegen, die zur Zeit weniger häufig verwendet "
 "werden. Es gibt immer viele Möglichkeiten, Geschäfte zu organisieren."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Probably programming will not be as lucrative on the new basis as it is "
 "now.  But that is not an argument against the change.  It is not considered "
@@ -837,7 +929,7 @@
 "die gleichen Gehälter beziehen, wäre dies ebenfalls nicht ungerecht. (In 
der "
 "Praxis würden sie auch weiterhin deutlich mehr beziehen.)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't people have a right to control how their creativity is "
 "used?&rdquo;</strong>"
@@ -845,7 +937,7 @@
 "<strong><cite><q>Haben Menschen nicht das Recht zu kontrollieren, wie ihre "
 "Ideen verwendet werden?</q></cite></strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "&ldquo;Control over the use of one's ideas&rdquo; really constitutes control "
 "over other people's lives; and it is usually used to make their lives more "
@@ -856,13 +948,26 @@
 "und wird i. d. R. eingesetzt, um den Menschen das Leben zu erschweren."
 
 # #f6 /8
-#. type: Content of: <p>
-msgid ""
-"People who have studied the issue of intellectual property rights<a href="
-"\"#f6\">(8)</a> carefully (such as lawyers) say that there is no intrinsic "
-"right to intellectual property.  The kinds of supposed intellectual property "
-"rights that the government recognizes were created by specific acts of "
-"legislation for specific purposes."
+#. type: Content of: <div><dl><dd><p>
+# | People who have studied the issue of intellectual property [-rights<a
+# | href=\"#f6\">(8)</a>-] {+rights&#8239;<a class=\"ftn\"
+# | href=\"#f6\">[8]</a>+} carefully (such as lawyers) say that there is no
+# | intrinsic right to intellectual property.  The kinds of supposed
+# | intellectual property rights that the government recognizes were created
+# | by specific acts of legislation for specific purposes.
+#, fuzzy
+#| msgid ""
+#| "People who have studied the issue of intellectual property rights<a href="
+#| "\"#f6\">(8)</a> carefully (such as lawyers) say that there is no "
+#| "intrinsic right to intellectual property.  The kinds of supposed "
+#| "intellectual property rights that the government recognizes were created "
+#| "by specific acts of legislation for specific purposes."
+msgid ""
+"People who have studied the issue of intellectual property rights&#8239;<a "
+"class=\"ftn\" href=\"#f6\">[8]</a> carefully (such as lawyers) say that "
+"there is no intrinsic right to intellectual property.  The kinds of supposed "
+"intellectual property rights that the government recognizes were created by "
+"specific acts of legislation for specific purposes."
 msgstr ""
 "Personen, die die Frage der Rechte am geistigen Eigentum<a href=\"#f6\" id="
 "\"f6-ref\" class=\"transnote\">(8)</a> aufmerksam untersucht haben (z.&#160;"
@@ -871,7 +976,7 @@
 "geistigen Eigentum wurden durch besondere Rechtsvorschriften für bestimmte "
 "Zwecke geschaffen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For example, the patent system was established to encourage inventors to "
 "disclose the details of their inventions.  Its purpose was to help society "
@@ -891,7 +996,7 @@
 "Produktionskosten gering sind, schaden Patente oft nicht viel. Sie behindern "
 "die meisten Einzelpersonen, die patentierte Produkte benutzen, nicht."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The idea of copyright did not exist in ancient times, when authors "
 "frequently copied other authors at length in works of nonfiction.  This "
@@ -911,7 +1016,7 @@
 "vervielfältigt werden konnten&#160;&#8209;&#160;schadete es wenig, und "
 "behindert dadurch die meisten Leser nicht."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "All intellectual property rights are just licenses granted by society "
 "because it was thought, rightly or wrongly, that society as a whole would "
@@ -925,7 +1030,7 @@
 "Sind wir wirklich durch die Gewährung solcher Lizenzen besser gestellt? "
 "Welche Art der Handlung erlauben wir einer Person dadurch zu tun?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The case of programs today is very different from that of books a hundred "
 "years ago.  The fact that the easiest way to copy a program is from one "
@@ -946,14 +1051,14 @@
 "auch spirituell schadet; eine Situation, in der eine Person kein "
 "Urheberrecht einfordern sollte, unabhängig davon, ob es das Recht 
ermöglicht."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Competition makes things get done better.&rdquo;</strong>"
 msgstr ""
 "<strong><cite><q>Wettbewerb bringt Dinge dazu, besser gemacht zu werden.</"
 "q></cite></strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The paradigm of competition is a race: by rewarding the winner, we encourage "
 "everyone to run faster.  When capitalism really works this way, it does a "
@@ -972,7 +1077,7 @@
 "&#160;wie z. B. andere Läufer anzugreifen. Wenn die Läufer in einen "
 "Faustkampf geraten, werden sie alle den Lauf später beenden."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Proprietary and secret software is the moral equivalent of runners in a fist "
 "fight.  Sad to say, the only referee we've got does not seem to object to "
@@ -987,7 +1092,7 @@
 "man einen Schuss abfeuern“). Er sollte sie stattdessen auseinanderbringen "
 "und Läufer bereits für den Versuch eines Angriffs bestrafen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Won't everyone stop programming without a monetary incentive?"
 "&rdquo;</strong>"
@@ -995,7 +1100,7 @@
 "<strong><cite><q>Wird ohne finanziellen Ansporn nicht jeder aufhören zu "
 "programmieren?</q></cite></strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually, many people will program with absolutely no monetary incentive.  "
 "Programming has an irresistible fascination for some people, usually the "
@@ -1008,7 +1113,7 @@
 "gibt keinen Mangel an professionellen Musikern, die am Ball bleiben, obwohl "
 "sie keine Hoffnung, haben ihren Lebensunterhalt zu bestreiten."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But really this question, though commonly asked, is not appropriate to the "
 "situation.  Pay for programmers will not disappear, only become less.  So "
@@ -1021,7 +1126,7 @@
 "reduzierten finanziellen Ansporn programmieren wird? Meine Erfahrung zeigt, "
 "dass sie werden."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For more than ten years, many of the world's best programmers worked at the "
 "Artificial Intelligence Lab for far less money than they could have had "
@@ -1033,7 +1138,7 @@
 "können. Sie erhielten nicht-finanzielle Belohnungen: Ruhm und Anerkennung, "
 "zum Beispiel. Und Kreativität ist auch Spaß, eine Belohnung in sich."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Then most of them left when offered a chance to do the same interesting work "
 "for a lot of money."
@@ -1041,7 +1146,7 @@
 "Dann gingen die meisten von ihnen, als sich eine Chance bot, dieselbe "
 "interessante Arbeit für viel Geld zu tun."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "What the facts show is that people will program for reasons other than "
 "riches; but if given a chance to make a lot of money as well, they will come "
@@ -1055,7 +1160,7 @@
 "zahlende Unternehmen sehen schlecht im Wettbewerb mit hoch zahlenden aus, "
 "müssen sich aber nicht schlecht machen, wenn hoch zahlende untersagt sind."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;We need the programmers desperately.  If they demand that we "
 "stop helping our neighbors, we have to obey.&rdquo;</strong>"
@@ -1064,7 +1169,7 @@
 "möchten, dass wir aufhören unseren Mitmenschen zu helfen, müssen wir 
folgen."
 "</q></cite></strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "You're never so desperate that you have to obey this sort of demand.  "
 "Remember: millions for defense, but not a cent for tribute!"
@@ -1073,14 +1178,14 @@
 "nachgeben müssen. Vergessen Sie nicht: Millionen für die Verteidigung, aber 
"
 "nicht einen Cent für Anerkennung!"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Programmers need to make a living somehow.&rdquo;</strong>"
 msgstr ""
 "<strong><cite><q>Programmierer müssen von irgendetwas leben.</q></cite></"
 "strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In the short run, this is true.  However, there are plenty of ways that "
 "programmers could make a living without selling the right to use a program.  "
@@ -1096,7 +1201,7 @@
 "andere Wege zu finden, wenn man sie finden möchte. Hier sind einige "
 "Beispiele."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A manufacturer introducing a new computer will pay for the porting of "
 "operating systems onto the new hardware."
@@ -1104,7 +1209,7 @@
 "Ein Rechnerhersteller, der einen neuen Rechner einführt, zahlt für die "
 "Portierung des Betriebssystems auf die neue Hardware."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The sale of teaching, handholding and maintenance services could also employ "
 "programmers."
@@ -1113,18 +1218,30 @@
 "beschäftigt werden."
 
 # #f7 /9
-#. type: Content of: <p>
-msgid ""
-"People with new ideas could distribute programs as freeware<a href=\"#f7\">"
-"(9)</a>, asking for donations from satisfied users, or selling handholding "
-"services.  I have met people who are already working this way successfully."
+#. type: Content of: <div><dl><dd><p>
+# | People with new ideas could distribute programs as [-freeware<a
+# | href=\"#f7\">(9)</a>,-] {+freeware&#8239;<a class=\"ftn\"
+# | href=\"#f7\">[9]</a>,+} asking for donations from satisfied users, or
+# | selling handholding services.  I have met people who are already working
+# | this way successfully.
+#, fuzzy
+#| msgid ""
+#| "People with new ideas could distribute programs as freeware<a href="
+#| "\"#f7\">(9)</a>, asking for donations from satisfied users, or selling "
+#| "handholding services.  I have met people who are already working this way "
+#| "successfully."
+msgid ""
+"People with new ideas could distribute programs as freeware&#8239;<a class="
+"\"ftn\" href=\"#f7\">[9]</a>, asking for donations from satisfied users, or "
+"selling handholding services.  I have met people who are already working "
+"this way successfully."
 msgstr ""
 "Menschen mit neuen Ideen können Programme als Freeware<a href=\"#f7\" id="
 "\"f7-ref\" class=\"transnote\">(9)</a> verbreiten, zufriedene Benutzer um "
 "Spenden bitten oder Dienstleistungen rentabel anbieten. Ich bin einigen "
 "Personen begegnet, die bereits erfolgreich auf diese Weise arbeiten."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Users with related needs can form users' groups, and pay dues.  A group "
 "would contract with programming companies to write programs that the group's "
@@ -1134,12 +1251,12 @@
 "Beiträge zahlen. Die Gruppe würde dann Programmierfirmen damit beauftragen, 
"
 "Programme zu schreiben, die die Mitglieder verwenden möchten."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "All sorts of development can be funded with a Software Tax:"
 msgstr ""
 "Alle Arten der Entwicklung können mit einer Softwaresteuer finanziert 
werden:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Suppose everyone who buys a computer has to pay x percent of the price as a "
 "software tax.  The government gives this to an agency like the NSF to spend "
@@ -1150,7 +1267,7 @@
 "der <span xml:lang=\"en\" lang=\"en\">National Science Foundation</span> "
 "(NSF), um es für die Softwareentwicklung einzusetzen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But if the computer buyer makes a donation to software development himself, "
 "he can take a credit against the tax.  He can donate to the project of his "
@@ -1165,7 +1282,7 @@
 "Spendenbeitrag bis zur gesamten Steuerschuld, die er zu zahlen hatte, "
 "anrechnen lassen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The total tax rate could be decided by a vote of the payers of the tax, "
 "weighted according to the amount they will be taxed on."
@@ -1173,21 +1290,21 @@
 "Der gesamte Steuersatz könnte durch ein Votum der Steuerzahler beschlossen "
 "werden, entsprechend dem auf sie zu besteuernden Betrag."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "The consequences:"
 msgstr "Die Konsequenzen: "
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "The computer-using community supports software development."
 msgstr "Die rechnernutzende Gemeinschaft unterstützt die Softwareentwicklung."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "This community decides what level of support is needed."
 msgstr ""
 "Diese Gemeinschaft entscheidet, welches Niveau der Unterstützung "
 "erforderlich ist."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "Users who care which projects their share is spent on can choose this for "
 "themselves."
@@ -1195,7 +1312,7 @@
 "Benutzer, denen es darauf ankommt, an welchen Projekten sie sich beteiligen, "
 "können dies selbst entscheiden."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the long run, making programs free is a step toward the postscarcity "
 "world, where nobody will have to work very hard just to make a living.  "
@@ -1213,7 +1330,7 @@
 "Familienberatung, Roboterreparatur und Asteroidenprospektierung. Es wird "
 "keine Notwendigkeit geben, von Programmierung zu leben."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We have already greatly reduced the amount of work that the whole society "
 "must do for its actual productivity, but only a little of this has "
@@ -1234,11 +1351,11 @@
 "technische Fortschritte in Sachen Produktivität zu erzielen, die sich in "
 "weniger Arbeit für uns alle äußern werden."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "Fußnoten"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The wording here was careless.  The intention was that nobody would have to "
 "pay for <b>permission</b> to use the GNU system.  But the words don't make "
@@ -1270,7 +1387,7 @@
 "dass jedermann, der eine Kopie besitzt, auch die Freiheit beim Gebrauch "
 "dieser Kopie mit anderen zu kooperieren hat."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The expression &ldquo;give away&rdquo; is another indication that I had not "
 "yet clearly separated the issue of price from that of freedom.  We now "
@@ -1285,10 +1402,21 @@
 "html#GiveAwaySoftware\"><em>Zu vermeidende Wörter</em></a> für weitere "
 "Informationen."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+# | This is another place I failed to distinguish carefully between the two
+# | different meanings of [-&ldquo;free&rdquo;.-] {+&ldquo;free.&rdquo;+} The
+# | statement as it stands is not false&mdash;you can get copies of GNU
+# | software at no charge, from your friends or over the net.  But it does
+# | suggest the wrong idea.
+#, fuzzy
+#| msgid ""
+#| "This is another place I failed to distinguish carefully between the two "
+#| "different meanings of &ldquo;free&rdquo;.  The statement as it stands is "
+#| "not false&mdash;you can get copies of GNU software at no charge, from "
+#| "your friends or over the net.  But it does suggest the wrong idea."
 msgid ""
 "This is another place I failed to distinguish carefully between the two "
-"different meanings of &ldquo;free&rdquo;.  The statement as it stands is not "
+"different meanings of &ldquo;free.&rdquo; The statement as it stands is not "
 "false&mdash;you can get copies of GNU software at no charge, from your "
 "friends or over the net.  But it does suggest the wrong idea."
 msgstr ""
@@ -1298,12 +1426,12 @@
 "&#160;man kann Kopien von GNU-Software kostenlos von Freunden oder über das "
 "Internet erhalten. Aber es lässt auf die falsche Idee schließen."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid "Several such companies now exist."
 msgstr ""
 "<a href=\"#f3-ref\">↗</a> Inzwischen gibt es mehrere solcher Unternehmen."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Although it is a charity rather than a company, the Free Software Foundation "
 "for 10 years raised most of its funds from its distribution service.  You "
@@ -1317,7 +1445,7 @@
 "href=\"/order/order.html\">Artikel von der FSF bestellen</a>, um ihre Arbeit "
 "zu unterstützen."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "A group of computer companies pooled funds around 1991 to support "
 "maintenance of the GNU C Compiler."
@@ -1325,7 +1453,7 @@
 "<a href=\"#f5-ref\">↗</a> Eine Gruppe von Rechnerfirmen hat um 1991 Kapital 
"
 "angesammelt, um die Wartung des GNU C-Compilers zu unterstützen."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "I think I was mistaken in saying that proprietary software was the most "
 "common basis for making money in software.  It seems that actually the most "
@@ -1347,10 +1475,31 @@
 "Deshalb erwarte ich nicht, dass die meisten bezahlten Programmierer weniger "
 "in einer Welt der freien Software verdienen würden."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+# | In the 1980s I had not yet realized how confusing it was to speak of
+# | &ldquo;the issue&rdquo; of &ldquo;intellectual [-property&rdquo;.-]
+# | {+property.&rdquo;+} That term is obviously biased; more subtle is the
+# | fact that it lumps together various disparate laws which raise very
+# | different issues.  Nowadays I urge people to reject the term
+# | &ldquo;intellectual property&rdquo; entirely, lest it lead others to
+# | suppose that those laws form one coherent issue.  The way to be clear is
+# | to discuss patents, copyrights, and trademarks separately.  See <a
+# | href=\"/philosophy/not-ipr.html\">further explanation</a> of how this term
+# | spreads confusion and bias.
+#, fuzzy
+#| msgid ""
+#| "In the 1980s I had not yet realized how confusing it was to speak of "
+#| "&ldquo;the issue&rdquo; of &ldquo;intellectual property&rdquo;.  That "
+#| "term is obviously biased; more subtle is the fact that it lumps together "
+#| "various disparate laws which raise very different issues.  Nowadays I "
+#| "urge people to reject the term &ldquo;intellectual property&rdquo; "
+#| "entirely, lest it lead others to suppose that those laws form one "
+#| "coherent issue.  The way to be clear is to discuss patents, copyrights, "
+#| "and trademarks separately.  See <a href=\"/philosophy/not-ipr.html"
+#| "\">further explanation</a> of how this term spreads confusion and bias."
 msgid ""
 "In the 1980s I had not yet realized how confusing it was to speak of &ldquo;"
-"the issue&rdquo; of &ldquo;intellectual property&rdquo;.  That term is "
+"the issue&rdquo; of &ldquo;intellectual property.&rdquo; That term is "
 "obviously biased; more subtle is the fact that it lumps together various "
 "disparate laws which raise very different issues.  Nowadays I urge people to "
 "reject the term &ldquo;intellectual property&rdquo; entirely, lest it lead "
@@ -1372,10 +1521,26 @@
 "Eigentum‘? Eine verführerische Illusion“</cite></a>, wie dieser Begriff "
 "Verwechslungsgefahr und Voreingenommenheit verbreitet."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+# | Subsequently we learned to distinguish between &ldquo;free software&rdquo;
+# | and [-&ldquo;freeware&rdquo;.-] {+&ldquo;freeware.&rdquo;+} The term
+# | &ldquo;freeware&rdquo; means software you are free to redistribute, but
+# | usually you are not free to study and change the source code, so most of
+# | it is not free software.  See &ldquo;<a
+# | href=\"/philosophy/words-to-avoid.html#Freeware\">Confusing Words and
+# | Phrases</a>&rdquo; for more explanation.
+#, fuzzy
+#| msgid ""
+#| "Subsequently we learned to distinguish between &ldquo;free "
+#| "software&rdquo; and &ldquo;freeware&rdquo;.  The term &ldquo;"
+#| "freeware&rdquo; means software you are free to redistribute, but usually "
+#| "you are not free to study and change the source code, so most of it is "
+#| "not free software.  See &ldquo;<a href=\"/philosophy/words-to-avoid."
+#| "html#Freeware\">Confusing Words and Phrases</a>&rdquo; for more "
+#| "explanation."
 msgid ""
 "Subsequently we learned to distinguish between &ldquo;free software&rdquo; "
-"and &ldquo;freeware&rdquo;.  The term &ldquo;freeware&rdquo; means software "
+"and &ldquo;freeware.&rdquo; The term &ldquo;freeware&rdquo; means software "
 "you are free to redistribute, but usually you are not free to study and "
 "change the source code, so most of it is not free software.  See &ldquo;<a "
 "href=\"/philosophy/words-to-avoid.html#Freeware\">Confusing Words and "
@@ -1416,14 +1581,20 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Bei der Übersetzung dieses Werkes wurde mit größter Sorgfalt vorgegangen. "
@@ -1437,12 +1608,18 @@
 "standards/README.translations\">LIESMICH für Übersetzungen</a>."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; 1985, 1993, 200[-3-]{+4+}, 2005, 2007, [-2008,-] 2009,
+# | 2010, [-2014-] {+2015, 2021+} Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014 "
+#| "Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 1985, 1993, 2004, 2005, 2007, 2009, 2010, 2015, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014 <span "
+"xml:lang=\"en\" lang=\"en\">Free Software Foundation, Inc.</span>"
 
 #. type: Content of: <div><p>
 msgid ""
@@ -1475,13 +1652,19 @@
 msgid "Updated:"
 msgstr "Letzte Änderung:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015, "
-"2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015, "
-"2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, "
+#~ "2015 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, "
+#~ "2015 Free Software Foundation, Inc."
+
+#~ msgid ""
+#~ "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, "
+#~ "2015, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, "
+#~ "2015, 2021 Free Software Foundation, Inc."
 
 #~ msgid ""
 #~ "The GNU Manifesto (which appears below) was written by <a href=\"http://";
@@ -1510,13 +1693,6 @@
 #~ "\">http://www.gnu.org/help/</a>."
 
 #~ msgid ""
-#~ "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014 "
-#~ "Free Software Foundation, Inc."
-#~ msgstr ""
-#~ "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014 "
-#~ "<span xml:lang=\"en\" lang=\"en\">Free Software Foundation, Inc.</span>"
-
-#~ msgid ""
 #~ "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010 Free "
 #~ "Software Foundation, Inc."
 #~ msgstr ""

Index: po/manifesto.el-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/manifesto.el-diff.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- po/manifesto.el-diff.html   8 Jun 2021 08:44:38 -0000       1.17
+++ po/manifesto.el-diff.html   2 Nov 2021 14:41:53 -0000       1.18
@@ -11,15 +11,27 @@
 </style></head>
 <body><pre>
 &lt;!--#include virtual="/server/header.html" --&gt;
-&lt;!-- Parent-Version: 1.77 --&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 --&gt;
+&lt;!--#set var="TAGS" value="gnu-history" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</em></ins></span> --&gt;
 &lt;title&gt;The GNU Manifesto
 - GNU Project - Free Software Foundation&lt;/title&gt;
+<span class="inserted"><ins><em>&lt;style type="text/css" 
media="print,screen"&gt;&lt;!--
+a.ftn { font-size: .94em; }
+--&gt;&lt;/style&gt;</em></ins></span>
 &lt;!--#include virtual="/gnu/po/manifesto.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&lt;div class="article reduced-width"&gt;</em></ins></span>
 &lt;h2&gt;The GNU Manifesto&lt;/h2&gt;
 
+<span class="inserted"><ins><em>&lt;div class="comment"&gt;</em></ins></span>
 &lt;p&gt; The GNU Manifesto (which appears below) was written
-by &lt;a href="http://www.stallman.org/"&gt;Richard Stallman&lt;/a&gt; <span 
class="removed"><del><strong>at the beginning
+by &lt;a
+<span 
class="removed"><del><strong>href="http://www.stallman.org/"&gt;Richard</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://www.stallman.org/"&gt;Richard</em></ins></span>
 Stallman&lt;/a&gt; <span class="removed"><del><strong>at the beginning
 of the GNU Project,</strong></del></span> <span class="inserted"><ins><em>in 
1985</em></ins></span> to
 ask for <span class="removed"><del><strong>participation and support.  
For</strong></del></span> <span class="inserted"><ins><em>support in 
developing</em></ins></span> the
 <span class="removed"><del><strong>first few years,</strong></del></span> 
<span class="inserted"><ins><em>GNU operating system.  Part of the
@@ -50,14 +62,16 @@
 &ldquo;open source&rdquo;&mdash;that term was coined in 1998 by people
 who disagree with the Free Software Movement's ethical values.  They
 use it to promote an
-&lt;a href="/philosophy/open-source-misses-the-point.html"&gt;amoral 
approach&lt;/a&gt; to the same field.&lt;/p&gt;</em></ins></span>
+&lt;a href="/philosophy/open-source-misses-the-point.html"&gt;amoral 
approach&lt;/a&gt; to the same field.&lt;/p&gt;
+&lt;hr class="no-display" /&gt;
+&lt;/div&gt;</em></ins></span>
 
 &lt;h3 id="whats-gnu"&gt;What's GNU?  Gnu's Not Unix!&lt;/h3&gt;
 
 &lt;p&gt;
    GNU, which stands for Gnu's Not Unix, is the name for the complete
 Unix-compatible software system which I am writing so that I can give
-it away free to everyone who can use it.&lt;a href="#f1"&gt;(1)&lt;/a&gt; 
Several
+it away free to everyone who can use <span 
class="removed"><del><strong>it.&lt;a 
href="#f1"&gt;(1)&lt;/a&gt;</strong></del></span> <span 
class="inserted"><ins><em>it&#8239;&lt;a class="ftn" 
href="#f1"&gt;[1]&lt;/a&gt;.</em></ins></span> Several
 other volunteers are helping me.  Contributions of time, money,
 programs and equipment are greatly needed.&lt;/p&gt;
 
@@ -116,7 +130,7 @@
 decided to put together a sufficient body of free software so that I
 will be able to get along without any software that is not free.  I
 have resigned from the AI Lab to deny MIT any legal excuse to prevent
-me from giving GNU away.&lt;a href="#f2a"&gt;(2)&lt;/a&gt;&lt;/p&gt;
+me from giving GNU <span class="removed"><del><strong>away.&lt;a 
href="#f2a"&gt;(2)&lt;/a&gt;&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>away&#8239;&lt;a class="ftn" 
href="#f2a"&gt;[2]&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
 
 &lt;h3 id="compatible"&gt;Why GNU Will Be Compatible with Unix&lt;/h3&gt;
 
@@ -165,7 +179,9 @@
 
 &lt;h3 id="contribute"&gt;How You Can Contribute&lt;/h3&gt;
 
-&lt;blockquote&gt;
+<span class="removed"><del><strong>&lt;blockquote&gt;</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;div class="comment"&gt;</em></ins></span>
 &lt;p&gt;
 (Nowadays, for software tasks to work on, see the &lt;a
 href="http://fsf.org/campaigns/priority-projects"&gt;High Priority Projects
@@ -174,7 +190,8 @@
 ways to help, see &lt;a href="/help/help.html"&gt;the guide to helping
 the GNU operating system&lt;/a&gt;.)
 &lt;/p&gt;
-&lt;/blockquote&gt;
+<span class="removed"><del><strong>&lt;/blockquote&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/div&gt;</em></ins></span>
 
 &lt;p&gt;
    I am asking computer manufacturers for donations of machines and
@@ -213,7 +230,7 @@
 
 &lt;p&gt;
    Once GNU is written, everyone will be able to obtain good system
-software free, just like air.&lt;a href="#f2"&gt;(3)&lt;/a&gt;&lt;/p&gt;
+software free, just like <span class="removed"><del><strong>air.&lt;a 
href="#f2"&gt;(3)&lt;/a&gt;&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>air&#8239;&lt;a class="ftn" 
href="#f2"&gt;[3]&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;
    This means much more than just saving everyone the price of a Unix
@@ -259,18 +276,23 @@
 
 &lt;h3 id="rebutted-objections"&gt;Some Easily Rebutted Objections to GNU's 
Goals&lt;/h3&gt;
 
-&lt;p id="support"&gt;
+<span class="removed"><del><strong>&lt;p</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;dl&gt;
+&lt;dt</em></ins></span> id="support"&gt;
 &lt;strong&gt;&ldquo;Nobody will use it if it is free, because that means
-they can't rely on any support.&rdquo;&lt;/strong&gt;&lt;/p&gt;
+they can't rely on any <span 
class="removed"><del><strong>support.&rdquo;&lt;/strong&gt;&lt;/p&gt;
 
-&lt;p&gt;
-&lt;strong&gt;&ldquo;You have to charge for the program to pay for providing
-the support.&rdquo;&lt;/strong&gt;&lt;/p&gt;
+&lt;p&gt;</strong></del></span> <span 
class="inserted"><ins><em>support.&rdquo;&lt;/strong&gt;&lt;/dt&gt;
 
+&lt;dt&gt;</em></ins></span>
+&lt;strong&gt;&ldquo;You have to charge for the program to pay for providing
+the <span 
class="removed"><del><strong>support.&rdquo;&lt;/strong&gt;&lt;/p&gt;</strong></del></span>
 <span class="inserted"><ins><em>support.&rdquo;&lt;/strong&gt;&lt;/dt&gt;
+&lt;dd&gt;</em></ins></span>
 &lt;p&gt;
    If people would rather pay for GNU plus service than get GNU free
 without service, a company to provide just service to people who have
-obtained GNU free ought to be profitable.&lt;a 
href="#f3"&gt;(4)&lt;/a&gt;&lt;/p&gt;
+obtained GNU free ought to be <span 
class="removed"><del><strong>profitable.&lt;a 
href="#f3"&gt;(4)&lt;/a&gt;&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>profitable&#8239;&lt;a class="ftn" 
href="#f3"&gt;[4]&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;
    We must distinguish between support in the form of real programming
@@ -302,14 +324,19 @@
 particular one.  Meanwhile, those of us who don't need the service
 should be able to use the program without paying for the service.&lt;/p&gt;
 
-&lt;p id="advertising"&gt;
+<span class="removed"><del><strong>&lt;p</strong></del></span>
+<span class="inserted"><ins><em>&lt;/dd&gt;
+
+&lt;dt</em></ins></span> id="advertising"&gt;
 &lt;strong&gt;&ldquo;You cannot reach many people without advertising, and
-you must charge for the program to support 
that.&rdquo;&lt;/strong&gt;&lt;/p&gt;
+you must charge for the program to support <span 
class="removed"><del><strong>that.&rdquo;&lt;/strong&gt;&lt;/p&gt;
 
-&lt;p&gt;
+&lt;p&gt;</strong></del></span> <span 
class="inserted"><ins><em>that.&rdquo;&lt;/strong&gt;&lt;/dt&gt;
+&lt;dt&gt;</em></ins></span>
 &lt;strong&gt;&ldquo;It's no use advertising a program people can get
-free.&rdquo;&lt;/strong&gt;&lt;/p&gt;
-
+<span 
class="removed"><del><strong>free.&rdquo;&lt;/strong&gt;&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>free.&rdquo;&lt;/strong&gt;&lt;/dt&gt;
+&lt;dd&gt;</em></ins></span>
 &lt;p&gt;
    There are various forms of free or very cheap publicity that can be
 used to inform numbers of computer users about something like GNU.  But
@@ -323,12 +350,15 @@
    On the other hand, if many people get GNU from their friends, and
 such companies don't succeed, this will show that advertising was not
 really necessary to spread GNU.  Why is it that free market advocates
-don't want to let the free market decide this?&lt;a 
href="#f4"&gt;(5)&lt;/a&gt;&lt;/p&gt;
+don't want to let the free market decide <span 
class="removed"><del><strong>this?&lt;a href="#f4"&gt;(5)&lt;/a&gt;&lt;/p&gt;
 
-&lt;p id="competitive"&gt;
-&lt;strong&gt;&ldquo;My company needs a proprietary operating system to get
-a competitive edge.&rdquo;&lt;/strong&gt;&lt;/p&gt;
+&lt;p</strong></del></span> <span class="inserted"><ins><em>this?&#8239;&lt;a 
class="ftn" href="#f4"&gt;[5]&lt;/a&gt;&lt;/p&gt;
+&lt;/dd&gt;
 
+&lt;dt</em></ins></span> id="competitive"&gt;
+&lt;strong&gt;&ldquo;My company needs a proprietary operating system to get
+a competitive <span 
class="removed"><del><strong>edge.&rdquo;&lt;/strong&gt;&lt;/p&gt;</strong></del></span>
 <span class="inserted"><ins><em>edge.&rdquo;&lt;/strong&gt;&lt;/dt&gt;
+&lt;dd&gt;</em></ins></span>
 &lt;p&gt;
    GNU will remove operating system software from the realm of
 competition.  You will not be able to get an edge in this area, but
@@ -341,12 +371,16 @@
 
 &lt;p&gt;
    I would like to see GNU development supported by gifts from many
-manufacturers and users, reducing the cost to each.&lt;a 
href="#f5"&gt;(6)&lt;/a&gt;&lt;/p&gt;
+manufacturers and users, reducing the cost to <span 
class="removed"><del><strong>each.&lt;a href="#f5"&gt;(6)&lt;/a&gt;&lt;/p&gt;
 
-&lt;p id="deserve"&gt;
-&lt;strong&gt;&ldquo;Don't programmers deserve a reward for their
-creativity?&rdquo;&lt;/strong&gt;&lt;/p&gt;
+&lt;p</strong></del></span> <span class="inserted"><ins><em>each&#8239;&lt;a 
class="ftn" href="#f5"&gt;[6]&lt;/a&gt;.&lt;/p&gt;
+&lt;/dd&gt;
 
+&lt;dt</em></ins></span> id="deserve"&gt;
+&lt;strong&gt;&ldquo;Don't programmers deserve a reward for their
+<span 
class="removed"><del><strong>creativity?&rdquo;&lt;/strong&gt;&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>creativity?&rdquo;&lt;/strong&gt;&lt;/dt&gt;
+&lt;dd&gt;</em></ins></span>
 &lt;p&gt;
    If anything deserves a reward, it is social contribution.
 Creativity can be a social contribution, but only in so far as society
@@ -354,10 +388,13 @@
 creating innovative programs, by the same token they deserve to be
 punished if they restrict the use of these programs.&lt;/p&gt;
 
-&lt;p id="reward"&gt;
-&lt;strong&gt;&ldquo;Shouldn't a programmer be able to ask for a reward for
-his creativity?&rdquo;&lt;/strong&gt;&lt;/p&gt;
+<span class="removed"><del><strong>&lt;p</strong></del></span>
+<span class="inserted"><ins><em>&lt;/dd&gt;
 
+&lt;dt</em></ins></span> id="reward"&gt;
+&lt;strong&gt;&ldquo;Shouldn't a programmer be able to ask for a reward for
+his <span 
class="removed"><del><strong>creativity?&rdquo;&lt;/strong&gt;&lt;/p&gt;</strong></del></span>
 <span class="inserted"><ins><em>creativity?&rdquo;&lt;/strong&gt;&lt;/dt&gt;
+&lt;dd&gt;</em></ins></span>
 &lt;p&gt;
    There is nothing wrong with wanting pay for work, or seeking to
 maximize one's income, as long as one does not use means that are
@@ -381,9 +418,12 @@
 does not justify depriving the world in general of all or part of that
 creativity.&lt;/p&gt;
 
-&lt;p id="starve"&gt;
-&lt;strong&gt;&ldquo;Won't programmers starve?&rdquo;&lt;/strong&gt;&lt;/p&gt;
+<span class="removed"><del><strong>&lt;p</strong></del></span>
+<span class="inserted"><ins><em>&lt;/dd&gt;
 
+&lt;dt</em></ins></span> id="starve"&gt;
+&lt;strong&gt;&ldquo;Won't programmers <span 
class="removed"><del><strong>starve?&rdquo;&lt;/strong&gt;&lt;/p&gt;</strong></del></span>
 <span class="inserted"><ins><em>starve?&rdquo;&lt;/strong&gt;&lt;/dt&gt;
+&lt;dd&gt;</em></ins></span>
 &lt;p&gt;
    I could answer that nobody is forced to be a programmer.  Most of us
 cannot manage to get any money for standing on the street and making
@@ -403,7 +443,7 @@
 
 &lt;p&gt;
    Restricting copying is not the only basis for business in software.
-It is the most common basis&lt;a href="#f8"&gt;(7)&lt;/a&gt; because it brings 
in
+It is the most common <span class="removed"><del><strong>basis&lt;a 
href="#f8"&gt;(7)&lt;/a&gt;</strong></del></span> <span 
class="inserted"><ins><em>basis&#8239;&lt;a class="ftn" 
href="#f8"&gt;[7]&lt;/a&gt;</em></ins></span> because it brings in
 the most money.  If it
 were prohibited, or rejected by the customer, software business would
 move to other bases of organization which are now used less often.
@@ -417,10 +457,13 @@
 either.  (In practice they would still make considerably more than
 that.)&lt;/p&gt;
 
-&lt;p id="right-to-control"&gt;
-&lt;strong&gt;&ldquo;Don't people have a right to control how their
-creativity is used?&rdquo;&lt;/strong&gt;&lt;/p&gt;
+<span class="removed"><del><strong>&lt;p</strong></del></span>
+<span class="inserted"><ins><em>&lt;/dd&gt;
 
+&lt;dt</em></ins></span> id="right-to-control"&gt;
+&lt;strong&gt;&ldquo;Don't people have a right to control how their
+creativity is <span 
class="removed"><del><strong>used?&rdquo;&lt;/strong&gt;&lt;/p&gt;</strong></del></span>
 <span class="inserted"><ins><em>used?&rdquo;&lt;/strong&gt;&lt;/dt&gt;
+&lt;dd&gt;</em></ins></span>
 &lt;p&gt;
 &ldquo;Control over the use of one's ideas&rdquo; really constitutes
 control over other people's lives; and it is usually used to make
@@ -428,7 +471,8 @@
 
 &lt;p&gt;
    People who have studied the issue of intellectual property
-rights&lt;a href="#f6"&gt;(8)&lt;/a&gt; carefully (such as lawyers) say that 
there
+<span class="removed"><del><strong>rights&lt;a 
href="#f6"&gt;(8)&lt;/a&gt;</strong></del></span>
+<span class="inserted"><ins><em>rights&#8239;&lt;a class="ftn" 
href="#f6"&gt;[8]&lt;/a&gt;</em></ins></span> carefully (such as lawyers) say 
that there
 is no intrinsic right to intellectual property.  The kinds of supposed
 intellectual property rights that the government recognizes were
 created by specific acts of legislation for specific purposes.&lt;/p&gt;
@@ -471,10 +515,14 @@
 both materially and spiritually; in which a person should not do so
 regardless of whether the law enables him to.&lt;/p&gt;
 
-&lt;p id="competition"&gt;
-&lt;strong&gt;&ldquo;Competition makes things get done
-better.&rdquo;&lt;/strong&gt;&lt;/p&gt;
+<span class="removed"><del><strong>&lt;p</strong></del></span>
+<span class="inserted"><ins><em>&lt;/dd&gt;
 
+&lt;dt</em></ins></span> id="competition"&gt;
+&lt;strong&gt;&ldquo;Competition makes things get done
+<span 
class="removed"><del><strong>better.&rdquo;&lt;/strong&gt;&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>better.&rdquo;&lt;/strong&gt;&lt;/dt&gt;
+&lt;dd&gt;</em></ins></span>
 &lt;p&gt;
    The paradigm of competition is a race: by rewarding the winner, we
 encourage everyone to run faster.  When capitalism really works this
@@ -491,10 +539,14 @@
 yards you run, you can fire one shot&rdquo;).  He really ought to
 break them up, and penalize runners for even trying to fight.&lt;/p&gt;
 
-&lt;p id="stop-programming"&gt;
-&lt;strong&gt;&ldquo;Won't everyone stop programming without a monetary
-incentive?&rdquo;&lt;/strong&gt;&lt;/p&gt;
+<span class="removed"><del><strong>&lt;p</strong></del></span>
+<span class="inserted"><ins><em>&lt;/dd&gt;
 
+&lt;dt</em></ins></span> id="stop-programming"&gt;
+&lt;strong&gt;&ldquo;Won't everyone stop programming without a monetary
+<span 
class="removed"><del><strong>incentive?&rdquo;&lt;/strong&gt;&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>incentive?&rdquo;&lt;/strong&gt;&lt;/dt&gt;
+&lt;dd&gt;</em></ins></span>
 &lt;p&gt;
    Actually, many people will program with absolutely no monetary
 incentive.  Programming has an irresistible fascination for some
@@ -526,17 +578,23 @@
 in competition with high-paying ones, but they do not have to do badly
 if the high-paying ones are banned.&lt;/p&gt;
 
-&lt;p id="desperate"&gt;
-&lt;strong&gt;&ldquo;We need the programmers desperately.  If they demand
-that we stop helping our neighbors, we have to 
obey.&rdquo;&lt;/strong&gt;&lt;/p&gt;
+<span class="removed"><del><strong>&lt;p</strong></del></span>
+<span class="inserted"><ins><em>&lt;/dd&gt;
 
+&lt;dt</em></ins></span> id="desperate"&gt;
+&lt;strong&gt;&ldquo;We need the programmers desperately.  If they demand
+that we stop helping our neighbors, we have to <span 
class="removed"><del><strong>obey.&rdquo;&lt;/strong&gt;&lt;/p&gt;</strong></del></span>
 <span class="inserted"><ins><em>obey.&rdquo;&lt;/strong&gt;&lt;/dt&gt;
+&lt;dd&gt;</em></ins></span>
 &lt;p&gt;
    You're never so desperate that you have to obey this sort of demand.
 Remember: millions for defense, but not a cent for tribute!&lt;/p&gt;
 
-&lt;p id="living"&gt;
-&lt;strong&gt;&ldquo;Programmers need to make a living 
somehow.&rdquo;&lt;/strong&gt;&lt;/p&gt;
+<span class="removed"><del><strong>&lt;p</strong></del></span>
+<span class="inserted"><ins><em>&lt;/dd&gt;
 
+&lt;dt</em></ins></span> id="living"&gt;
+&lt;strong&gt;&ldquo;Programmers need to make a living <span 
class="removed"><del><strong>somehow.&rdquo;&lt;/strong&gt;&lt;/p&gt;</strong></del></span>
 <span class="inserted"><ins><em>somehow.&rdquo;&lt;/strong&gt;&lt;/dt&gt;
+&lt;dd&gt;</em></ins></span>
 &lt;p&gt;
    In the short run, this is true.  However, there are plenty of ways
 that programmers could make a living without selling the right to use a
@@ -555,7 +613,8 @@
 
 &lt;p&gt;
    People with new ideas could distribute programs as
-freeware&lt;a href="#f7"&gt;(9)&lt;/a&gt;, asking for donations from satisfied
+<span class="removed"><del><strong>freeware&lt;a 
href="#f7"&gt;(9)&lt;/a&gt;,</strong></del></span>
+<span class="inserted"><ins><em>freeware&#8239;&lt;a class="ftn" 
href="#f7"&gt;[9]&lt;/a&gt;,</em></ins></span> asking for donations from 
satisfied
 users, or selling handholding services.  I have met people who are
 already working this way successfully.&lt;/p&gt;
 
@@ -592,6 +651,10 @@
 &lt;li&gt;Users who care which projects their share is spent on can
           choose this for themselves.&lt;/li&gt;
 &lt;/ul&gt;
+<span class="inserted"><ins><em>&lt;/dd&gt;
+&lt;/dl&gt;
+&lt;div class="column-limit"&gt;&lt;/div&gt;</em></ins></span>
+
 &lt;p&gt;
    In the long run, making programs free is a step toward the
 postscarcity world, where nobody will have to work very hard just to
@@ -610,9 +673,9 @@
 competition.  Free software will greatly reduce these drains in the
 area of software production.  We must do this, in order for technical
 gains in productivity to translate into less work for us.&lt;/p&gt;
+<span class="inserted"><ins><em>&lt;div 
class="column-limit"&gt;&lt;/div&gt;</em></ins></span>
 
-
-&lt;h3 id="footnotes"&gt;Footnotes&lt;/h3&gt;
+&lt;h3 <span 
class="removed"><del><strong>id="footnotes"&gt;Footnotes&lt;/h3&gt;</strong></del></span>
 <span class="inserted"><ins><em>id="footnotes" 
class="footnote"&gt;Footnotes&lt;/h3&gt;</em></ins></span>
 
 &lt;!-- The anchors do not match the actual footnote numbers because of
      revisions over time.  And if a new footnote is added, the references
@@ -641,7 +704,7 @@
 Words and Phrases&lt;/a&gt;&rdquo; for more explanation.&lt;/li&gt;
 
 &lt;li id="f2"&gt;This is another place I failed to distinguish
-carefully between the two different meanings of &ldquo;free&rdquo;.
+carefully between the two different meanings of <span 
class="removed"><del><strong>&ldquo;free&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;free.&rdquo;</em></ins></span>
 The statement as it stands is not false&mdash;you can get copies of GNU
 software at no charge, from your friends or over the net.  But it does
 suggest the wrong idea.&lt;/li&gt;
@@ -670,7 +733,8 @@
 
 &lt;li id="f6"&gt;In the 1980s I had not yet realized how confusing
 it was to speak of &ldquo;the issue&rdquo; of &ldquo;intellectual
-property&rdquo;.  That term is obviously biased; more subtle is the
+<span class="removed"><del><strong>property&rdquo;.</strong></del></span>
+<span class="inserted"><ins><em>property.&rdquo;</em></ins></span>  That term 
is obviously biased; more subtle is the
 fact that it lumps together various disparate laws which raise very
 different issues.  Nowadays I urge people to reject the term
 &ldquo;intellectual property&rdquo; entirely, lest it lead others to
@@ -680,7 +744,7 @@
 this term spreads confusion and bias.&lt;/li&gt;
 
 &lt;li id="f7"&gt;Subsequently we learned to distinguish
-between &ldquo;free software&rdquo; and &ldquo;freeware&rdquo;.  The
+between &ldquo;free software&rdquo; and <span 
class="removed"><del><strong>&ldquo;freeware&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;freeware.&rdquo;</em></ins></span>  The
 term &ldquo;freeware&rdquo; means software you are free to
 redistribute, but usually you are not free to study and change the
 source code, so most of it is not free software.  See
@@ -688,10 +752,11 @@
 Words and Phrases&lt;/a&gt;&rdquo; for more explanation.&lt;/li&gt;
 
 &lt;/ol&gt;
+<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;
-&lt;div id="footer"&gt;
+&lt;div <span 
class="removed"><del><strong>id="footer"&gt;</strong></del></span> <span 
class="inserted"><ins><em>id="footer" role="contentinfo"&gt;</em></ins></span>
 &lt;div class="unprintable"&gt;
 
 &lt;p&gt;Please send general FSF &amp; GNU inquiries to
@@ -709,13 +774,13 @@
         to &lt;a href="mailto:web-translators@gnu.org"&gt;
         &lt;web-translators@gnu.org&gt;&lt;/a&gt;.&lt;/p&gt;
 
-        &lt;p&gt;For information on coordinating and submitting translations of
+        &lt;p&gt;For information on coordinating and <span 
class="removed"><del><strong>submitting</strong></del></span> <span 
class="inserted"><ins><em>contributing</em></ins></span> translations of
         our web pages, see &lt;a
         href="/server/standards/README.translations.html"&gt;Translations
         README&lt;/a&gt;. --&gt;
 Please see the &lt;a
 href="/server/standards/README.translations.html"&gt;Translations
-README&lt;/a&gt; for information on coordinating and submitting translations
+README&lt;/a&gt; for information on coordinating and <span 
class="removed"><del><strong>submitting</strong></del></span> <span 
class="inserted"><ins><em>contributing</em></ins></span> translations
 of this article.&lt;/p&gt;
 &lt;/div&gt;
 
@@ -736,7 +801,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; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 
<span class="removed"><del><strong>2014</strong></del></span> <span 
class="inserted"><ins><em>2014, 2015</em></ins></span>
+&lt;p&gt;Copyright &copy; 1985, 1993, <span 
class="removed"><del><strong>2003,</strong></del></span> <span 
class="inserted"><ins><em>2004,</em></ins></span> 2005, 2007, <span 
class="removed"><del><strong>2008,</strong></del></span> 2009, 2010, <span 
class="removed"><del><strong>2014</strong></del></span> <span 
class="inserted"><ins><em>2015, 2021</em></ins></span>
 Free Software Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;
@@ -753,11 +818,12 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/06/08 08:44:38 $
+$Date: 2021/11/02 14:41: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: po/manifesto.el.po
===================================================================
RCS file: /web/www/www/gnu/po/manifesto.el.po,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- po/manifesto.el.po  8 Jun 2021 08:44:38 -0000       1.30
+++ po/manifesto.el.po  2 Nov 2021 14:41:53 -0000       1.31
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: www-el_v0.2.0\n"
-"POT-Creation-Date: 2015-06-02 12:55+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2015-04-11 15:52+0200\n"
 "Last-Translator: Georgios Zarkadas <gz@member.fsf.org>\n"
 "Language-Team: Greek <www-el-translators@gnu.org>\n"
@@ -24,19 +24,20 @@
 msgid "The GNU Manifesto - GNU Project - Free Software Foundation"
 msgstr "Το μανιφέστο του GNU - Έργο GNU - Ίδρυμα 
Ελεύθερου Λογισμικού"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "The GNU Manifesto"
 msgstr "Το μανιφέστο του GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 # | The GNU Manifesto (which appears below) was written by <a
-# | href=\"http://www.stallman.org/\";>Richard Stallman</a> [-at the beginning
-# | of the GNU Project,-] {+in 1985+} to ask for [-participation and support. 
-# | For-] {+support in developing+} the [-first few years,-] {+GNU operating
-# | system.  Part of the text was taken from the original announcement of
-# | 1983.  Through 1987,+} it was updated in minor ways to account for
-# | [-developments, but now-] {+developments; since then,+} it seems best to
-# | leave it [-unchanged as most people have seen it.-] {+unchanged.+}
+# | href=\"http{+s+}://www.stallman.org/\">Richard Stallman</a> [-at the
+# | beginning of the GNU Project,-] {+in 1985+} to ask for [-participation and
+# | support.  For-] {+support in developing+} the [-first few years,-] {+GNU
+# | operating system.  Part of the text was taken from the original
+# | announcement of 1983.  Through 1987,+} it was updated in minor ways to
+# | account for [-developments, but now-] {+developments; since then,+} it
+# | seems best to leave it [-unchanged as most people have seen it.-]
+# | {+unchanged.+}
 #, fuzzy
 #| msgid ""
 #| "The GNU Manifesto (which appears below) was written by <a href=\"http://";
@@ -45,7 +46,7 @@
 #| "it was updated in minor ways to account for developments, but now it "
 #| "seems best to leave it unchanged as most people have seen it."
 msgid ""
-"The GNU Manifesto (which appears below) was written by <a href=\"http://www.";
+"The GNU Manifesto (which appears below) was written by <a href=\"https://www.";
 "stallman.org/\">Richard Stallman</a> in 1985 to ask for support in "
 "developing the GNU operating system.  Part of the text was taken from the "
 "original announcement of 1983.  Through 1987, it was updated in minor ways "
@@ -58,7 +59,7 @@
 "εξελίξεις, αλλά τώρα φαίνεται καλύτερο να 
παραμένει χωρίς αλλαγές, όπως το "
 "είδε ο περισσότερος κόσμος."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Since that time, we have learned about certain common misunderstandings that "
 "different wording could help avoid.  Footnotes added since 1993 help clarify "
@@ -68,7 +69,7 @@
 "διαφορετική διατύπωση θα βοηθούσε να 
είχαν αποφευχθεί.  Οι υποσημειώσεις που "
 "προστέθηκαν από το 1993 βοηθούν στη διευ
κρίνιση αυτών των σημείων."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If you want to install the GNU/Linux system, we recommend you use one of the "
 "<a href=\"/distros\">100% free software GNU/Linux distributions</a>.  For "
@@ -76,7 +77,7 @@
 "a>."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The GNU Project is part of the Free Software Movement, a campaign for <a "
 "href=\"/philosophy/free-sw.html\">freedom for users of software</a>.  It is "
@@ -86,17 +87,30 @@
 "open-source-misses-the-point.html\">amoral approach</a> to the same field."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "What's GNU? Gnu's Not Unix!"
 msgstr "Τι είναι το GNU; Το Gnu δεν είναι Unix! (Gnu's Not 
Unix!)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | GNU, which stands for Gnu's Not Unix, is the name for the complete
+# | Unix-compatible software system which I am writing so that I can give it
+# | away free to everyone who can use [-it.<a href=\"#f1\">(1)</a>-]
+# | {+it&#8239;<a class=\"ftn\" href=\"#f1\">[1]</a>.+} Several other
+# | volunteers are helping me.  Contributions of time, money, programs and
+# | equipment are greatly needed.
+#, fuzzy
+#| msgid ""
+#| "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
+#| "compatible software system which I am writing so that I can give it away "
+#| "free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
+#| "volunteers are helping me.  Contributions of time, money, programs and "
+#| "equipment are greatly needed."
 msgid ""
 "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
 "compatible software system which I am writing so that I can give it away "
-"free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
-"volunteers are helping me.  Contributions of time, money, programs and "
-"equipment are greatly needed."
+"free to everyone who can use it&#8239;<a class=\"ftn\" href=\"#f1\">[1]</a>. "
+"Several other volunteers are helping me.  Contributions of time, money, "
+"programs and equipment are greatly needed."
 msgstr ""
 "To GNU, το οποίο είναι συντομογραφία του Gnu's 
Not Unix, είναι το όνομα του "
 "πλήρους, συμβατού με Unix συστήματος 
λογισμικού που γράφω, ώστε να το δώσω "
@@ -104,7 +118,7 @@
 "a>  Διάφοροι άλλοι εθελοντές με βοηθούν.  
Χρειάζονται ιδιαίτερα συνεισφορές "
 "σε χρόνο, χρήμα, προγράμματα και 
εξοπλισμό."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So far we have an Emacs text editor with Lisp for writing editor commands, a "
 "source level debugger, a yacc-compatible parser generator, a linker, and "
@@ -136,7 +150,7 @@
 "ο,τιδήποτε χρήσιμο έρχεται συνήθως μαζί 
με ένα σύστημα Unix, και περισσότερα "
 "ακόμη."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU will be able to run Unix programs, but will not be identical to Unix.  "
 "We will make all improvements that are convenient, based on our experience "
@@ -160,7 +174,7 @@
 "Θα προσπαθήσουμε να υποστηρίξουμε τα UUCP, 
MIT Chaosnet, και τα πρωτόκολλα "
 "του Διαδικτύου για επικοινωνίες."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is aimed initially at machines in the 68000/16000 class with virtual "
 "memory, because they are the easiest machines to make it run on.  The extra "
@@ -172,7 +186,7 @@
 "αυτές.  Η επιπλέον προσπάθεια για να 
τρέξει σε μικρότερες μηχανές, θα μείνει "
 "σε όσους επιθυμούν να το χρησιμοποιήσουν 
σ' εκείνες."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid horrible confusion, please pronounce the <em>g</em> in the word "
 "&ldquo;GNU&rdquo; when it is the name of this project."
@@ -180,11 +194,11 @@
 "Για την αποφυγή τρομερής σύγχυσης, 
παρακαλούμε προφέρετε το <em>g</em> στη "
 "λέξη &ldquo;GNU&rdquo;  όταν είναι το όνομα αυτού 
του έργου."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why I Must Write GNU"
 msgstr "Γιατί πρέπει να γράψω το GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I consider that the Golden Rule requires that if I like a program I must "
 "share it with other people who like it.  Software sellers want to divide the "
@@ -208,13 +222,26 @@
 "παραμένω σε ένα ίδρυμα όπου συμβαίνουν 
τέτοια πράγματα για μένα, ενάντια στη "
 "θέλησή μου."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | So that I can continue to use computers without dishonor, I have decided
+# | to put together a sufficient body of free software so that I will be able
+# | to get along without any software that is not free.  I have resigned from
+# | the AI Lab to deny MIT any legal excuse to prevent me from giving GNU
+# | [-away.<a href=\"#f2a\">(2)</a>-] {+away&#8239;<a class=\"ftn\"
+# | href=\"#f2a\">[2]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "So that I can continue to use computers without dishonor, I have decided "
+#| "to put together a sufficient body of free software so that I will be able "
+#| "to get along without any software that is not free.  I have resigned from "
+#| "the AI Lab to deny MIT any legal excuse to prevent me from giving GNU "
+#| "away.<a href=\"#f2a\">(2)</a>"
 msgid ""
 "So that I can continue to use computers without dishonor, I have decided to "
 "put together a sufficient body of free software so that I will be able to "
 "get along without any software that is not free.  I have resigned from the "
-"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away.<a "
-"href=\"#f2a\">(2)</a>"
+"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away&#8239;"
+"<a class=\"ftn\" href=\"#f2a\">[2]</a>."
 msgstr ""
 "Προκειμένου να μπορώ να συνεχίσω να 
χρησιμοποιώ υπολογιστές χωρίς ατίμωση, "
 "αποφάσισα να συναθροίσω ένα ικανό σώμα 
ελεύθερου λογισμικού, έτσι ώστε να "
@@ -223,11 +250,11 @@
 "στο MIT, οποιαδήποτε νομική δικαιολογία που 
να με εμποδίσει να διαθέσω το "
 "GNU δωρεάν.<a href=\"#f2a\">(2)</a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why GNU Will Be Compatible with Unix"
 msgstr "Γιατί το GNU θα είναι συμβατό με το Unix"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Unix is not my ideal system, but it is not too bad.  The essential features "
 "of Unix seem to be good ones, and I think I can fill in what Unix lacks "
@@ -240,11 +267,11 @@
 "αλλοιώσω.  Κι ένα λειτουργικό σύστημα συ
μβατό με to Unix θα ήταν βολικό για "
 "πολλούς άλλους ανθρώπους να το υιοθετήσου
ν."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How GNU Will Be Available"
 msgstr "Πώς θα γίνει η διάθεση του GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is not in the public domain.  Everyone will be permitted to modify and "
 "redistribute GNU, but no distributor will be allowed to restrict its further "
@@ -259,11 +286,11 @@
 "μετατροπές δεν θα επιτρέπονται.  Θέλω να 
εξασφαλίσω πως όλες οι εκδόσεις του "
 "GNU θα παραμείνουν ελεύθερες."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why Many Other Programmers Want to Help"
 msgstr "Γιατί πολλοί άλλοι προγραμματιστές 
θέλουν να βοηθήσουν"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found many other programmers who are excited about GNU and want to "
 "help."
@@ -271,7 +298,7 @@
 "Έχω βρει πολλούς άλλους προγραμματιστές 
που είναι ενθουσιασμένοι με το GNU "
 "και θέλουν να βοηθήσουν."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Many programmers are unhappy about the commercialization of system "
 "software.  It may enable them to make more money, but it requires them to "
@@ -297,7 +324,7 @@
 "κυνικοί και πιστεύουν πώς ο 
προγραμματισμός είναι απλώς ένας τρόπος να 
"
 "κερδίζει κανείς χρήματα."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By working on and using GNU rather than proprietary programs, we can be "
 "hospitable to everyone and obey the law.  In addition, GNU serves as an "
@@ -315,11 +342,11 @@
 "τους μισούς από τους προγραμματιστές που 
απευθύνομαι, αυτή είναι μια "
 "σημαντική ευτυχία την οποία τα χρήματα 
δεν μπορούν να την αντικαταστήσουν."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How You Can Contribute"
 msgstr "Πως μπορείτε να συνεισφέρετε"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "(Nowadays, for software tasks to work on, see the <a href=\"http://fsf.org/";
 "campaigns/priority-projects\">High Priority Projects list</a> and the <a "
@@ -335,7 +362,7 @@
 "άλλους τρόπους να βοηθήσετε, δείτε <a 
href=\"/help/help.html\">τον οδηγό για "
 "να βοηθήσετε το λειτουργικό σύστημα GNU</a>.)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am asking computer manufacturers for donations of machines and money.  I'm "
 "asking individuals for donations of programs and work."
@@ -343,7 +370,7 @@
 "Ζητώ από τους κατασκευαστές υπολογιστών 
δωρεές μηχανημάτων και χρημάτων.  "
 "Από τους ιδιώτες ζητώ δωρεές προγραμμάτων 
και εργασίας."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One consequence you can expect if you donate machines is that GNU will run "
 "on them at an early date.  The machines should be complete, ready to use "
@@ -355,7 +382,7 @@
 "έτοιμα προς χρήση συστήματα, εγκεκριμένα 
για χρήση σε κατοικημένες περιοχές, "
 "και χωρίς ανάγκη από ιδιαίτερη ψύξη ή 
παροχή ενέργειας."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found very many programmers eager to contribute part-time work for "
 "GNU.  For most projects, such part-time distributed work would be very hard "
@@ -387,7 +414,7 @@
 "επιτεύξιμη εργασία.  (Ο πυρήνας θα 
απαιτήσει στενότερη επικοινωνία και θα "
 "πραγματοποιηθεί από μια μικρή, σφιχτή 
ομάδα.)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If I get donations of money, I may be able to hire a few people full or part "
 "time.  The salary won't be high by programmers' standards, but I'm looking "
@@ -405,19 +432,26 @@
 "το να τους απαλλάξει από την ανάγκη να 
εξοικονομούν τα προς το ζην με άλλο "
 "τρόπο."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why All Computer Users Will Benefit"
 msgstr "Γιατί όλοι οι χρήστες υπολογιστών θα 
ωφεληθούν"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Once GNU is written, everyone will be able to obtain good system software
+# | free, just like [-air.<a href=\"#f2\">(3)</a>-] {+air&#8239;<a
+# | class=\"ftn\" href=\"#f2\">[3]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "Once GNU is written, everyone will be able to obtain good system software "
+#| "free, just like air.<a href=\"#f2\">(3)</a>"
 msgid ""
 "Once GNU is written, everyone will be able to obtain good system software "
-"free, just like air.<a href=\"#f2\">(3)</a>"
+"free, just like air&#8239;<a class=\"ftn\" href=\"#f2\">[3]</a>."
 msgstr ""
 "Όταν το GNU γραφτεί, ο καθένας θα μπορεί να 
αποκτήσει καλό λογισμικό "
 "συστήματος ελεύθερα, ακριβώς όπως τον 
αέρα.<a href=\"#f2\">(3)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This means much more than just saving everyone the price of a Unix license.  "
 "It means that much wasteful duplication of system programming effort will be "
@@ -428,7 +462,7 @@
 "προσπάθειας προγραμματισμού συστημάτων.  
Αυτή η προσπάθεια μπορεί αντίθετα "
 "να κατευθυνθεί προς την πρόοδο του 
επιπέδου της τεχνολογίας."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Complete system sources will be available to everyone.  As a result, a user "
 "who needs changes in the system will always be free to make them himself, or "
@@ -443,7 +477,7 @@
 "είναι πλέον στο έλεος ενός προγραμματιστή 
ή εταιρείας που κατέχει τον πηγαίο "
 "κώδικα και είναι στην αποκλειστική θέση 
να κάνει αλλαγές. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Schools will be able to provide a much more educational environment by "
 "encouraging all students to study and improve the system code.  Harvard's "
@@ -460,7 +494,7 @@
 "άρνησή του να εγκαταστήσει κάποια 
προγράμματα.  Αυτό υπήρξε μεγάλη έμπνευση "
 "για μένα."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Finally, the overhead of considering who owns the system software and what "
 "one is or is not entitled to do with it will be lifted."
@@ -469,7 +503,7 @@
 "λογισμικού συστήματος και το τι μπορεί 
και τι δεν μπορεί κάποιος να κάνει με "
 "αυτό, θα απαλειφθεί."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Arrangements to make people pay for using a program, including licensing of "
 "copies, always incur a tremendous cost to society through the cumbersome "
@@ -496,7 +530,7 @@
 "υποστηριχθεί οικονομικά η παραγωγή αέρα 
με έναν κεφαλικό φόρο και να "
 "πετάξουμε τις μάσκες."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copying all or parts of a program is as natural to a programmer as "
 "breathing, and as productive.  It ought to be as free."
@@ -505,11 +539,11 @@
 "έναν προγραμματιστή όσο και η αναπνοή, και 
εξίσου παραγωγικό.  Θα έπρεπε να "
 "είναι και εξίσου ελεύθερο."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Some Easily Rebutted Objections to GNU's Goals"
 msgstr "Κάποιες εύκολα ανασκευάσιμες 
αντιρρήσεις για τους στόχους του GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Nobody will use it if it is free, because that means they "
 "can't rely on any support.&rdquo;</strong>"
@@ -518,7 +552,7 @@
 "σημαίνει πώς δεν μπορoύν να υπολογίζουν σε 
οποιαδήποτε υποστήριξη.&rdquo;</"
 "strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You have to charge for the program to pay for providing the "
 "support.&rdquo;</strong>"
@@ -526,18 +560,27 @@
 "<strong>&ldquo;Πρέπει να χρεώνεις για το 
πρόγραμμα, ώστε να παρέχεις "
 "υποστήριξη.&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | If people would rather pay for GNU plus service than get GNU free without
+# | service, a company to provide just service to people who have obtained GNU
+# | free ought to be [-profitable.<a href=\"#f3\">(4)</a>-]
+# | {+profitable&#8239;<a class=\"ftn\" href=\"#f3\">[4]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "If people would rather pay for GNU plus service than get GNU free without "
+#| "service, a company to provide just service to people who have obtained "
+#| "GNU free ought to be profitable.<a href=\"#f3\">(4)</a>"
 msgid ""
 "If people would rather pay for GNU plus service than get GNU free without "
 "service, a company to provide just service to people who have obtained GNU "
-"free ought to be profitable.<a href=\"#f3\">(4)</a>"
+"free ought to be profitable&#8239;<a class=\"ftn\" href=\"#f3\">[4]</a>."
 msgstr ""
 "Εάν οι άνθρωποι θα προτιμούσαν να πληρώνου
ν για το GNU συν την υποστήριξη, "
 "παρά να το λαμβάνουν ελεύθερα χωρίς υ
πηρεσίες, τότε μια εταιρεία που θα "
 "παρείχε υποστήριξη και μόνο σε όσους 
απέκτησαν το GNU δωρεάν θα όφειλε να "
 "είναι επικερδής.<a href=\"#f3\">(4)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We must distinguish between support in the form of real programming work and "
 "mere handholding.  The former is something one cannot rely on from a "
@@ -550,7 +593,7 @@
 "πρόβλημά σας δεν είναι κοινό με αρκετούς 
άλλους ανθρώπους, ο προμηθευτής θα "
 "σας πει να πάτε να χαθείτε."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If your business needs to be able to rely on support, the only way is to "
 "have all the necessary sources and tools.  Then you can hire any available "
@@ -571,7 +614,7 @@
 "αποδοθεί στις διευθετήσεις της διάθεσης.  
Το GNU δεν λύνει όλα τα προβλήματα "
 "του κόσμου, απλώς μερικά από αυτά."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Meanwhile, the users who know nothing about computers need handholding: "
 "doing things for them which they could easily do themselves but don't know "
@@ -581,7 +624,7 @@
 "χρειάζονται το κράτημα του χεριού· να 
γίνονται πράγματα γι' αυτούς τα οποία "
 "θα μπορούσαν να κάνουν και οι ίδιοι 
εύκολα, αλλά δεν ξέρουν πώς."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Such services could be provided by companies that sell just handholding and "
 "repair service.  If it is true that users would rather spend money and get a "
@@ -600,7 +643,7 @@
 "από εμάς δεν χρειαζόμαστε την υπηρεσία, θα 
πρέπει να έχουμε τη δυνατότητα να "
 "χρησιμοποιούμε το πρόγραμμα χωρίς να 
πληρώσουμε για την υπηρεσία."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You cannot reach many people without advertising, and you "
 "must charge for the program to support that.&rdquo;</strong>"
@@ -609,7 +652,7 @@
 "και πρέπει να χρεώνεις για το πρόγραμμα, 
ώστε να υποστηρίξεις τη διαφήμιση."
 "&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;It's no use advertising a program people can get free.&rdquo;"
 "</strong>"
@@ -617,7 +660,7 @@
 "<strong>&ldquo;Δεν υπάρχει λόγος να διαφημίζεις 
ένα πρόγραμμα που μπορούν "
 "όλοι να το πάρουν ελεύθερα.&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are various forms of free or very cheap publicity that can be used to "
 "inform numbers of computer users about something like GNU.  But it may be "
@@ -636,12 +679,23 @@
 "Με αυτό τον τρόπο, μόνο οι χρήστες που 
επωφελούνται της διαφήμισης, "
 "πληρώνουν γι' αυτήν."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | On the other hand, if many people get GNU from their friends, and such
+# | companies don't succeed, this will show that advertising was not really
+# | necessary to spread GNU.  Why is it that free market advocates don't want
+# | to let the free market decide [-this?<a href=\"#f4\">(5)</a>-]
+# | {+this?&#8239;<a class=\"ftn\" href=\"#f4\">[5]</a>+}
+#, fuzzy
+#| msgid ""
+#| "On the other hand, if many people get GNU from their friends, and such "
+#| "companies don't succeed, this will show that advertising was not really "
+#| "necessary to spread GNU.  Why is it that free market advocates don't want "
+#| "to let the free market decide this?<a href=\"#f4\">(5)</a>"
 msgid ""
 "On the other hand, if many people get GNU from their friends, and such "
 "companies don't succeed, this will show that advertising was not really "
 "necessary to spread GNU.  Why is it that free market advocates don't want to "
-"let the free market decide this?<a href=\"#f4\">(5)</a>"
+"let the free market decide this?&#8239;<a class=\"ftn\" href=\"#f4\">[5]</a>"
 msgstr ""
 "Από την άλλη, εάν πολλοί άνθρωποι πάρουν 
το GNU από τους φίλους τους και "
 "τέτοιες εταιρείες δεν τα καταφέρουν, αυτό 
θα δείξει ότι η διαφήμιση δεν ήταν "
@@ -649,7 +703,7 @@
 "ελεύθερης αγοράς δε θέλουν ν' αφήσουν την 
ελεύθερη αγορά να το αποφασίσει "
 "αυτό;<a href=\"#f4\">(5)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;My company needs a proprietary operating system to get a "
 "competitive edge.&rdquo;</strong>"
@@ -657,7 +711,7 @@
 "<strong>&ldquo;Η εταιρεία μου χρειάζεται ένα 
ιδιοκτητικό λειτουργικό "
 "σύστημα, ώστε να αποκτήσει ένα 
ανταγωνιστικό πλεονέκτημα.&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU will remove operating system software from the realm of competition.  "
 "You will not be able to get an edge in this area, but neither will your "
@@ -677,16 +731,25 @@
 "άλλο αντικείμενο, το GNU μπορεί να σας γλυ
τώσει από το να σπρωχθείτε στην "
 "ακριβή επιχείρηση της πώλησης λειτου
ργικών συστημάτων."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | I would like to see GNU development supported by gifts from many
+# | manufacturers and users, reducing the cost to [-each.<a
+# | href=\"#f5\">(6)</a>-] {+each&#8239;<a class=\"ftn\"
+# | href=\"#f5\">[6]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "I would like to see GNU development supported by gifts from many "
+#| "manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
 msgid ""
 "I would like to see GNU development supported by gifts from many "
-"manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
+"manufacturers and users, reducing the cost to each&#8239;<a class=\"ftn\" "
+"href=\"#f5\">[6]</a>."
 msgstr ""
 "Θα ήθελα να δω την ανάπτυξη του GNU να υ
ποστηρίζεται με δωρεές από πολλούς "
 "κατασκευαστές και χρήστες, κατεβάζοντας 
το κόστος για τον καθένα.<a href="
 "\"#f5\">(6)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't programmers deserve a reward for their creativity?"
 "&rdquo;</strong>"
@@ -694,7 +757,7 @@
 "<strong>&ldquo;Δεν αξίζουν οι προγραμματιστές 
μια ανταμοιβή για τη "
 "δημιουργικότητά τους;&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If anything deserves a reward, it is social contribution.  Creativity can be "
 "a social contribution, but only in so far as society is free to use the "
@@ -709,7 +772,7 @@
 "προγραμμάτων, με την ίδια λογική αξίζουν 
να τιμωρηθούν εάν περιορίζουν τη "
 "χρήση αυτών των προγραμμάτων."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Shouldn't a programmer be able to ask for a reward for his "
 "creativity?&rdquo;</strong>"
@@ -717,7 +780,7 @@
 "<strong>&ldquo;Δεν θα έπρεπε ένας 
προγραμματιστής να μπορεί να ζητήσει "
 "ανταμοιβή για τη δημιουργικότητά του
;&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is nothing wrong with wanting pay for work, or seeking to maximize "
 "one's income, as long as one does not use means that are destructive.  But "
@@ -728,7 +791,7 @@
 "χρησιμοποιεί δεν είναι καταστρεπτικά.  
Αλλά τα μέσα που συνηθίζονται στον "
 "κλάδο του λογισμικού σήμερα είναι 
βασισμένα στην καταστροφή."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Extracting money from users of a program by restricting their use of it is "
 "destructive because the restrictions reduce the amount and the ways that the "
@@ -743,7 +806,7 @@
 "πρόγραμμα.  Όταν υπάρχει μια ηθελημένη 
επιλογή να περιορίσεις, οι επιζήμιες "
 "συνέπειες είναι ηθελημένη καταστροφή."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The reason a good citizen does not use such destructive means to become "
 "wealthier is that, if everyone did so, we would all become poorer from the "
@@ -762,11 +825,11 @@
 "ανταμειφθεί κανείς για τη δημιου
ργικότητά του δε δικαιολογεί το να στερεί "
 "τον κόσμο εν γένει από το όλον ή από μέρος 
της δημιουργικότητας αυτής."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid "<strong>&ldquo;Won't programmers starve?&rdquo;</strong>"
 msgstr "<strong>&ldquo;Δεν θα πεινάσουν οι 
προγραμματιστές;&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "I could answer that nobody is forced to be a programmer.  Most of us cannot "
 "manage to get any money for standing on the street and making faces.  But we "
@@ -779,7 +842,7 @@
 "αποτέλεσμα, καταδικασμένοι να περνάμε τη 
ζωή μας στητοί στο δρόμο, κάνοντας "
 "μορφασμούς και πεινώντας.  Κάνουμε κάτι 
άλλο."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But that is the wrong answer because it accepts the questioner's implicit "
 "assumption: that without ownership of software, programmers cannot possibly "
@@ -789,7 +852,7 @@
 "που ρωτά: ότι χωρίς ιδιοκτησία του 
λογισμικού οι προγραμματιστές δεν μπορούν "
 "σε καμία περίπτωση να πληρωθούν μια 
δεκάρα.  Πώς είναι τάχα όλα ή τίποτα."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The real reason programmers will not starve is that it will still be "
 "possible for them to get paid for programming; just not paid as much as now."
@@ -798,13 +861,28 @@
 "ότι θα είναι ακόμη δυνατό γι' αυτούς να 
αμείβονται για να προγραμματίζουν· "
 "απλά όχι τόσο πολύ όσο τώρα."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | Restricting copying is not the only basis for business in software.  It is
+# | the most common [-basis<a href=\"#f8\">(7)</a>-] {+basis&#8239;<a
+# | class=\"ftn\" href=\"#f8\">[7]</a>+} because it brings in the most money. 
+# | If it were prohibited, or rejected by the customer, software business
+# | would move to other bases of organization which are now used less often. 
+# | There are always numerous ways to organize any kind of business.
+#, fuzzy
+#| msgid ""
+#| "Restricting copying is not the only basis for business in software.  It "
+#| "is the most common basis<a href=\"#f8\">(7)</a> because it brings in the "
+#| "most money.  If it were prohibited, or rejected by the customer, software "
+#| "business would move to other bases of organization which are now used "
+#| "less often.  There are always numerous ways to organize any kind of "
+#| "business."
 msgid ""
 "Restricting copying is not the only basis for business in software.  It is "
-"the most common basis<a href=\"#f8\">(7)</a> because it brings in the most "
-"money.  If it were prohibited, or rejected by the customer, software "
-"business would move to other bases of organization which are now used less "
-"often.  There are always numerous ways to organize any kind of business."
+"the most common basis&#8239;<a class=\"ftn\" href=\"#f8\">[7]</a> because it "
+"brings in the most money.  If it were prohibited, or rejected by the "
+"customer, software business would move to other bases of organization which "
+"are now used less often.  There are always numerous ways to organize any "
+"kind of business."
 msgstr ""
 "Ο περιορισμός της αντιγραφής δεν είναι η 
μοναδική βάση για επιχειρήσεις στην "
 "αγορά λογισμικού. Είναι η πλέον κοινή 
βάση<a href=\"#f8\">(7)</a>, γιατί "
@@ -813,7 +891,7 @@
 "οργάνωσης οι οποίες τώρα 
χρησιμοποιούνται λιγότερο.  Υπάρχουν 
πάντοτε πολλοί "
 "τρόποι για να οργανωθεί οποιοδήποτε είδος 
επιχείρησης."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Probably programming will not be as lucrative on the new basis as it is "
 "now.  But that is not an argument against the change.  It is not considered "
@@ -828,7 +906,7 @@
 "αυτό αδικία. (Στην πράξη, θα εξακολου
θούσαν να βγάζουν σημαντικά περισσότερα "
 "από αυτά.)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't people have a right to control how their creativity is "
 "used?&rdquo;</strong>"
@@ -836,7 +914,7 @@
 "<strong>&ldquo;Δεν έχουν οι άνθρωποι το δικαίωμα 
να ελέγξουν πώς "
 "χρησιμοποιείται η δημιουργικότητά του
ς;&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "&ldquo;Control over the use of one's ideas&rdquo; really constitutes control "
 "over other people's lives; and it is usually used to make their lives more "
@@ -846,13 +924,26 @@
 "πραγματικότητα έλεγχο στις ζωές άλλων 
ανθρώπων· και συνήθως χρησιμοποιείται "
 "για να κάνει τις ζωές τους δυσκολότερες."
 
-#. type: Content of: <p>
-msgid ""
-"People who have studied the issue of intellectual property rights<a href="
-"\"#f6\">(8)</a> carefully (such as lawyers) say that there is no intrinsic "
-"right to intellectual property.  The kinds of supposed intellectual property "
-"rights that the government recognizes were created by specific acts of "
-"legislation for specific purposes."
+#. type: Content of: <div><dl><dd><p>
+# | People who have studied the issue of intellectual property [-rights<a
+# | href=\"#f6\">(8)</a>-] {+rights&#8239;<a class=\"ftn\"
+# | href=\"#f6\">[8]</a>+} carefully (such as lawyers) say that there is no
+# | intrinsic right to intellectual property.  The kinds of supposed
+# | intellectual property rights that the government recognizes were created
+# | by specific acts of legislation for specific purposes.
+#, fuzzy
+#| msgid ""
+#| "People who have studied the issue of intellectual property rights<a href="
+#| "\"#f6\">(8)</a> carefully (such as lawyers) say that there is no "
+#| "intrinsic right to intellectual property.  The kinds of supposed "
+#| "intellectual property rights that the government recognizes were created "
+#| "by specific acts of legislation for specific purposes."
+msgid ""
+"People who have studied the issue of intellectual property rights&#8239;<a "
+"class=\"ftn\" href=\"#f6\">[8]</a> carefully (such as lawyers) say that "
+"there is no intrinsic right to intellectual property.  The kinds of supposed "
+"intellectual property rights that the government recognizes were created by "
+"specific acts of legislation for specific purposes."
 msgstr ""
 "Οι άνθρωποι που μελέτησαν το ζήτημα των 
πνευματικών δικαιωμάτων <a href="
 "\"#f6\">(8)</a> προσεκτικά (όπως οι δικηγόροι) 
λένε πως δεν υπάρχει εγγενές "
@@ -860,7 +951,7 @@
 "δικαιωμάτων τα οποία αναγνωρίζει η κυ
βέρνηση δημιουργήθηκαν με συγκεκριμένες "
 "πράξεις νομοθεσίας για να εξυπηρετηθούν 
συγκεκριμένοι σκοποί."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For example, the patent system was established to encourage inventors to "
 "disclose the details of their inventions.  Its purpose was to help society "
@@ -882,7 +973,7 @@
 "μεγάλο κακό.  Δεν βάζουν εμπόδια στους 
περισσότερους ιδιώτες που "
 "χρησιμοποιούν προϊόντα καλυμμένα από ευ
ρεσιτεχνίες."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The idea of copyright did not exist in ancient times, when authors "
 "frequently copied other authors at length in works of nonfiction.  This "
@@ -903,7 +994,7 @@
 "τυπογραφείο&mdash;έκανε μικρό κακό και δεν 
εμπόδιζε τους περισσότερους από "
 "τους ιδιώτες που διαβάζουν τα βιβλία."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "All intellectual property rights are just licenses granted by society "
 "because it was thought, rightly or wrongly, that society as a whole would "
@@ -917,7 +1008,7 @@
 "περίπτωση πρέπει να ρωτάμε: είμαστε 
πράγματι καλύτερα με το να χορηγούμε μια "
 "τέτοια άδεια;  Τί είδους πράξεις 
αδειοδοτούμε ένα πρόσωπο να κάνει;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The case of programs today is very different from that of books a hundred "
 "years ago.  The fact that the easiest way to copy a program is from one "
@@ -939,14 +1030,14 @@
 "όσο και πνευματικά· μιας κατάστασης στην 
οποία ένα πρόσωπο δεν θα έπρεπε να "
 "ενεργεί έτσι ανεξάρτητα με το εάν του το 
επιτρέπει ο νόμος."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Competition makes things get done better.&rdquo;</strong>"
 msgstr ""
 "<strong>&ldquo;Ο ανταγωνισμός κάνει τα πράγματα 
να γίνονται καλύτερα.&rdquo;"
 "</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The paradigm of competition is a race: by rewarding the winner, we encourage "
 "everyone to run faster.  When capitalism really works this way, it does a "
@@ -966,7 +1057,7 @@
 "δρομείς.  Εάν οι δρομείς εμπλακούν σε 
αψιμαχίες, θα τερματίσουν όλοι "
 "καθυστερημένα."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Proprietary and secret software is the moral equivalent of runners in a fist "
 "fight.  Sad to say, the only referee we've got does not seem to object to "
@@ -981,7 +1072,7 @@
 "πραγματικά να σταματάει τις αψιμαχίες και 
να τιμωρεί τους δρομείς ακόμα και "
 "για την απόπειρα να καβγαδίσουν."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Won't everyone stop programming without a monetary incentive?"
 "&rdquo;</strong>"
@@ -989,7 +1080,7 @@
 "<strong>&ldquo;Δε θα σταματήσουν όλοι να γράφουν 
προγράμματα χωρίς ένα "
 "χρηματικό κίνητρο;&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually, many people will program with absolutely no monetary incentive.  "
 "Programming has an irresistible fascination for some people, usually the "
@@ -1002,7 +1093,7 @@
 "αυτόν.  Δεν υπάρχει καμία έλλειψη σ' 
επαγγελματίες μουσικούς που επιμένουν "
 "κι ας μην έχουν καμιά ελπίδα πως θα τα 
βγάλουν πέρα μ' αυτόν τον τρόπο."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But really this question, though commonly asked, is not appropriate to the "
 "situation.  Pay for programmers will not disappear, only become less.  So "
@@ -1014,7 +1105,7 @@
 "απλώς θα είναι μικρότερη.  Έτσι η σωστή 
ερώτηση είναι, θα προγραμματίζει "
 "κανείς μ' ένα μειωμένο χρηματικό κίνητρο;  
Η εμπειρία μου δείχνει πως ναι."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For more than ten years, many of the world's best programmers worked at the "
 "Artificial Intelligence Lab for far less money than they could have had "
@@ -1027,7 +1118,7 @@
 "μη-χρηματικής ανταμοιβής: φήμη και 
αναγνώριση, για παράδειγμα.  Και η "
 "δημιουργικότητα είναι επίσης διασκέδαση, 
μια ανταμοιβή από μόνη της."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Then most of them left when offered a chance to do the same interesting work "
 "for a lot of money."
@@ -1035,7 +1126,7 @@
 "Μετά οι περισσότεροι έφυγαν όταν τους 
προτάθηκε η ευκαιρία να κάνουν την "
 "ίδια συναρπαστική εργασία με πολλά 
χρήματα."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "What the facts show is that people will program for reasons other than "
 "riches; but if given a chance to make a lot of money as well, they will come "
@@ -1050,7 +1141,7 @@
 "εκείνους που πληρώνουν πολλά, αλλά δεν 
σημαίνει πως δεν θα τα πάνε καλά εάν "
 "εκείνοι που πληρώνουν πολλά απαγορευτούν."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;We need the programmers desperately.  If they demand that we "
 "stop helping our neighbors, we have to obey.&rdquo;</strong>"
@@ -1059,7 +1150,7 @@
 "απαιτήσουν να σταματήσουμε να βοηθάμε του
ς γείτονές μας, πρέπει να "
 "υπακούσουμε.&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "You're never so desperate that you have to obey this sort of demand.  "
 "Remember: millions for defense, but not a cent for tribute!"
@@ -1068,14 +1159,14 @@
 "είδους απαιτήσεις. Θυμηθείτε: εκατομμύρια 
για την άμυνα, αλλά ούτε ένα σεντ "
 "για φόρο υποτέλειας!"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Programmers need to make a living somehow.&rdquo;</strong>"
 msgstr ""
 "<strong>&ldquo;Οι προγραμματιστές πρέπει με 
κάποιον τρόπο να βγάζουν τα προς "
 "το ζην.&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In the short run, this is true.  However, there are plenty of ways that "
 "programmers could make a living without selling the right to use a program.  "
@@ -1091,7 +1182,7 @@
 "ζην.  Είναι εύκολο να βρείτε άλλους τρόπου
ς, αρκεί να θέλετε να τους "
 "βρείτε.  Εδώ είναι μερικά παραδείγματα."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A manufacturer introducing a new computer will pay for the porting of "
 "operating systems onto the new hardware."
@@ -1099,7 +1190,7 @@
 "Ένας κατασκευαστής  ο οποίος παρουσιάζει 
ένα νέο υπολογιστή, θα πληρώνει τη "
 "μεταφορά των  λειτουργικών συστημάτων στο 
νέο υλικό."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The sale of teaching, handholding and maintenance services could also employ "
 "programmers."
@@ -1107,18 +1198,30 @@
 "Η πώληση διδασκαλίας, υποστήριξης και συ
ντήρησης θα μπορούσε επίσης να "
 "απασχολεί προγραμματιστές."
 
-#. type: Content of: <p>
-msgid ""
-"People with new ideas could distribute programs as freeware<a href=\"#f7\">"
-"(9)</a>, asking for donations from satisfied users, or selling handholding "
-"services.  I have met people who are already working this way successfully."
+#. type: Content of: <div><dl><dd><p>
+# | People with new ideas could distribute programs as [-freeware<a
+# | href=\"#f7\">(9)</a>,-] {+freeware&#8239;<a class=\"ftn\"
+# | href=\"#f7\">[9]</a>,+} asking for donations from satisfied users, or
+# | selling handholding services.  I have met people who are already working
+# | this way successfully.
+#, fuzzy
+#| msgid ""
+#| "People with new ideas could distribute programs as freeware<a href="
+#| "\"#f7\">(9)</a>, asking for donations from satisfied users, or selling "
+#| "handholding services.  I have met people who are already working this way "
+#| "successfully."
+msgid ""
+"People with new ideas could distribute programs as freeware&#8239;<a class="
+"\"ftn\" href=\"#f7\">[9]</a>, asking for donations from satisfied users, or "
+"selling handholding services.  I have met people who are already working "
+"this way successfully."
 msgstr ""
 "Άνθρωποι με νέες ιδέες θα μπορούσαν να 
διανέμουν τα προγράμματά τους ως "
 "δωρεάν λογισμικό<a href=\"#f7\">(9)</a>, ζητώντας 
δωρεές από ικανοποιημένους "
 "χρήστες, ή πωλώντας υπηρεσίες υ
ποστήριξης.  Έχω γνωρίσει ανθρώπους οι 
οποίοι "
 "ήδη εργάζονται επιτυχημένα μ' αυτό τον 
τρόπο."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Users with related needs can form users' groups, and pay dues.  A group "
 "would contract with programming companies to write programs that the group's "
@@ -1129,12 +1232,12 @@
 "προγραμματιστών, ώστε να γράψουν 
προγράμματα τα οποία θα ήθελαν να "
 "χρησιμοποιούν τα μέλη της ομάδας χρηστών."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "All sorts of development can be funded with a Software Tax:"
 msgstr ""
 "Όλων των ειδών η ανάπτυξη μπορεί να 
χρηματοδοτηθεί μ' ένα Φόρο Λογισμικού:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Suppose everyone who buys a computer has to pay x percent of the price as a "
 "software tax.  The government gives this to an agency like the NSF to spend "
@@ -1145,7 +1248,7 @@
 "υπηρεσία όπως τo NSF<sup><a href=\"#TransNote4\">[4]</a></sup> 
για να το "
 "διαθέσει στην ανάπτυξη λογισμικού."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But if the computer buyer makes a donation to software development himself, "
 "he can take a credit against the tax.  He can donate to the project of his "
@@ -1159,7 +1262,7 @@
 "χρησιμοποιήσει το αποτέλεσμα μόλις 
ολοκληρωθεί.  Μπορεί να έχει έκπτωση για "
 "οποιοδήποτε ποσό μέχρι το συνολικό ύψος 
του φόρου που θα έπρεπε να πληρώσει."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The total tax rate could be decided by a vote of the payers of the tax, "
 "weighted according to the amount they will be taxed on."
@@ -1168,20 +1271,20 @@
 "την ψήφο αυτών που θα κληθούν να τον 
καταβάλλουν, σταθμίζοντάς το με το ποσό "
 "που θα φορολογηθούν."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "The consequences:"
 msgstr "Τα αποτελέσματα:"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "The computer-using community supports software development."
 msgstr ""
 "Η κοινότητα των χρηστών υπολογιστών 
στηρίζει την ανάπτυξη του λογισμικού."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "This community decides what level of support is needed."
 msgstr "Αυτή η κοινότητα επιλέγει τον βαθμό υ
ποστήριξης που χρειάζεται."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "Users who care which projects their share is spent on can choose this for "
 "themselves."
@@ -1189,7 +1292,7 @@
 "Οι χρήστες που ενδιαφέρονται για το ποια 
έργα χρηματοδοτούνται με το μερίδιό "
 "τους, μπορούν να το επιλέξουν οι ίδιοι."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the long run, making programs free is a step toward the postscarcity "
 "world, where nobody will have to work very hard just to make a living.  "
@@ -1208,7 +1311,7 @@
 "συσκέψεις, η επισκευή ρομπότ και η 
χαρτογράφηση των αστεροειδών.  Δε θα "
 "υπάρχει καμία ανάγκη να βγάζει κανείς τα 
προς το ζην από τον προγραμματισμό."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We have already greatly reduced the amount of work that the whole society "
 "must do for its actual productivity, but only a little of this has "
@@ -1230,11 +1333,11 @@
 "εξελίξεις στην παραγωγικότητα να 
μεταφράζονται σε λιγότερη εργασία για 
εμάς."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "Υποσημειώσεις"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The wording here was careless.  The intention was that nobody would have to "
 "pay for <b>permission</b> to use the GNU system.  But the words don't make "
@@ -1266,7 +1369,7 @@
 "καλύτερο.  Το σημαντικό είναι πώς ο 
καθένας που έχει ένα αντίγραφο, έχει την "
 "ελευθερία να συνεργάζεται με άλλους στη 
χρήση του."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The expression &ldquo;give away&rdquo; is another indication that I had not "
 "yet clearly separated the issue of price from that of freedom.  We now "
@@ -1281,10 +1384,21 @@
 "html#GiveAwaySoftware\">Λέξεις και φράσεις που 
προκαλούν σύγχυση</a>&rdquo; "
 "για πιο λεπτομερή εξήγηση."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+# | This is another place I failed to distinguish carefully between the two
+# | different meanings of [-&ldquo;free&rdquo;.-] {+&ldquo;free.&rdquo;+} The
+# | statement as it stands is not false&mdash;you can get copies of GNU
+# | software at no charge, from your friends or over the net.  But it does
+# | suggest the wrong idea.
+#, fuzzy
+#| msgid ""
+#| "This is another place I failed to distinguish carefully between the two "
+#| "different meanings of &ldquo;free&rdquo;.  The statement as it stands is "
+#| "not false&mdash;you can get copies of GNU software at no charge, from "
+#| "your friends or over the net.  But it does suggest the wrong idea."
 msgid ""
 "This is another place I failed to distinguish carefully between the two "
-"different meanings of &ldquo;free&rdquo;.  The statement as it stands is not "
+"different meanings of &ldquo;free.&rdquo; The statement as it stands is not "
 "false&mdash;you can get copies of GNU software at no charge, from your "
 "friends or over the net.  But it does suggest the wrong idea."
 msgstr ""
@@ -1294,11 +1408,11 @@
 "λογισμικού GNU χωρίς χρέωση, από τους φίλου
ς σας ή από το Διαδίκτυο.  Αλλά "
 "πράγματι υπονοεί τη λάθος ιδέα."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid "Several such companies now exist."
 msgstr "Υπάρχουν τώρα αρκετές τέτοιες 
εταιρείες."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Although it is a charity rather than a company, the Free Software Foundation "
 "for 10 years raised most of its funds from its distribution service.  You "
@@ -1310,7 +1424,7 @@
 "δική του υπηρεσία διανομής.  Μπορείτε να <a 
href=\"/order/order.html"
 "\">παραγγείλετε πράγματα από το ΙΕΛ</a> για 
να υποστηρίξετε το έργο του. "
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "A group of computer companies pooled funds around 1991 to support "
 "maintenance of the GNU C Compiler."
@@ -1318,7 +1432,7 @@
 "Μια ομάδα εταιρειών υπολογιστών συ
γκέντρωσε πόρους γύρω στο 1991, για να "
 "υποστηρίξει τη συντήρηση του GNU 
μεταγλωττιστή της C."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "I think I was mistaken in saying that proprietary software was the most "
 "common basis for making money in software.  It seems that actually the most "
@@ -1340,10 +1454,31 @@
 "περισσότεροι επί πληρωμή προγραμματιστές 
θα κέρδιζαν λιγότερα σ' έναν κόσμο "
 "ελεύθερου λογισμικού."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+# | In the 1980s I had not yet realized how confusing it was to speak of
+# | &ldquo;the issue&rdquo; of &ldquo;intellectual [-property&rdquo;.-]
+# | {+property.&rdquo;+} That term is obviously biased; more subtle is the
+# | fact that it lumps together various disparate laws which raise very
+# | different issues.  Nowadays I urge people to reject the term
+# | &ldquo;intellectual property&rdquo; entirely, lest it lead others to
+# | suppose that those laws form one coherent issue.  The way to be clear is
+# | to discuss patents, copyrights, and trademarks separately.  See <a
+# | href=\"/philosophy/not-ipr.html\">further explanation</a> of how this term
+# | spreads confusion and bias.
+#, fuzzy
+#| msgid ""
+#| "In the 1980s I had not yet realized how confusing it was to speak of "
+#| "&ldquo;the issue&rdquo; of &ldquo;intellectual property&rdquo;.  That "
+#| "term is obviously biased; more subtle is the fact that it lumps together "
+#| "various disparate laws which raise very different issues.  Nowadays I "
+#| "urge people to reject the term &ldquo;intellectual property&rdquo; "
+#| "entirely, lest it lead others to suppose that those laws form one "
+#| "coherent issue.  The way to be clear is to discuss patents, copyrights, "
+#| "and trademarks separately.  See <a href=\"/philosophy/not-ipr.html"
+#| "\">further explanation</a> of how this term spreads confusion and bias."
 msgid ""
 "In the 1980s I had not yet realized how confusing it was to speak of &ldquo;"
-"the issue&rdquo; of &ldquo;intellectual property&rdquo;.  That term is "
+"the issue&rdquo; of &ldquo;intellectual property.&rdquo; That term is "
 "obviously biased; more subtle is the fact that it lumps together various "
 "disparate laws which raise very different issues.  Nowadays I urge people to "
 "reject the term &ldquo;intellectual property&rdquo; entirely, lest it lead "
@@ -1364,10 +1499,26 @@
 "Δείτε μια <a href=\"/philosophy/not-ipr.html\">περαιτέρω 
εξήγηση</a> για το "
 "πώς αυτός ο όρος διασπείρει σύγχυση και 
προκατάληψη."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+# | Subsequently we learned to distinguish between &ldquo;free software&rdquo;
+# | and [-&ldquo;freeware&rdquo;.-] {+&ldquo;freeware.&rdquo;+} The term
+# | &ldquo;freeware&rdquo; means software you are free to redistribute, but
+# | usually you are not free to study and change the source code, so most of
+# | it is not free software.  See &ldquo;<a
+# | href=\"/philosophy/words-to-avoid.html#Freeware\">Confusing Words and
+# | Phrases</a>&rdquo; for more explanation.
+#, fuzzy
+#| msgid ""
+#| "Subsequently we learned to distinguish between &ldquo;free "
+#| "software&rdquo; and &ldquo;freeware&rdquo;.  The term &ldquo;"
+#| "freeware&rdquo; means software you are free to redistribute, but usually "
+#| "you are not free to study and change the source code, so most of it is "
+#| "not free software.  See &ldquo;<a href=\"/philosophy/words-to-avoid."
+#| "html#Freeware\">Confusing Words and Phrases</a>&rdquo; for more "
+#| "explanation."
 msgid ""
 "Subsequently we learned to distinguish between &ldquo;free software&rdquo; "
-"and &ldquo;freeware&rdquo;.  The term &ldquo;freeware&rdquo; means software "
+"and &ldquo;freeware.&rdquo; The term &ldquo;freeware&rdquo; means software "
 "you are free to redistribute, but usually you are not free to study and "
 "change the source code, so most of it is not free software.  See &ldquo;<a "
 "href=\"/philosophy/words-to-avoid.html#Freeware\">Confusing Words and "
@@ -1411,6 +1562,7 @@
 "άλλες διορθώσεις ή προτάσεις μπορούν να 
σταλούν στο <a href=\"mailto:";
 "webmasters@gnu.org\">&lt;webmasters@gnu.org&gt;</a>."
 
+# TODO: submitting -> contributing.
 #.  TRANSLATORS: Ignore the original text in this paragraph,
 #.         replace it with the translation of these two:
 #.         We work hard and do our best to provide accurate, good quality
@@ -1418,14 +1570,20 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Εργαζόμαστε σκληρά και κάνουμε ό,τι 
καλύτερο μπορούμε για να παρέχουμε "
@@ -1437,15 +1595,15 @@
 "\"/server/standards/README.translations.html\">Μεταφράσεις 
ΔΙΑΒΑΣΕΜΕ</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, [-2014-]
-# | {+2014, 2015+} Free Software Foundation, Inc.
+# | Copyright &copy; 1985, 1993, 200[-3-]{+4+}, 2005, 2007, [-2008,-] 2009,
+# | 2010, [-2014-] {+2015, 2021+} Free Software Foundation, Inc.
 #, fuzzy
 #| msgid ""
 #| "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014 "
 #| "Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 1985, 1993, 2004, 2005, 2007, 2009, 2010, 2015, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
 "Πνευματικά δικαιώματα:<br />\n"
 "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014 Free "

Index: po/manifesto.es.po
===================================================================
RCS file: /web/www/www/gnu/po/manifesto.es.po,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- po/manifesto.es.po  2 Nov 2021 13:56:41 -0000       1.28
+++ po/manifesto.es.po  2 Nov 2021 14:41:53 -0000       1.29
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manifesto.es.html\n"
-"POT-Creation-Date: 2015-06-02 12:55+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2016-01-28 15:58+0100\n"
 "Last-Translator: Dora Scilipoti <dora AT gnu DOT org>\n"
 "Language-Team: Spanish <www-es-general@gnu.org>\n"
@@ -22,6 +22,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-11-02 14:27+0000\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Poedit-Language: Spanish\n"
 
@@ -31,14 +32,28 @@
 msgstr "El manifiesto de GNU - Proyecto GNU -  Free Software Foundation "
 
 # type: Content of: <h2>
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "The GNU Manifesto"
 msgstr "El manifiesto de GNU"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
+# | The GNU Manifesto (which appears below) was written by <a
+# | href=\"http{+s+}://www.stallman.org/\">Richard Stallman</a> in 1985 to ask
+# | for support in developing the GNU operating system.  Part of the text was
+# | taken from the original announcement of 1983.  Through 1987, it was
+# | updated in minor ways to account for developments; since then, it seems
+# | best to leave it unchanged.
+#, fuzzy
+#| msgid ""
+#| "The GNU Manifesto (which appears below) was written by <a href=\"http://";
+#| "www.stallman.org/\">Richard Stallman</a> in 1985 to ask for support in "
+#| "developing the GNU operating system.  Part of the text was taken from the "
+#| "original announcement of 1983.  Through 1987, it was updated in minor "
+#| "ways to account for developments; since then, it seems best to leave it "
+#| "unchanged."
 msgid ""
-"The GNU Manifesto (which appears below) was written by <a href=\"http://www.";
+"The GNU Manifesto (which appears below) was written by <a href=\"https://www.";
 "stallman.org/\">Richard Stallman</a> in 1985 to ask for support in "
 "developing the GNU operating system.  Part of the text was taken from the "
 "original announcement of 1983.  Through 1987, it was updated in minor ways "
@@ -52,7 +67,7 @@
 "partir de entonces, parece mejor dejarlo tal cual."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Since that time, we have learned about certain common misunderstandings that "
 "different wording could help avoid.  Footnotes added since 1993 help clarify "
@@ -63,7 +78,7 @@
 "pie de página que hemos añadido a partir de 1993 ayudan a clarificar estos "
 "puntos."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If you want to install the GNU/Linux system, we recommend you use one of the "
 "<a href=\"/distros\">100% free software GNU/Linux distributions</a>.  For "
@@ -75,7 +90,7 @@
 "a>. Para colaborar, consulte <a href=\"/help/help.html\">http://www.gnu.org/";
 "help</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The GNU Project is part of the Free Software Movement, a campaign for <a "
 "href=\"/philosophy/free-sw.html\">freedom for users of software</a>.  It is "
@@ -93,18 +108,31 @@
 "abordar el mismo asunto."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "What's GNU? Gnu's Not Unix!"
 msgstr "¿Qué es GNU? ¡GNU No es Unix!"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | GNU, which stands for Gnu's Not Unix, is the name for the complete
+# | Unix-compatible software system which I am writing so that I can give it
+# | away free to everyone who can use [-it.<a href=\"#f1\">(1)</a>-]
+# | {+it&#8239;<a class=\"ftn\" href=\"#f1\">[1]</a>.+} Several other
+# | volunteers are helping me.  Contributions of time, money, programs and
+# | equipment are greatly needed.
+#, fuzzy
+#| msgid ""
+#| "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
+#| "compatible software system which I am writing so that I can give it away "
+#| "free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
+#| "volunteers are helping me.  Contributions of time, money, programs and "
+#| "equipment are greatly needed."
 msgid ""
 "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
 "compatible software system which I am writing so that I can give it away "
-"free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
-"volunteers are helping me.  Contributions of time, money, programs and "
-"equipment are greatly needed."
+"free to everyone who can use it&#8239;<a class=\"ftn\" href=\"#f1\">[1]</a>. "
+"Several other volunteers are helping me.  Contributions of time, money, "
+"programs and equipment are greatly needed."
 msgstr ""
 "GNU, que significa «Gnu No es Unix», es el nombre del sistema de software "
 "completamente compatible con Unix que estoy escribiendo para entregarlo "
@@ -113,7 +141,7 @@
 "dinero, programas y equipos son muy necesarias."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So far we have an Emacs text editor with Lisp for writing editor commands, a "
 "source level debugger, a yacc-compatible parser generator, a linker, and "
@@ -145,7 +173,7 @@
 "Unix y más. "
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU will be able to run Unix programs, but will not be identical to Unix.  "
 "We will make all improvements that are convenient, based on our experience "
@@ -170,7 +198,7 @@
 "Chaosnet y protocolos de Internet para las comunicaciones."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is aimed initially at machines in the 68000/16000 class with virtual "
 "memory, because they are the easiest machines to make it run on.  The extra "
@@ -183,7 +211,7 @@
 "dejaremos a quienes quieran utilizarlo en ellas."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid horrible confusion, please pronounce the <em>g</em> in the word "
 "&ldquo;GNU&rdquo; when it is the name of this project."
@@ -193,12 +221,12 @@
 "\"#TransNote1\" id=\"TransNote1-rev\"><sup>[1]</sup></a>."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why I Must Write GNU"
 msgstr "Por qué debo escribir GNU"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I consider that the Golden Rule requires that if I like a program I must "
 "share it with other people who like it.  Software sellers want to divide the "
@@ -222,13 +250,26 @@
 "hicieran en mi nombre en contra de mi voluntad."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | So that I can continue to use computers without dishonor, I have decided
+# | to put together a sufficient body of free software so that I will be able
+# | to get along without any software that is not free.  I have resigned from
+# | the AI Lab to deny MIT any legal excuse to prevent me from giving GNU
+# | [-away.<a href=\"#f2a\">(2)</a>-] {+away&#8239;<a class=\"ftn\"
+# | href=\"#f2a\">[2]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "So that I can continue to use computers without dishonor, I have decided "
+#| "to put together a sufficient body of free software so that I will be able "
+#| "to get along without any software that is not free.  I have resigned from "
+#| "the AI Lab to deny MIT any legal excuse to prevent me from giving GNU "
+#| "away.<a href=\"#f2a\">(2)</a>"
 msgid ""
 "So that I can continue to use computers without dishonor, I have decided to "
 "put together a sufficient body of free software so that I will be able to "
 "get along without any software that is not free.  I have resigned from the "
-"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away.<a "
-"href=\"#f2a\">(2)</a>"
+"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away&#8239;"
+"<a class=\"ftn\" href=\"#f2a\">[2]</a>."
 msgstr ""
 "Para poder continuar a utilizar las computadoras sin deshonra, he decidido "
 "agrupar un conjunto suficiente de software libre para poder vivir sin usar "
@@ -238,12 +279,12 @@
 "impida distribuir software de GNU <a href=\"#f2a\">(2)</a>."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why GNU Will Be Compatible with Unix"
 msgstr "Por qué GNU será compatible con Unix"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Unix is not my ideal system, but it is not too bad.  The essential features "
 "of Unix seem to be good ones, and I think I can fill in what Unix lacks "
@@ -256,12 +297,12 @@
 "adopción por parte de muchas otras personas."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How GNU Will Be Available"
 msgstr "Cómo estará disponible GNU"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is not in the public domain.  Everyone will be permitted to modify and "
 "redistribute GNU, but no distributor will be allowed to restrict its further "
@@ -276,12 +317,12 @@
 "asegurarme que todas las versiones de GNU permanezcan libres."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why Many Other Programmers Want to Help"
 msgstr "Por qué muchos programadores quieren colaborar"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found many other programmers who are excited about GNU and want to "
 "help."
@@ -290,7 +331,7 @@
 "colaborar."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Many programmers are unhappy about the commercialization of system "
 "software.  It may enable them to make more money, but it requires them to "
@@ -316,7 +357,7 @@
 "manera de ganar dinero."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By working on and using GNU rather than proprietary programs, we can be "
 "hospitable to everyone and obey the law.  In addition, GNU serves as an "
@@ -334,12 +375,12 @@
 "importante que el dinero no puede reemplazar."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How You Can Contribute"
 msgstr "Cómo colaborar"
 
 # type: Content of: <blockquote><p>
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "(Nowadays, for software tasks to work on, see the <a href=\"http://fsf.org/";
 "campaigns/priority-projects\">High Priority Projects list</a> and the <a "
@@ -357,7 +398,7 @@
 "GNU</a>."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am asking computer manufacturers for donations of machines and money.  I'm "
 "asking individuals for donations of programs and work."
@@ -366,7 +407,7 @@
 "individuos les pido donaciones en forma de programas y trabajo."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One consequence you can expect if you donate machines is that GNU will run "
 "on them at an early date.  The machines should be complete, ready to use "
@@ -379,7 +420,7 @@
 "y no requerir ventilación o fuentes de energía sofisticadas."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found very many programmers eager to contribute part-time work for "
 "GNU.  For most projects, such part-time distributed work would be very hard "
@@ -411,7 +452,7 @@
 "compacto)."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If I get donations of money, I may be able to hire a few people full or part "
 "time.  The salary won't be high by programmers' standards, but I'm looking "
@@ -428,21 +469,28 @@
 "trabajar en GNU ahorrándoles la necesidad de ganarse la vida de otra manera."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why All Computer Users Will Benefit"
 msgstr "Por qué se beneficiarán todos los usuarios de computadoras."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Once GNU is written, everyone will be able to obtain good system software
+# | free, just like [-air.<a href=\"#f2\">(3)</a>-] {+air&#8239;<a
+# | class=\"ftn\" href=\"#f2\">[3]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "Once GNU is written, everyone will be able to obtain good system software "
+#| "free, just like air.<a href=\"#f2\">(3)</a>"
 msgid ""
 "Once GNU is written, everyone will be able to obtain good system software "
-"free, just like air.<a href=\"#f2\">(3)</a>"
+"free, just like air&#8239;<a class=\"ftn\" href=\"#f2\">[3]</a>."
 msgstr ""
 "Una vez que GNU esté terminado, todo el mundo podrá obtener un buen sistema 
"
 "de software tan libre como el aire. <a href=\"#f2\">(3)</a>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This means much more than just saving everyone the price of a Unix license.  "
 "It means that much wasteful duplication of system programming effort will be "
@@ -454,7 +502,7 @@
 "avance de la tecnología."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Complete system sources will be available to everyone.  As a result, a user "
 "who needs changes in the system will always be free to make them himself, or "
@@ -470,7 +518,7 @@
 "puede realizar modificaciones."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Schools will be able to provide a much more educational environment by "
 "encouraging all students to study and improve the system code.  Harvard's "
@@ -487,7 +535,7 @@
 "mucho en esa política."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Finally, the overhead of considering who owns the system software and what "
 "one is or is not entitled to do with it will be lifted."
@@ -497,7 +545,7 @@
 "desaparecido."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Arrangements to make people pay for using a program, including licensing of "
 "copies, always incur a tremendous cost to society through the cumbersome "
@@ -524,7 +572,7 @@
 "impuesto y desechar las máscaras."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copying all or parts of a program is as natural to a programmer as "
 "breathing, and as productive.  It ought to be as free."
@@ -533,12 +581,12 @@
 "respirar, además es productivo. Debería ser libre."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Some Easily Rebutted Objections to GNU's Goals"
 msgstr "Algunas objeciones,  fácilmente rebatibles, a los objetivos de GNU"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Nobody will use it if it is free, because that means they "
 "can't rely on any support.&rdquo;</strong>"
@@ -547,7 +595,7 @@
 "con ningún tipo de asistencia».</strong>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You have to charge for the program to pay for providing the "
 "support.&rdquo;</strong>"
@@ -556,18 +604,27 @@
 "asistencia».</strong>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | If people would rather pay for GNU plus service than get GNU free without
+# | service, a company to provide just service to people who have obtained GNU
+# | free ought to be [-profitable.<a href=\"#f3\">(4)</a>-]
+# | {+profitable&#8239;<a class=\"ftn\" href=\"#f3\">[4]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "If people would rather pay for GNU plus service than get GNU free without "
+#| "service, a company to provide just service to people who have obtained "
+#| "GNU free ought to be profitable.<a href=\"#f3\">(4)</a>"
 msgid ""
 "If people would rather pay for GNU plus service than get GNU free without "
 "service, a company to provide just service to people who have obtained GNU "
-"free ought to be profitable.<a href=\"#f3\">(4)</a>"
+"free ought to be profitable&#8239;<a class=\"ftn\" href=\"#f3\">[4]</a>."
 msgstr ""
 "Si la gente prefiere pagar por GNU más el servicio en lugar de recibir GNU "
 "sin servicio, una empresa que preste solamente el servicio a las personas "
 "que hayan obtenido GNU debe ser rentable. <a href=\"#f3\">(4)</a>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We must distinguish between support in the form of real programming work and "
 "mere handholding.  The former is something one cannot rely on from a "
@@ -580,7 +637,7 @@
 "por bastante gente, el vendedor no se preocupará en solucionarlo."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If your business needs to be able to rely on support, the only way is to "
 "have all the necessary sources and tools.  Then you can hire any available "
@@ -601,7 +658,7 @@
 "elimina todos los problemas del mundo, sólo algunos de ellos."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Meanwhile, the users who know nothing about computers need handholding: "
 "doing things for them which they could easily do themselves but don't know "
@@ -612,7 +669,7 @@
 "fácilmente, pero no saben cómo."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Such services could be provided by companies that sell just handholding and "
 "repair service.  If it is true that users would rather spend money and get a "
@@ -632,7 +689,7 @@
 "posibilidad de utilizar el programa sin tener que pagar por el servicio."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You cannot reach many people without advertising, and you "
 "must charge for the program to support that.&rdquo;</strong>"
@@ -641,7 +698,7 @@
 "financiarla es necesario cobrar por el programa».</strong>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;It's no use advertising a program people can get free.&rdquo;"
 "</strong>"
@@ -650,7 +707,7 @@
 "gratuitamente».</strong>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are various forms of free or very cheap publicity that can be used to "
 "inform numbers of computer users about something like GNU.  But it may be "
@@ -669,12 +726,23 @@
 "publicidad la pagarán."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | On the other hand, if many people get GNU from their friends, and such
+# | companies don't succeed, this will show that advertising was not really
+# | necessary to spread GNU.  Why is it that free market advocates don't want
+# | to let the free market decide [-this?<a href=\"#f4\">(5)</a>-]
+# | {+this?&#8239;<a class=\"ftn\" href=\"#f4\">[5]</a>+}
+#, fuzzy
+#| msgid ""
+#| "On the other hand, if many people get GNU from their friends, and such "
+#| "companies don't succeed, this will show that advertising was not really "
+#| "necessary to spread GNU.  Why is it that free market advocates don't want "
+#| "to let the free market decide this?<a href=\"#f4\">(5)</a>"
 msgid ""
 "On the other hand, if many people get GNU from their friends, and such "
 "companies don't succeed, this will show that advertising was not really "
 "necessary to spread GNU.  Why is it that free market advocates don't want to "
-"let the free market decide this?<a href=\"#f4\">(5)</a>"
+"let the free market decide this?&#8239;<a class=\"ftn\" href=\"#f4\">[5]</a>"
 msgstr ""
 "Por otro lado, si mucha gente consigue GNU de sus amigos, y esas empresas no "
 "tienen éxito, esto demostrará que la publicidad no era realmente necesaria "
@@ -682,7 +750,7 @@
 "quieren dejar que el libre mercado lo decida? <a href=\"#f4\">(5)</a>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;My company needs a proprietary operating system to get a "
 "competitive edge.&rdquo;</strong>"
@@ -691,7 +759,7 @@
 "ventaja competitiva».</strong>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU will remove operating system software from the realm of competition.  "
 "You will not be able to get an edge in this area, but neither will your "
@@ -710,17 +778,26 @@
 "de la venta de sistemas operativos."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | I would like to see GNU development supported by gifts from many
+# | manufacturers and users, reducing the cost to [-each.<a
+# | href=\"#f5\">(6)</a>-] {+each&#8239;<a class=\"ftn\"
+# | href=\"#f5\">[6]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "I would like to see GNU development supported by gifts from many "
+#| "manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
 msgid ""
 "I would like to see GNU development supported by gifts from many "
-"manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
+"manufacturers and users, reducing the cost to each&#8239;<a class=\"ftn\" "
+"href=\"#f5\">[6]</a>."
 msgstr ""
 "Me gustaría ver que el desarrollo de GNU se mantuviera gracias a donaciones "
 "de algunos fabricantes y usuarios, reduciendo el coste para todos. <a href="
 "\"#f5\">(6)</a>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't programmers deserve a reward for their creativity?"
 "&rdquo;</strong>"
@@ -729,7 +806,7 @@
 "strong>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If anything deserves a reward, it is social contribution.  Creativity can be "
 "a social contribution, but only in so far as society is free to use the "
@@ -745,7 +822,7 @@
 "estos programas."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Shouldn't a programmer be able to ask for a reward for his "
 "creativity?&rdquo;</strong>"
@@ -754,7 +831,7 @@
 "creatividad?»</strong>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is nothing wrong with wanting pay for work, or seeking to maximize "
 "one's income, as long as one does not use means that are destructive.  But "
@@ -766,7 +843,7 @@
 "se basan en la destrucción."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Extracting money from users of a program by restricting their use of it is "
 "destructive because the restrictions reduce the amount and the ways that the "
@@ -781,7 +858,7 @@
 "restringir, las consecuencias dañinas son una destrucción deliberada."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The reason a good citizen does not use such destructive means to become "
 "wealthier is that, if everyone did so, we would all become poorer from the "
@@ -800,12 +877,12 @@
 "justifica privar al mundo en general de toda o parte de esa creatividad."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid "<strong>&ldquo;Won't programmers starve?&rdquo;</strong>"
 msgstr "<strong>«¿No se morirán de hambre los programadores?»</strong>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "I could answer that nobody is forced to be a programmer.  Most of us cannot "
 "manage to get any money for standing on the street and making faces.  But we "
@@ -819,7 +896,7 @@
 "cosa."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But that is the wrong answer because it accepts the questioner's implicit "
 "assumption: that without ownership of software, programmers cannot possibly "
@@ -831,7 +908,7 @@
 "nada."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The real reason programmers will not starve is that it will still be "
 "possible for them to get paid for programming; just not paid as much as now."
@@ -841,13 +918,28 @@
 "pagará tanto como en la actualidad."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | Restricting copying is not the only basis for business in software.  It is
+# | the most common [-basis<a href=\"#f8\">(7)</a>-] {+basis&#8239;<a
+# | class=\"ftn\" href=\"#f8\">[7]</a>+} because it brings in the most money. 
+# | If it were prohibited, or rejected by the customer, software business
+# | would move to other bases of organization which are now used less often. 
+# | There are always numerous ways to organize any kind of business.
+#, fuzzy
+#| msgid ""
+#| "Restricting copying is not the only basis for business in software.  It "
+#| "is the most common basis<a href=\"#f8\">(7)</a> because it brings in the "
+#| "most money.  If it were prohibited, or rejected by the customer, software "
+#| "business would move to other bases of organization which are now used "
+#| "less often.  There are always numerous ways to organize any kind of "
+#| "business."
 msgid ""
 "Restricting copying is not the only basis for business in software.  It is "
-"the most common basis<a href=\"#f8\">(7)</a> because it brings in the most "
-"money.  If it were prohibited, or rejected by the customer, software "
-"business would move to other bases of organization which are now used less "
-"often.  There are always numerous ways to organize any kind of business."
+"the most common basis&#8239;<a class=\"ftn\" href=\"#f8\">[7]</a> because it "
+"brings in the most money.  If it were prohibited, or rejected by the "
+"customer, software business would move to other bases of organization which "
+"are now used less often.  There are always numerous ways to organize any "
+"kind of business."
 msgstr ""
 "Restringir la copia no es la única forma para hacer negocios con el "
 "software. Es la forma más común <a href=\"#f8\">(7)</a>  porque es con la "
@@ -857,7 +949,7 @@
 "modos para organizar cualquier tipo de negocio."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Probably programming will not be as lucrative on the new basis as it is "
 "now.  But that is not an argument against the change.  It is not considered "
@@ -873,7 +965,7 @@
 "más)."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't people have a right to control how their creativity is "
 "used?&rdquo;</strong>"
@@ -882,7 +974,7 @@
 "creatividad?»</strong>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "&ldquo;Control over the use of one's ideas&rdquo; really constitutes control "
 "over other people's lives; and it is usually used to make their lives more "
@@ -893,13 +985,26 @@
 "vida más difícil."
 
 # type: Content of: <p>
-#. type: Content of: <p>
-msgid ""
-"People who have studied the issue of intellectual property rights<a href="
-"\"#f6\">(8)</a> carefully (such as lawyers) say that there is no intrinsic "
-"right to intellectual property.  The kinds of supposed intellectual property "
-"rights that the government recognizes were created by specific acts of "
-"legislation for specific purposes."
+#. type: Content of: <div><dl><dd><p>
+# | People who have studied the issue of intellectual property [-rights<a
+# | href=\"#f6\">(8)</a>-] {+rights&#8239;<a class=\"ftn\"
+# | href=\"#f6\">[8]</a>+} carefully (such as lawyers) say that there is no
+# | intrinsic right to intellectual property.  The kinds of supposed
+# | intellectual property rights that the government recognizes were created
+# | by specific acts of legislation for specific purposes.
+#, fuzzy
+#| msgid ""
+#| "People who have studied the issue of intellectual property rights<a href="
+#| "\"#f6\">(8)</a> carefully (such as lawyers) say that there is no "
+#| "intrinsic right to intellectual property.  The kinds of supposed "
+#| "intellectual property rights that the government recognizes were created "
+#| "by specific acts of legislation for specific purposes."
+msgid ""
+"People who have studied the issue of intellectual property rights&#8239;<a "
+"class=\"ftn\" href=\"#f6\">[8]</a> carefully (such as lawyers) say that "
+"there is no intrinsic right to intellectual property.  The kinds of supposed "
+"intellectual property rights that the government recognizes were created by "
+"specific acts of legislation for specific purposes."
 msgstr ""
 "Las personas que han estudiado cuidadosamente el tema de los derechos de "
 "propiedad intelectual<a href=\"#f6\">(8)</a> (por ejemplo los abogados) "
@@ -909,7 +1014,7 @@
 "específicos."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For example, the patent system was established to encourage inventors to "
 "disclose the details of their inventions.  Its purpose was to help society "
@@ -931,7 +1036,7 @@
 "individuos que usan productos patentados. "
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The idea of copyright did not exist in ancient times, when authors "
 "frequently copied other authors at length in works of nonfiction.  This "
@@ -952,7 +1057,7 @@
 "a la mayor parte de los individuos que leían los libros."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "All intellectual property rights are just licenses granted by society "
 "because it was thought, rightly or wrongly, that society as a whole would "
@@ -968,7 +1073,7 @@
 "persona?"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The case of programs today is very different from that of books a hundred "
 "years ago.  The fact that the easiest way to copy a program is from one "
@@ -989,13 +1094,13 @@
 "debería hacerlo a pesar de que la ley se lo permita."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Competition makes things get done better.&rdquo;</strong>"
 msgstr "<strong>«La competición hace que las cosas se hagan 
mejor».</strong>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The paradigm of competition is a race: by rewarding the winner, we encourage "
 "everyone to run faster.  When capitalism really works this way, it does a "
@@ -1015,7 +1120,7 @@
 "llegarán tarde a la meta."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Proprietary and secret software is the moral equivalent of runners in a fist "
 "fight.  Sad to say, the only referee we've got does not seem to object to "
@@ -1030,7 +1135,7 @@
 "penalizar a los corredores, incluso por tratar de enredarse en una pelea."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Won't everyone stop programming without a monetary incentive?"
 "&rdquo;</strong>"
@@ -1039,7 +1144,7 @@
 "strong>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually, many people will program with absolutely no monetary incentive.  "
 "Programming has an irresistible fascination for some people, usually the "
@@ -1053,7 +1158,7 @@
 "esperanzas de ganarse la vida de esa forma."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But really this question, though commonly asked, is not appropriate to the "
 "situation.  Pay for programmers will not disappear, only become less.  So "
@@ -1066,7 +1171,7 @@
 "incentivo económico? Mi experiencia muestra que sí lo harán."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For more than ten years, many of the world's best programmers worked at the "
 "Artificial Intelligence Lab for far less money than they could have had "
@@ -1080,7 +1185,7 @@
 "creatividad también es divertida, es una recompensa en sí misma."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Then most of them left when offered a chance to do the same interesting work "
 "for a lot of money."
@@ -1089,7 +1194,7 @@
 "mismo trabajo interesante por mucho dinero."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "What the facts show is that people will program for reasons other than "
 "riches; but if given a chance to make a lot of money as well, they will come "
@@ -1104,7 +1209,7 @@
 "pero no tendría que irles tan mal si las que pagan mucho fueran prohibidas."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;We need the programmers desperately.  If they demand that we "
 "stop helping our neighbors, we have to obey.&rdquo;</strong>"
@@ -1114,7 +1219,7 @@
 "strong>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "You're never so desperate that you have to obey this sort of demand.  "
 "Remember: millions for defense, but not a cent for tribute!"
@@ -1124,7 +1229,7 @@
 "tributos! <a href=\"#TransNote2\" id=\"TransNote2-rev\"><sup>[2]</sup></a>."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Programmers need to make a living somehow.&rdquo;</strong>"
 msgstr ""
@@ -1132,7 +1237,7 @@
 "</strong>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In the short run, this is true.  However, there are plenty of ways that "
 "programmers could make a living without selling the right to use a program.  "
@@ -1148,7 +1253,7 @@
 "encontrarlas. He aquí unos cuantos ejemplos:"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A manufacturer introducing a new computer will pay for the porting of "
 "operating systems onto the new hardware."
@@ -1157,7 +1262,7 @@
 "sistemas operativos al nuevo hardware."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The sale of teaching, handholding and maintenance services could also employ "
 "programmers."
@@ -1166,11 +1271,23 @@
 "pueden dar trabajo a programadores."
 
 # type: Content of: <p>
-#. type: Content of: <p>
-msgid ""
-"People with new ideas could distribute programs as freeware<a href=\"#f7\">"
-"(9)</a>, asking for donations from satisfied users, or selling handholding "
-"services.  I have met people who are already working this way successfully."
+#. type: Content of: <div><dl><dd><p>
+# | People with new ideas could distribute programs as [-freeware<a
+# | href=\"#f7\">(9)</a>,-] {+freeware&#8239;<a class=\"ftn\"
+# | href=\"#f7\">[9]</a>,+} asking for donations from satisfied users, or
+# | selling handholding services.  I have met people who are already working
+# | this way successfully.
+#, fuzzy
+#| msgid ""
+#| "People with new ideas could distribute programs as freeware<a href="
+#| "\"#f7\">(9)</a>, asking for donations from satisfied users, or selling "
+#| "handholding services.  I have met people who are already working this way "
+#| "successfully."
+msgid ""
+"People with new ideas could distribute programs as freeware&#8239;<a class="
+"\"ftn\" href=\"#f7\">[9]</a>, asking for donations from satisfied users, or "
+"selling handholding services.  I have met people who are already working "
+"this way successfully."
 msgstr ""
 "La gente con ideas nuevas podría distribuir programas como <cite>freeware</"
 "cite> <a href=\"#f7\">(9)</a>, pidiendo donaciones a los usuarios "
@@ -1178,7 +1295,7 @@
 "que ya trabajan así y con mucho éxito."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Users with related needs can form users' groups, and pay dues.  A group "
 "would contract with programming companies to write programs that the group's "
@@ -1190,13 +1307,13 @@
 "gustaría utilizar."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "All sorts of development can be funded with a Software Tax:"
 msgstr ""
 "Todo tipo de desarrollo puede ser financiado con un impuesto al software:"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Suppose everyone who buys a computer has to pay x percent of the price as a "
 "software tax.  The government gives this to an agency like the NSF to spend "
@@ -1209,7 +1326,7 @@
 "en el desarrollo de software."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But if the computer buyer makes a donation to software development himself, "
 "he can take a credit against the tax.  He can donate to the project of his "
@@ -1224,7 +1341,7 @@
 "cantidad de donación hasta la totalidad del impuesto que tenía que pagar."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The total tax rate could be decided by a vote of the payers of the tax, "
 "weighted according to the amount they will be taxed on."
@@ -1234,22 +1351,22 @@
 "el impuesto."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "The consequences:"
 msgstr "Las consecuencias:"
 
 # type: Content of: <ul><li>
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "The computer-using community supports software development."
 msgstr "La comunidad usuaria de computadoras apoya el desarrollo de software."
 
 # type: Content of: <ul><li>
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "This community decides what level of support is needed."
 msgstr "Esta comunidad decide qué nivel de apoyo es necesario."
 
 # type: Content of: <ul><li>
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "Users who care which projects their share is spent on can choose this for "
 "themselves."
@@ -1258,7 +1375,7 @@
 "pueden escogerlos por sí mismos."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the long run, making programs free is a step toward the postscarcity "
 "world, where nobody will have to work very hard just to make a living.  "
@@ -1277,7 +1394,7 @@
 "mediante la programación."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We have already greatly reduced the amount of work that the whole society "
 "must do for its actual productivity, but only a little of this has "
@@ -1299,12 +1416,12 @@
 "se traduzcan en menos trabajo para nosotros."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "Notas"
 
 # type: Content of: <ol><li>
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The wording here was careless.  The intention was that nobody would have to "
 "pay for <b>permission</b> to use the GNU system.  But the words don't make "
@@ -1336,7 +1453,7 @@
 "una copia tengan la libertad de colaborar con los demás al usar el programa."
 
 # type: Content of: <ol><li>
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The expression &ldquo;give away&rdquo; is another indication that I had not "
 "yet clearly separated the issue of price from that of freedom.  We now "
@@ -1352,10 +1469,21 @@
 "confusas que vale la pena evitar»</a>."
 
 # type: Content of: <ol><li>
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+# | This is another place I failed to distinguish carefully between the two
+# | different meanings of [-&ldquo;free&rdquo;.-] {+&ldquo;free.&rdquo;+} The
+# | statement as it stands is not false&mdash;you can get copies of GNU
+# | software at no charge, from your friends or over the net.  But it does
+# | suggest the wrong idea.
+#, fuzzy
+#| msgid ""
+#| "This is another place I failed to distinguish carefully between the two "
+#| "different meanings of &ldquo;free&rdquo;.  The statement as it stands is "
+#| "not false&mdash;you can get copies of GNU software at no charge, from "
+#| "your friends or over the net.  But it does suggest the wrong idea."
 msgid ""
 "This is another place I failed to distinguish carefully between the two "
-"different meanings of &ldquo;free&rdquo;.  The statement as it stands is not "
+"different meanings of &ldquo;free.&rdquo; The statement as it stands is not "
 "false&mdash;you can get copies of GNU software at no charge, from your "
 "friends or over the net.  But it does suggest the wrong idea."
 msgstr ""
@@ -1366,12 +1494,12 @@
 "amigos o a través de Internet&mdash;, pero sugiere una idea errónea."
 
 # type: Content of: <ol><li>
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid "Several such companies now exist."
 msgstr "Ya existen varias compañías de este tipo."
 
 # type: Content of: <ol><li>
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Although it is a charity rather than a company, the Free Software Foundation "
 "for 10 years raised most of its funds from its distribution service.  You "
@@ -1385,7 +1513,7 @@
 "actividad."
 
 # type: Content of: <ol><li>
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "A group of computer companies pooled funds around 1991 to support "
 "maintenance of the GNU C Compiler."
@@ -1394,7 +1522,7 @@
 "apoyar el mantenimiento del compilador C de GNU."
 
 # type: Content of: <ol><li>
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "I think I was mistaken in saying that proprietary software was the most "
 "common basis for making money in software.  It seems that actually the most "
@@ -1415,10 +1543,31 @@
 "programadores ganarían menos en un mundo de software libre."
 
 # type: Content of: <ol><li>
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+# | In the 1980s I had not yet realized how confusing it was to speak of
+# | &ldquo;the issue&rdquo; of &ldquo;intellectual [-property&rdquo;.-]
+# | {+property.&rdquo;+} That term is obviously biased; more subtle is the
+# | fact that it lumps together various disparate laws which raise very
+# | different issues.  Nowadays I urge people to reject the term
+# | &ldquo;intellectual property&rdquo; entirely, lest it lead others to
+# | suppose that those laws form one coherent issue.  The way to be clear is
+# | to discuss patents, copyrights, and trademarks separately.  See <a
+# | href=\"/philosophy/not-ipr.html\">further explanation</a> of how this term
+# | spreads confusion and bias.
+#, fuzzy
+#| msgid ""
+#| "In the 1980s I had not yet realized how confusing it was to speak of "
+#| "&ldquo;the issue&rdquo; of &ldquo;intellectual property&rdquo;.  That "
+#| "term is obviously biased; more subtle is the fact that it lumps together "
+#| "various disparate laws which raise very different issues.  Nowadays I "
+#| "urge people to reject the term &ldquo;intellectual property&rdquo; "
+#| "entirely, lest it lead others to suppose that those laws form one "
+#| "coherent issue.  The way to be clear is to discuss patents, copyrights, "
+#| "and trademarks separately.  See <a href=\"/philosophy/not-ipr.html"
+#| "\">further explanation</a> of how this term spreads confusion and bias."
 msgid ""
 "In the 1980s I had not yet realized how confusing it was to speak of &ldquo;"
-"the issue&rdquo; of &ldquo;intellectual property&rdquo;.  That term is "
+"the issue&rdquo; of &ldquo;intellectual property.&rdquo; That term is "
 "obviously biased; more subtle is the fact that it lumps together various "
 "disparate laws which raise very different issues.  Nowadays I urge people to "
 "reject the term &ldquo;intellectual property&rdquo; entirely, lest it lead "
@@ -1439,10 +1588,26 @@
 "prejuicios."
 
 # type: Content of: <ol><li>
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+# | Subsequently we learned to distinguish between &ldquo;free software&rdquo;
+# | and [-&ldquo;freeware&rdquo;.-] {+&ldquo;freeware.&rdquo;+} The term
+# | &ldquo;freeware&rdquo; means software you are free to redistribute, but
+# | usually you are not free to study and change the source code, so most of
+# | it is not free software.  See &ldquo;<a
+# | href=\"/philosophy/words-to-avoid.html#Freeware\">Confusing Words and
+# | Phrases</a>&rdquo; for more explanation.
+#, fuzzy
+#| msgid ""
+#| "Subsequently we learned to distinguish between &ldquo;free "
+#| "software&rdquo; and &ldquo;freeware&rdquo;.  The term &ldquo;"
+#| "freeware&rdquo; means software you are free to redistribute, but usually "
+#| "you are not free to study and change the source code, so most of it is "
+#| "not free software.  See &ldquo;<a href=\"/philosophy/words-to-avoid."
+#| "html#Freeware\">Confusing Words and Phrases</a>&rdquo; for more "
+#| "explanation."
 msgid ""
 "Subsequently we learned to distinguish between &ldquo;free software&rdquo; "
-"and &ldquo;freeware&rdquo;.  The term &ldquo;freeware&rdquo; means software "
+"and &ldquo;freeware.&rdquo; The term &ldquo;freeware&rdquo; means software "
 "you are free to redistribute, but usually you are not free to study and "
 "change the source code, so most of it is not free software.  See &ldquo;<a "
 "href=\"/philosophy/words-to-avoid.html#Freeware\">Confusing Words and "
@@ -1485,7 +1650,6 @@
 "proponer otras correcciones o sugerencias, diríjase a <a href=\"mailto:";
 "webmasters@gnu.org\">&lt;webmasters@gnu.org&gt;</a>."
 
-#
 #.  TRANSLATORS: Ignore the original text in this paragraph,
 #.         replace it with the translation of these two:
 #.         We work hard and do our best to provide accurate, good quality
@@ -1493,14 +1657,14 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "El equipo de traductores al español se esfuerza por ofrecer traducciones "
@@ -1513,9 +1677,15 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
+# | Copyright &copy; 1985, 1993, 200[-3-]{+4+}, 2005, 2007, [-2008,-] 2009,
+# | 2010, [-2014, 2015-] {+2015, 2021+} Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, "
+#| "2015 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 1985, 1993, 2004, 2005, 2007, 2009, 2010, 2015, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015 "
 "Free Software Foundation, Inc."
@@ -1550,10 +1720,9 @@
 msgstr "Última actualización:"
 
 # type: Content of: <div><p>
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015, "
-"2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015, "
-"2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, "
+#~ "2015, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, "
+#~ "2015, 2021 Free Software Foundation, Inc."

Index: po/manifesto.fr.po
===================================================================
RCS file: /web/www/www/gnu/po/manifesto.fr.po,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- po/manifesto.fr.po  2 Nov 2021 13:56:41 -0000       1.72
+++ po/manifesto.fr.po  2 Nov 2021 14:41:53 -0000       1.73
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manifesto.html\n"
-"POT-Creation-Date: 2015-06-02 12:55+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2021-09-12 19:21+0200\n"
 "Last-Translator: Sogal <sogal AT member.fsf.org>\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-11-02 14:27+0000\n"
 "Plural-Forms: \n"
 "X-Generator: Gtranslator 2.91.5\n"
 
@@ -24,13 +25,27 @@
 msgid "The GNU Manifesto - GNU Project - Free Software Foundation"
 msgstr "Le manifeste GNU - Projet GNU - Free Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "The GNU Manifesto"
 msgstr "Le manifeste GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
+# | The GNU Manifesto (which appears below) was written by <a
+# | href=\"http{+s+}://www.stallman.org/\">Richard Stallman</a> in 1985 to ask
+# | for support in developing the GNU operating system.  Part of the text was
+# | taken from the original announcement of 1983.  Through 1987, it was
+# | updated in minor ways to account for developments; since then, it seems
+# | best to leave it unchanged.
+#, fuzzy
+#| msgid ""
+#| "The GNU Manifesto (which appears below) was written by <a href=\"http://";
+#| "www.stallman.org/\">Richard Stallman</a> in 1985 to ask for support in "
+#| "developing the GNU operating system.  Part of the text was taken from the "
+#| "original announcement of 1983.  Through 1987, it was updated in minor "
+#| "ways to account for developments; since then, it seems best to leave it "
+#| "unchanged."
 msgid ""
-"The GNU Manifesto (which appears below) was written by <a href=\"http://www.";
+"The GNU Manifesto (which appears below) was written by <a href=\"https://www.";
 "stallman.org/\">Richard Stallman</a> in 1985 to ask for support in "
 "developing the GNU operating system.  Part of the text was taken from the "
 "original announcement of 1983.  Through 1987, it was updated in minor ways "
@@ -43,7 +58,7 @@
 "mises à jour pour tenir compte de l'évolution du projet, mais il nous 
semble "
 "maintenant plus judicieux de le laisser inchangé."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Since that time, we have learned about certain common misunderstandings that "
 "different wording could help avoid.  Footnotes added since 1993 help clarify "
@@ -53,7 +68,7 @@
 "interprétés ; ceci peut être corrigé en changeant quelques mots. Des 
notes "
 "ajoutées depuis 1993 aident à clarifier ces points."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If you want to install the GNU/Linux system, we recommend you use one of the "
 "<a href=\"/distros\">100% free software GNU/Linux distributions</a>.  For "
@@ -65,7 +80,7 @@
 "libres</a>. Pour savoir comment contribuer, voir <a href=\"/help/help.html"
 "\">http://www.gnu.org/help</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The GNU Project is part of the Free Software Movement, a campaign for <a "
 "href=\"/philosophy/free-sw.html\">freedom for users of software</a>.  It is "
@@ -82,17 +97,30 @@
 "pour promouvoir une <a href=\"/philosophy/open-source-misses-the-point.html"
 "\">approche amorale</a> du même domaine."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "What's GNU? Gnu's Not Unix!"
 msgstr "Qu'est ce que GNU ? GNU N'est pas Unix !"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | GNU, which stands for Gnu's Not Unix, is the name for the complete
+# | Unix-compatible software system which I am writing so that I can give it
+# | away free to everyone who can use [-it.<a href=\"#f1\">(1)</a>-]
+# | {+it&#8239;<a class=\"ftn\" href=\"#f1\">[1]</a>.+} Several other
+# | volunteers are helping me.  Contributions of time, money, programs and
+# | equipment are greatly needed.
+#, fuzzy
+#| msgid ""
+#| "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
+#| "compatible software system which I am writing so that I can give it away "
+#| "free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
+#| "volunteers are helping me.  Contributions of time, money, programs and "
+#| "equipment are greatly needed."
 msgid ""
 "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
 "compatible software system which I am writing so that I can give it away "
-"free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
-"volunteers are helping me.  Contributions of time, money, programs and "
-"equipment are greatly needed."
+"free to everyone who can use it&#8239;<a class=\"ftn\" href=\"#f1\">[1]</a>. "
+"Several other volunteers are helping me.  Contributions of time, money, "
+"programs and equipment are greatly needed."
 msgstr ""
 "GNU, l'acronyme de <i>GNU's Not Unix</i> (GNU N'est pas Unix), est le nom du "
 "système complet de logiciels, compatible avec Unix, que je suis en train "
@@ -101,7 +129,7 @@
 "autres bénévoles. Les contributions en temps, en argent, en logiciel et en "
 "équipement nous sont indispensables."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So far we have an Emacs text editor with Lisp for writing editor commands, a "
 "source level debugger, a yacc-compatible parser generator, a linker, and "
@@ -134,7 +162,7 @@
 "toutes les choses utiles qui sont normalement incluses dans un système Unix, 
"
 "et plus encore."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU will be able to run Unix programs, but will not be identical to Unix.  "
 "We will make all improvements that are convenient, based on our experience "
@@ -159,7 +187,7 @@
 "protocoles de communication UUCP, Chaosnet (protocole du <abbr title="
 "\"Massachusetts Institute of Technology\">MIT</abbr>) et Internet."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is aimed initially at machines in the 68000/16000 class with virtual "
 "memory, because they are the easiest machines to make it run on.  The extra "
@@ -171,7 +199,7 @@
 "le faire fonctionner. Libre à celui qui voudra s'en servir sur des machines "
 "moins puissantes de poursuivre notre travail pour l'adapter à cet usage."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid horrible confusion, please pronounce the <em>g</em> in the word "
 "&ldquo;GNU&rdquo; when it is the name of this project."
@@ -179,11 +207,11 @@
 "Pour éviter d'horribles confusions, merci de prononcer distinctement le "
 "<em>g</em> de « GNU » quand vous parlez de ce projet."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why I Must Write GNU"
 msgstr "Pourquoi je dois écrire GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I consider that the Golden Rule requires that if I like a program I must "
 "share it with other people who like it.  Software sellers want to divide the "
@@ -208,13 +236,26 @@
 "institution où ce genre de choses étaient faites en mon nom contre ma "
 "volonté."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | So that I can continue to use computers without dishonor, I have decided
+# | to put together a sufficient body of free software so that I will be able
+# | to get along without any software that is not free.  I have resigned from
+# | the AI Lab to deny MIT any legal excuse to prevent me from giving GNU
+# | [-away.<a href=\"#f2a\">(2)</a>-] {+away&#8239;<a class=\"ftn\"
+# | href=\"#f2a\">[2]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "So that I can continue to use computers without dishonor, I have decided "
+#| "to put together a sufficient body of free software so that I will be able "
+#| "to get along without any software that is not free.  I have resigned from "
+#| "the AI Lab to deny MIT any legal excuse to prevent me from giving GNU "
+#| "away.<a href=\"#f2a\">(2)</a>"
 msgid ""
 "So that I can continue to use computers without dishonor, I have decided to "
 "put together a sufficient body of free software so that I will be able to "
 "get along without any software that is not free.  I have resigned from the "
-"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away.<a "
-"href=\"#f2a\">(2)</a>"
+"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away&#8239;"
+"<a class=\"ftn\" href=\"#f2a\">[2]</a>."
 msgstr ""
 "Afin de pouvoir continuer à utiliser les ordinateurs en accord avec ma "
 "conscience, j'ai décidé de réunir un ensemble de logiciels libres avec "
@@ -223,11 +264,11 @@
 "invoquer aucune excuse juridique pour m'empêcher de distribuer GNU "
 "gratuitement <a id=\"f2a-rev\" href=\"#f2a\">(2)</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why GNU Will Be Compatible with Unix"
 msgstr "Pourquoi GNU sera compatible avec Unix"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Unix is not my ideal system, but it is not too bad.  The essential features "
 "of Unix seem to be good ones, and I think I can fill in what Unix lacks "
@@ -240,11 +281,11 @@
 "probable que beaucoup de gens trouveront pratique d'adopter un système "
 "compatible avec Unix."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How GNU Will Be Available"
 msgstr "Comment GNU sera distribué"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is not in the public domain.  Everyone will be permitted to modify and "
 "redistribute GNU, but no distributor will be allowed to restrict its further "
@@ -259,11 +300,11 @@
 "\"#TransNote3\" id=\"TransNote3-rev\"><sup>c</sup></a> seront interdites. Je "
 "veux m'assurer que toutes les versions de GNU resteront libres."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why Many Other Programmers Want to Help"
 msgstr "Pourquoi de nombreux programmeurs veulent m'aider"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found many other programmers who are excited about GNU and want to "
 "help."
@@ -271,7 +312,7 @@
 "J'ai rencontré nombre de programmeurs que GNU passionne et qui souhaitent "
 "apporter leur aide."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Many programmers are unhappy about the commercialization of system "
 "software.  It may enable them to make more money, but it requires them to "
@@ -296,7 +337,7 @@
 "termes de l'alternative. Ils deviennent cyniques au point de penser que "
 "programmer n'est qu'une façon de gagner de l'argent."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By working on and using GNU rather than proprietary programs, we can be "
 "hospitable to everyone and obey the law.  In addition, GNU serves as an "
@@ -314,11 +355,11 @@
 "avec lesquels j'ai discuté, c'est une satisfaction importante que l'argent "
 "ne peut pas remplacer."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How You Can Contribute"
 msgstr "Comment vous pouvez contribuer"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "(Nowadays, for software tasks to work on, see the <a href=\"http://fsf.org/";
 "campaigns/priority-projects\">High Priority Projects list</a> and the <a "
@@ -335,7 +376,7 @@
 "d'autres domaines, regardez le <a href=\"/help/help.html\">guide pour aider "
 "le projet GNU</a>.)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am asking computer manufacturers for donations of machines and money.  I'm "
 "asking individuals for donations of programs and work."
@@ -344,7 +385,7 @@
 "d'argent. Je demande aux particuliers de faire don de programmes et de "
 "travail."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One consequence you can expect if you donate machines is that GNU will run "
 "on them at an early date.  The machines should be complete, ready to use "
@@ -357,7 +398,7 @@
 "zone résidentielle, et elles ne doivent pas avoir de besoins sortant de "
 "l'ordinaire en climatisation ni en alimentation."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found very many programmers eager to contribute part-time work for "
 "GNU.  For most projects, such part-time distributed work would be very hard "
@@ -388,7 +429,7 @@
 "réalisable (le noyau demandera quand même une communication plus soutenue 
et "
 "sera développé par un petit groupe structuré)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If I get donations of money, I may be able to hire a few people full or part "
 "time.  The salary won't be high by programmers' standards, but I'm looking "
@@ -405,20 +446,27 @@
 "toutes leurs ressources au projet GNU, en leur évitant d'avoir à gagner 
leur "
 "vie autrement."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why All Computer Users Will Benefit"
 msgstr "Pourquoi tous les utilisateurs en bénéficieront"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Once GNU is written, everyone will be able to obtain good system software
+# | free, just like [-air.<a href=\"#f2\">(3)</a>-] {+air&#8239;<a
+# | class=\"ftn\" href=\"#f2\">[3]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "Once GNU is written, everyone will be able to obtain good system software "
+#| "free, just like air.<a href=\"#f2\">(3)</a>"
 msgid ""
 "Once GNU is written, everyone will be able to obtain good system software "
-"free, just like air.<a href=\"#f2\">(3)</a>"
+"free, just like air&#8239;<a class=\"ftn\" href=\"#f2\">[3]</a>."
 msgstr ""
 "Une fois GNU achevé, tout le monde pourra se procurer de bons logiciels "
 "système, gratuits comme l'air qui nous entoure <a id=\"f2-rev\" 
href=\"#f2\">"
 "(3)</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This means much more than just saving everyone the price of a Unix license.  "
 "It means that much wasteful duplication of system programming effort will be "
@@ -429,7 +477,7 @@
 "programmation système en double, et qu'on pourra rediriger ces efforts vers "
 "le progrès méthodologique."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Complete system sources will be available to everyone.  As a result, a user "
 "who needs changes in the system will always be free to make them himself, or "
@@ -444,7 +492,7 @@
 "seront plus à la merci d'une personne ou entreprise particulière, seule à "
 "pouvoir effectuer les modifications car elle possède le code source."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Schools will be able to provide a much more educational environment by "
 "encouraging all students to study and improve the system code.  Harvard's "
@@ -460,7 +508,7 @@
 "publiquement, et ils faisaient respecter cette politique en refusant "
 "carrément d'installer certains programmes. Cela m'a beaucoup inspiré."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Finally, the overhead of considering who owns the system software and what "
 "one is or is not entitled to do with it will be lifted."
@@ -468,7 +516,7 @@
 "Enfin, les frais engendrés par les questions de propriété et de limites "
 "d'utilisation des logiciels système ne seront plus d'actualité."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Arrangements to make people pay for using a program, including licensing of "
 "copies, always incur a tremendous cost to society through the cumbersome "
@@ -495,7 +543,7 @@
 "fabrication de l'air par un impôt de capitation et se débarrasser des "
 "masques."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copying all or parts of a program is as natural to a programmer as "
 "breathing, and as productive.  It ought to be as free."
@@ -503,11 +551,11 @@
 "Copier tout ou partie d'un logiciel semble aussi naturel à un programmeur "
 "que de respirer, tout aussi productif. Cela aussi devrait être libre."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Some Easily Rebutted Objections to GNU's Goals"
 msgstr "Quelques objections facilement contrées aux objectifs de GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Nobody will use it if it is free, because that means they "
 "can't rely on any support.&rdquo;</strong>"
@@ -515,7 +563,7 @@
 "<strong>« Personne ne s'en servira si c'est gratuit, car cela veut dire que 
"
 "l'on ne peut compter sur aucun support technique. »</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You have to charge for the program to pay for providing the "
 "support.&rdquo;</strong>"
@@ -523,18 +571,27 @@
 "<strong>« Il faut faire payer le logiciel pour financer le service après-"
 "vente. »</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | If people would rather pay for GNU plus service than get GNU free without
+# | service, a company to provide just service to people who have obtained GNU
+# | free ought to be [-profitable.<a href=\"#f3\">(4)</a>-]
+# | {+profitable&#8239;<a class=\"ftn\" href=\"#f3\">[4]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "If people would rather pay for GNU plus service than get GNU free without "
+#| "service, a company to provide just service to people who have obtained "
+#| "GNU free ought to be profitable.<a href=\"#f3\">(4)</a>"
 msgid ""
 "If people would rather pay for GNU plus service than get GNU free without "
 "service, a company to provide just service to people who have obtained GNU "
-"free ought to be profitable.<a href=\"#f3\">(4)</a>"
+"free ought to be profitable&#8239;<a class=\"ftn\" href=\"#f3\">[4]</a>."
 msgstr ""
 "Si les gens préfèrent acheter GNU avec du service après-vente, plutôt que 
"
 "d'obtenir GNU gratuitement sans service, une entreprise qui proposera "
 "uniquement du service à ceux qui auront obtenu GNU gratuitement devrait 
être "
 "rentable <a id=\"f3-rev\" href=\"#f3\">(4)</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We must distinguish between support in the form of real programming work and "
 "mere handholding.  The former is something one cannot rely on from a "
@@ -546,7 +603,7 @@
 "premier de la part d'un fournisseur de logiciel. Si votre problème n'est pas 
"
 "suffisamment répandu, le fournisseur vous enverra balader."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If your business needs to be able to rely on support, the only way is to "
 "have all the necessary sources and tools.  Then you can hire any available "
@@ -567,7 +624,7 @@
 "ce problème. GNU ne résout pas tous les problèmes de la planète, mais "
 "seulement quelques-uns."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Meanwhile, the users who know nothing about computers need handholding: "
 "doing things for them which they could easily do themselves but don't know "
@@ -577,7 +634,7 @@
 "besoin d'assistance, besoin qu'on fasse à leur place ce qu'ils pourraient "
 "facilement faire eux-mêmes si seulement ils s'y connaissaient."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Such services could be provided by companies that sell just handholding and "
 "repair service.  If it is true that users would rather spend money and get a "
@@ -597,7 +654,7 @@
 "temps, ceux d'entre nous qui n'ont pas besoin du service devront être en "
 "mesure d'utiliser le logiciel sans payer le service."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You cannot reach many people without advertising, and you "
 "must charge for the program to support that.&rdquo;</strong>"
@@ -605,7 +662,7 @@
 "<strong>« On ne peut pas être connu sans publicité et il faut faire payer 
le "
 "logiciel pour la financer. »</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;It's no use advertising a program people can get free.&rdquo;"
 "</strong>"
@@ -613,7 +670,7 @@
 "<strong>« Ça ne sert à rien de faire de la publicité pour un programme 
que "
 "l'on peut obtenir gratuitement. »</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are various forms of free or very cheap publicity that can be used to "
 "inform numbers of computer users about something like GNU.  But it may be "
@@ -631,12 +688,23 @@
 "campagne et bien davantage. Ainsi, seuls les utilisateurs qui tirent "
 "avantage de la publicité la payent."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | On the other hand, if many people get GNU from their friends, and such
+# | companies don't succeed, this will show that advertising was not really
+# | necessary to spread GNU.  Why is it that free market advocates don't want
+# | to let the free market decide [-this?<a href=\"#f4\">(5)</a>-]
+# | {+this?&#8239;<a class=\"ftn\" href=\"#f4\">[5]</a>+}
+#, fuzzy
+#| msgid ""
+#| "On the other hand, if many people get GNU from their friends, and such "
+#| "companies don't succeed, this will show that advertising was not really "
+#| "necessary to spread GNU.  Why is it that free market advocates don't want "
+#| "to let the free market decide this?<a href=\"#f4\">(5)</a>"
 msgid ""
 "On the other hand, if many people get GNU from their friends, and such "
 "companies don't succeed, this will show that advertising was not really "
 "necessary to spread GNU.  Why is it that free market advocates don't want to "
-"let the free market decide this?<a href=\"#f4\">(5)</a>"
+"let the free market decide this?&#8239;<a class=\"ftn\" href=\"#f4\">[5]</a>"
 msgstr ""
 "En revanche, si de nombreuses personnes obtiennent GNU par leurs relations, "
 "et que de telles entreprises ne sont pas rentables, cela démontrera que la "
@@ -644,7 +712,7 @@
 "partisans de l'économie libérale ne veulent-ils pas laisser cette décision 
"
 "au marché libre <a id=\"f4-rev\" href=\"#f4\">(5)</a> ?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;My company needs a proprietary operating system to get a "
 "competitive edge.&rdquo;</strong>"
@@ -652,7 +720,7 @@
 "<strong>« Ma société a besoin d'un système d'exploitation propriétaire 
pour "
 "être compétitive. »</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU will remove operating system software from the realm of competition.  "
 "You will not be able to get an edge in this area, but neither will your "
@@ -670,16 +738,25 @@
 "vous. Si votre commerce est différent, GNU peut vous éviter d'être poussé 
"
 "vers le domaine onéreux de la vente de systèmes d'exploitation."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | I would like to see GNU development supported by gifts from many
+# | manufacturers and users, reducing the cost to [-each.<a
+# | href=\"#f5\">(6)</a>-] {+each&#8239;<a class=\"ftn\"
+# | href=\"#f5\">[6]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "I would like to see GNU development supported by gifts from many "
+#| "manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
 msgid ""
 "I would like to see GNU development supported by gifts from many "
-"manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
+"manufacturers and users, reducing the cost to each&#8239;<a class=\"ftn\" "
+"href=\"#f5\">[6]</a>."
 msgstr ""
 "J'aimerais bien voir le développement de GNU financé par des dons de "
 "fabricants et d'utilisateurs, réduisant ainsi les coûts pour chacun <a id="
 "\"f5-rev\" href=\"#f5\">(6)</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't programmers deserve a reward for their creativity?"
 "&rdquo;</strong>"
@@ -687,7 +764,7 @@
 "<strong>« Les programmeurs ne méritent-ils pas d'être récompensés pour 
leur "
 "créativité ? »</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If anything deserves a reward, it is social contribution.  Creativity can be "
 "a social contribution, but only in so far as society is free to use the "
@@ -701,7 +778,7 @@
 "méritent d'être récompensés pour la création de logiciels innovants, de 
même "
 "ils méritent d'être punis s'ils limitent l'utilisation de leurs programmes."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Shouldn't a programmer be able to ask for a reward for his "
 "creativity?&rdquo;</strong>"
@@ -709,7 +786,7 @@
 "<strong>« Un programmeur ne doit-il pas avoir le droit de demander une "
 "récompense pour sa créativité ? »</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is nothing wrong with wanting pay for work, or seeking to maximize "
 "one's income, as long as one does not use means that are destructive.  But "
@@ -720,7 +797,7 @@
 "Mais dans le secteur du logiciel de nos jours, les moyens habituels sont "
 "fondées sur la destruction."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Extracting money from users of a program by restricting their use of it is "
 "destructive because the restrictions reduce the amount and the ways that the "
@@ -735,7 +812,7 @@
 "des limites, les conséquences néfastes qui en découlent sont de la "
 "destruction délibérée."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The reason a good citizen does not use such destructive means to become "
 "wealthier is that, if everyone did so, we would all become poorer from the "
@@ -754,11 +831,11 @@
 "Plus précisément, le désir d'être récompensé pour sa création ne 
justifie "
 "pas que l'on prive le monde entier de tout ou partie de cette créativité."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid "<strong>&ldquo;Won't programmers starve?&rdquo;</strong>"
 msgstr "<strong>« Les programmeurs ne vont-ils pas mourir de faim ? 
»</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "I could answer that nobody is forced to be a programmer.  Most of us cannot "
 "manage to get any money for standing on the street and making faces.  But we "
@@ -771,7 +848,7 @@
 "notre vie sur le champ de foire à faire des grimaces et à mourir de faim. "
 "Nous faisons autre chose."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But that is the wrong answer because it accepts the questioner's implicit "
 "assumption: that without ownership of software, programmers cannot possibly "
@@ -781,7 +858,7 @@
 "à savoir que, sans la propriété du logiciel, les programmeurs ne 
pourraient "
 "pas recevoir le moindre sou. C'est, soi-disant, tout ou rien."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The real reason programmers will not starve is that it will still be "
 "possible for them to get paid for programming; just not paid as much as now."
@@ -790,13 +867,28 @@
 "c'est qu'il leur sera tout de même possible d'être payés pour programmer 
; "
 "seulement, pas aussi bien qu'aujourd'hui."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | Restricting copying is not the only basis for business in software.  It is
+# | the most common [-basis<a href=\"#f8\">(7)</a>-] {+basis&#8239;<a
+# | class=\"ftn\" href=\"#f8\">[7]</a>+} because it brings in the most money. 
+# | If it were prohibited, or rejected by the customer, software business
+# | would move to other bases of organization which are now used less often. 
+# | There are always numerous ways to organize any kind of business.
+#, fuzzy
+#| msgid ""
+#| "Restricting copying is not the only basis for business in software.  It "
+#| "is the most common basis<a href=\"#f8\">(7)</a> because it brings in the "
+#| "most money.  If it were prohibited, or rejected by the customer, software "
+#| "business would move to other bases of organization which are now used "
+#| "less often.  There are always numerous ways to organize any kind of "
+#| "business."
 msgid ""
 "Restricting copying is not the only basis for business in software.  It is "
-"the most common basis<a href=\"#f8\">(7)</a> because it brings in the most "
-"money.  If it were prohibited, or rejected by the customer, software "
-"business would move to other bases of organization which are now used less "
-"often.  There are always numerous ways to organize any kind of business."
+"the most common basis&#8239;<a class=\"ftn\" href=\"#f8\">[7]</a> because it "
+"brings in the most money.  If it were prohibited, or rejected by the "
+"customer, software business would move to other bases of organization which "
+"are now used less often.  There are always numerous ways to organize any "
+"kind of business."
 msgstr ""
 "Restreindre la copie n'est pas la seule base du commerce des logiciels. "
 "C'est la base la plus commune <a id=\"f8-rev\" href=\"#f8\">(7)</a>, car la "
@@ -805,7 +897,7 @@
 "sont actuellement moins utilisées. Il y a de nombreuses façons d'organiser "
 "une entreprise."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Probably programming will not be as lucrative on the new basis as it is "
 "now.  But that is not an argument against the change.  It is not considered "
@@ -820,7 +912,7 @@
 "même chose, ce ne serait pas non plus une injustice (en pratique, ils "
 "gagneraient quand même beaucoup plus)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't people have a right to control how their creativity is "
 "used?&rdquo;</strong>"
@@ -828,7 +920,7 @@
 "<strong>« Les gens n'ont-ils pas le droit de contrôler l'usage qui est 
fait "
 "de leur créativité ? »</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "&ldquo;Control over the use of one's ideas&rdquo; really constitutes control "
 "over other people's lives; and it is usually used to make their lives more "
@@ -837,13 +929,26 @@
 "« Contrôler l'usage qui est fait de ses idées » revient à contrôler 
la vie "
 "des autres ; et c'est souvent utilisé pour leur rendre la vie plus 
difficile."
 
-#. type: Content of: <p>
-msgid ""
-"People who have studied the issue of intellectual property rights<a href="
-"\"#f6\">(8)</a> carefully (such as lawyers) say that there is no intrinsic "
-"right to intellectual property.  The kinds of supposed intellectual property "
-"rights that the government recognizes were created by specific acts of "
-"legislation for specific purposes."
+#. type: Content of: <div><dl><dd><p>
+# | People who have studied the issue of intellectual property [-rights<a
+# | href=\"#f6\">(8)</a>-] {+rights&#8239;<a class=\"ftn\"
+# | href=\"#f6\">[8]</a>+} carefully (such as lawyers) say that there is no
+# | intrinsic right to intellectual property.  The kinds of supposed
+# | intellectual property rights that the government recognizes were created
+# | by specific acts of legislation for specific purposes.
+#, fuzzy
+#| msgid ""
+#| "People who have studied the issue of intellectual property rights<a href="
+#| "\"#f6\">(8)</a> carefully (such as lawyers) say that there is no "
+#| "intrinsic right to intellectual property.  The kinds of supposed "
+#| "intellectual property rights that the government recognizes were created "
+#| "by specific acts of legislation for specific purposes."
+msgid ""
+"People who have studied the issue of intellectual property rights&#8239;<a "
+"class=\"ftn\" href=\"#f6\">[8]</a> carefully (such as lawyers) say that "
+"there is no intrinsic right to intellectual property.  The kinds of supposed "
+"intellectual property rights that the government recognizes were created by "
+"specific acts of legislation for specific purposes."
 msgstr ""
 "Ceux qui ont étudié la question des droits de propriété intellectuelle 
<a id="
 "\"f6-rev\" href=\"#f6\">(8)</a> à fond (les avocats, les juristes, etc.) "
@@ -852,7 +957,7 @@
 "reconnus par les pouvoirs publics ont été créés par des actes 
législatifs "
 "précis dans des buts bien précis."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For example, the patent system was established to encourage inventors to "
 "disclose the details of their inventions.  Its purpose was to help society "
@@ -873,7 +978,7 @@
 "trop de tort. Ils ne gênent pas la plupart des particuliers qui utilisent "
 "des produits brevetés."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The idea of copyright did not exist in ancient times, when authors "
 "frequently copied other authors at length in works of nonfiction.  This "
@@ -894,7 +999,7 @@
 "ce système ne causait pas beaucoup de tort et ne gênait pas la plupart des "
 "lecteurs."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "All intellectual property rights are just licenses granted by society "
 "because it was thought, rightly or wrongly, that society as a whole would "
@@ -908,7 +1013,7 @@
 "devons nous demander : avons-nous vraiment intérêt à accorder cette "
 "licence ? Quels actes autorisons-nous avec cette licence ?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The case of programs today is very different from that of books a hundred "
 "years ago.  The fact that the easiest way to copy a program is from one "
@@ -928,12 +1033,12 @@
 "matériellement et spirituellement ; une situation dans laquelle personne ne 
"
 "doit agir ainsi, que ce soit ou non autorisé par la loi."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Competition makes things get done better.&rdquo;</strong>"
 msgstr "<strong>« La concurrence permet de mieux faire les choses. 
»</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The paradigm of competition is a race: by rewarding the winner, we encourage "
 "everyone to run faster.  When capitalism really works this way, it does a "
@@ -952,7 +1057,7 @@
 "trouver d'autres stratégies comme d'agresser les autres concurrents. Si les "
 "coureurs en viennent aux mains, ils finiront tous en retard."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Proprietary and secret software is the moral equivalent of runners in a fist "
 "fight.  Sad to say, the only referee we've got does not seem to object to "
@@ -967,7 +1072,7 @@
 "de feu. » Ce qu'il devrait faire, c'est séparer les combattants et 
pénaliser "
 "les coureurs dès qu'ils font mine de se battre."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Won't everyone stop programming without a monetary incentive?"
 "&rdquo;</strong>"
@@ -975,7 +1080,7 @@
 "<strong>« Les gens ne s'arrêteront-ils pas de programmer, sans l'appât du 
"
 "gain ? »</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually, many people will program with absolutely no monetary incentive.  "
 "Programming has an irresistible fascination for some people, usually the "
@@ -988,7 +1093,7 @@
 "qui n'ont aucun espoir de gagner leur vie avec la musique et pourtant "
 "continuent à jouer."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But really this question, though commonly asked, is not appropriate to the "
 "situation.  Pay for programmers will not disappear, only become less.  So "
@@ -1001,7 +1106,7 @@
 "programmeurs qui travailleront pour une moindre rémunération ? D'après 
mon "
 "expérience, la réponse est oui."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For more than ten years, many of the world's best programmers worked at the "
 "Artificial Intelligence Lab for far less money than they could have had "
@@ -1015,7 +1120,7 @@
 "reconnaissance des autres, par exemple. Sans oublier que créer est amusant 
; "
 "c'est une récompense en soi."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Then most of them left when offered a chance to do the same interesting work "
 "for a lot of money."
@@ -1023,7 +1128,7 @@
 "Et puis la plupart sont partis quand on leur a proposé de faire le même "
 "travail intéressant en étant très bien payés."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "What the facts show is that people will program for reasons other than "
 "riches; but if given a chance to make a lot of money as well, they will come "
@@ -1037,7 +1142,7 @@
 "payent moins bien ont du mal face à ceux qui payent bien, mais ils devraient 
"
 "pouvoir s'en sortir si les gros payeurs sont bannis."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;We need the programmers desperately.  If they demand that we "
 "stop helping our neighbors, we have to obey.&rdquo;</strong>"
@@ -1045,7 +1150,7 @@
 "<strong>« Nos besoins en programmeurs sont tellement importants que s'ils "
 "interdisent le partage, nous ne pouvons que leur obéir. »</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "You're never so desperate that you have to obey this sort of demand.  "
 "Remember: millions for defense, but not a cent for tribute!"
@@ -1054,13 +1159,13 @@
 "une telle interdiction. Rappelez-vous : des millions pour la défense, mais "
 "pas un sou de tribut !"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Programmers need to make a living somehow.&rdquo;</strong>"
 msgstr ""
 "<strong>« Il faut bien que les programmeurs gagnent leur pain. »</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In the short run, this is true.  However, there are plenty of ways that "
 "programmers could make a living without selling the right to use a program.  "
@@ -1076,7 +1181,7 @@
 "pain. Vous pouvez facilement trouver d'autres manières si vous le voulez. "
 "Voici quelques exemples."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A manufacturer introducing a new computer will pay for the porting of "
 "operating systems onto the new hardware."
@@ -1084,7 +1189,7 @@
 "Un fabricant qui sort un nouvel ordinateur payera pour le portage des "
 "systèmes d'exploitation sur le nouveau matériel."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The sale of teaching, handholding and maintenance services could also employ "
 "programmers."
@@ -1092,11 +1197,23 @@
 "Les services payants d'enseignement, d'assistance et de maintenance peuvent "
 "également créer des postes de programmeurs."
 
-#. type: Content of: <p>
-msgid ""
-"People with new ideas could distribute programs as freeware<a href=\"#f7\">"
-"(9)</a>, asking for donations from satisfied users, or selling handholding "
-"services.  I have met people who are already working this way successfully."
+#. type: Content of: <div><dl><dd><p>
+# | People with new ideas could distribute programs as [-freeware<a
+# | href=\"#f7\">(9)</a>,-] {+freeware&#8239;<a class=\"ftn\"
+# | href=\"#f7\">[9]</a>,+} asking for donations from satisfied users, or
+# | selling handholding services.  I have met people who are already working
+# | this way successfully.
+#, fuzzy
+#| msgid ""
+#| "People with new ideas could distribute programs as freeware<a href="
+#| "\"#f7\">(9)</a>, asking for donations from satisfied users, or selling "
+#| "handholding services.  I have met people who are already working this way "
+#| "successfully."
+msgid ""
+"People with new ideas could distribute programs as freeware&#8239;<a class="
+"\"ftn\" href=\"#f7\">[9]</a>, asking for donations from satisfied users, or "
+"selling handholding services.  I have met people who are already working "
+"this way successfully."
 msgstr ""
 "Des personnes aux idées novatrices peuvent distribuer des logiciels comme "
 "« graticiels » <i>[freeware]</i> <a id=\"f7-rev\" href=\"#f7\">(9)</a>, 
en "
@@ -1104,7 +1221,7 @@
 "d'assistance. J'ai rencontré des personnes qui travaillent déjà de cette "
 "manière avec succès."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Users with related needs can form users' groups, and pay dues.  A group "
 "would contract with programming companies to write programs that the group's "
@@ -1115,13 +1232,13 @@
 "passer contrat avec une entreprise de développement pour écrire des "
 "programmes spécifiques répondant aux souhaits de ses membres."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "All sorts of development can be funded with a Software Tax:"
 msgstr ""
 "Toutes sortes de développements pourraient être financés par une taxe sur 
le "
 "logiciel."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Suppose everyone who buys a computer has to pay x percent of the price as a "
 "software tax.  The government gives this to an agency like the NSF to spend "
@@ -1133,7 +1250,7 @@
 "\">NSF</abbr><a href=\"#TransNote4\" id=\"TransNote4-rev\"><sup>d</sup></a> "
 "pour subventionner le développement."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But if the computer buyer makes a donation to software development himself, "
 "he can take a credit against the tax.  He can donate to the project of his "
@@ -1147,7 +1264,7 @@
 "du projet. La réduction peut atteindre le montant total de la taxe qu'il "
 "avait à payer."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The total tax rate could be decided by a vote of the payers of the tax, "
 "weighted according to the amount they will be taxed on."
@@ -1155,19 +1272,19 @@
 "Le taux de la taxe pourrait être déterminé par un vote de ceux qui la "
 "payent, pondéré par le montant sur lequel ils seront taxés."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "The consequences:"
 msgstr "Les conséquences :"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "The computer-using community supports software development."
 msgstr "la communauté des utilisateurs soutient le développement logiciel ;"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "This community decides what level of support is needed."
 msgstr "cette communauté décide du niveau de soutien financier nécessaire 
;"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "Users who care which projects their share is spent on can choose this for "
 "themselves."
@@ -1175,7 +1292,7 @@
 "les utilisateurs qui s'intéressent aux projets bénéficiant de leur "
 "participation peuvent les choisir eux-mêmes."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the long run, making programs free is a step toward the postscarcity "
 "world, where nobody will have to work very hard just to make a living.  "
@@ -1193,7 +1310,7 @@
 "conseil familial, la réparation de robots et l'exploration d'astéroïdes. 
On "
 "pourra programmer sans avoir besoin d'en faire un gagne-pain."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We have already greatly reduced the amount of work that the whole society "
 "must do for its actual productivity, but only a little of this has "
@@ -1214,11 +1331,11 @@
 "chose à faire pour que les gains de productivité sur le plan technique se "
 "traduisent en une diminution du temps de travail."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "Notes"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The wording here was careless.  The intention was that nobody would have to "
 "pay for <b>permission</b> to use the GNU system.  But the words don't make "
@@ -1251,7 +1368,7 @@
 "collaboration avec d'autres. <a href=\"#f1-rev\" class=\"nounderline"
 "\">&#8593;</a>"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The expression &ldquo;give away&rdquo; is another indication that I had not "
 "yet clearly separated the issue of price from that of freedom.  We now "
@@ -1266,10 +1383,21 @@
 "html#GiveAwaySoftware\">Termes prêtant à confusion</a> » pour d'autres "
 "explications. <a href=\"#f2a-rev\" class=\"nounderline\">&#8593;</a>"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+# | This is another place I failed to distinguish carefully between the two
+# | different meanings of [-&ldquo;free&rdquo;.-] {+&ldquo;free.&rdquo;+} The
+# | statement as it stands is not false&mdash;you can get copies of GNU
+# | software at no charge, from your friends or over the net.  But it does
+# | suggest the wrong idea.
+#, fuzzy
+#| msgid ""
+#| "This is another place I failed to distinguish carefully between the two "
+#| "different meanings of &ldquo;free&rdquo;.  The statement as it stands is "
+#| "not false&mdash;you can get copies of GNU software at no charge, from "
+#| "your friends or over the net.  But it does suggest the wrong idea."
 msgid ""
 "This is another place I failed to distinguish carefully between the two "
-"different meanings of &ldquo;free&rdquo;.  The statement as it stands is not "
+"different meanings of &ldquo;free.&rdquo; The statement as it stands is not "
 "false&mdash;you can get copies of GNU software at no charge, from your "
 "friends or over the net.  But it does suggest the wrong idea."
 msgstr ""
@@ -1279,13 +1407,13 @@
 "ou par Internet. Mais le fait est qu'elle suggère la mauvaise "
 "interprétation. <a href=\"#f2-rev\" class=\"nounderline\">&#8593;</a>"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid "Several such companies now exist."
 msgstr ""
 "Plusieurs sociétés de ce type existent actuellement. <a href=\"#f3-rev\" "
 "class=\"nounderline\">&#8593;</a>"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Although it is a charity rather than a company, the Free Software Foundation "
 "for 10 years raised most of its funds from its distribution service.  You "
@@ -1298,7 +1426,7 @@
 "\">commander des logiciels, des livres, etc., à la FSF</a> pour soutenir son 
"
 "travail. <a href=\"#f4-rev\" class=\"nounderline\">&#8593;</a>"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "A group of computer companies pooled funds around 1991 to support "
 "maintenance of the GNU C Compiler."
@@ -1307,7 +1435,7 @@
 "financer la maintenance du compilateur C de GNU. <a 
href=\"#f5-rev\">&#8593;"
 "</a>"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "I think I was mistaken in saying that proprietary software was the most "
 "common basis for making money in software.  It seems that actually the most "
@@ -1329,10 +1457,31 @@
 "programmeurs payés gagnent moins dans un monde de logiciel libre. <a href="
 "\"#f8-rev\" class=\"nounderline\">&#8593;</a>"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+# | In the 1980s I had not yet realized how confusing it was to speak of
+# | &ldquo;the issue&rdquo; of &ldquo;intellectual [-property&rdquo;.-]
+# | {+property.&rdquo;+} That term is obviously biased; more subtle is the
+# | fact that it lumps together various disparate laws which raise very
+# | different issues.  Nowadays I urge people to reject the term
+# | &ldquo;intellectual property&rdquo; entirely, lest it lead others to
+# | suppose that those laws form one coherent issue.  The way to be clear is
+# | to discuss patents, copyrights, and trademarks separately.  See <a
+# | href=\"/philosophy/not-ipr.html\">further explanation</a> of how this term
+# | spreads confusion and bias.
+#, fuzzy
+#| msgid ""
+#| "In the 1980s I had not yet realized how confusing it was to speak of "
+#| "&ldquo;the issue&rdquo; of &ldquo;intellectual property&rdquo;.  That "
+#| "term is obviously biased; more subtle is the fact that it lumps together "
+#| "various disparate laws which raise very different issues.  Nowadays I "
+#| "urge people to reject the term &ldquo;intellectual property&rdquo; "
+#| "entirely, lest it lead others to suppose that those laws form one "
+#| "coherent issue.  The way to be clear is to discuss patents, copyrights, "
+#| "and trademarks separately.  See <a href=\"/philosophy/not-ipr.html"
+#| "\">further explanation</a> of how this term spreads confusion and bias."
 msgid ""
 "In the 1980s I had not yet realized how confusing it was to speak of &ldquo;"
-"the issue&rdquo; of &ldquo;intellectual property&rdquo;.  That term is "
+"the issue&rdquo; of &ldquo;intellectual property.&rdquo; That term is "
 "obviously biased; more subtle is the fact that it lumps together various "
 "disparate laws which raise very different issues.  Nowadays I urge people to "
 "reject the term &ldquo;intellectual property&rdquo; entirely, lest it lead "
@@ -1353,10 +1502,26 @@
 "détaillées</a> sur la manière dont ce terme sème la confusion et le parti 
"
 "pris. <a href=\"#f6-rev\" class=\"nounderline\">&#8593;</a>"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+# | Subsequently we learned to distinguish between &ldquo;free software&rdquo;
+# | and [-&ldquo;freeware&rdquo;.-] {+&ldquo;freeware.&rdquo;+} The term
+# | &ldquo;freeware&rdquo; means software you are free to redistribute, but
+# | usually you are not free to study and change the source code, so most of
+# | it is not free software.  See &ldquo;<a
+# | href=\"/philosophy/words-to-avoid.html#Freeware\">Confusing Words and
+# | Phrases</a>&rdquo; for more explanation.
+#, fuzzy
+#| msgid ""
+#| "Subsequently we learned to distinguish between &ldquo;free "
+#| "software&rdquo; and &ldquo;freeware&rdquo;.  The term &ldquo;"
+#| "freeware&rdquo; means software you are free to redistribute, but usually "
+#| "you are not free to study and change the source code, so most of it is "
+#| "not free software.  See &ldquo;<a href=\"/philosophy/words-to-avoid."
+#| "html#Freeware\">Confusing Words and Phrases</a>&rdquo; for more "
+#| "explanation."
 msgid ""
 "Subsequently we learned to distinguish between &ldquo;free software&rdquo; "
-"and &ldquo;freeware&rdquo;.  The term &ldquo;freeware&rdquo; means software "
+"and &ldquo;freeware.&rdquo; The term &ldquo;freeware&rdquo; means software "
 "you are free to redistribute, but usually you are not free to study and "
 "change the source code, so most of it is not free software.  See &ldquo;<a "
 "href=\"/philosophy/words-to-avoid.html#Freeware\">Confusing Words and "
@@ -1417,14 +1582,14 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Merci d'adresser vos commentaires sur les pages en français à &lt;<a href="
@@ -1435,9 +1600,15 @@
 "traduction</a> les infos nécessaires."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; 1985, 1993, 200[-3-]{+4+}, 2005, 2007, [-2008,-] 2009,
+# | 2010, [-2014, 2015-] {+2015, 2021+} Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, "
+#| "2015 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 1985, 1993, 2004, 2005, 2007, 2009, 2010, 2015, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015 "
 "Free Software Foundation, Inc."
@@ -1471,10 +1642,9 @@
 msgid "Updated:"
 msgstr "Dernière mise à jour :"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015, "
-"2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015, "
-"2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, "
+#~ "2015, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, "
+#~ "2015, 2021 Free Software Foundation, Inc."

Index: po/manifesto.hr-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/manifesto.hr-diff.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- po/manifesto.hr-diff.html   30 May 2021 19:32:26 -0000      1.9
+++ po/manifesto.hr-diff.html   2 Nov 2021 14:41:53 -0000       1.10
@@ -11,15 +11,27 @@
 </style></head>
 <body><pre>
 &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.77</em></ins></span> --&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 --&gt;
+&lt;!--#set var="TAGS" value="gnu-history" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</em></ins></span> --&gt;
 &lt;title&gt;The GNU Manifesto
 - GNU Project - Free Software Foundation&lt;/title&gt;
+<span class="inserted"><ins><em>&lt;style type="text/css" 
media="print,screen"&gt;&lt;!--
+a.ftn { font-size: .94em; }
+--&gt;&lt;/style&gt;</em></ins></span>
 &lt;!--#include virtual="/gnu/po/manifesto.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&lt;div class="article reduced-width"&gt;</em></ins></span>
 &lt;h2&gt;The GNU Manifesto&lt;/h2&gt;
 
+<span class="inserted"><ins><em>&lt;div class="comment"&gt;</em></ins></span>
 &lt;p&gt; The GNU Manifesto (which appears below) was written
-by &lt;a href="http://www.stallman.org/"&gt;Richard Stallman&lt;/a&gt; <span 
class="removed"><del><strong>at the beginning
+by &lt;a
+<span 
class="removed"><del><strong>href="http://www.stallman.org/"&gt;Richard</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://www.stallman.org/"&gt;Richard</em></ins></span>
 Stallman&lt;/a&gt; <span class="removed"><del><strong>at the beginning
 of the GNU Project,</strong></del></span> <span class="inserted"><ins><em>in 
1985</em></ins></span> to
 ask for <span class="removed"><del><strong>participation and support.  
For</strong></del></span> <span class="inserted"><ins><em>support in 
developing</em></ins></span> the
 <span class="removed"><del><strong>first few years,</strong></del></span> 
<span class="inserted"><ins><em>GNU operating system.  Part of the
@@ -53,13 +65,15 @@
 who disagree with the Free Software Movement's ethical values.  They
 use it to promote an
 &lt;a href="/philosophy/open-source-misses-the-point.html"&gt;amoral 
approach&lt;/a&gt; to the same field.&lt;/p&gt;
+&lt;hr class="no-display" /&gt;
+&lt;/div&gt;
 
 &lt;h3 id="whats-gnu"&gt;What's</em></ins></span> GNU?  Gnu's Not 
Unix!&lt;/h3&gt;
 
 &lt;p&gt;
    GNU, which stands for Gnu's Not Unix, is the name for the complete
 Unix-compatible software system which I am writing so that I can give
-it away free to everyone who can use it.&lt;a href="#f1"&gt;(1)&lt;/a&gt; 
Several
+it away free to everyone who can use <span 
class="removed"><del><strong>it.&lt;a 
href="#f1"&gt;(1)&lt;/a&gt;</strong></del></span> <span 
class="inserted"><ins><em>it&#8239;&lt;a class="ftn" 
href="#f1"&gt;[1]&lt;/a&gt;.</em></ins></span> Several
 other volunteers are helping me.  Contributions of time, money,
 programs and equipment are greatly needed.&lt;/p&gt;
 
@@ -120,11 +134,11 @@
 decided to put together a sufficient body of free software so that I
 will be able to get along without any software that is not free.  I
 have resigned from the AI Lab to deny MIT any legal excuse to prevent
-me from giving GNU away.&lt;a href="#f2a"&gt;(2)&lt;/a&gt;&lt;/p&gt;
+me from giving GNU <span class="removed"><del><strong>away.&lt;a 
href="#f2a"&gt;(2)&lt;/a&gt;&lt;/p&gt;
 
-<span class="removed"><del><strong>&lt;h3&gt;Why</strong></del></span>
+&lt;h3&gt;Why</strong></del></span> <span 
class="inserted"><ins><em>away&#8239;&lt;a class="ftn" 
href="#f2a"&gt;[2]&lt;/a&gt;.&lt;/p&gt;
 
-<span class="inserted"><ins><em>&lt;h3 
id="compatible"&gt;Why</em></ins></span> GNU Will Be Compatible with 
Unix&lt;/h3&gt;
+&lt;h3 id="compatible"&gt;Why</em></ins></span> GNU Will Be Compatible with 
Unix&lt;/h3&gt;
 
 &lt;p&gt;
    Unix is not my ideal system, but it is not too bad.  The essential
@@ -177,7 +191,9 @@
 
 <span class="inserted"><ins><em>&lt;h3 
id="contribute"&gt;How</em></ins></span> You Can Contribute&lt;/h3&gt;
 
-&lt;blockquote&gt;
+<span class="removed"><del><strong>&lt;blockquote&gt;</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;div class="comment"&gt;</em></ins></span>
 &lt;p&gt;
 (Nowadays, for software tasks to work on, see the &lt;a
 href="http://fsf.org/campaigns/priority-projects"&gt;High Priority Projects
@@ -186,7 +202,8 @@
 ways to help, see &lt;a <span 
class="removed"><del><strong>href="http://gnu.org/help/help.html"&gt;the</strong></del></span>
 <span 
class="inserted"><ins><em>href="/help/help.html"&gt;the</em></ins></span> guide 
to helping
 the GNU operating system&lt;/a&gt;.)
 &lt;/p&gt;
-&lt;/blockquote&gt;
+<span class="removed"><del><strong>&lt;/blockquote&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/div&gt;</em></ins></span>
 
 &lt;p&gt;
    I am asking computer manufacturers for donations of machines and
@@ -227,7 +244,7 @@
 
 &lt;p&gt;
    Once GNU is written, everyone will be able to obtain good system
-software free, just like air.&lt;a href="#f2"&gt;(3)&lt;/a&gt;&lt;/p&gt;
+software free, just like <span class="removed"><del><strong>air.&lt;a 
href="#f2"&gt;(3)&lt;/a&gt;&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>air&#8239;&lt;a class="ftn" 
href="#f2"&gt;[3]&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;
    This means much more than just saving everyone the price of a Unix
@@ -277,18 +294,21 @@
 
 <span class="removed"><del><strong>&lt;p&gt;</strong></del></span>
 
-<span class="inserted"><ins><em>&lt;p id="support"&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;dl&gt;
+&lt;dt id="support"&gt;</em></ins></span>
 &lt;strong&gt;&ldquo;Nobody will use it if it is free, because that means
-they can't rely on any support.&rdquo;&lt;/strong&gt;&lt;/p&gt;
+they can't rely on any <span 
class="removed"><del><strong>support.&rdquo;&lt;/strong&gt;&lt;/p&gt;
 
-&lt;p&gt;
-&lt;strong&gt;&ldquo;You have to charge for the program to pay for providing
-the support.&rdquo;&lt;/strong&gt;&lt;/p&gt;
+&lt;p&gt;</strong></del></span> <span 
class="inserted"><ins><em>support.&rdquo;&lt;/strong&gt;&lt;/dt&gt;
 
+&lt;dt&gt;</em></ins></span>
+&lt;strong&gt;&ldquo;You have to charge for the program to pay for providing
+the <span 
class="removed"><del><strong>support.&rdquo;&lt;/strong&gt;&lt;/p&gt;</strong></del></span>
 <span class="inserted"><ins><em>support.&rdquo;&lt;/strong&gt;&lt;/dt&gt;
+&lt;dd&gt;</em></ins></span>
 &lt;p&gt;
    If people would rather pay for GNU plus service than get GNU free
 without service, a company to provide just service to people who have
-obtained GNU free ought to be profitable.&lt;a 
href="#f3"&gt;(4)&lt;/a&gt;&lt;/p&gt;
+obtained GNU free ought to be <span 
class="removed"><del><strong>profitable.&lt;a 
href="#f3"&gt;(4)&lt;/a&gt;&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>profitable&#8239;&lt;a class="ftn" 
href="#f3"&gt;[4]&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;
    We must distinguish between support in the form of real programming
@@ -321,15 +341,18 @@
 should be able to use the program without paying for the service.&lt;/p&gt;
 
 <span class="removed"><del><strong>&lt;p&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/dd&gt;
 
-<span class="inserted"><ins><em>&lt;p id="advertising"&gt;</em></ins></span>
+&lt;dt id="advertising"&gt;</em></ins></span>
 &lt;strong&gt;&ldquo;You cannot reach many people without advertising, and
-you must charge for the program to support 
that.&rdquo;&lt;/strong&gt;&lt;/p&gt;
+you must charge for the program to support <span 
class="removed"><del><strong>that.&rdquo;&lt;/strong&gt;&lt;/p&gt;
 
-&lt;p&gt;
+&lt;p&gt;</strong></del></span> <span 
class="inserted"><ins><em>that.&rdquo;&lt;/strong&gt;&lt;/dt&gt;
+&lt;dt&gt;</em></ins></span>
 &lt;strong&gt;&ldquo;It's no use advertising a program people can get
-free.&rdquo;&lt;/strong&gt;&lt;/p&gt;
-
+<span 
class="removed"><del><strong>free.&rdquo;&lt;/strong&gt;&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>free.&rdquo;&lt;/strong&gt;&lt;/dt&gt;
+&lt;dd&gt;</em></ins></span>
 &lt;p&gt;
    There are various forms of free or very cheap publicity that can be
 used to inform numbers of computer users about something like GNU.  But
@@ -343,14 +366,15 @@
    On the other hand, if many people get GNU from their friends, and
 such companies don't succeed, this will show that advertising was not
 really necessary to spread GNU.  Why is it that free market advocates
-don't want to let the free market decide this?&lt;a 
href="#f4"&gt;(5)&lt;/a&gt;&lt;/p&gt;
+don't want to let the free market decide <span 
class="removed"><del><strong>this?&lt;a href="#f4"&gt;(5)&lt;/a&gt;&lt;/p&gt;
 
-<span class="removed"><del><strong>&lt;p&gt;</strong></del></span>
+&lt;p&gt;</strong></del></span> <span 
class="inserted"><ins><em>this?&#8239;&lt;a class="ftn" 
href="#f4"&gt;[5]&lt;/a&gt;&lt;/p&gt;
+&lt;/dd&gt;
 
-<span class="inserted"><ins><em>&lt;p id="competitive"&gt;</em></ins></span>
+&lt;dt id="competitive"&gt;</em></ins></span>
 &lt;strong&gt;&ldquo;My company needs a proprietary operating system to get
-a competitive edge.&rdquo;&lt;/strong&gt;&lt;/p&gt;
-
+a competitive <span 
class="removed"><del><strong>edge.&rdquo;&lt;/strong&gt;&lt;/p&gt;</strong></del></span>
 <span class="inserted"><ins><em>edge.&rdquo;&lt;/strong&gt;&lt;/dt&gt;
+&lt;dd&gt;</em></ins></span>
 &lt;p&gt;
    GNU will remove operating system software from the realm of
 competition.  You will not be able to get an edge in this area, but
@@ -363,14 +387,16 @@
 
 &lt;p&gt;
    I would like to see GNU development supported by gifts from many
-manufacturers and users, reducing the cost to each.&lt;a 
href="#f5"&gt;(6)&lt;/a&gt;&lt;/p&gt;
+manufacturers and users, reducing the cost to <span 
class="removed"><del><strong>each.&lt;a href="#f5"&gt;(6)&lt;/a&gt;&lt;/p&gt;
 
-<span class="removed"><del><strong>&lt;p&gt;</strong></del></span>
+&lt;p&gt;</strong></del></span> <span 
class="inserted"><ins><em>each&#8239;&lt;a class="ftn" 
href="#f5"&gt;[6]&lt;/a&gt;.&lt;/p&gt;
+&lt;/dd&gt;
 
-<span class="inserted"><ins><em>&lt;p id="deserve"&gt;</em></ins></span>
+&lt;dt id="deserve"&gt;</em></ins></span>
 &lt;strong&gt;&ldquo;Don't programmers deserve a reward for their
-creativity?&rdquo;&lt;/strong&gt;&lt;/p&gt;
-
+<span 
class="removed"><del><strong>creativity?&rdquo;&lt;/strong&gt;&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>creativity?&rdquo;&lt;/strong&gt;&lt;/dt&gt;
+&lt;dd&gt;</em></ins></span>
 &lt;p&gt;
    If anything deserves a reward, it is social contribution.
 Creativity can be a social contribution, but only in so far as society
@@ -379,11 +405,12 @@
 punished if they restrict the use of these programs.&lt;/p&gt;
 
 <span class="removed"><del><strong>&lt;p&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/dd&gt;
 
-<span class="inserted"><ins><em>&lt;p id="reward"&gt;</em></ins></span>
+&lt;dt id="reward"&gt;</em></ins></span>
 &lt;strong&gt;&ldquo;Shouldn't a programmer be able to ask for a reward for
-his creativity?&rdquo;&lt;/strong&gt;&lt;/p&gt;
-
+his <span 
class="removed"><del><strong>creativity?&rdquo;&lt;/strong&gt;&lt;/p&gt;</strong></del></span>
 <span class="inserted"><ins><em>creativity?&rdquo;&lt;/strong&gt;&lt;/dt&gt;
+&lt;dd&gt;</em></ins></span>
 &lt;p&gt;
    There is nothing wrong with wanting pay for work, or seeking to
 maximize one's income, as long as one does not use means that are
@@ -408,10 +435,11 @@
 creativity.&lt;/p&gt;
 
 <span class="removed"><del><strong>&lt;p&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/dd&gt;
 
-<span class="inserted"><ins><em>&lt;p id="starve"&gt;</em></ins></span>
-&lt;strong&gt;&ldquo;Won't programmers starve?&rdquo;&lt;/strong&gt;&lt;/p&gt;
-
+&lt;dt id="starve"&gt;</em></ins></span>
+&lt;strong&gt;&ldquo;Won't programmers <span 
class="removed"><del><strong>starve?&rdquo;&lt;/strong&gt;&lt;/p&gt;</strong></del></span>
 <span class="inserted"><ins><em>starve?&rdquo;&lt;/strong&gt;&lt;/dt&gt;
+&lt;dd&gt;</em></ins></span>
 &lt;p&gt;
    I could answer that nobody is forced to be a programmer.  Most of us
 cannot manage to get any money for standing on the street and making
@@ -431,7 +459,7 @@
 
 &lt;p&gt;
    Restricting copying is not the only basis for business in software.
-It is the most common basis&lt;a href="#f8"&gt;(7)&lt;/a&gt; because it brings 
in
+It is the most common <span class="removed"><del><strong>basis&lt;a 
href="#f8"&gt;(7)&lt;/a&gt;</strong></del></span> <span 
class="inserted"><ins><em>basis&#8239;&lt;a class="ftn" 
href="#f8"&gt;[7]&lt;/a&gt;</em></ins></span> because it brings in
 the most money.  If it
 were prohibited, or rejected by the customer, software business would
 move to other bases of organization which are now used less often.
@@ -446,11 +474,12 @@
 that.)&lt;/p&gt;
 
 <span class="removed"><del><strong>&lt;p&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/dd&gt;
 
-<span class="inserted"><ins><em>&lt;p 
id="right-to-control"&gt;</em></ins></span>
+&lt;dt id="right-to-control"&gt;</em></ins></span>
 &lt;strong&gt;&ldquo;Don't people have a right to control how their
-creativity is used?&rdquo;&lt;/strong&gt;&lt;/p&gt;
-
+creativity is <span 
class="removed"><del><strong>used?&rdquo;&lt;/strong&gt;&lt;/p&gt;</strong></del></span>
 <span class="inserted"><ins><em>used?&rdquo;&lt;/strong&gt;&lt;/dt&gt;
+&lt;dd&gt;</em></ins></span>
 &lt;p&gt;
 &ldquo;Control over the use of one's ideas&rdquo; really constitutes
 control over other people's lives; and it is usually used to make
@@ -458,7 +487,8 @@
 
 &lt;p&gt;
    People who have studied the issue of intellectual property
-rights&lt;a href="#f6"&gt;(8)&lt;/a&gt; carefully (such as lawyers) say that 
there
+<span class="removed"><del><strong>rights&lt;a 
href="#f6"&gt;(8)&lt;/a&gt;</strong></del></span>
+<span class="inserted"><ins><em>rights&#8239;&lt;a class="ftn" 
href="#f6"&gt;[8]&lt;/a&gt;</em></ins></span> carefully (such as lawyers) say 
that there
 is no intrinsic right to intellectual property.  The kinds of supposed
 intellectual property rights that the government recognizes were
 created by specific acts of legislation for specific purposes.&lt;/p&gt;
@@ -502,11 +532,13 @@
 regardless of whether the law enables him to.&lt;/p&gt;
 
 <span class="removed"><del><strong>&lt;p&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/dd&gt;
 
-<span class="inserted"><ins><em>&lt;p id="competition"&gt;</em></ins></span>
+&lt;dt id="competition"&gt;</em></ins></span>
 &lt;strong&gt;&ldquo;Competition makes things get done
-better.&rdquo;&lt;/strong&gt;&lt;/p&gt;
-
+<span 
class="removed"><del><strong>better.&rdquo;&lt;/strong&gt;&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>better.&rdquo;&lt;/strong&gt;&lt;/dt&gt;
+&lt;dd&gt;</em></ins></span>
 &lt;p&gt;
    The paradigm of competition is a race: by rewarding the winner, we
 encourage everyone to run faster.  When capitalism really works this
@@ -524,11 +556,13 @@
 break them up, and penalize runners for even trying to fight.&lt;/p&gt;
 
 <span class="removed"><del><strong>&lt;p&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/dd&gt;
 
-<span class="inserted"><ins><em>&lt;p 
id="stop-programming"&gt;</em></ins></span>
+&lt;dt id="stop-programming"&gt;</em></ins></span>
 &lt;strong&gt;&ldquo;Won't everyone stop programming without a monetary
-incentive?&rdquo;&lt;/strong&gt;&lt;/p&gt;
-
+<span 
class="removed"><del><strong>incentive?&rdquo;&lt;/strong&gt;&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>incentive?&rdquo;&lt;/strong&gt;&lt;/dt&gt;
+&lt;dd&gt;</em></ins></span>
 &lt;p&gt;
    Actually, many people will program with absolutely no monetary
 incentive.  Programming has an irresistible fascination for some
@@ -561,20 +595,22 @@
 if the high-paying ones are banned.&lt;/p&gt;
 
 <span class="removed"><del><strong>&lt;p&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/dd&gt;
 
-<span class="inserted"><ins><em>&lt;p id="desperate"&gt;</em></ins></span>
+&lt;dt id="desperate"&gt;</em></ins></span>
 &lt;strong&gt;&ldquo;We need the programmers desperately.  If they demand
-that we stop helping our neighbors, we have to 
obey.&rdquo;&lt;/strong&gt;&lt;/p&gt;
-
+that we stop helping our neighbors, we have to <span 
class="removed"><del><strong>obey.&rdquo;&lt;/strong&gt;&lt;/p&gt;</strong></del></span>
 <span class="inserted"><ins><em>obey.&rdquo;&lt;/strong&gt;&lt;/dt&gt;
+&lt;dd&gt;</em></ins></span>
 &lt;p&gt;
    You're never so desperate that you have to obey this sort of demand.
 Remember: millions for defense, but not a cent for tribute!&lt;/p&gt;
 
 <span class="removed"><del><strong>&lt;p&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/dd&gt;
 
-<span class="inserted"><ins><em>&lt;p id="living"&gt;</em></ins></span>
-&lt;strong&gt;&ldquo;Programmers need to make a living 
somehow.&rdquo;&lt;/strong&gt;&lt;/p&gt;
-
+&lt;dt id="living"&gt;</em></ins></span>
+&lt;strong&gt;&ldquo;Programmers need to make a living <span 
class="removed"><del><strong>somehow.&rdquo;&lt;/strong&gt;&lt;/p&gt;</strong></del></span>
 <span class="inserted"><ins><em>somehow.&rdquo;&lt;/strong&gt;&lt;/dt&gt;
+&lt;dd&gt;</em></ins></span>
 &lt;p&gt;
    In the short run, this is true.  However, there are plenty of ways
 that programmers could make a living without selling the right to use a
@@ -593,7 +629,8 @@
 
 &lt;p&gt;
    People with new ideas could distribute programs as
-freeware&lt;a href="#f7"&gt;(9)&lt;/a&gt;, asking for donations from satisfied
+<span class="removed"><del><strong>freeware&lt;a 
href="#f7"&gt;(9)&lt;/a&gt;,</strong></del></span>
+<span class="inserted"><ins><em>freeware&#8239;&lt;a class="ftn" 
href="#f7"&gt;[9]&lt;/a&gt;,</em></ins></span> asking for donations from 
satisfied
 users, or selling handholding services.  I have met people who are
 already working this way successfully.&lt;/p&gt;
 
@@ -630,6 +667,10 @@
 &lt;li&gt;Users who care which projects their share is spent on can
           choose this for themselves.&lt;/li&gt;
 &lt;/ul&gt;
+<span class="inserted"><ins><em>&lt;/dd&gt;
+&lt;/dl&gt;
+&lt;div class="column-limit"&gt;&lt;/div&gt;</em></ins></span>
+
 &lt;p&gt;
    In the long run, making programs free is a step toward the
 postscarcity world, where nobody will have to work very hard just to
@@ -651,9 +692,9 @@
 
 
 <span 
class="removed"><del><strong>&lt;h4&gt;Footnotes&lt;/h4&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;div class="column-limit"&gt;&lt;/div&gt;
 
-
-<span class="inserted"><ins><em>&lt;h3 
id="footnotes"&gt;Footnotes&lt;/h3&gt;</em></ins></span>
+&lt;h3 id="footnotes" 
class="footnote"&gt;Footnotes&lt;/h3&gt;</em></ins></span>
 
 &lt;!-- The anchors do not match the actual footnote numbers because of
      revisions over time.  And if a new footnote is added, the references
@@ -689,7 +730,7 @@
 <span class="removed"><del><strong>&lt;li&gt;&lt;a 
name="f2"&gt;&lt;/a&gt;This</strong></del></span>
 
 <span class="inserted"><ins><em>&lt;li id="f2"&gt;This</em></ins></span> is 
another place I failed to distinguish
-carefully between the two different meanings of &ldquo;free&rdquo;.
+carefully between the two different meanings of <span 
class="removed"><del><strong>&ldquo;free&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;free.&rdquo;</em></ins></span>
 The statement as it stands is not false&mdash;you can get copies of GNU
 software at no charge, from your friends or over the net.  But it does
 suggest the wrong idea.&lt;/li&gt;
@@ -728,7 +769,8 @@
 
 <span class="inserted"><ins><em>&lt;li id="f6"&gt;In</em></ins></span> the 
1980s I had not yet realized how confusing
 it was to speak of &ldquo;the issue&rdquo; of &ldquo;intellectual
-property&rdquo;.  That term is obviously biased; more subtle is the
+<span class="removed"><del><strong>property&rdquo;.</strong></del></span>
+<span class="inserted"><ins><em>property.&rdquo;</em></ins></span>  That term 
is obviously biased; more subtle is the
 fact that it lumps together various disparate laws which raise very
 different issues.  Nowadays I urge people to reject the term
 &ldquo;intellectual property&rdquo; entirely, lest it lead others to
@@ -740,7 +782,7 @@
 <span class="removed"><del><strong>&lt;li&gt;&lt;a 
name="f7"&gt;&lt;/a&gt;Subsequently</strong></del></span>
 
 <span class="inserted"><ins><em>&lt;li 
id="f7"&gt;Subsequently</em></ins></span> we learned to distinguish
-between &ldquo;free software&rdquo; and &ldquo;freeware&rdquo;.  The
+between &ldquo;free software&rdquo; and <span 
class="removed"><del><strong>&ldquo;freeware&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;freeware.&rdquo;</em></ins></span>  The
 term &ldquo;freeware&rdquo; means software you are free to
 redistribute, but usually you are not free to study and change the
 source code, so most of it is not free software.  See
@@ -750,11 +792,12 @@
 Words and <span 
class="removed"><del><strong>Phrases&lt;/q&gt;&lt;/a&gt;</strong></del></span> 
<span class="inserted"><ins><em>Phrases&lt;/a&gt;&rdquo;</em></ins></span> for 
more explanation.&lt;/li&gt;
 
 &lt;/ol&gt;
+<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;
-&lt;div id="footer"&gt;
-<span class="inserted"><ins><em>&lt;div 
class="unprintable"&gt;</em></ins></span>
+&lt;div <span 
class="removed"><del><strong>id="footer"&gt;</strong></del></span> <span 
class="inserted"><ins><em>id="footer" role="contentinfo"&gt;
+&lt;div class="unprintable"&gt;</em></ins></span>
 
 &lt;p&gt;Please send general FSF &amp; GNU inquiries to
 &lt;a href="mailto:gnu@gnu.org"&gt;&lt;gnu@gnu.org&gt;&lt;/a&gt;.
@@ -771,13 +814,13 @@
         to &lt;a href="mailto:web-translators@gnu.org"&gt;
         &lt;web-translators@gnu.org&gt;&lt;/a&gt;.&lt;/p&gt;
 
-        &lt;p&gt;For information on coordinating and submitting translations of
+        &lt;p&gt;For information on coordinating and <span 
class="removed"><del><strong>submitting</strong></del></span> <span 
class="inserted"><ins><em>contributing</em></ins></span> translations of
         our web pages, see &lt;a
         href="/server/standards/README.translations.html"&gt;Translations
         README&lt;/a&gt;. --&gt;
 Please see the &lt;a
 href="/server/standards/README.translations.html"&gt;Translations
-README&lt;/a&gt; for information on coordinating and submitting translations
+README&lt;/a&gt; for information on coordinating and <span 
class="removed"><del><strong>submitting</strong></del></span> <span 
class="inserted"><ins><em>contributing</em></ins></span> translations
 of this article.&lt;/p&gt;
 <span class="inserted"><ins><em>&lt;/div&gt;</em></ins></span>
 
@@ -798,7 +841,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; 1985, 1993, 2003, 2005, 2007, 2008, 2009, <span 
class="removed"><del><strong>2010</strong></del></span> <span 
class="inserted"><ins><em>2010, 2014, 2015</em></ins></span>
+&lt;p&gt;Copyright &copy; 1985, 1993, <span 
class="removed"><del><strong>2003,</strong></del></span> <span 
class="inserted"><ins><em>2004,</em></ins></span> 2005, 2007, <span 
class="removed"><del><strong>2008,</strong></del></span> 2009, <span 
class="removed"><del><strong>2010</strong></del></span> <span 
class="inserted"><ins><em>2010, 2015, 2021</em></ins></span>
 Free Software Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;
@@ -817,11 +860,12 @@
 
 <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/11/02 14:41: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: po/manifesto.hr.po
===================================================================
RCS file: /web/www/www/gnu/po/manifesto.hr.po,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- po/manifesto.hr.po  30 May 2021 19:32:26 -0000      1.11
+++ po/manifesto.hr.po  2 Nov 2021 14:41:53 -0000       1.12
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manifesto.html\n"
-"POT-Creation-Date: 2015-06-02 12:55+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2013-05-14 18:42+0100\n"
 "Last-Translator: Marin Rameša <marin.ramesa@gmail.com>\n"
 "Language-Team: www-hr <www-hr-lista@gnu.org>\n"
@@ -23,19 +23,20 @@
 msgid "The GNU Manifesto - GNU Project - Free Software Foundation"
 msgstr "GNU manifest - GNU projekt - Zaklada za slobodan softver"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "The GNU Manifesto"
 msgstr "GNU manifest"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 # | The GNU Manifesto (which appears below) was written by <a
-# | href=\"http://www.stallman.org/\";>Richard Stallman</a> [-at the beginning
-# | of the GNU Project,-] {+in 1985+} to ask for [-participation and support. 
-# | For-] {+support in developing+} the [-first few years,-] {+GNU operating
-# | system.  Part of the text was taken from the original announcement of
-# | 1983.  Through 1987,+} it was updated in minor ways to account for
-# | [-developments, but now-] {+developments; since then,+} it seems best to
-# | leave it [-unchanged as most people have seen it.-] {+unchanged.+}
+# | href=\"http{+s+}://www.stallman.org/\">Richard Stallman</a> [-at the
+# | beginning of the GNU Project,-] {+in 1985+} to ask for [-participation and
+# | support.  For-] {+support in developing+} the [-first few years,-] {+GNU
+# | operating system.  Part of the text was taken from the original
+# | announcement of 1983.  Through 1987,+} it was updated in minor ways to
+# | account for [-developments, but now-] {+developments; since then,+} it
+# | seems best to leave it [-unchanged as most people have seen it.-]
+# | {+unchanged.+}
 #, fuzzy
 #| msgid ""
 #| "The GNU Manifesto (which appears below) was written by <a href=\"http://";
@@ -44,7 +45,7 @@
 #| "it was updated in minor ways to account for developments, but now it "
 #| "seems best to leave it unchanged as most people have seen it."
 msgid ""
-"The GNU Manifesto (which appears below) was written by <a href=\"http://www.";
+"The GNU Manifesto (which appears below) was written by <a href=\"https://www.";
 "stallman.org/\">Richard Stallman</a> in 1985 to ask for support in "
 "developing the GNU operating system.  Part of the text was taken from the "
 "original announcement of 1983.  Through 1987, it was updated in minor ways "
@@ -56,7 +57,7 @@
 "u manjoj mjeri da bi ostao u toku događaja, no sada se čini kako je 
najbolje "
 "ostaviti ga neizmijenjenog kakvog ga je većina ljudi vidjela."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Since that time, we have learned about certain common misunderstandings that "
 "different wording could help avoid.  Footnotes added since 1993 help clarify "
@@ -66,7 +67,7 @@
 "dijelova engleskog originala koja bi se izbjegla da je tekst drugačije "
 "sročen. Bilješke dodane od 1993. pojašnjavaju ove stavke."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 # | [-For up-to-date information about-]{+If you want to install+} the
 # | [-available GNU software, please see-] {+GNU/Linux system, we recommend
 # | you use one of+} the [-information available on our <a
@@ -94,7 +95,7 @@
 "Za informacije kako pridonijeti, pogledajte <a href=\"/help/help.html"
 "\">http://www.gnu.org/help</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The GNU Project is part of the Free Software Movement, a campaign for <a "
 "href=\"/philosophy/free-sw.html\">freedom for users of software</a>.  It is "
@@ -104,24 +105,37 @@
 "open-source-misses-the-point.html\">amoral approach</a> to the same field."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "What's GNU? Gnu's Not Unix!"
 msgstr "Å to je GNU? Gnu Nije Unix!"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | GNU, which stands for Gnu's Not Unix, is the name for the complete
+# | Unix-compatible software system which I am writing so that I can give it
+# | away free to everyone who can use [-it.<a href=\"#f1\">(1)</a>-]
+# | {+it&#8239;<a class=\"ftn\" href=\"#f1\">[1]</a>.+} Several other
+# | volunteers are helping me.  Contributions of time, money, programs and
+# | equipment are greatly needed.
+#, fuzzy
+#| msgid ""
+#| "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
+#| "compatible software system which I am writing so that I can give it away "
+#| "free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
+#| "volunteers are helping me.  Contributions of time, money, programs and "
+#| "equipment are greatly needed."
 msgid ""
 "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
 "compatible software system which I am writing so that I can give it away "
-"free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
-"volunteers are helping me.  Contributions of time, money, programs and "
-"equipment are greatly needed."
+"free to everyone who can use it&#8239;<a class=\"ftn\" href=\"#f1\">[1]</a>. "
+"Several other volunteers are helping me.  Contributions of time, money, "
+"programs and equipment are greatly needed."
 msgstr ""
 "GNU, Å¡to je kratica za Gnu Nije Unix, je naziv za potpun softverski sustav "
 "kompatibilan s Unixom koji pišem kako bih ga mogao dati slobodno tako da ga "
 "svatko može koristiti.<a href=\"#f1\">(1)</a> Nekoliko drugih dobrovoljaca "
 "mi pomaže. Donacije vremena, novca, programa i opreme su vrlo potrebne."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So far we have an Emacs text editor with Lisp for writing editor commands, a "
 "source level debugger, a yacc-compatible parser generator, a linker, and "
@@ -151,7 +165,7 @@
 "elektroničku dokumentaciju. Nadamo se da ćemo, jednom, ponuditi sve korisno 
"
 "što uobičajeno dolazi sa Unix sustavom, i više."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU will be able to run Unix programs, but will not be identical to Unix.  "
 "We will make all improvements that are convenient, based on our experience "
@@ -173,7 +187,7 @@
 "sistemski programski jezici. Probati ćemo podržavati protokole za "
 "komunikaciju UUCP, MIT Chaosnet i Internet."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is aimed initially at machines in the 68000/16000 class with virtual "
 "memory, because they are the easiest machines to make it run on.  The extra "
@@ -185,7 +199,7 @@
 "možemo natjerati da radi. Dodatni trud potreban da ga pokrenemo i na manjim "
 "strojevima će biti ostavljen nekome tko želi koristiti GNU na njima."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid horrible confusion, please pronounce the <em>g</em> in the word "
 "&ldquo;GNU&rdquo; when it is the name of this project."
@@ -194,11 +208,11 @@
 "GNU&rdquo; kada je to ime ovog projekta.<sup><a href=\"#TransNote1\">1</a></"
 "sup> "
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why I Must Write GNU"
 msgstr "Zašto moram napisati GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I consider that the Golden Rule requires that if I like a program I must "
 "share it with other people who like it.  Software sellers want to divide the "
@@ -220,13 +234,26 @@
 "drugim ne-gostoljubivostima, no u jednom trenutku otišli su predaleko: nisam 
"
 "mogao ostati u ustanovi u kojoj se takve stvari rade protiv moje volje."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | So that I can continue to use computers without dishonor, I have decided
+# | to put together a sufficient body of free software so that I will be able
+# | to get along without any software that is not free.  I have resigned from
+# | the AI Lab to deny MIT any legal excuse to prevent me from giving GNU
+# | [-away.<a href=\"#f2a\">(2)</a>-] {+away&#8239;<a class=\"ftn\"
+# | href=\"#f2a\">[2]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "So that I can continue to use computers without dishonor, I have decided "
+#| "to put together a sufficient body of free software so that I will be able "
+#| "to get along without any software that is not free.  I have resigned from "
+#| "the AI Lab to deny MIT any legal excuse to prevent me from giving GNU "
+#| "away.<a href=\"#f2a\">(2)</a>"
 msgid ""
 "So that I can continue to use computers without dishonor, I have decided to "
 "put together a sufficient body of free software so that I will be able to "
 "get along without any software that is not free.  I have resigned from the "
-"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away.<a "
-"href=\"#f2a\">(2)</a>"
+"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away&#8239;"
+"<a class=\"ftn\" href=\"#f2a\">[2]</a>."
 msgstr ""
 "Kako bih mogao nastaviti koristiti računala bez da budem nečastan, odlučio 
"
 "sam složiti dovoljnu količinu slobodnog softvera tako da mogu ići dalje 
bez "
@@ -234,11 +261,11 @@
 "legalno ne bi mogao sprječavati u slobodnom davanju GNU-a.<a href=\"#f2a\">"
 "(2)</a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why GNU Will Be Compatible with Unix"
 msgstr "Zašto će GNU biti kompatibilan s Unixom"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Unix is not my ideal system, but it is not too bad.  The essential features "
 "of Unix seem to be good ones, and I think I can fill in what Unix lacks "
@@ -250,11 +277,11 @@
 "popuniti bez da uništim te osobine. A sustav kompatibilan s Unixom bio bi "
 "jednostavan za prihvaćanje mnogim drugim ljudima."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How GNU Will Be Available"
 msgstr "Kako će GNU biti dostupan"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is not in the public domain.  Everyone will be permitted to modify and "
 "redistribute GNU, but no distributor will be allowed to restrict its further "
@@ -269,18 +296,18 @@
 "izmjene neće biti dozvoljene. Želim osigurati da će sve inačice GNU-a 
ostati "
 "slobodne."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why Many Other Programmers Want to Help"
 msgstr "Zašto mnogi drugi programeri žele pomoći"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found many other programmers who are excited about GNU and want to "
 "help."
 msgstr ""
 "Pronašao sam mnogo programera koji su uzbuđeni oko GNU-a i žele pomoći."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Many programmers are unhappy about the commercialization of system "
 "software.  It may enable them to make more money, but it requires them to "
@@ -304,7 +331,7 @@
 "dobro sa bilo kojim odabirom. Postaju cinični i misle da je programiranje "
 "samo način za zaradu."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By working on and using GNU rather than proprietary programs, we can be "
 "hospitable to everyone and obey the law.  In addition, GNU serves as an "
@@ -320,11 +347,11 @@
 "ako koristimo softver koji nije slobodan. Za oko pola programera s kojima "
 "razgovaram, ovo je bitna sreća koju novac ne može zamijeniti."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How You Can Contribute"
 msgstr "Kako vi možete pripomoći"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "(Nowadays, for software tasks to work on, see the <a href=\"http://fsf.org/";
 "campaigns/priority-projects\">High Priority Projects list</a> and the <a "
@@ -340,7 +367,7 @@
 "softverske pakete. Za druge načine na koje možete pomoći, pogledajte <a 
href="
 "\"/help/help.html\">vodič za pomaganje GNU operativnoga sustava</a>.)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am asking computer manufacturers for donations of machines and money.  I'm "
 "asking individuals for donations of programs and work."
@@ -348,7 +375,7 @@
 "Tražim proizvođače računala za donacije strojeva i novca. Tražim 
pojedince "
 "za donacije programa i rada."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One consequence you can expect if you donate machines is that GNU will run "
 "on them at an early date.  The machines should be complete, ready to use "
@@ -360,7 +387,7 @@
 "uporabu, odobreni za uporabu u naseljenim područjima, i da ne trebaju "
 "sofisticirano hlađenje ili napajanje."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found very many programmers eager to contribute part-time work for "
 "GNU.  For most projects, such part-time distributed work would be very hard "
@@ -388,7 +415,7 @@
 "biti će jednostavna zadaća. (Jezgra će zahtijevati bližu komunikaciju i "
 "morati će se razvijati od strane male, uske grupe.)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If I get donations of money, I may be able to hire a few people full or part "
 "time.  The salary won't be high by programmers' standards, but I'm looking "
@@ -404,19 +431,26 @@
 "punu energiju na rad na GNU-u poštedom od potrebe da zarade za život na 
neki "
 "drugi način."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why All Computer Users Will Benefit"
 msgstr "Zašto će svi korisnici računala imati koristi"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Once GNU is written, everyone will be able to obtain good system software
+# | free, just like [-air.<a href=\"#f2\">(3)</a>-] {+air&#8239;<a
+# | class=\"ftn\" href=\"#f2\">[3]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "Once GNU is written, everyone will be able to obtain good system software "
+#| "free, just like air.<a href=\"#f2\">(3)</a>"
 msgid ""
 "Once GNU is written, everyone will be able to obtain good system software "
-"free, just like air.<a href=\"#f2\">(3)</a>"
+"free, just like air&#8239;<a class=\"ftn\" href=\"#f2\">[3]</a>."
 msgstr ""
 "Kada GNU bude napisan, svatko će moći dobiti dobar sistemski softver "
 "slobodno, baš kao i zrak.<a href=\"#f2\">(3)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This means much more than just saving everyone the price of a Unix license.  "
 "It means that much wasteful duplication of system programming effort will be "
@@ -426,7 +460,7 @@
 "će se bespotrebno gubljenje vremena na programiranje izbjeći. To vrijeme "
 "može umjesto toga ići u unaprjeđivanje tehnologije."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Complete system sources will be available to everyone.  As a result, a user "
 "who needs changes in the system will always be free to make them himself, or "
@@ -441,7 +475,7 @@
 "ili kompanije koja posjeduje izvorni kod i jedina ima mogućnost napraviti "
 "izmjene."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Schools will be able to provide a much more educational environment by "
 "encouraging all students to study and improve the system code.  Harvard's "
@@ -456,7 +490,7 @@
 "sustav ako njegov izvorni kod nije bio javan, i držali se toga tako da su "
 "stvarno odbijali instalirati određene programe. Ovo me snažno nadahnulo."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Finally, the overhead of considering who owns the system software and what "
 "one is or is not entitled to do with it will be lifted."
@@ -464,7 +498,7 @@
 "Konačno, gubljenje vremena na razmišljanje tko je vlasnik sistemskog "
 "softvera i što se smije ili ne smije činiti s njim bit će uklonjeno."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Arrangements to make people pay for using a program, including licensing of "
 "copies, always incur a tremendous cost to society through the cumbersome "
@@ -489,7 +523,7 @@
 "ikada skidate masku su strašne. Bolje je podržavati tvornicu zraka porezom "
 "po glavi stanovnika i jednostavno odbaciti maske."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copying all or parts of a program is as natural to a programmer as "
 "breathing, and as productive.  It ought to be as free."
@@ -497,11 +531,11 @@
 "Kopiranje svih ili dijelova programa je prirodno programeru poput disanja, i "
 "jednako produktivno. Mora biti slobodno."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Some Easily Rebutted Objections to GNU's Goals"
 msgstr "Neki jednostavno odbacivi prigovori ciljevima GNU-a"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Nobody will use it if it is free, because that means they "
 "can't rely on any support.&rdquo;</strong>"
@@ -509,7 +543,7 @@
 "<strong>&ldquo;Nitko ga neće koristiti ako je besplatan, jer to znači da "
 "nemaju podršku na koju se mogu pouzdati.&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You have to charge for the program to pay for providing the "
 "support.&rdquo;</strong>"
@@ -517,17 +551,26 @@
 "<strong>&ldquo;Morate naplaćivati za program kako biste platili pružanje "
 "podrške.&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | If people would rather pay for GNU plus service than get GNU free without
+# | service, a company to provide just service to people who have obtained GNU
+# | free ought to be [-profitable.<a href=\"#f3\">(4)</a>-]
+# | {+profitable&#8239;<a class=\"ftn\" href=\"#f3\">[4]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "If people would rather pay for GNU plus service than get GNU free without "
+#| "service, a company to provide just service to people who have obtained "
+#| "GNU free ought to be profitable.<a href=\"#f3\">(4)</a>"
 msgid ""
 "If people would rather pay for GNU plus service than get GNU free without "
 "service, a company to provide just service to people who have obtained GNU "
-"free ought to be profitable.<a href=\"#f3\">(4)</a>"
+"free ought to be profitable&#8239;<a class=\"ftn\" href=\"#f3\">[4]</a>."
 msgstr ""
 "Ako bi ljudi radije platili za GNU i podršku nego dobili besplatni GNU bez "
 "podrške, kompanija koja bi pružala samo podršku ljudima koji su slobodno "
 "nabavili GNU morala bi biti profitabilna.<a href=\"#f3\">(4)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We must distinguish between support in the form of real programming work and "
 "mere handholding.  The former is something one cannot rely on from a "
@@ -539,7 +582,7 @@
 "prodavača softvera. Ako vaš problem ne dijeli dovoljno ljudi, prodavač će 
"
 "vam reći da se gonite."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If your business needs to be able to rely on support, the only way is to "
 "have all the necessary sources and tools.  Then you can hire any available "
@@ -558,7 +601,7 @@
 "biti moguće da nema kompetentne osobe, no ovaj problem ne može se baciti na 
"
 "način distribucije. GNU ne rješava sve svjetske probleme, samo neke."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Meanwhile, the users who know nothing about computers need handholding: "
 "doing things for them which they could easily do themselves but don't know "
@@ -568,7 +611,7 @@
 "ruku: trebaju da netko za njih učini ono što bi i oni sami jednostavno 
mogli "
 "no ne znaju kako."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Such services could be provided by companies that sell just handholding and "
 "repair service.  If it is true that users would rather spend money and get a "
@@ -585,7 +628,7 @@
 "vezani uz pojedinu. U međuvremenu, oni od nas koji ne trebaju uslugu će "
 "morati moći koristiti program i bez plaćanja za uslugu."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You cannot reach many people without advertising, and you "
 "must charge for the program to support that.&rdquo;</strong>"
@@ -593,7 +636,7 @@
 "<strong>&ldquo;Ne možete dosegnuti mnogo ljudi bez oglašavanja, i morate "
 "naplatiti program da biste to podržavali.&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;It's no use advertising a program people can get free.&rdquo;"
 "</strong>"
@@ -601,7 +644,7 @@
 "<strong>&ldquo;Beskorisno je oglašavati program do kojeg ljudi mogu doći "
 "besplatno.&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are various forms of free or very cheap publicity that can be used to "
 "inform numbers of computer users about something like GNU.  But it may be "
@@ -618,19 +661,30 @@
 "oglašavanje i više. Na ovaj način, samo korisnici koji imaju koristi od "
 "oglašavanja plate za njega."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | On the other hand, if many people get GNU from their friends, and such
+# | companies don't succeed, this will show that advertising was not really
+# | necessary to spread GNU.  Why is it that free market advocates don't want
+# | to let the free market decide [-this?<a href=\"#f4\">(5)</a>-]
+# | {+this?&#8239;<a class=\"ftn\" href=\"#f4\">[5]</a>+}
+#, fuzzy
+#| msgid ""
+#| "On the other hand, if many people get GNU from their friends, and such "
+#| "companies don't succeed, this will show that advertising was not really "
+#| "necessary to spread GNU.  Why is it that free market advocates don't want "
+#| "to let the free market decide this?<a href=\"#f4\">(5)</a>"
 msgid ""
 "On the other hand, if many people get GNU from their friends, and such "
 "companies don't succeed, this will show that advertising was not really "
 "necessary to spread GNU.  Why is it that free market advocates don't want to "
-"let the free market decide this?<a href=\"#f4\">(5)</a>"
+"let the free market decide this?&#8239;<a class=\"ftn\" href=\"#f4\">[5]</a>"
 msgstr ""
 "S druge strane, ako mnogo ljudi dobije GNU od svojih prijatelja, i takve "
 "kompanije ne uspiju, ovo će pokazati da oglašavanje nije ustvari bilo "
 "potrebno da se GNU proširi. Zašto zagovornici slobodnog tržišta ne 
dopuštaju "
 "da slobodno tržište odluči o ovome?<a href=\"#f4\">(5)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;My company needs a proprietary operating system to get a "
 "competitive edge.&rdquo;</strong>"
@@ -638,7 +692,7 @@
 "<strong>&ldquo;Moja kompanija treba vlasnički operativni sustav da bi dobila 
"
 "na konkurentnosti.&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU will remove operating system software from the realm of competition.  "
 "You will not be able to get an edge in this area, but neither will your "
@@ -655,15 +709,24 @@
 "problem. Ako je vaš posao nešto drugo, GNU vas može spasiti od polaska u "
 "skupi posao prodaje operativnih sustava."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | I would like to see GNU development supported by gifts from many
+# | manufacturers and users, reducing the cost to [-each.<a
+# | href=\"#f5\">(6)</a>-] {+each&#8239;<a class=\"ftn\"
+# | href=\"#f5\">[6]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "I would like to see GNU development supported by gifts from many "
+#| "manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
 msgid ""
 "I would like to see GNU development supported by gifts from many "
-"manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
+"manufacturers and users, reducing the cost to each&#8239;<a class=\"ftn\" "
+"href=\"#f5\">[6]</a>."
 msgstr ""
 "Volio bih vidjeti da GNU razvoj podržavaju darovi mnogih proizvođača i "
 "korisnika, smanjujući cijenu oboma.<a href=\"#f5\">(6)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't programmers deserve a reward for their creativity?"
 "&rdquo;</strong>"
@@ -671,7 +734,7 @@
 "<strong>&ldquo;Ne zaslužuju li programeri nagradu za svoju kreativnost?"
 "&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If anything deserves a reward, it is social contribution.  Creativity can be "
 "a social contribution, but only in so far as society is free to use the "
@@ -684,7 +747,7 @@
 "programeri zaslužuju nagradu za stvaranje inovativnih programa, na isti "
 "način trebaju biti kažnjeni ako ograničuju uporabu ovih programa."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Shouldn't a programmer be able to ask for a reward for his "
 "creativity?&rdquo;</strong>"
@@ -692,7 +755,7 @@
 "<strong>&ldquo;Ne bi li programer trebao moći tražiti nagradu za svoju "
 "kreativnost?&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is nothing wrong with wanting pay for work, or seeking to maximize "
 "one's income, as long as one does not use means that are destructive.  But "
@@ -703,7 +766,7 @@
 "mjere koje su danas uobičajene u području softvera zasnovane su na "
 "destruktivnosti."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Extracting money from users of a program by restricting their use of it is "
 "destructive because the restrictions reduce the amount and the ways that the "
@@ -717,7 +780,7 @@
 "programa. Kada postoji namjerni odabir da se ograniči, štetne posljedice su 
"
 "namjerno uništenje."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The reason a good citizen does not use such destructive means to become "
 "wealthier is that, if everyone did so, we would all become poorer from the "
@@ -735,11 +798,11 @@
 "bude nagrađen za kreativnost ne opravdava sprječavanje svijeta da koristi "
 "svu ili dio te kreativnosti."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid "<strong>&ldquo;Won't programmers starve?&rdquo;</strong>"
 msgstr "<strong>&ldquo;Neće li programeri gladovati?&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "I could answer that nobody is forced to be a programmer.  Most of us cannot "
 "manage to get any money for standing on the street and making faces.  But we "
@@ -751,7 +814,7 @@
 "kao rezultat, prisiljeni provoditi naš život stajući na ulici i 
gladujući. "
 "Činimo nešto drugo."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But that is the wrong answer because it accepts the questioner's implicit "
 "assumption: that without ownership of software, programmers cannot possibly "
@@ -761,7 +824,7 @@
 "pitanja: da bez vlasništva nad softverom, programeri ne mogu biti plaćeni 
ni "
 "centa. Navodno je sve ili ništa."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The real reason programmers will not starve is that it will still be "
 "possible for them to get paid for programming; just not paid as much as now."
@@ -769,13 +832,28 @@
 "Pravi razlog zašto programeri neće gladovati je da će još uvijek biti 
moguće "
 "da budu plaćeni za programiranje; samo ne plaćeni koliko sada."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | Restricting copying is not the only basis for business in software.  It is
+# | the most common [-basis<a href=\"#f8\">(7)</a>-] {+basis&#8239;<a
+# | class=\"ftn\" href=\"#f8\">[7]</a>+} because it brings in the most money. 
+# | If it were prohibited, or rejected by the customer, software business
+# | would move to other bases of organization which are now used less often. 
+# | There are always numerous ways to organize any kind of business.
+#, fuzzy
+#| msgid ""
+#| "Restricting copying is not the only basis for business in software.  It "
+#| "is the most common basis<a href=\"#f8\">(7)</a> because it brings in the "
+#| "most money.  If it were prohibited, or rejected by the customer, software "
+#| "business would move to other bases of organization which are now used "
+#| "less often.  There are always numerous ways to organize any kind of "
+#| "business."
 msgid ""
 "Restricting copying is not the only basis for business in software.  It is "
-"the most common basis<a href=\"#f8\">(7)</a> because it brings in the most "
-"money.  If it were prohibited, or rejected by the customer, software "
-"business would move to other bases of organization which are now used less "
-"often.  There are always numerous ways to organize any kind of business."
+"the most common basis&#8239;<a class=\"ftn\" href=\"#f8\">[7]</a> because it "
+"brings in the most money.  If it were prohibited, or rejected by the "
+"customer, software business would move to other bases of organization which "
+"are now used less often.  There are always numerous ways to organize any "
+"kind of business."
 msgstr ""
 "Ograničavanje kopiranja nije jedina osnova softverskim kompanijama. To je "
 "najuobičajenija osnova<a href=\"#f8\">(7)</a> jer donosi najviše novca. Da "
@@ -783,7 +861,7 @@
 "pomaknule na druge osnove organizacije koje se sada rijeđe koriste. Uvijek "
 "su postojali razni načini da se organizira bilo koja vrsta posla."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Probably programming will not be as lucrative on the new basis as it is "
 "now.  But that is not an argument against the change.  It is not considered "
@@ -797,7 +875,7 @@
 "toliko zarađivali, ni to ne bi bila nepravda. (U praksi bi i dalje "
 "zarađivali mnogo više nego prodavači.)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't people have a right to control how their creativity is "
 "used?&rdquo;</strong>"
@@ -805,7 +883,7 @@
 "<strong>&ldquo;Nemaju li ljudi pravo da kontroliraju kako se njihova "
 "kreativnost koristi?&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "&ldquo;Control over the use of one's ideas&rdquo; really constitutes control "
 "over other people's lives; and it is usually used to make their lives more "
@@ -814,13 +892,26 @@
 "&ldquo;Kontrola nad uporabom ideja pojedinca&rdquo; ustvari je kontrola nad "
 "tuđim životima; i obično se koristi da bi učinila njihove živote 
težima."
 
-#. type: Content of: <p>
-msgid ""
-"People who have studied the issue of intellectual property rights<a href="
-"\"#f6\">(8)</a> carefully (such as lawyers) say that there is no intrinsic "
-"right to intellectual property.  The kinds of supposed intellectual property "
-"rights that the government recognizes were created by specific acts of "
-"legislation for specific purposes."
+#. type: Content of: <div><dl><dd><p>
+# | People who have studied the issue of intellectual property [-rights<a
+# | href=\"#f6\">(8)</a>-] {+rights&#8239;<a class=\"ftn\"
+# | href=\"#f6\">[8]</a>+} carefully (such as lawyers) say that there is no
+# | intrinsic right to intellectual property.  The kinds of supposed
+# | intellectual property rights that the government recognizes were created
+# | by specific acts of legislation for specific purposes.
+#, fuzzy
+#| msgid ""
+#| "People who have studied the issue of intellectual property rights<a href="
+#| "\"#f6\">(8)</a> carefully (such as lawyers) say that there is no "
+#| "intrinsic right to intellectual property.  The kinds of supposed "
+#| "intellectual property rights that the government recognizes were created "
+#| "by specific acts of legislation for specific purposes."
+msgid ""
+"People who have studied the issue of intellectual property rights&#8239;<a "
+"class=\"ftn\" href=\"#f6\">[8]</a> carefully (such as lawyers) say that "
+"there is no intrinsic right to intellectual property.  The kinds of supposed "
+"intellectual property rights that the government recognizes were created by "
+"specific acts of legislation for specific purposes."
 msgstr ""
 "Ljudi koji su proučavali problem prava intelektualnog vlasništva<a href="
 "\"#f6\">(8)</a> pažljivo (poput odvjetnika) kažu da ne postoji urođeno 
pravo "
@@ -828,7 +919,7 @@
 "vlasništva koje vlada prepoznaje stvoreni su posebnim zakonima za posebne "
 "svrhe."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For example, the patent system was established to encourage inventors to "
 "disclose the details of their inventions.  Its purpose was to help society "
@@ -848,7 +939,7 @@
 "ne čine mnogo štete. Ne rade probleme većini pojedinaca koji koriste "
 "patentirane proizvode."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The idea of copyright did not exist in ancient times, when authors "
 "frequently copied other authors at length in works of nonfiction.  This "
@@ -868,7 +959,7 @@
 "tiskarskom stroju&mdash;učinio je malo štete, a nije smetao većini "
 "pojedinaca koji čitaju knjige."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "All intellectual property rights are just licenses granted by society "
 "because it was thought, rightly or wrongly, that society as a whole would "
@@ -882,7 +973,7 @@
 "zapitati: imamo li stvarno koristi od davanja takve licence? Kakav čin "
 "dozvoljavamo pojedincu da čini?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The case of programs today is very different from that of books a hundred "
 "years ago.  The fact that the easiest way to copy a program is from one "
@@ -902,13 +993,13 @@
 "duhovno; situaciju u kojoj osoba to ne bi trebala to činiti dozvoljavao ili "
 "ne dozvoljavao joj to zakon."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Competition makes things get done better.&rdquo;</strong>"
 msgstr ""
 "<strong>&ldquo;Konkurencija čini da se stvari rade bolje.&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The paradigm of competition is a race: by rewarding the winner, we encourage "
 "everyone to run faster.  When capitalism really works this way, it does a "
@@ -926,7 +1017,7 @@
 "strategije&mdash;poput napadanja drugih trkača. Ako se trkači počnu tući, 
"
 "svi će doći kasnije."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Proprietary and secret software is the moral equivalent of runners in a fist "
 "fight.  Sad to say, the only referee we've got does not seem to object to "
@@ -940,7 +1031,7 @@
 "napraviti jedan udarac.&rdquo;) Ustvari bi ih trebao razdvojiti, i kazniti "
 "trkače što se uopće pokušavaju tući."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Won't everyone stop programming without a monetary incentive?"
 "&rdquo;</strong>"
@@ -948,7 +1039,7 @@
 "<strong>&ldquo;Neće li svi prestati programirati bez novčane 
naknade?&rdquo;"
 "</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually, many people will program with absolutely no monetary incentive.  "
 "Programming has an irresistible fascination for some people, usually the "
@@ -960,7 +1051,7 @@
 "koji su u njemu najbolji. Mnogi profesionalni glazbenici nastavljaju svirati "
 "makar nemaju nade da će zaraditi za život na taj način."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But really this question, though commonly asked, is not appropriate to the "
 "situation.  Pay for programmers will not disappear, only become less.  So "
@@ -972,7 +1063,7 @@
 "je pravo pitanje, da li će itko programirati sa smanjenom novčanom 
naknadom? "
 "Moje iskustvo pokazuje da hoće."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For more than ten years, many of the world's best programmers worked at the "
 "Artificial Intelligence Lab for far less money than they could have had "
@@ -985,7 +1076,7 @@
 "slavu i poštovanje, na primjer. A kreativnost je i zabavna, nagrada sama po "
 "sebi."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Then most of them left when offered a chance to do the same interesting work "
 "for a lot of money."
@@ -993,7 +1084,7 @@
 "Tada je većina njih otišla kada su dobili šansu da rade isti interesantan "
 "posao za mnogo novca."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "What the facts show is that people will program for reasons other than "
 "riches; but if given a chance to make a lot of money as well, they will come "
@@ -1007,7 +1098,7 @@
 "konkurenciji sa onima koje puno plaćaju, ali ne moraju loše stajati ako se "
 "zabrane one koje puno plaćaju."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;We need the programmers desperately.  If they demand that we "
 "stop helping our neighbors, we have to obey.&rdquo;</strong>"
@@ -1015,7 +1106,7 @@
 "<strong>&ldquo;Očajnički trebamo programere. Ako oni zahtijevaju da "
 "prestanemo pomagati našim bližnjima, moramo se pokoriti.&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "You're never so desperate that you have to obey this sort of demand.  "
 "Remember: millions for defense, but not a cent for tribute!"
@@ -1023,12 +1114,12 @@
 "Nikada niste toliko očajni da se morate pokoriti ovakvoj vrsti zahtjeva. "
 "Zapamtite: milijuni za obranu, no niti jedan cent za slavu!"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Programmers need to make a living somehow.&rdquo;</strong>"
 msgstr "<strong>&ldquo;Programeri nekako moraju preživjeti.&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In the short run, this is true.  However, there are plenty of ways that "
 "programmers could make a living without selling the right to use a program.  "
@@ -1042,7 +1133,7 @@
 "novca, a ne zato što je to jedini način. Jednostavno je pronaći druge 
načine "
 "ako ih želite pronaći. Evo nekoliko primjera."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A manufacturer introducing a new computer will pay for the porting of "
 "operating systems onto the new hardware."
@@ -1050,7 +1141,7 @@
 "Proizvođač koji predstavlja novo računalo platit će za prijenos 
operativnih "
 "sustava na novi hardver."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The sale of teaching, handholding and maintenance services could also employ "
 "programmers."
@@ -1058,18 +1149,30 @@
 "Prodaja usluga učenja, držanja za ruke i održavanja također može "
 "zapošljavati programere."
 
-#. type: Content of: <p>
-msgid ""
-"People with new ideas could distribute programs as freeware<a href=\"#f7\">"
-"(9)</a>, asking for donations from satisfied users, or selling handholding "
-"services.  I have met people who are already working this way successfully."
+#. type: Content of: <div><dl><dd><p>
+# | People with new ideas could distribute programs as [-freeware<a
+# | href=\"#f7\">(9)</a>,-] {+freeware&#8239;<a class=\"ftn\"
+# | href=\"#f7\">[9]</a>,+} asking for donations from satisfied users, or
+# | selling handholding services.  I have met people who are already working
+# | this way successfully.
+#, fuzzy
+#| msgid ""
+#| "People with new ideas could distribute programs as freeware<a href="
+#| "\"#f7\">(9)</a>, asking for donations from satisfied users, or selling "
+#| "handholding services.  I have met people who are already working this way "
+#| "successfully."
+msgid ""
+"People with new ideas could distribute programs as freeware&#8239;<a class="
+"\"ftn\" href=\"#f7\">[9]</a>, asking for donations from satisfied users, or "
+"selling handholding services.  I have met people who are already working "
+"this way successfully."
 msgstr ""
 "Ljudi s novim idejama mogli bi distribuirati programe besplatno<a href="
 "\"#f7\">(9)</a> (<i>freeware</i>), tražeći donacije od zadovoljnih "
 "korisnika, ili prodavajući usluge držanja za ruke. Upoznao sam ljude koji "
 "već uspješno rade na ovaj način."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Users with related needs can form users' groups, and pay dues.  A group "
 "would contract with programming companies to write programs that the group's "
@@ -1079,11 +1182,11 @@
 "Udruga bi s programerskim kompanijama ugovorila pisanje programa koje bi "
 "članovi grupe željeli koristiti."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "All sorts of development can be funded with a Software Tax:"
 msgstr "Mnoge vrste razvoja može se financirati sa Softverskim Porezom:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Suppose everyone who buys a computer has to pay x percent of the price as a "
 "software tax.  The government gives this to an agency like the NSF to spend "
@@ -1093,7 +1196,7 @@
 "softverski porez. Vlada to daje agenciji poput NSF koja to troši na razvoj "
 "softvera."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But if the computer buyer makes a donation to software development himself, "
 "he can take a credit against the tax.  He can donate to the project of his "
@@ -1107,7 +1210,7 @@
 "Može odbiti porez u iznosu bilo koje količine donacije do razine za koju bi 
"
 "inače morao platiti."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The total tax rate could be decided by a vote of the payers of the tax, "
 "weighted according to the amount they will be taxed on."
@@ -1115,19 +1218,19 @@
 "Ukupna razina poreza može se odrediti glasanjem osoba koje plaćaju porez, "
 "određena prema količini na koju će biti oporezovani."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "The consequences:"
 msgstr "Posljedice:"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "The computer-using community supports software development."
 msgstr "Zajednica korisnika računala podržava razvoj softvera."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "This community decides what level of support is needed."
 msgstr "Ova zajednica odlučuje koju količinu podrške trebaju."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "Users who care which projects their share is spent on can choose this for "
 "themselves."
@@ -1135,7 +1238,7 @@
 "Korisnici koje zanima koji projekti će dobiti njihov novac mogu ovo sami "
 "odabrati."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the long run, making programs free is a step toward the postscarcity "
 "world, where nobody will have to work very hard just to make a living.  "
@@ -1153,7 +1256,7 @@
 "popravljanja robota i pregledavanja asteroida. Neće biti potrebe da se "
 "zarađuje za život od programiranja."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We have already greatly reduced the amount of work that the whole society "
 "must do for its actual productivity, but only a little of this has "
@@ -1172,11 +1275,11 @@
 "područjima softverske produkcije. Ovo moramo učiniti, kako bismo pretvorili 
"
 "tehničke dobitke u produktivnosti u manje posla za nas same."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "Fusnote"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The wording here was careless.  The intention was that nobody would have to "
 "pay for <b>permission</b> to use the GNU system.  But the words don't make "
@@ -1207,7 +1310,7 @@
 "Važna stvar je da svatko tko ima kopiju ima i slobodu da surađuje s drugima 
"
 "u njenom korištenju."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The expression &ldquo;give away&rdquo; is another indication that I had not "
 "yet clearly separated the issue of price from that of freedom.  We now "
@@ -1221,10 +1324,21 @@
 "\"/philosophy/words-to-avoid.html#GiveAwaySoftware\">zbunjujuće riječi i "
 "fraze</a>&rdquo; za bolje objašnjenje. "
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+# | This is another place I failed to distinguish carefully between the two
+# | different meanings of [-&ldquo;free&rdquo;.-] {+&ldquo;free.&rdquo;+} The
+# | statement as it stands is not false&mdash;you can get copies of GNU
+# | software at no charge, from your friends or over the net.  But it does
+# | suggest the wrong idea.
+#, fuzzy
+#| msgid ""
+#| "This is another place I failed to distinguish carefully between the two "
+#| "different meanings of &ldquo;free&rdquo;.  The statement as it stands is "
+#| "not false&mdash;you can get copies of GNU software at no charge, from "
+#| "your friends or over the net.  But it does suggest the wrong idea."
 msgid ""
 "This is another place I failed to distinguish carefully between the two "
-"different meanings of &ldquo;free&rdquo;.  The statement as it stands is not "
+"different meanings of &ldquo;free.&rdquo; The statement as it stands is not "
 "false&mdash;you can get copies of GNU software at no charge, from your "
 "friends or over the net.  But it does suggest the wrong idea."
 msgstr ""
@@ -1233,11 +1347,11 @@
 "kopije GNU softvera besplatno, od svojih prijatelja ili putem mreže. No ipak 
"
 "daje krivu ideju."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid "Several such companies now exist."
 msgstr "Danas postoji više takvih kompanija."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Although it is a charity rather than a company, the Free Software Foundation "
 "for 10 years raised most of its funds from its distribution service.  You "
@@ -1249,7 +1363,7 @@
 "usluge. Možete <a href=\"/order/order.html\">naručiti stvari od FSF-a</a> 
da "
 "biste podržali rad zaklade."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "A group of computer companies pooled funds around 1991 to support "
 "maintenance of the GNU C Compiler."
@@ -1257,7 +1371,7 @@
 "Grupa računalnih kompanija je skupila novac oko 1991. da bi podržala razvoj 
"
 "GNU C kompajlera."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "I think I was mistaken in saying that proprietary software was the most "
 "common basis for making money in software.  It seems that actually the most "
@@ -1277,10 +1391,31 @@
 "tome, više ne očekujem da će većina plaćenih programera zarađivati 
manje u "
 "svijetu slobodnog softvera.  "
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+# | In the 1980s I had not yet realized how confusing it was to speak of
+# | &ldquo;the issue&rdquo; of &ldquo;intellectual [-property&rdquo;.-]
+# | {+property.&rdquo;+} That term is obviously biased; more subtle is the
+# | fact that it lumps together various disparate laws which raise very
+# | different issues.  Nowadays I urge people to reject the term
+# | &ldquo;intellectual property&rdquo; entirely, lest it lead others to
+# | suppose that those laws form one coherent issue.  The way to be clear is
+# | to discuss patents, copyrights, and trademarks separately.  See <a
+# | href=\"/philosophy/not-ipr.html\">further explanation</a> of how this term
+# | spreads confusion and bias.
+#, fuzzy
+#| msgid ""
+#| "In the 1980s I had not yet realized how confusing it was to speak of "
+#| "&ldquo;the issue&rdquo; of &ldquo;intellectual property&rdquo;.  That "
+#| "term is obviously biased; more subtle is the fact that it lumps together "
+#| "various disparate laws which raise very different issues.  Nowadays I "
+#| "urge people to reject the term &ldquo;intellectual property&rdquo; "
+#| "entirely, lest it lead others to suppose that those laws form one "
+#| "coherent issue.  The way to be clear is to discuss patents, copyrights, "
+#| "and trademarks separately.  See <a href=\"/philosophy/not-ipr.html"
+#| "\">further explanation</a> of how this term spreads confusion and bias."
 msgid ""
 "In the 1980s I had not yet realized how confusing it was to speak of &ldquo;"
-"the issue&rdquo; of &ldquo;intellectual property&rdquo;.  That term is "
+"the issue&rdquo; of &ldquo;intellectual property.&rdquo; That term is "
 "obviously biased; more subtle is the fact that it lumps together various "
 "disparate laws which raise very different issues.  Nowadays I urge people to "
 "reject the term &ldquo;intellectual property&rdquo; entirely, lest it lead "
@@ -1300,10 +1435,26 @@
 "Pogledajte <a href=\"/philosophy/not-ipr.html\">daljnje objašnjenje</a> o "
 "tome kako ovaj termin Å¡iri zbunjenost i priklonjenost."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+# | Subsequently we learned to distinguish between &ldquo;free software&rdquo;
+# | and [-&ldquo;freeware&rdquo;.-] {+&ldquo;freeware.&rdquo;+} The term
+# | &ldquo;freeware&rdquo; means software you are free to redistribute, but
+# | usually you are not free to study and change the source code, so most of
+# | it is not free software.  See &ldquo;<a
+# | href=\"/philosophy/words-to-avoid.html#Freeware\">Confusing Words and
+# | Phrases</a>&rdquo; for more explanation.
+#, fuzzy
+#| msgid ""
+#| "Subsequently we learned to distinguish between &ldquo;free "
+#| "software&rdquo; and &ldquo;freeware&rdquo;.  The term &ldquo;"
+#| "freeware&rdquo; means software you are free to redistribute, but usually "
+#| "you are not free to study and change the source code, so most of it is "
+#| "not free software.  See &ldquo;<a href=\"/philosophy/words-to-avoid."
+#| "html#Freeware\">Confusing Words and Phrases</a>&rdquo; for more "
+#| "explanation."
 msgid ""
 "Subsequently we learned to distinguish between &ldquo;free software&rdquo; "
-"and &ldquo;freeware&rdquo;.  The term &ldquo;freeware&rdquo; means software "
+"and &ldquo;freeware.&rdquo; The term &ldquo;freeware&rdquo; means software "
 "you are free to redistribute, but usually you are not free to study and "
 "change the source code, so most of it is not free software.  See &ldquo;<a "
 "href=\"/philosophy/words-to-avoid.html#Freeware\">Confusing Words and "
@@ -1346,14 +1497,20 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Radimo naporno i dajemo sve od sebe da bi pružili točne, visoko kvalitetne "
@@ -1365,15 +1522,15 @@
 "prijevode</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, [-2010-]
-# | {+2010, 2014, 2015+} Free Software Foundation, Inc.
+# | Copyright &copy; 1985, 1993, 200[-3-]{+4+}, 2005, 2007, [-2008,-] 2009,
+# | [-2010-] {+2010, 2015, 2021+} Free Software Foundation, Inc.
 #, fuzzy
 #| msgid ""
 #| "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010 Free "
 #| "Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 1985, 1993, 2004, 2005, 2007, 2009, 2010, 2015, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010 Free "
 "Software Foundation, Inc."
@@ -1406,6 +1563,19 @@
 msgstr "Zadnji put promijenjeno:"
 
 #~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "Radimo naporno i dajemo sve od sebe da bi pružili točne, visoko "
+#~ "kvalitetne prijevode. Međutim, nismo oslobođeni od nesavršenosti. Molim 
"
+#~ "vas šaljite vaše komentare i općenite prijedloge u tom smislu na <a 
href="
+#~ "\"mailto:web-translators@gnu.org\";>&lt;web-translators@gnu.org&gt;</a>.</"
+#~ "p> <p>Za informacije o koordiniranju i slanju prijevoda naših mrežnih "
+#~ "stranica, pogledajte <a href=\"/server/standards/README.translations.html"
+#~ "\">README za prijevode</a>."
+
+#~ msgid ""
 #~ "For up-to-date information about the available GNU software, please see "
 #~ "the information available on our <a href=\"/home.html\">web server</a>, "
 #~ "in particular our <a href=\"/software/software.html\">list of software</"

Index: po/manifesto.it.po
===================================================================
RCS file: /web/www/www/gnu/po/manifesto.it.po,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- po/manifesto.it.po  2 Nov 2021 13:56:42 -0000       1.25
+++ po/manifesto.it.po  2 Nov 2021 14:41:53 -0000       1.26
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manifesto.html\n"
-"POT-Creation-Date: 2015-06-02 12:55+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2016-04-11 16:22+0100\n"
 "Last-Translator: Andrea Pescetti <pescetti@gnu.org>\n"
 "Language-Team: Italian\n"
@@ -17,19 +17,34 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-11-02 14:27+0000\n"
 "X-Generator: Poedit 1.5.4\n"
 
 #. type: Content of: <title>
 msgid "The GNU Manifesto - GNU Project - Free Software Foundation"
 msgstr "Il Manifesto GNU - Progetto GNU - Free Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "The GNU Manifesto"
 msgstr "Il Manifesto GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
+# | The GNU Manifesto (which appears below) was written by <a
+# | href=\"http{+s+}://www.stallman.org/\">Richard Stallman</a> in 1985 to ask
+# | for support in developing the GNU operating system.  Part of the text was
+# | taken from the original announcement of 1983.  Through 1987, it was
+# | updated in minor ways to account for developments; since then, it seems
+# | best to leave it unchanged.
+#, fuzzy
+#| msgid ""
+#| "The GNU Manifesto (which appears below) was written by <a href=\"http://";
+#| "www.stallman.org/\">Richard Stallman</a> in 1985 to ask for support in "
+#| "developing the GNU operating system.  Part of the text was taken from the "
+#| "original announcement of 1983.  Through 1987, it was updated in minor "
+#| "ways to account for developments; since then, it seems best to leave it "
+#| "unchanged."
 msgid ""
-"The GNU Manifesto (which appears below) was written by <a href=\"http://www.";
+"The GNU Manifesto (which appears below) was written by <a href=\"https://www.";
 "stallman.org/\">Richard Stallman</a> in 1985 to ask for support in "
 "developing the GNU operating system.  Part of the text was taken from the "
 "original announcement of 1983.  Through 1987, it was updated in minor ways "
@@ -42,7 +57,7 @@
 "lievemente aggiornato per tener conto degli sviluppi, ma da quel momento la "
 "scelta migliore sembra essere quella di lasciarlo immutato."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Since that time, we have learned about certain common misunderstandings that "
 "different wording could help avoid.  Footnotes added since 1993 help clarify "
@@ -52,7 +67,7 @@
 "evitare con una diversa scelta di termini. Le note in calce aggiunte a "
 "partire dal 1993 aiutano a chiarire questi punti. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If you want to install the GNU/Linux system, we recommend you use one of the "
 "<a href=\"/distros\">100% free software GNU/Linux distributions</a>.  For "
@@ -64,7 +79,7 @@
 "Vedete <a href=\"/help/help.html\">http://www.gnu.org/help</a> per scoprire "
 "come contribuire."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The GNU Project is part of the Free Software Movement, a campaign for <a "
 "href=\"/philosophy/free-sw.html\">freedom for users of software</a>.  It is "
@@ -81,17 +96,30 @@
 "affrontano le stesse questioni ma lo fanno con un <a href=\"/philosophy/open-"
 "source-misses-the-point.html\">approccio privo di riferimenti etici</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "What's GNU? Gnu's Not Unix!"
 msgstr "Cos'è GNU?  Gnu Non è Unix!"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | GNU, which stands for Gnu's Not Unix, is the name for the complete
+# | Unix-compatible software system which I am writing so that I can give it
+# | away free to everyone who can use [-it.<a href=\"#f1\">(1)</a>-]
+# | {+it&#8239;<a class=\"ftn\" href=\"#f1\">[1]</a>.+} Several other
+# | volunteers are helping me.  Contributions of time, money, programs and
+# | equipment are greatly needed.
+#, fuzzy
+#| msgid ""
+#| "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
+#| "compatible software system which I am writing so that I can give it away "
+#| "free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
+#| "volunteers are helping me.  Contributions of time, money, programs and "
+#| "equipment are greatly needed."
 msgid ""
 "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
 "compatible software system which I am writing so that I can give it away "
-"free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
-"volunteers are helping me.  Contributions of time, money, programs and "
-"equipment are greatly needed."
+"free to everyone who can use it&#8239;<a class=\"ftn\" href=\"#f1\">[1]</a>. "
+"Several other volunteers are helping me.  Contributions of time, money, "
+"programs and equipment are greatly needed."
 msgstr ""
 "GNU, che sta per \"Gnu's Not Unix\" (Gnu Non è Unix), è il nome del sistema 
"
 "software completo e Unix-compatibile che sto scrivendo per distribuirlo "
@@ -99,7 +127,7 @@
 "altri volontari mi stanno aiutando.  Abbiamo gran necessità di contributi in 
"
 "tempo, denaro, programmi e macchine."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So far we have an Emacs text editor with Lisp for writing editor commands, a "
 "source level debugger, a yacc-compatible parser generator, a linker, and "
@@ -129,7 +157,7 @@
 "Speriamo di fornire, col tempo, tutte le cose utili che normalmente si "
 "trovano in un sistema Unix, ed anche di più. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU will be able to run Unix programs, but will not be identical to Unix.  "
 "We will make all improvements that are convenient, based on our experience "
@@ -153,7 +181,7 @@
 "Per le comunicazioni vedremo di supportare UUCP, Chaosnet del MIT ed i "
 "protocolli di Internet. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is aimed initially at machines in the 68000/16000 class with virtual "
 "memory, because they are the easiest machines to make it run on.  The extra "
@@ -165,7 +193,7 @@
 "Lasceremo agli interessati il lavoro necessario a farlo girare su macchine "
 "più piccole."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid horrible confusion, please pronounce the <em>g</em> in the word "
 "&ldquo;GNU&rdquo; when it is the name of this project."
@@ -175,11 +203,11 @@
 "serve ad evitare che in inglese \"GNU\" sia pronunciato come la parola \"new"
 "\"]."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why I Must Write GNU"
 msgstr "Perché devo scrivere GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I consider that the Golden Rule requires that if I like a program I must "
 "share it with other people who like it.  Software sellers want to divide the "
@@ -203,13 +231,26 @@
 "rimanere in una istituzione dove ciò viene fatto a mio nome contro la mia "
 "volontà. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | So that I can continue to use computers without dishonor, I have decided
+# | to put together a sufficient body of free software so that I will be able
+# | to get along without any software that is not free.  I have resigned from
+# | the AI Lab to deny MIT any legal excuse to prevent me from giving GNU
+# | [-away.<a href=\"#f2a\">(2)</a>-] {+away&#8239;<a class=\"ftn\"
+# | href=\"#f2a\">[2]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "So that I can continue to use computers without dishonor, I have decided "
+#| "to put together a sufficient body of free software so that I will be able "
+#| "to get along without any software that is not free.  I have resigned from "
+#| "the AI Lab to deny MIT any legal excuse to prevent me from giving GNU "
+#| "away.<a href=\"#f2a\">(2)</a>"
 msgid ""
 "So that I can continue to use computers without dishonor, I have decided to "
 "put together a sufficient body of free software so that I will be able to "
 "get along without any software that is not free.  I have resigned from the "
-"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away.<a "
-"href=\"#f2a\">(2)</a>"
+"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away&#8239;"
+"<a class=\"ftn\" href=\"#f2a\">[2]</a>."
 msgstr ""
 "Per poter continuare ad usare i computer senza disonore, ho deciso di "
 "raccogliere un corpus di software libero in modo da andare avanti senza "
@@ -217,11 +258,11 @@
 "di Intelligenza Artificiale per togliere al MIT ogni scusa legale che mi "
 "impedisca di distribuire GNU.<a href=\"#f2a\">(2)</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why GNU Will Be Compatible with Unix"
 msgstr "Perché GNU sarà compatibile con Unix"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Unix is not my ideal system, but it is not too bad.  The essential features "
 "of Unix seem to be good ones, and I think I can fill in what Unix lacks "
@@ -233,11 +274,11 @@
 "Unix senza rovinarne le caratteristiche. E adottare un sistema compatibile "
 "con Unix può risultare pratico anche per molti altri. "
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How GNU Will Be Available"
 msgstr "Come sarà reso disponibile GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is not in the public domain.  Everyone will be permitted to modify and "
 "redistribute GNU, but no distributor will be allowed to restrict its further "
@@ -252,11 +293,11 @@
 "\"> proprietarie</a>.  Voglio essere sicuro che tutte le versioni di GNU "
 "rimangano libere.  "
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why Many Other Programmers Want to Help"
 msgstr "Perché molti altri programmatori desiderano essere d'aiuto"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found many other programmers who are excited about GNU and want to "
 "help."
@@ -264,7 +305,7 @@
 "Ho trovato molti altri programmatori molto interessati a GNU che vogliono "
 "dare una mano."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Many programmers are unhappy about the commercialization of system "
 "software.  It may enable them to make more money, but it requires them to "
@@ -289,7 +330,7 @@
 "scelte. Diventano cinici e pensano che programmare sia solo un modo per fare "
 "soldi. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By working on and using GNU rather than proprietary programs, we can be "
 "hospitable to everyone and obey the law.  In addition, GNU serves as an "
@@ -306,11 +347,11 @@
 "software che non sia libero. Per circa la metà dei programmatori che conosco 
"
 "è una soddisfazione importante, che il denaro non può sostituire."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How You Can Contribute"
 msgstr "Come si può contribuire"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "(Nowadays, for software tasks to work on, see the <a href=\"http://fsf.org/";
 "campaigns/priority-projects\">High Priority Projects list</a> and the <a "
@@ -327,7 +368,7 @@
 "href=\"/help/help.html\">la guida per aiutare il sistema il sistema "
 "operativo GNU</a>)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am asking computer manufacturers for donations of machines and money.  I'm "
 "asking individuals for donations of programs and work."
@@ -335,7 +376,7 @@
 "Chiedo ai produttori di computer donazioni in denaro e macchine, ed ai "
 "privati donazioni in programmi e lavoro."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One consequence you can expect if you donate machines is that GNU will run "
 "on them at an early date.  The machines should be complete, ready to use "
@@ -347,7 +388,7 @@
 "l'utilizzo in aree residenziali e non devono richiedere raffreddamento o "
 "alimentazione di tipo sofisticato."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found very many programmers eager to contribute part-time work for "
 "GNU.  For most projects, such part-time distributed work would be very hard "
@@ -377,7 +418,7 @@
 "fattibile. Il kernel invece richiederà una più stretta cooperazione, e 
verrà "
 "sviluppato da un gruppo piccolo e affiatato."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If I get donations of money, I may be able to hire a few people full or part "
 "time.  The salary won't be high by programmers' standards, but I'm looking "
@@ -393,19 +434,26 @@
 "permettere a degli appassionati di dedicare tutte le loro energie al lavoro "
 "su GNU senza essere costretti a guadagnarsi da vivere in un altro modo."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why All Computer Users Will Benefit"
 msgstr "Perché tutti gli utenti dei computer ne trarranno beneficio"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Once GNU is written, everyone will be able to obtain good system software
+# | free, just like [-air.<a href=\"#f2\">(3)</a>-] {+air&#8239;<a
+# | class=\"ftn\" href=\"#f2\">[3]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "Once GNU is written, everyone will be able to obtain good system software "
+#| "free, just like air.<a href=\"#f2\">(3)</a>"
 msgid ""
 "Once GNU is written, everyone will be able to obtain good system software "
-"free, just like air.<a href=\"#f2\">(3)</a>"
+"free, just like air&#8239;<a class=\"ftn\" href=\"#f2\">[3]</a>."
 msgstr ""
 "Una volta scritto GNU, ognuno potrà avere liberamente del buon software di "
 "sistema, così come può avere l'aria.<a href=\"#f2\">(3)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This means much more than just saving everyone the price of a Unix license.  "
 "It means that much wasteful duplication of system programming effort will be "
@@ -416,7 +464,7 @@
 "sforzo della programmazione di sistema. Queste energie possono essere invece "
 "impiegate ad avanzare lo stato dell'arte."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Complete system sources will be available to everyone.  As a result, a user "
 "who needs changes in the system will always be free to make them himself, or "
@@ -431,7 +479,7 @@
 "in balia di un solo programmatore o di una impresa che, avendo la proprietà "
 "esclusiva dei sorgenti, sia la sola a poter fare le modifiche."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Schools will be able to provide a much more educational environment by "
 "encouraging all students to study and improve the system code.  Harvard's "
@@ -448,7 +496,7 @@
 "installare alcuni programmi. Questo comportamento mi è stato di grande "
 "ispirazione."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Finally, the overhead of considering who owns the system software and what "
 "one is or is not entitled to do with it will be lifted."
@@ -456,7 +504,7 @@
 "Infine, scompariranno le necessità burocratiche di tener conto di chi sia il 
"
 "proprietario del software di sistema e di chi abbia il diritto di farci cosa."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Arrangements to make people pay for using a program, including licensing of "
 "copies, always incur a tremendous cost to society through the cumbersome "
@@ -482,7 +530,7 @@
 "finanziare l'impianto di ossigenazione con una tassa pro capite e buttar via "
 "le maschere."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copying all or parts of a program is as natural to a programmer as "
 "breathing, and as productive.  It ought to be as free."
@@ -491,11 +539,11 @@
 "programmatore quanto respirare ed è altrettanto produttivo.  Dovrebbe essere 
"
 "altrettanto libero."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Some Easily Rebutted Objections to GNU's Goals"
 msgstr "Alcune obiezioni facilmente confutabili agli obiettivi GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Nobody will use it if it is free, because that means they "
 "can't rely on any support.&rdquo;</strong>"
@@ -503,7 +551,7 @@
 "<strong>&laquo;La gente non lo userà se è gratuito, perché non potrà 
avere "
 "l'assistenza&raquo;.</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You have to charge for the program to pay for providing the "
 "support.&rdquo;</strong>"
@@ -511,18 +559,27 @@
 "<strong>&laquo;Un programma deve essere a pagamento, per poter fornire "
 "supporto adeguato&raquo;.</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | If people would rather pay for GNU plus service than get GNU free without
+# | service, a company to provide just service to people who have obtained GNU
+# | free ought to be [-profitable.<a href=\"#f3\">(4)</a>-]
+# | {+profitable&#8239;<a class=\"ftn\" href=\"#f3\">[4]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "If people would rather pay for GNU plus service than get GNU free without "
+#| "service, a company to provide just service to people who have obtained "
+#| "GNU free ought to be profitable.<a href=\"#f3\">(4)</a>"
 msgid ""
 "If people would rather pay for GNU plus service than get GNU free without "
 "service, a company to provide just service to people who have obtained GNU "
-"free ought to be profitable.<a href=\"#f3\">(4)</a>"
+"free ought to be profitable&#8239;<a class=\"ftn\" href=\"#f3\">[4]</a>."
 msgstr ""
 "Se la gente preferisse pagare per GNU più l'assistenza piuttosto che avere "
 "GNU gratis senza assistenza, allora un'impresa che fornisse assistenza a chi "
 "si è procurato GNU gratis potrebbe operare con profitto.<a 
href=\"#f3\">(4)</"
 "a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We must distinguish between support in the form of real programming work and "
 "mere handholding.  The former is something one cannot rely on from a "
@@ -534,7 +591,7 @@
 "software. Se il problema non è sentito da un numero sufficiente di clienti "
 "allora il venditore dirà al cliente di arrangiarsi."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If your business needs to be able to rely on support, the only way is to "
 "have all the necessary sources and tools.  Then you can hire any available "
@@ -554,7 +611,7 @@
 "non potrà essere imputato al sistema di distribuzione. GNU non elimina tutti 
"
 "i problemi del mondo, solo alcuni."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Meanwhile, the users who know nothing about computers need handholding: "
 "doing things for them which they could easily do themselves but don't know "
@@ -564,7 +621,7 @@
 "di manutenzione, cioè di cose che potrebbero fare facilmente da soli ma che "
 "non sono in grado di fare."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Such services could be provided by companies that sell just handholding and "
 "repair service.  If it is true that users would rather spend money and get a "
@@ -583,7 +640,7 @@
 "frattempo, coloro che non avranno bisogno del servizio saranno sempre in "
 "grado di usare il programma senza pagare il servizio."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You cannot reach many people without advertising, and you "
 "must charge for the program to support that.&rdquo;</strong>"
@@ -591,7 +648,7 @@
 "<strong>&laquo;Non si può raggiungere molta gente senza pubblicità, e per "
 "finanziarla si deve far pagare il programma.&raquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;It's no use advertising a program people can get free.&rdquo;"
 "</strong>"
@@ -599,7 +656,7 @@
 "<strong>&laquo;&Egrave; inutile reclamizzare un programma gratuito&raquo;.</"
 "strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are various forms of free or very cheap publicity that can be used to "
 "inform numbers of computer users about something like GNU.  But it may be "
@@ -617,12 +674,23 @@
 "pubblicità e da guadagnarci. In questo modo, pagano la pubblicità solo gli "
 "utenti che ne beneficiano."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | On the other hand, if many people get GNU from their friends, and such
+# | companies don't succeed, this will show that advertising was not really
+# | necessary to spread GNU.  Why is it that free market advocates don't want
+# | to let the free market decide [-this?<a href=\"#f4\">(5)</a>-]
+# | {+this?&#8239;<a class=\"ftn\" href=\"#f4\">[5]</a>+}
+#, fuzzy
+#| msgid ""
+#| "On the other hand, if many people get GNU from their friends, and such "
+#| "companies don't succeed, this will show that advertising was not really "
+#| "necessary to spread GNU.  Why is it that free market advocates don't want "
+#| "to let the free market decide this?<a href=\"#f4\">(5)</a>"
 msgid ""
 "On the other hand, if many people get GNU from their friends, and such "
 "companies don't succeed, this will show that advertising was not really "
 "necessary to spread GNU.  Why is it that free market advocates don't want to "
-"let the free market decide this?<a href=\"#f4\">(5)</a>"
+"let the free market decide this?&#8239;<a class=\"ftn\" href=\"#f4\">[5]</a>"
 msgstr ""
 "D'altro canto, se molta gente ottiene GNU da amici e queste aziende non "
 "hanno successo, vorrà dire che la pubblicità non era necessaria per "
@@ -630,7 +698,7 @@
 "vogliono lasciare che sia il libero mercato a decidere?<a href=\"#f4\">(5)</"
 "a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;My company needs a proprietary operating system to get a "
 "competitive edge.&rdquo;</strong>"
@@ -638,7 +706,7 @@
 "<strong>&laquo;La mia azienda ha bisogno di un sistema operativo "
 "proprietario per essere più avanti della concorrenza&raquo;.</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU will remove operating system software from the realm of competition.  "
 "You will not be able to get an edge in this area, but neither will your "
@@ -656,16 +724,25 @@
 "avete un'attività di altro tipo, GNU vi può evitare di essere spinti nel "
 "costoso campo della vendita di sistemi operativi."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | I would like to see GNU development supported by gifts from many
+# | manufacturers and users, reducing the cost to [-each.<a
+# | href=\"#f5\">(6)</a>-] {+each&#8239;<a class=\"ftn\"
+# | href=\"#f5\">[6]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "I would like to see GNU development supported by gifts from many "
+#| "manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
 msgid ""
 "I would like to see GNU development supported by gifts from many "
-"manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
+"manufacturers and users, reducing the cost to each&#8239;<a class=\"ftn\" "
+"href=\"#f5\">[6]</a>."
 msgstr ""
 "Mi piacerebbe che lo sviluppo di GNU fosse sostenuto da donazioni da parte "
 "di numerosi produttori ed utenti, riducendo così la spesa per tutti.<a href="
 "\"#f5\">(6)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't programmers deserve a reward for their creativity?"
 "&rdquo;</strong>"
@@ -673,7 +750,7 @@
 "<strong>&laquo;Ma i programmatori non meritano una ricompensa per la loro "
 "creatività?&raquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If anything deserves a reward, it is social contribution.  Creativity can be "
 "a social contribution, but only in so far as society is free to use the "
@@ -688,7 +765,7 @@
 "la stessa logica meritano una punizione se pongono restrizioni all'uso di "
 "questi programmi."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Shouldn't a programmer be able to ask for a reward for his "
 "creativity?&rdquo;</strong>"
@@ -696,7 +773,7 @@
 "<strong>&laquo;Un programmatore non dovrebbe poter chiedere una ricompensa "
 "per la sua creatività?&raquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is nothing wrong with wanting pay for work, or seeking to maximize "
 "one's income, as long as one does not use means that are destructive.  But "
@@ -707,7 +784,7 @@
 "metodi che siano distruttivi. Ma i metodi comuni nel campo del software, al "
 "giorno d'oggi, sono distruttivi."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Extracting money from users of a program by restricting their use of it is "
 "destructive because the restrictions reduce the amount and the ways that the "
@@ -721,7 +798,7 @@
 "programma. Quando c'è una scelta deliberata di porre restrizioni, le "
 "conseguenze dannose sono distruzione deliberata."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The reason a good citizen does not use such destructive means to become "
 "wealthier is that, if everyone did so, we would all become poorer from the "
@@ -740,12 +817,12 @@
 "propria creatività non giustifica il privare il mondo nel suo insieme di "
 "tutta o parte di questa creatività."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid "<strong>&ldquo;Won't programmers starve?&rdquo;</strong>"
 msgstr ""
 "<strong>&laquo;Ma i programmatori non moriranno di fame?&raquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "I could answer that nobody is forced to be a programmer.  Most of us cannot "
 "manage to get any money for standing on the street and making faces.  But we "
@@ -757,7 +834,7 @@
 "ciò non vuol dire che siamo condannati a passare la vita per strada a fare i 
"
 "mimi, e morire di fame.  Facciamo un altro lavoro."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But that is the wrong answer because it accepts the questioner's implicit "
 "assumption: that without ownership of software, programmers cannot possibly "
@@ -768,7 +845,7 @@
 "pagare ai programmatori il becco di un quattrino.  Un'assunzione del tipo "
 "tutto o niente. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The real reason programmers will not starve is that it will still be "
 "possible for them to get paid for programming; just not paid as much as now."
@@ -777,13 +854,28 @@
 "loro egualmente possibile essere pagati per programmare, solo non pagati "
 "così tanto come ora. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | Restricting copying is not the only basis for business in software.  It is
+# | the most common [-basis<a href=\"#f8\">(7)</a>-] {+basis&#8239;<a
+# | class=\"ftn\" href=\"#f8\">[7]</a>+} because it brings in the most money. 
+# | If it were prohibited, or rejected by the customer, software business
+# | would move to other bases of organization which are now used less often. 
+# | There are always numerous ways to organize any kind of business.
+#, fuzzy
+#| msgid ""
+#| "Restricting copying is not the only basis for business in software.  It "
+#| "is the most common basis<a href=\"#f8\">(7)</a> because it brings in the "
+#| "most money.  If it were prohibited, or rejected by the customer, software "
+#| "business would move to other bases of organization which are now used "
+#| "less often.  There are always numerous ways to organize any kind of "
+#| "business."
 msgid ""
 "Restricting copying is not the only basis for business in software.  It is "
-"the most common basis<a href=\"#f8\">(7)</a> because it brings in the most "
-"money.  If it were prohibited, or rejected by the customer, software "
-"business would move to other bases of organization which are now used less "
-"often.  There are always numerous ways to organize any kind of business."
+"the most common basis&#8239;<a class=\"ftn\" href=\"#f8\">[7]</a> because it "
+"brings in the most money.  If it were prohibited, or rejected by the "
+"customer, software business would move to other bases of organization which "
+"are now used less often.  There are always numerous ways to organize any "
+"kind of business."
 msgstr ""
 "Porre restrizioni sulle copie non è l'unico modello di affari nel campo del "
 "software. &Egrave; il modello più comune<a href=\"#f8\">(7)</a> perché è 
il "
@@ -792,7 +884,7 @@
 "ora meno comuni. Ci sono sempre numerosi modi per organizzare un qualunque "
 "tipo di affari.  "
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Probably programming will not be as lucrative on the new basis as it is "
 "now.  But that is not an argument against the change.  It is not considered "
@@ -807,7 +899,7 @@
 "stipendi (in pratica guadagnerebbero molto di più), non sarebbe nemmeno "
 "quella un'ingiustizia."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't people have a right to control how their creativity is "
 "used?&rdquo;</strong>"
@@ -815,7 +907,7 @@
 "<strong>&laquo;Ma le persone non hanno diritto di controllare  come la loro "
 "creatività viene usata?&raquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "&ldquo;Control over the use of one's ideas&rdquo; really constitutes control "
 "over other people's lives; and it is usually used to make their lives more "
@@ -825,13 +917,26 @@
 "un controllo sulle vite degli altri; e di solito viene usato per rendere più 
"
 "difficili le loro vite."
 
-#. type: Content of: <p>
-msgid ""
-"People who have studied the issue of intellectual property rights<a href="
-"\"#f6\">(8)</a> carefully (such as lawyers) say that there is no intrinsic "
-"right to intellectual property.  The kinds of supposed intellectual property "
-"rights that the government recognizes were created by specific acts of "
-"legislation for specific purposes."
+#. type: Content of: <div><dl><dd><p>
+# | People who have studied the issue of intellectual property [-rights<a
+# | href=\"#f6\">(8)</a>-] {+rights&#8239;<a class=\"ftn\"
+# | href=\"#f6\">[8]</a>+} carefully (such as lawyers) say that there is no
+# | intrinsic right to intellectual property.  The kinds of supposed
+# | intellectual property rights that the government recognizes were created
+# | by specific acts of legislation for specific purposes.
+#, fuzzy
+#| msgid ""
+#| "People who have studied the issue of intellectual property rights<a href="
+#| "\"#f6\">(8)</a> carefully (such as lawyers) say that there is no "
+#| "intrinsic right to intellectual property.  The kinds of supposed "
+#| "intellectual property rights that the government recognizes were created "
+#| "by specific acts of legislation for specific purposes."
+msgid ""
+"People who have studied the issue of intellectual property rights&#8239;<a "
+"class=\"ftn\" href=\"#f6\">[8]</a> carefully (such as lawyers) say that "
+"there is no intrinsic right to intellectual property.  The kinds of supposed "
+"intellectual property rights that the government recognizes were created by "
+"specific acts of legislation for specific purposes."
 msgstr ""
 "Le persone che hanno studiato con cura i vari aspetti del diritto alla "
 "proprietà intellettuale<a href=\"#f6\">(8)</a> (come gli avvocati) dicono "
@@ -839,7 +944,7 @@
 "dei supposti diritti alla proprietà intellettuale riconosciuti dal governo "
 "furono creati da specifici atti legislativi per scopi specifici."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For example, the patent system was established to encourage inventors to "
 "disclose the details of their inventions.  Its purpose was to help society "
@@ -860,7 +965,7 @@
 "brevetti non costituiscono un gran danno.  E non ostacolano la gran parte "
 "degli individui che usano prodotti coperti da brevetto."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The idea of copyright did not exist in ancient times, when authors "
 "frequently copied other authors at length in works of nonfiction.  This "
@@ -880,7 +985,7 @@
 "apparecchiature tipografiche, non fece molto danno e non pose ostacoli alla "
 "maggior parte dei lettori."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "All intellectual property rights are just licenses granted by society "
 "because it was thought, rightly or wrongly, that society as a whole would "
@@ -894,7 +999,7 @@
 "dobbiamo chiederci: facciamo realmente bene a concedere queste licenze?  Che "
 "atti permettiamo di compiere con esse? "
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The case of programs today is very different from that of books a hundred "
 "years ago.  The fact that the easiest way to copy a program is from one "
@@ -914,14 +1019,14 @@
 "suo insieme, sia materialmente che spiritualmente, una situazione in cui "
 "quel qualcuno non dovrebbe farlo, che la legge lo permetta o no."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Competition makes things get done better.&rdquo;</strong>"
 msgstr ""
 "<strong>&laquo;La competizione fa sì che le cose siano fatte 
meglio&raquo;.</"
 "strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The paradigm of competition is a race: by rewarding the winner, we encourage "
 "everyone to run faster.  When capitalism really works this way, it does a "
@@ -939,7 +1044,7 @@
 "trovare altre strategie, come ad esempio attaccare gli altri concorrenti.  "
 "Se i corridori si azzuffano, arrivano tutti in ritardo al traguardo. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Proprietary and secret software is the moral equivalent of runners in a fist "
 "fight.  Sad to say, the only referee we've got does not seem to object to "
@@ -953,7 +1058,7 @@
 "puoi tirare un pugno&raquo;).  Dovrebbe invece dividerli e penalizzarli "
 "anche se solo provassero a combattere. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Won't everyone stop programming without a monetary incentive?"
 "&rdquo;</strong>"
@@ -961,7 +1066,7 @@
 "<strong>&laquo;Ma  senza un incentivo economico non smetterebbero tutti di "
 "programmare?&raquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually, many people will program with absolutely no monetary incentive.  "
 "Programming has an irresistible fascination for some people, usually the "
@@ -973,7 +1078,7 @@
 "quelli che ci riescono meglio. Non mancano certo i musicisti professionisti "
 "che insistono pur non avendo speranza di guadagnarsi da vivere suonando."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But really this question, though commonly asked, is not appropriate to the "
 "situation.  Pay for programmers will not disappear, only become less.  So "
@@ -985,7 +1090,7 @@
 "corretta è: \"qualcuno si metterà mai a programmare per un minore incentivo 
"
 "economico?\". La mia esperienza dice che sì, ci si metterà."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For more than ten years, many of the world's best programmers worked at the "
 "Artificial Intelligence Lab for far less money than they could have had "
@@ -998,7 +1103,7 @@
 "soddisfazioni non economiche di moltissimi tipi, ad esempio fama e "
 "riconoscenza. E la creatività è anche divertente, un premio di per sé. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Then most of them left when offered a chance to do the same interesting work "
 "for a lot of money."
@@ -1006,7 +1111,7 @@
 "Poi molti se ne sono andati quando hanno avuto la possibilità di fare lo "
 "stesso interessante lavoro per un mucchio di soldi. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "What the facts show is that people will program for reasons other than "
 "riches; but if given a chance to make a lot of money as well, they will come "
@@ -1021,7 +1126,7 @@
 "pagano molto, ma non sarebbero necessariamente in questa posizione se quelle "
 "che pagano molto fossero bandite. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;We need the programmers desperately.  If they demand that we "
 "stop helping our neighbors, we have to obey.&rdquo;</strong>"
@@ -1030,7 +1135,7 @@
 "chiedono di smettere di aiutare i nostri vicini dobbiamo obbedire&raquo;.</"
 "strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "You're never so desperate that you have to obey this sort of demand.  "
 "Remember: millions for defense, but not a cent for tribute!"
@@ -1039,14 +1144,14 @@
 "Ricorda: milioni in difesa, ma non un centesimo in tributi [N.d.T.: è una "
 "famosa frase di George Washington]. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Programmers need to make a living somehow.&rdquo;</strong>"
 msgstr ""
 "<strong>&laquo;I programmatori devono guadagnarsi da vivere in qualche "
 "modo&raquo;.</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In the short run, this is true.  However, there are plenty of ways that "
 "programmers could make a living without selling the right to use a program.  "
@@ -1061,7 +1166,7 @@
 "strada per guadagnarsi da vivere. &Egrave; facile trovarne altre se se ne "
 "vogliono trovare. Ecco una serie di esempi."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A manufacturer introducing a new computer will pay for the porting of "
 "operating systems onto the new hardware."
@@ -1069,7 +1174,7 @@
 "Un produttore che immette sul mercato un nuovo computer pagherà per il "
 "porting dei sistemi operativi sul nuovo hardware. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The sale of teaching, handholding and maintenance services could also employ "
 "programmers."
@@ -1077,18 +1182,30 @@
 "I servizi a pagamento di insegnamento, gestione e manutenzione possono "
 "impiegare dei programmatori. "
 
-#. type: Content of: <p>
-msgid ""
-"People with new ideas could distribute programs as freeware<a href=\"#f7\">"
-"(9)</a>, asking for donations from satisfied users, or selling handholding "
-"services.  I have met people who are already working this way successfully."
+#. type: Content of: <div><dl><dd><p>
+# | People with new ideas could distribute programs as [-freeware<a
+# | href=\"#f7\">(9)</a>,-] {+freeware&#8239;<a class=\"ftn\"
+# | href=\"#f7\">[9]</a>,+} asking for donations from satisfied users, or
+# | selling handholding services.  I have met people who are already working
+# | this way successfully.
+#, fuzzy
+#| msgid ""
+#| "People with new ideas could distribute programs as freeware<a href="
+#| "\"#f7\">(9)</a>, asking for donations from satisfied users, or selling "
+#| "handholding services.  I have met people who are already working this way "
+#| "successfully."
+msgid ""
+"People with new ideas could distribute programs as freeware&#8239;<a class="
+"\"ftn\" href=\"#f7\">[9]</a>, asking for donations from satisfied users, or "
+"selling handholding services.  I have met people who are already working "
+"this way successfully."
 msgstr ""
 "Persone con idee nuove possono distribuire i programmi gratuitamente<a href="
 "\"#f7\">(9)</a> chiedendo donazioni agli utenti soddisfatti, o vendendo "
 "servizi di gestione.  Ho incontrato persone che già lavorano con successo in 
"
 "questo modo.  "
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Users with related needs can form users' groups, and pay dues.  A group "
 "would contract with programming companies to write programs that the group's "
@@ -1098,13 +1215,13 @@
 "potrebbe stipulare un contratto con un'impresa di programmazione per "
 "scrivere i programmi che i membri del gruppo vorrebbero usare. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "All sorts of development can be funded with a Software Tax:"
 msgstr ""
 "Tutti i tipi di sviluppo possono essere finanziati da una Tassa per il "
 "Software:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Suppose everyone who buys a computer has to pay x percent of the price as a "
 "software tax.  The government gives this to an agency like the NSF to spend "
@@ -1115,7 +1232,7 @@
 "fondi ad un'agenzia come la NSF [N.d.T.: più o meno l'equivalente del nostro 
"
 "CNR] per impiegarli nello sviluppo del software. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But if the computer buyer makes a donation to software development himself, "
 "he can take a credit against the tax.  He can donate to the project of his "
@@ -1130,7 +1247,7 @@
 "ottenere un credito per ogni donazione fatta, fino al valore totale della "
 "tassa che dovrebbe pagare. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The total tax rate could be decided by a vote of the payers of the tax, "
 "weighted according to the amount they will be taxed on."
@@ -1138,20 +1255,20 @@
 "Il gettito complessivo di questa tassa potrebbe essere deciso dal voto di "
 "chi la paga, pesato secondo l'ammontare pagato. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "The consequences:"
 msgstr "Le conseguenze:"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "The computer-using community supports software development."
 msgstr ""
 "La comunità degli utenti di computer sosterrebbe lo sviluppo del software."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "This community decides what level of support is needed."
 msgstr "La comunità sceglierebbe il livello di sostegno necessario."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "Users who care which projects their share is spent on can choose this for "
 "themselves."
@@ -1159,7 +1276,7 @@
 "Gli utenti che fossero interessati a sapere su che progetto vengano spesi i "
 "loro soldi avrebbero la possibilità di gestire personalmente la cosa. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the long run, making programs free is a step toward the postscarcity "
 "world, where nobody will have to work very hard just to make a living.  "
@@ -1177,7 +1294,7 @@
 "familiare, riparare i robot e prevedere il moto degli asteroidi. Non ci sarà 
"
 "bisogno di guadagnarsi da vivere con la programmazione."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We have already greatly reduced the amount of work that the whole society "
 "must do for its actual productivity, but only a little of this has "
@@ -1198,11 +1315,11 @@
 "tecnici in produttività si traducano in meno lavoro per noi. "
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "Note"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The wording here was careless.  The intention was that nobody would have to "
 "pay for <b>permission</b> to use the GNU system.  But the words don't make "
@@ -1232,7 +1349,7 @@
 "software tanto meglio. La cosa importante è che chiunque ne abbia una copia "
 "sia libero di cooperare con altri nell'usarlo."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The expression &ldquo;give away&rdquo; is another indication that I had not "
 "yet clearly separated the issue of price from that of freedom.  We now "
@@ -1246,10 +1363,21 @@
 "ulteriori spiegazioni vedere la pagina sui <a href=\"/philosophy/words-to-"
 "avoid.html#GiveAwaySoftware\"> termini da evitare</a>."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+# | This is another place I failed to distinguish carefully between the two
+# | different meanings of [-&ldquo;free&rdquo;.-] {+&ldquo;free.&rdquo;+} The
+# | statement as it stands is not false&mdash;you can get copies of GNU
+# | software at no charge, from your friends or over the net.  But it does
+# | suggest the wrong idea.
+#, fuzzy
+#| msgid ""
+#| "This is another place I failed to distinguish carefully between the two "
+#| "different meanings of &ldquo;free&rdquo;.  The statement as it stands is "
+#| "not false&mdash;you can get copies of GNU software at no charge, from "
+#| "your friends or over the net.  But it does suggest the wrong idea."
 msgid ""
 "This is another place I failed to distinguish carefully between the two "
-"different meanings of &ldquo;free&rdquo;.  The statement as it stands is not "
+"different meanings of &ldquo;free.&rdquo; The statement as it stands is not "
 "false&mdash;you can get copies of GNU software at no charge, from your "
 "friends or over the net.  But it does suggest the wrong idea."
 msgstr ""
@@ -1258,11 +1386,11 @@
 "si possono ottenere gratuitamente copie del software GNU, o dagli amici o "
 "attraverso la rete. Ma in effetti suggerisce un'idea sbagliata."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid "Several such companies now exist."
 msgstr "Oggi esistono effettivamente molte ditte di questo tipo."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Although it is a charity rather than a company, the Free Software Foundation "
 "for 10 years raised most of its funds from its distribution service.  You "
@@ -1274,7 +1402,7 @@
 "distribuzione di software e materiale. &Egrave; possibile <a href=\"/order/"
 "order.html\">ordinare materiale dalla FSF</a> per sostenere il suo lavoro."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "A group of computer companies pooled funds around 1991 to support "
 "maintenance of the GNU C Compiler."
@@ -1282,7 +1410,7 @@
 "Un gruppo di aziende decise, intorno al 1991, di mettere insieme fondi per "
 "contribuire alla manutenzione del compilatore C di GNU."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "I think I was mistaken in saying that proprietary software was the most "
 "common basis for making money in software.  It seems that actually the most "
@@ -1303,10 +1431,31 @@
 "che la maggior parte dei programmatori pagati guadagnerebbero meno in quella "
 "situazione."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+# | In the 1980s I had not yet realized how confusing it was to speak of
+# | &ldquo;the issue&rdquo; of &ldquo;intellectual [-property&rdquo;.-]
+# | {+property.&rdquo;+} That term is obviously biased; more subtle is the
+# | fact that it lumps together various disparate laws which raise very
+# | different issues.  Nowadays I urge people to reject the term
+# | &ldquo;intellectual property&rdquo; entirely, lest it lead others to
+# | suppose that those laws form one coherent issue.  The way to be clear is
+# | to discuss patents, copyrights, and trademarks separately.  See <a
+# | href=\"/philosophy/not-ipr.html\">further explanation</a> of how this term
+# | spreads confusion and bias.
+#, fuzzy
+#| msgid ""
+#| "In the 1980s I had not yet realized how confusing it was to speak of "
+#| "&ldquo;the issue&rdquo; of &ldquo;intellectual property&rdquo;.  That "
+#| "term is obviously biased; more subtle is the fact that it lumps together "
+#| "various disparate laws which raise very different issues.  Nowadays I "
+#| "urge people to reject the term &ldquo;intellectual property&rdquo; "
+#| "entirely, lest it lead others to suppose that those laws form one "
+#| "coherent issue.  The way to be clear is to discuss patents, copyrights, "
+#| "and trademarks separately.  See <a href=\"/philosophy/not-ipr.html"
+#| "\">further explanation</a> of how this term spreads confusion and bias."
 msgid ""
 "In the 1980s I had not yet realized how confusing it was to speak of &ldquo;"
-"the issue&rdquo; of &ldquo;intellectual property&rdquo;.  That term is "
+"the issue&rdquo; of &ldquo;intellectual property.&rdquo; That term is "
 "obviously biased; more subtle is the fact that it lumps together various "
 "disparate laws which raise very different issues.  Nowadays I urge people to "
 "reject the term &ldquo;intellectual property&rdquo; entirely, lest it lead "
@@ -1326,10 +1475,26 @@
 "informazioni</a> su come questo termine diffonda confusione e parzialità di "
 "giudizio."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+# | Subsequently we learned to distinguish between &ldquo;free software&rdquo;
+# | and [-&ldquo;freeware&rdquo;.-] {+&ldquo;freeware.&rdquo;+} The term
+# | &ldquo;freeware&rdquo; means software you are free to redistribute, but
+# | usually you are not free to study and change the source code, so most of
+# | it is not free software.  See &ldquo;<a
+# | href=\"/philosophy/words-to-avoid.html#Freeware\">Confusing Words and
+# | Phrases</a>&rdquo; for more explanation.
+#, fuzzy
+#| msgid ""
+#| "Subsequently we learned to distinguish between &ldquo;free "
+#| "software&rdquo; and &ldquo;freeware&rdquo;.  The term &ldquo;"
+#| "freeware&rdquo; means software you are free to redistribute, but usually "
+#| "you are not free to study and change the source code, so most of it is "
+#| "not free software.  See &ldquo;<a href=\"/philosophy/words-to-avoid."
+#| "html#Freeware\">Confusing Words and Phrases</a>&rdquo; for more "
+#| "explanation."
 msgid ""
 "Subsequently we learned to distinguish between &ldquo;free software&rdquo; "
-"and &ldquo;freeware&rdquo;.  The term &ldquo;freeware&rdquo; means software "
+"and &ldquo;freeware.&rdquo; The term &ldquo;freeware&rdquo; means software "
 "you are free to redistribute, but usually you are not free to study and "
 "change the source code, so most of it is not free software.  See &ldquo;<a "
 "href=\"/philosophy/words-to-avoid.html#Freeware\">Confusing Words and "
@@ -1369,14 +1534,14 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Le traduzioni italiane sono effettuate ponendo la massima attenzione ai "
@@ -1390,9 +1555,15 @@
 "traduzioni</a>."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; 1985, 1993, 200[-3-]{+4+}, 2005, 2007, [-2008,-] 2009,
+# | 2010, [-2014, 2015-] {+2015, 2021+} Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, "
+#| "2015 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 1985, 1993, 2004, 2005, 2007, 2009, 2010, 2015, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015 "
 "Free Software Foundation, Inc."
@@ -1427,13 +1598,12 @@
 msgid "Updated:"
 msgstr "Ultimo aggiornamento:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015, "
-"2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015, "
-"2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, "
+#~ "2015, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, "
+#~ "2015, 2021 Free Software Foundation, Inc."
 
 #~ msgid ""
 #~ "For up-to-date information about the available GNU software, please see "

Index: po/manifesto.ja.po
===================================================================
RCS file: /web/www/www/gnu/po/manifesto.ja.po,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- po/manifesto.ja.po  2 Nov 2021 13:56:41 -0000       1.27
+++ po/manifesto.ja.po  2 Nov 2021 14:41:53 -0000       1.28
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manifesto.html\n"
-"POT-Creation-Date: 2015-06-02 12:55+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2015-06-03 09:40+0900\n"
 "Last-Translator: NIIBE Yutaka <gniibe@fsij.org>\n"
 "Language-Team: Japanese <web-translators-ja@gnu.org>\n"
@@ -14,18 +14,27 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-11-02 14:27+0000\n"
 
 #. type: Content of: <title>
 msgid "The GNU Manifesto - GNU Project - Free Software Foundation"
 msgstr "GNU宣言 - GNUプロジェクト - 
フリーソフトウェアファウンデーション"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "The GNU Manifesto"
 msgstr "GNU宣言"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "The GNU Manifesto (which appears below) was written by <a href=\"http://";
+#| "www.stallman.org/\">Richard Stallman</a> in 1985 to ask for support in "
+#| "developing the GNU operating system.  Part of the text was taken from the "
+#| "original announcement of 1983.  Through 1987, it was updated in minor "
+#| "ways to account for developments; since then, it seems best to leave it "
+#| "unchanged."
 msgid ""
-"The GNU Manifesto (which appears below) was written by <a href=\"http://www.";
+"The GNU Manifesto (which appears below) was written by <a href=\"https://www.";
 "stallman.org/\">Richard Stallman</a> in 1985 to ask for support in "
 "developing the GNU operating system.  Part of the text was taken from the "
 "original announcement of 1983.  Through 1987, it was updated in minor ways "
@@ -36,7 +45,7 @@
 "れたものです。1987年までは、開発を説明するのに少々
更新されましたが、それから"
 "は、変更なしのままで置いておくのがよいでしょう。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Since that time, we have learned about certain common misunderstandings that "
 "different wording could help avoid.  Footnotes added since 1993 help clarify "
@@ -46,7 +55,7 @@
 
"を、わたしたちは学びました。1993年から脚注を付け足し、この点を明確にしまし"
 "た。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If you want to install the GNU/Linux system, we recommend you use one of the "
 "<a href=\"/distros\">100% free software GNU/Linux distributions</a>.  For "
@@ -58,7 +67,7 @@
 "とをを推奨します。どのように貢献するかについては、<a 
href=\"/help/help.html"
 "\">http://www.gnu.org/help</a>をご覧ください。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The GNU Project is part of the Free Software Movement, a campaign for <a "
 "href=\"/philosophy/free-sw.html\">freedom for users of software</a>.  It is "
@@ -74,24 +83,31 @@
 "フィールドで<a 
href=\"/philosophy/open-source-misses-the-point.html\">倫理と"
 
"は無関係のアプローチ</a>を推進するのにこの用語を使っています。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "What's GNU? Gnu's Not Unix!"
 msgstr "GNUってなに? GnuはUnixではない (Gnu's Not Unix)!"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
+#| "compatible software system which I am writing so that I can give it away "
+#| "free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
+#| "volunteers are helping me.  Contributions of time, money, programs and "
+#| "equipment are greatly needed."
 msgid ""
 "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
 "compatible software system which I am writing so that I can give it away "
-"free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
-"volunteers are helping me.  Contributions of time, money, programs and "
-"equipment are greatly needed."
+"free to everyone who can use it&#8239;<a class=\"ftn\" href=\"#f1\">[1]</a>. "
+"Several other volunteers are helping me.  Contributions of time, money, "
+"programs and equipment are greatly needed."
 msgstr ""
 "GNU、それはGnuはUnixではない(Gnu's Not 
Unix)を表しますが、わたしが「フリー」"
 "に渡し、誰もが使えるように、書いている完å…
¨ãªUnix互換のソフトウェア・システム"
 "の名称です。<a href=\"#f1\">(1)</a> 
何人かのほかのボランティアがわたしを助け"
 "てくれます。時間、お金、プログラム
、そして機器の貢献が大いに必要です。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So far we have an Emacs text editor with Lisp for writing editor commands, a "
 "source level debugger, a yacc-compatible parser generator, a linker, and "
@@ -120,7 +136,7 @@
 "ンも加
えるでしょう。わたしたちは、最終的には、Unixシステム
に通常ついてくる、"
 
"すべての有用なものと、もっと多くを提供することを望みます。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU will be able to run Unix programs, but will not be identical to Unix.  "
 "We will make all improvements that are convenient, based on our experience "
@@ -142,7 +158,7 @@
 "Chaosnet, 
そしてインターネットの各プロトコルを通信のためにサポートしようとし"
 "ています。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is aimed initially at machines in the 68000/16000 class with virtual "
 "memory, because they are the easiest machines to make it run on.  The extra "
@@ -153,7 +169,7 @@
 "なら、それらは走らせるのにもっとも容易なマシンだ
からです。より小さなマシンで"
 "走らせる追加
の努力は、それを使いたい誰かに残されます。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid horrible confusion, please pronounce the <em>g</em> in the word "
 "&ldquo;GNU&rdquo; when it is the name of this project."
@@ -161,11 +177,11 @@
 
"とんでもない混同を避けるため、このプロジェクトの名前の時は、&ldquo;GNU&rdquo;"
 "の<em>g</em>を発音してください。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why I Must Write GNU"
 msgstr "なぜ、わたしはGNUを書かねばならないか"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I consider that the Golden Rule requires that if I like a program I must "
 "share it with other people who like it.  Software sellers want to divide the "
@@ -187,13 +203,20 @@
 "行ってしまいました: 
わたしの意志に反してわたしにそのようなことが行われる機関"
 "に留まることはできません。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "So that I can continue to use computers without dishonor, I have decided "
+#| "to put together a sufficient body of free software so that I will be able "
+#| "to get along without any software that is not free.  I have resigned from "
+#| "the AI Lab to deny MIT any legal excuse to prevent me from giving GNU "
+#| "away.<a href=\"#f2a\">(2)</a>"
 msgid ""
 "So that I can continue to use computers without dishonor, I have decided to "
 "put together a sufficient body of free software so that I will be able to "
 "get along without any software that is not free.  I have resigned from the "
-"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away.<a "
-"href=\"#f2a\">(2)</a>"
+"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away&#8239;"
+"<a class=\"ftn\" href=\"#f2a\">[2]</a>."
 msgstr ""
 
"屈辱なしにコンピュータを使うことを続けられるために、わたしは、十分な自由ソフ"
 
"トウェアをひとそろい、まとめることを決意しました。そうして、どんな自由でない"
@@ -201,11 +224,11 @@
 
"がGNUを渡すのを禁じる、どんな法的理由もMITに与えませんでした。<a
 href=\"#f2a"
 "\">(2)</a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why GNU Will Be Compatible with Unix"
 msgstr "なぜGNUはUnixと互換となるのか"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Unix is not my ideal system, but it is not too bad.  The essential features "
 "of Unix seem to be good ones, and I think I can fill in what Unix lacks "
@@ -217,11 +240,11 @@
 "ことなく、補うことができるだ
ろうと考えました。そしてUnixと互換のシステムは多"
 "くのほかの人々が採用するのに便利でしょう。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How GNU Will Be Available"
 msgstr "どのようにしてGNUは利用可能となるのか"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is not in the public domain.  Everyone will be permitted to modify and "
 "redistribute GNU, but no distributor will be allowed to restrict its further "
@@ -235,11 +258,11 @@
 
"プライエタリ</a>な改変は許されません。わたしは、すべてのGNUのバージョンが自由"
 "のままであることを確実にしたいのです。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why Many Other Programmers Want to Help"
 msgstr 
"なぜ、たくさんのほかのプログラマが援助したいのか"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found many other programmers who are excited about GNU and want to "
 "help."
@@ -247,7 +270,7 @@
 
"多くのほかのプログラマがGNUについて興奮し、支持を希望するのを、わたしは知りま"
 "した。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Many programmers are unhappy about the commercialization of system "
 "software.  It may enable them to make more money, but it requires them to "
@@ -270,7 +293,7 @@
 "しょう。しかし、法律を信じる人々
はどちらの選択でも安堵しません。かれらは冷笑"
 "的となり、プログラミングは単にお金を得る方法だ
と考えるのです。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By working on and using GNU rather than proprietary programs, we can be "
 "hospitable to everyone and obey the law.  In addition, GNU serves as an "
@@ -286,11 +309,11 @@
 
"には不可能である、調和の感覚をわたしたちに与えてくれます。わたしが話したプロ"
 
"グラマの半数にとって、これはお金では置き換えられない重要な幸福です。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How You Can Contribute"
 msgstr "どのようにあなたは貢献できるか"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "(Nowadays, for software tasks to work on, see the <a href=\"http://fsf.org/";
 "campaigns/priority-projects\">High Priority Projects list</a> and the <a "
@@ -306,7 +329,7 @@
 "方法については、<a 
href=\"/help/help.html\">GNUオペレーティング・システムを手"
 "伝うガイド</a>をご覧ください。)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am asking computer manufacturers for donations of machines and money.  I'm "
 "asking individuals for donations of programs and work."
@@ -314,7 +337,7 @@
 "コンピュータ製造業者
にはマシンとお金の寄付を求めています。個人にはプログラãƒ
 "
 "と作業の寄付を求めています。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One consequence you can expect if you donate machines is that GNU will run "
 "on them at an early date.  The machines should be complete, ready to use "
@@ -325,7 +348,7 @@
 "だろう、というものです。マシンは完å…
¨ã§ã€ã™ãã«ä½¿ãˆã‚‹ã‚·ã‚¹ãƒ†ãƒ ã§ã€å±…住地域での"
 "使用が認められ、特別な空調や電源設備が必
要のないものであるべきです。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found very many programmers eager to contribute part-time work for "
 "GNU.  For most projects, such part-time distributed work would be very hard "
@@ -352,7 +375,7 @@
 
"ても、これらの部分を組み合わせることは実現可能な仕事です。(カーネルは緊密なや"
 "りとりを必
要とし、小さく密接なグループによって作業されるでしょう。)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If I get donations of money, I may be able to hire a few people full or part "
 "time.  The salary won't be high by programmers' standards, but I'm looking "
@@ -368,19 +391,23 @@
 
"GNUの作業に向けることを可能とする方法、と考えています。別の方法で生計を立てる"
 "必要から免れることができますから。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why All Computer Users Will Benefit"
 msgstr 
"なぜ、すべてのコンピュータ・ユーザが利益を受けるのか"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Once GNU is written, everyone will be able to obtain good system software "
+#| "free, just like air.<a href=\"#f2\">(3)</a>"
 msgid ""
 "Once GNU is written, everyone will be able to obtain good system software "
-"free, just like air.<a href=\"#f2\">(3)</a>"
+"free, just like air&#8239;<a class=\"ftn\" href=\"#f2\">[3]</a>."
 msgstr ""
 "一旦、GNUが書かれたら、すべての人が良いシステム
ソフトウェアを、ちょうど空気の"
 "ように、自由に得ることが出来るのです。<a 
href=\"#f2\">(3)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This means much more than just saving everyone the price of a Unix license.  "
 "It means that much wasteful duplication of system programming effort will be "
@@ -391,7 +418,7 @@
 
"が避けられることを意味します。その努力は、代わりに、最å
…ˆç«¯ã®æŠ€è¡“をより進める"
 "ために使えるのです。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Complete system sources will be available to everyone.  As a result, a user "
 "who needs changes in the system will always be free to make them himself, or "
@@ -405,7 +432,7 @@
 
"ユーザは、ソースコードを所有し、変更ができる単独の地位にいる一人のプログラ"
 "マ、あるいは一つの会社の慈悲にすがる必
要はもうなくなるのです。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Schools will be able to provide a much more educational environment by "
 "encouraging all students to study and improve the system code.  Harvard's "
@@ -421,7 +448,7 @@
 "実際にあるいくつかのプログラム
をインストールすることを拒否していました。わた"
 "しは、これに大きく影響を受けました。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Finally, the overhead of considering who owns the system software and what "
 "one is or is not entitled to do with it will be lifted."
@@ -429,7 +456,7 @@
 "最後に、誰がシステム
・ソフトウェアを所有し、なにがそれとともに行われる資æ 
¼ãŒ"
 
"あるのかないのかを検討するオーバヘッドがなくなるでしょう。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Arrangements to make people pay for using a program, including licensing of "
 "copies, always incur a tremendous cost to society through the cumbersome "
@@ -453,7 +480,7 @@
 "の場所に置くとなっては暴虐でしょう。それよりも、人é 
­ç¨Žã§ç©ºæ°—プラントをサポー"
 "トし、マスクはやめる方が妥当でしょう。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copying all or parts of a program is as natural to a programmer as "
 "breathing, and as productive.  It ought to be as free."
@@ -461,11 +488,11 @@
 "プログラム
のすべてあるいは一部をコピーすることはプログラマにとって、呼吸する"
 
"ことのように自然です。そしてそれは生産的です。それは自由であるべきです。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Some Easily Rebutted Objections to GNU's Goals"
 msgstr "GNUの目標に対する容易に反駁できる反論"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Nobody will use it if it is free, because that means they "
 "can't rely on any support.&rdquo;</strong>"
@@ -473,24 +500,29 @@
 
"<strong>「それが自由ならば誰も使わないでしょう。なぜなら、それにはどんなサ"
 "ポートも期待
できないことを意味するからです。」</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You have to charge for the program to pay for providing the "
 "support.&rdquo;</strong>"
 msgstr ""
 
"<strong>「サポートを提供するために料金を支払うよう課すべきです。」</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "If people would rather pay for GNU plus service than get GNU free without "
+#| "service, a company to provide just service to people who have obtained "
+#| "GNU free ought to be profitable.<a href=\"#f3\">(4)</a>"
 msgid ""
 "If people would rather pay for GNU plus service than get GNU free without "
 "service, a company to provide just service to people who have obtained GNU "
-"free ought to be profitable.<a href=\"#f3\">(4)</a>"
+"free ought to be profitable&#8239;<a class=\"ftn\" href=\"#f3\">[4]</a>."
 msgstr ""
 "人々が、GNUを無料でサービスなしではなく、むしろGNUと加
えたサービスに支払うの"
 "であれば、GNUを無料で取得した人々にサービスだ
けを提供する会社が利益を生むで"
 "しょう。<a href=\"#f3\">(4)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We must distinguish between support in the form of real programming work and "
 "mere handholding.  The former is something one cannot rely on from a "
@@ -502,7 +534,7 @@
 "十分な人々に共有されていないå 
´åˆã€ãƒ™ãƒ³ãƒ€ãƒ¼ã¯ã‚なたに、失せろ、というでしょ"
 "う。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If your business needs to be able to rely on support, the only way is to "
 "have all the necessary sources and tools.  Then you can hire any available "
@@ -522,7 +554,7 @@
 
"を言うものではありません。GNUはこの世界のすべての問題を一掃するのではありませ"
 "ん。問題のいくつかに過ぎません。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Meanwhile, the users who know nothing about computers need handholding: "
 "doing things for them which they could easily do themselves but don't know "
@@ -532,7 +564,7 @@
 
"れら自身で容易にできるけれども、どうやったらいいか知らないことを、かれらのた"
 "めにするのです。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Such services could be provided by companies that sell just handholding and "
 "repair service.  If it is true that users would rather spend money and get a "
@@ -549,7 +581,7 @@
 "ビスは必要としないわたしたちは、サービスに支払う必
要なく、プログラムを使える"
 "べきです。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You cannot reach many people without advertising, and you "
 "must charge for the program to support that.&rdquo;</strong>"
@@ -557,7 +589,7 @@
 "<strong>「広告なしには多くの人々
に届くことができません。そしてそれをサポート"
 "するにはプログラム
に(料金を)課さねばなりません。」</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;It's no use advertising a program people can get free.&rdquo;"
 "</strong>"
@@ -565,7 +597,7 @@
 "<strong>「人々が自由に入手できるプログラム
に広告することなど無用です。」</"
 "strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are various forms of free or very cheap publicity that can be used to "
 "inform numbers of computer users about something like GNU.  But it may be "
@@ -581,19 +613,25 @@
 
"の支払いをするのに十分足るように成功するでしょう。この方法では、広告から利益"
 "を得るユーザだけがそれに支払いをするのです。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "On the other hand, if many people get GNU from their friends, and such "
+#| "companies don't succeed, this will show that advertising was not really "
+#| "necessary to spread GNU.  Why is it that free market advocates don't want "
+#| "to let the free market decide this?<a href=\"#f4\">(5)</a>"
 msgid ""
 "On the other hand, if many people get GNU from their friends, and such "
 "companies don't succeed, this will show that advertising was not really "
 "necessary to spread GNU.  Why is it that free market advocates don't want to "
-"let the free market decide this?<a href=\"#f4\">(5)</a>"
+"let the free market decide this?&#8239;<a class=\"ftn\" href=\"#f4\">[5]</a>"
 msgstr ""
 
"一方、多くの人がGNUをその友達から得て、そのような会社が成功しないå
 ´åˆã€GNUを"
 "広めるのに実際は広告は必
要ないことを示すでしょう。自由市場の擁護者は自由市場"
 
"がこれを決めるようにしたいと思わないのはなぜでしょうか?<a
 href=\"#f4\">(5)</"
 "a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;My company needs a proprietary operating system to get a "
 "competitive edge.&rdquo;</strong>"
@@ -601,7 +639,7 @@
 
"<strong>「わたしの会社はプロプライエタリなオペレーティング・システãƒ
 ã‚’競争力"
 "を得るために必要とします。」</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU will remove operating system software from the realm of competition.  "
 "You will not be able to get an edge in this area, but neither will your "
@@ -619,15 +657,20 @@
 
"あなたのビジネスがそのほかのことであれば、GNUは、高価なオペレーティング・シス"
 "テム
を売るビジネスに押し込まれることからあなたを救うことができるでしょう。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "I would like to see GNU development supported by gifts from many "
+#| "manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
 msgid ""
 "I would like to see GNU development supported by gifts from many "
-"manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
+"manufacturers and users, reducing the cost to each&#8239;<a class=\"ftn\" "
+"href=\"#f5\">[6]</a>."
 msgstr ""
 "GNUの開発が、たくさんの製造業者
とユーザからの恩恵で支援され、それぞれのコスト"
 
"を削減することを、みてみたいと、わたしは願っています。<a
 href=\"#f5\">(6)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't programmers deserve a reward for their creativity?"
 "&rdquo;</strong>"
@@ -635,7 +678,7 @@
 "<strong>「プログラマはその創造性に対して報é…
¬ã«å€¤ã—ないのでしょうか?」</"
 "strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If anything deserves a reward, it is social contribution.  Creativity can be "
 "a social contribution, but only in so far as society is free to use the "
@@ -648,7 +691,7 @@
 "し、プログラマが革新的なプログラムを作ったことで報é…
¬ã«å€¤ã™ã‚‹ãªã‚‰ã°ã€åŒæ§˜ãªç†"
 "由で、そのプログラムの利用を制限したå 
´åˆã«ã¯ç½°ã«å€¤ã—ます。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Shouldn't a programmer be able to ask for a reward for his "
 "creativity?&rdquo;</strong>"
@@ -656,7 +699,7 @@
 "<strong>「プログラマはその創造性に対して報é…
¬ã‚’要求することができるべきではな"
 "いでしょうか?」</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is nothing wrong with wanting pay for work, or seeking to maximize "
 "one's income, as long as one does not use means that are destructive.  But "
@@ -666,7 +709,7 @@
 
"を用いるのではない限り、まったく問題ありません。しかし、今日、ソフトウェアの"
 "分野で慣習となっている方法はç 
´å£Šã«ã‚‚とづいています。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Extracting money from users of a program by restricting their use of it is "
 "destructive because the restrictions reduce the amount and the ways that the "
@@ -679,7 +722,7 @@
 "す。これは人類がそのプログラム
から引き出す富の量を減らします。制限する故意の"
 "選択がある時には、悪影響は故意の破壊です。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The reason a good citizen does not use such destructive means to become "
 "wealthier is that, if everyone did so, we would all become poorer from the "
@@ -696,11 +739,11 @@
 "体的には、創造性への報é…
¬ã‚’得たいという欲望は、その創造性の全体あるいは一部を"
 "世間一般から奪うことを正当化しません。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid "<strong>&ldquo;Won't programmers starve?&rdquo;</strong>"
 msgstr "<strong>「プログラマは飢えませんか?」</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "I could answer that nobody is forced to be a programmer.  Most of us cannot "
 "manage to get any money for standing on the street and making faces.  But we "
@@ -712,7 +755,7 @@
 
"一生を街角に立ってにらめっこをすることに費やしなさいと宣告され、飢えてしま"
 
"う、ということはありません。わたしたちはなにかほかのことをします。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But that is the wrong answer because it accepts the questioner's implicit "
 "assumption: that without ownership of software, programmers cannot possibly "
@@ -723,7 +766,7 @@
 
"われることができない、との仮定です。いわゆるオール・オア・ナッシングの考え方"
 "です。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The real reason programmers will not starve is that it will still be "
 "possible for them to get paid for programming; just not paid as much as now."
@@ -731,13 +774,22 @@
 
"プログラマが飢えない本当の理由は、プログラミングで支払いを得ることがそれでも"
 "可能だからです。今と同じように多くはないだけです。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Restricting copying is not the only basis for business in software.  It "
+#| "is the most common basis<a href=\"#f8\">(7)</a> because it brings in the "
+#| "most money.  If it were prohibited, or rejected by the customer, software "
+#| "business would move to other bases of organization which are now used "
+#| "less often.  There are always numerous ways to organize any kind of "
+#| "business."
 msgid ""
 "Restricting copying is not the only basis for business in software.  It is "
-"the most common basis<a href=\"#f8\">(7)</a> because it brings in the most "
-"money.  If it were prohibited, or rejected by the customer, software "
-"business would move to other bases of organization which are now used less "
-"often.  There are always numerous ways to organize any kind of business."
+"the most common basis&#8239;<a class=\"ftn\" href=\"#f8\">[7]</a> because it "
+"brings in the most money.  If it were prohibited, or rejected by the "
+"customer, software business would move to other bases of organization which "
+"are now used less often.  There are always numerous ways to organize any "
+"kind of business."
 msgstr ""
 "コピーをすることを制限することだ
けが、ソフトウェアのビジネスの基礎ではありま"
 
"せん。それがほとんどのお金を持ってくるので、これは、もっともよくある基礎<a
 "
@@ -746,7 +798,7 @@
 
"織化の基礎へと移行するでしょう。いろいろなビジネスを組織するたくさんの方法が"
 "常にあります。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Probably programming will not be as lucrative on the new basis as it is "
 "now.  But that is not an argument against the change.  It is not considered "
@@ -760,7 +812,7 @@
 
"合、それも不正ではないでしょう。(実際には、プログラマはそれよりも十分多くを得"
 "るでしょう。)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't people have a right to control how their creativity is "
 "used?&rdquo;</strong>"
@@ -768,7 +820,7 @@
 "<strong>「創造
性がどのように使われるかコントロールする権利を人々
は有しません"
 "か?」</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "&ldquo;Control over the use of one's ideas&rdquo; really constitutes control "
 "over other people's lives; and it is usually used to make their lives more "
@@ -778,20 +830,27 @@
 
"生活をコントロールすることから構成されます。そして、それは通常、その暮らしを"
 "より困難にしてしまいます。"
 
-#. type: Content of: <p>
-msgid ""
-"People who have studied the issue of intellectual property rights<a href="
-"\"#f6\">(8)</a> carefully (such as lawyers) say that there is no intrinsic "
-"right to intellectual property.  The kinds of supposed intellectual property "
-"rights that the government recognizes were created by specific acts of "
-"legislation for specific purposes."
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "People who have studied the issue of intellectual property rights<a href="
+#| "\"#f6\">(8)</a> carefully (such as lawyers) say that there is no "
+#| "intrinsic right to intellectual property.  The kinds of supposed "
+#| "intellectual property rights that the government recognizes were created "
+#| "by specific acts of legislation for specific purposes."
+msgid ""
+"People who have studied the issue of intellectual property rights&#8239;<a "
+"class=\"ftn\" href=\"#f6\">[8]</a> carefully (such as lawyers) say that "
+"there is no intrinsic right to intellectual property.  The kinds of supposed "
+"intellectual property rights that the government recognizes were created by "
+"specific acts of legislation for specific purposes."
 msgstr ""
 "知的財産権<a href=\"#f6\">(8)</a>の問題を慎重に研究した人々
(法律家のように)"
 
"は、知的財産には本来備わっている権利はない、と言います。政府が認識する、信じ"
 
"られている類の知的財産権は、特定の目的のための特定の法律によって作られたもの"
 "です。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For example, the patent system was established to encourage inventors to "
 "disclose the details of their inventions.  Its purpose was to help society "
@@ -809,7 +868,7 @@
 
"力は、生産の設立と比較すれば小さく、特許は、しばしば、そんなに有害なものでは"
 
"ありません。特許製品を使うほとんどの個人を妨害することはありません。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The idea of copyright did not exist in ancient times, when authors "
 "frequently copied other authors at length in works of nonfiction.  This "
@@ -827,7 +886,7 @@
 
"的に複製されることができる、書籍)では、害をなすことはほとんどなく、書籍を読"
 "む、ほとんどの個人を害することはありませんでした。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "All intellectual property rights are just licenses granted by society "
 "because it was thought, rightly or wrongly, that society as a whole would "
@@ -842,7 +901,7 @@
 "とだろうか、と。わたしたちがどのような行動を、人々
にライセンスしているのか、"
 "と。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The case of programs today is very different from that of books a hundred "
 "years ago.  The fact that the easiest way to copy a program is from one "
@@ -861,12 +920,12 @@
 
"を生み出しています。この状況では、法律がそれを可能にするかどうかに関係なく、"
 "そうするべきではありません。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Competition makes things get done better.&rdquo;</strong>"
 msgstr 
"<strong>「競争が、ものごとをよりよいものとします。」</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The paradigm of competition is a race: by rewarding the winner, we encourage "
 "everyone to run faster.  When capitalism really works this way, it does a "
@@ -883,7 +942,7 @@
 "つけるかもしれません。ほかの走者
を攻撃する、というように。走者が素手で殴り合"
 "うようになれば、全員が遅
くゴールすることになります。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Proprietary and secret software is the moral equivalent of runners in a fist "
 "fight.  Sad to say, the only referee we've got does not seem to object to "
@@ -896,7 +955,7 @@
 "けです(「10ヤード走る毎に一発だ
け殴れます」、と)。レフェリーは本当はかれらを"
 "止めに入るべきで、格闘しようとしただけでも走者
を罰するべきなのです。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Won't everyone stop programming without a monetary incentive?"
 "&rdquo;</strong>"
@@ -904,7 +963,7 @@
 "<strong>「金銭のå 
±å¥¨ãŒãªã‘れば、みんなプログラミングを止めてしまうのでは?」</"
 "strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually, many people will program with absolutely no monetary incentive.  "
 "Programming has an irresistible fascination for some people, usually the "
@@ -916,7 +975,7 @@
 
"て。その方法で生計を立てる希望がまったくなくても、プロフェッショナルのミュー"
 "ジシャンの不足の心配はまったくありません。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But really this question, though commonly asked, is not appropriate to the "
 "situation.  Pay for programmers will not disappear, only become less.  So "
@@ -928,7 +987,7 @@
 
"ですから、正しい質問は、削減された金銭の動機で、誰かがプログラãƒ
 ã‚’するでしょ"
 "うか? というものです。わたしの経験では、プログラム
する人はいる、のです。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For more than ten years, many of the world's best programmers worked at the "
 "Artificial Intelligence Lab for far less money than they could have had "
@@ -940,7 +999,7 @@
 "を得たのです。たとえば、名声、感謝です。そして、創造
性は楽しいもので、それ自"
 "身が報酬です。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Then most of them left when offered a chance to do the same interesting work "
 "for a lot of money."
@@ -948,7 +1007,7 @@
 
"それから、同じ興味深い仕事をたくさんのお金でできる機会が提示された時に、ほと"
 "んどは去りました。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "What the facts show is that people will program for reasons other than "
 "riches; but if given a chance to make a lot of money as well, they will come "
@@ -962,7 +1021,7 @@
 
"勝ち得ませんが、高給を支払う組織が禁止されれば、やっていけないわけではありま"
 "せん。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;We need the programmers desperately.  If they demand that we "
 "stop helping our neighbors, we have to obey.&rdquo;</strong>"
@@ -971,7 +1030,7 @@
 
"人を助けることを止めることを要求するなら、わたしたちは従わなければなりませ"
 "ん。」</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "You're never so desperate that you have to obey this sort of demand.  "
 "Remember: millions for defense, but not a cent for tribute!"
@@ -980,12 +1039,12 @@
 "てありません。忘れないように: 
たとえ何百万かかろうとも防衛を、しかし、賄賂に"
 "は1セントも払うな、です。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Programmers need to make a living somehow.&rdquo;</strong>"
 msgstr "<strong>「プログラマはなにかで生計を立てる必
要があります。」</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In the short run, this is true.  However, there are plenty of ways that "
 "programmers could make a living without selling the right to use a program.  "
@@ -999,7 +1058,7 @@
 "で、それが生計を立てる唯一の方法だ
から、ではありません。探そうと思えば、ほか"
 
"の方法を見つけることは容易でしょう。いくつか例をあげてみましょう。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A manufacturer introducing a new computer will pay for the porting of "
 "operating systems onto the new hardware."
@@ -1007,24 +1066,31 @@
 "新しいコンピュータを作る製造者
は、新しいハードウェアにオペレーティング・シス"
 "テムを移植するために支払うでしょう。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The sale of teaching, handholding and maintenance services could also employ "
 "programmers."
 msgstr 
"指導や取扱い、保守のサービスもプログラマを雇うでしょう。"
 
-#. type: Content of: <p>
-msgid ""
-"People with new ideas could distribute programs as freeware<a href=\"#f7\">"
-"(9)</a>, asking for donations from satisfied users, or selling handholding "
-"services.  I have met people who are already working this way successfully."
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "People with new ideas could distribute programs as freeware<a href="
+#| "\"#f7\">(9)</a>, asking for donations from satisfied users, or selling "
+#| "handholding services.  I have met people who are already working this way "
+#| "successfully."
+msgid ""
+"People with new ideas could distribute programs as freeware&#8239;<a class="
+"\"ftn\" href=\"#f7\">[9]</a>, asking for donations from satisfied users, or "
+"selling handholding services.  I have met people who are already working "
+"this way successfully."
 msgstr ""
 "新しいアイデアを持った人々は、プログラム
をフリーウェア<a href=\"#f7\">(9)</a>"
 "としてé…
å¸ƒã—て、満足したユーザに寄付をお願いしたり、取扱いサービスを販売でき"
 
"るでしょう。わたしは、この方法で働くことにすでに成功している人ã€
…に会ったこと"
 "があります。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Users with related needs can form users' groups, and pay dues.  A group "
 "would contract with programming companies to write programs that the group's "
@@ -1034,12 +1100,12 @@
 
"す。グループはプログラミングの会社と契約して、グループのメンバーが使いたいプ"
 "ログラムを書いてもらうのです。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "All sorts of development can be funded with a Software Tax:"
 msgstr ""
 
"すべての種類の開発は「ソフトウェア税」で資金提供を受けることができます:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Suppose everyone who buys a computer has to pay x percent of the price as a "
 "software tax.  The government gives this to an agency like the NSF to spend "
@@ -1049,7 +1115,7 @@
 
"ばならない状況を考えてみましょう。政府はこれをNSFのような機関に与え、ソフト"
 "ウェアの開発に使うのです。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But if the computer buyer makes a donation to software development himself, "
 "he can take a credit against the tax.  He can donate to the project of his "
@@ -1062,32 +1128,32 @@
 
"は選択されます。それがなされた時の結果を使いたいと希望するからです。支払わな"
 
"ければならない税額にいたるまで、寄付の控除を受けることができます。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The total tax rate could be decided by a vote of the payers of the tax, "
 "weighted according to the amount they will be taxed on."
 msgstr "税率は納税する金額に応じて重み付けられた納税者
の投票で決められます。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "The consequences:"
 msgstr "その結果:"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "The computer-using community supports software development."
 msgstr 
"コンピュータを使うコミュニティがソフトウェアの開発をサポートする。"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "This community decides what level of support is needed."
 msgstr 
"このコミュニティがどういったレベルのサポートが必
要かを決定する。"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "Users who care which projects their share is spent on can choose this for "
 "themselves."
 msgstr ""
 
"どのプロジェクトが取り分を費やすかを気にするユーザは自分自身で選択できる。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the long run, making programs free is a step toward the postscarcity "
 "world, where nobody will have to work very hard just to make a living.  "
@@ -1103,7 +1169,7 @@
 "といったもの、の後には、人々
はプログラミングのような楽しい活動に専心する自由"
 "があるでしょう。プログラミングで生計を立てられる必
要はないでしょう。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We have already greatly reduced the amount of work that the whole society "
 "must do for its actual productivity, but only a little of this has "
@@ -1122,11 +1188,11 @@
 
"ければなりません。生産性の技術的利得を、わたしたちのより少ない労働に変換する"
 "ために。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "脚注"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The wording here was careless.  The intention was that nobody would have to "
 "pay for <b>permission</b> to use the GNU system.  But the words don't make "
@@ -1154,7 +1220,7 @@
 
"役立てば、それはよりよいことです。重要なことは、そのコピーを持つすべての人が"
 "それを使用してほかの人々
と協力する自由があることです。"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The expression &ldquo;give away&rdquo; is another indication that I had not "
 "yet clearly separated the issue of price from that of freedom.  We now "
@@ -1167,10 +1233,16 @@
 "避けるよう奨めます。より詳しい説明は、「<a 
href=\"/philosophy/words-to-avoid."
 
"html#GiveAwaySoftware\">紛らわしい言葉と言い方</a>」をご覧くだ
さい。"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "This is another place I failed to distinguish carefully between the two "
+#| "different meanings of &ldquo;free&rdquo;.  The statement as it stands is "
+#| "not false&mdash;you can get copies of GNU software at no charge, from "
+#| "your friends or over the net.  But it does suggest the wrong idea."
 msgid ""
 "This is another place I failed to distinguish carefully between the two "
-"different meanings of &ldquo;free&rdquo;.  The statement as it stands is not "
+"different meanings of &ldquo;free.&rdquo; The statement as it stands is not "
 "false&mdash;you can get copies of GNU software at no charge, from your "
 "friends or over the net.  But it does suggest the wrong idea."
 msgstr ""
@@ -1179,11 +1251,11 @@
 
"るいはネットを通じて、GNUソフトウェアのコピーを無料でå
…¥æ‰‹ã™ã‚‹ã“とはできます。"
 "しかし、これは間違った考えを示唆します。"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid "Several such companies now exist."
 msgstr "そういった会社はいくつか今存在します。"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Although it is a charity rather than a company, the Free Software Foundation "
 "for 10 years raised most of its funds from its distribution service.  You "
@@ -1195,7 +1267,7 @@
 "るために、<a 
href=\"/order/order.html\">FSFのものを注文する</a>ことができま"
 "す。"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "A group of computer companies pooled funds around 1991 to support "
 "maintenance of the GNU C Compiler."
@@ -1203,7 +1275,7 @@
 "1991年あたりで、コンピュータ会社のグループが、GNU 
Cコンパイラの保守を支援する"
 "ために、資金を集めました。"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "I think I was mistaken in saying that proprietary software was the most "
 "common basis for making money in software.  It seems that actually the most "
@@ -1223,10 +1295,21 @@
 
"つづけるでしょう。ですから、わたしは、ほとんどの雇われたプログラマが自由ソフ"
 
"トウェアの世界で少なく稼ぐとは、もはや考えていません。"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "In the 1980s I had not yet realized how confusing it was to speak of "
+#| "&ldquo;the issue&rdquo; of &ldquo;intellectual property&rdquo;.  That "
+#| "term is obviously biased; more subtle is the fact that it lumps together "
+#| "various disparate laws which raise very different issues.  Nowadays I "
+#| "urge people to reject the term &ldquo;intellectual property&rdquo; "
+#| "entirely, lest it lead others to suppose that those laws form one "
+#| "coherent issue.  The way to be clear is to discuss patents, copyrights, "
+#| "and trademarks separately.  See <a href=\"/philosophy/not-ipr.html"
+#| "\">further explanation</a> of how this term spreads confusion and bias."
 msgid ""
 "In the 1980s I had not yet realized how confusing it was to speak of &ldquo;"
-"the issue&rdquo; of &ldquo;intellectual property&rdquo;.  That term is "
+"the issue&rdquo; of &ldquo;intellectual property.&rdquo; That term is "
 "obviously biased; more subtle is the fact that it lumps together various "
 "disparate laws which raise very different issues.  Nowadays I urge people to "
 "reject the term &ldquo;intellectual property&rdquo; entirely, lest it lead "
@@ -1244,10 +1327,19 @@
 
"することです。この用語が如何に混乱と偏見をひろげるかについては、<a
 href=\"/"
 "philosophy/not-ipr.html\">さらなる説明</a>をご覧ください。"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "Subsequently we learned to distinguish between &ldquo;free "
+#| "software&rdquo; and &ldquo;freeware&rdquo;.  The term &ldquo;"
+#| "freeware&rdquo; means software you are free to redistribute, but usually "
+#| "you are not free to study and change the source code, so most of it is "
+#| "not free software.  See &ldquo;<a href=\"/philosophy/words-to-avoid."
+#| "html#Freeware\">Confusing Words and Phrases</a>&rdquo; for more "
+#| "explanation."
 msgid ""
 "Subsequently we learned to distinguish between &ldquo;free software&rdquo; "
-"and &ldquo;freeware&rdquo;.  The term &ldquo;freeware&rdquo; means software "
+"and &ldquo;freeware.&rdquo; The term &ldquo;freeware&rdquo; means software "
 "you are free to redistribute, but usually you are not free to study and "
 "change the source code, so most of it is not free software.  See &ldquo;<a "
 "href=\"/philosophy/words-to-avoid.html#Freeware\">Confusing Words and "
@@ -1284,26 +1376,30 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 
"正確で良い品質の翻訳を提供するよう努力していますが、不完å
…¨ãªå ´åˆã‚‚あるかと思"
 "います。翻訳に関するコメントと提案は、<a 
href=\"mailto:web-translators@gnu.";
 
"org\">&lt;web-translators@gnu.org&gt;</a>におねがいします。</p><p>わたしたち"
-"のウェブページの翻訳の調整と提出については、<a 
href=\"/server/standards/"
+"のウェブページの翻訳の調整と貢献については、<a 
href=\"/server/standards/"
 "README.translations.html\">翻訳 README</a>をご覧ください。"
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, "
+#| "2015 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 1985, 1993, 2004, 2005, 2007, 2009, 2010, 2015, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015 "
 "Free Software Foundation, Inc."
@@ -1333,13 +1429,12 @@
 msgid "Updated:"
 msgstr "最終更新:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015, "
-"2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015, "
-"2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, "
+#~ "2015, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, "
+#~ "2015, 2021 Free Software Foundation, Inc."
 
 #~ msgid ""
 #~ "For up-to-date information about the available GNU software, please see "

Index: po/manifesto.ko.po
===================================================================
RCS file: /web/www/www/gnu/po/manifesto.ko.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- po/manifesto.ko.po  12 Jul 2019 17:28:53 -0000      1.2
+++ po/manifesto.ko.po  2 Nov 2021 14:41:53 -0000       1.3
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manifesto.html\n"
-"POT-Creation-Date: 2015-06-02 12:55+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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,19 +23,20 @@
 msgid "The GNU Manifesto - GNU Project - Free Software Foundation"
 msgstr "GNU 선언문 - GNU 프로젝트 - 자유 소프트웨어 재단"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "The GNU Manifesto"
 msgstr "GNU 선언문"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 # | The GNU Manifesto (which appears below) was written by <a
-# | href=\"http://www.stallman.org/\";>Richard Stallman</a> [-at the beginning
-# | of the GNU Project,-] {+in 1985+} to ask for [-participation and support. 
-# | For-] {+support in developing+} the [-first few years,-] {+GNU operating
-# | system.  Part of the text was taken from the original announcement of
-# | 1983.  Through 1987,+} it was updated in minor ways to account for
-# | [-developments, but now-] {+developments; since then,+} it seems best to
-# | leave it [-unchanged as most people have seen it.-] {+unchanged.+}
+# | href=\"http{+s+}://www.stallman.org/\">Richard Stallman</a> [-at the
+# | beginning of the GNU Project,-] {+in 1985+} to ask for [-participation and
+# | support.  For-] {+support in developing+} the [-first few years,-] {+GNU
+# | operating system.  Part of the text was taken from the original
+# | announcement of 1983.  Through 1987,+} it was updated in minor ways to
+# | account for [-developments, but now-] {+developments; since then,+} it
+# | seems best to leave it [-unchanged as most people have seen it.-]
+# | {+unchanged.+}
 #, fuzzy
 #| msgid ""
 #| "The GNU Manifesto (which appears below) was written by <a href=\"http://";
@@ -44,7 +45,7 @@
 #| "it was updated in minor ways to account for developments, but now it "
 #| "seems best to leave it unchanged as most people have seen it."
 msgid ""
-"The GNU Manifesto (which appears below) was written by <a href=\"http://www.";
+"The GNU Manifesto (which appears below) was written by <a href=\"https://www.";
 "stallman.org/\">Richard Stallman</a> in 1985 to ask for support in "
 "developing the GNU operating system.  Part of the text was taken from the "
 "original announcement of 1983.  Through 1987, it was updated in minor ways "
@@ -56,7 +57,7 @@
 "해 부분적인 개정이 이루어 졌지만, 이제는 문서가 널리 
알려짐에 따라 많은 사람"
 "들이 알고 있는 내용 그대로를 보존하는 편이 낫다고 
판단하게 되었습니다."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Since that time, we have learned about certain common misunderstandings that "
 "different wording could help avoid.  Footnotes added since 1993 help clarify "
@@ -66,7 +67,7 @@
 "들의 문제점을 알게 되었고, 1993년에 주석을 추가하는 
것으로 해석상의 난점들을 "
 "명확하게 정리했습니다. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 # | [-For up-to-date information about-]{+If you want to install+} the
 # | [-available GNU software, please see-] {+GNU/Linux system, we recommend
 # | you use one of+} the [-information available on our-] <a
@@ -90,7 +91,7 @@
 "<a href=\"/software/software.html\">소프트웨어 디렉토리</a>를 
통해서 참고할 "
 "수 있습니다."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The GNU Project is part of the Free Software Movement, a campaign for <a "
 "href=\"/philosophy/free-sw.html\">freedom for users of software</a>.  It is "
@@ -100,17 +101,30 @@
 "open-source-misses-the-point.html\">amoral approach</a> to the same field."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "What's GNU? Gnu's Not Unix!"
 msgstr "GNU란 무엇인가? Gnu는 유닉스가 아니다!"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | GNU, which stands for Gnu's Not Unix, is the name for the complete
+# | Unix-compatible software system which I am writing so that I can give it
+# | away free to everyone who can use [-it.<a href=\"#f1\">(1)</a>-]
+# | {+it&#8239;<a class=\"ftn\" href=\"#f1\">[1]</a>.+} Several other
+# | volunteers are helping me.  Contributions of time, money, programs and
+# | equipment are greatly needed.
+#, fuzzy
+#| msgid ""
+#| "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
+#| "compatible software system which I am writing so that I can give it away "
+#| "free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
+#| "volunteers are helping me.  Contributions of time, money, programs and "
+#| "equipment are greatly needed."
 msgid ""
 "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
 "compatible software system which I am writing so that I can give it away "
-"free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
-"volunteers are helping me.  Contributions of time, money, programs and "
-"equipment are greatly needed."
+"free to everyone who can use it&#8239;<a class=\"ftn\" href=\"#f1\">[1]</a>. "
+"Several other volunteers are helping me.  Contributions of time, money, "
+"programs and equipment are greatly needed."
 msgstr ""
 "GNU(그뉴)란 `GNU는 유닉스가 아니다'를 의미하는 영어 
표현인 `Gnu is Not "
 "Unix'를 구성하는 단어들의 첫자를 따서 만든 약어이다. 
GNU는 유닉스와 완벽하게 "
@@ -119,7 +133,7 @@
 "주고 있지만 보다 많은 자원자들의 지원과 프로그램과 
장비 그리고 금전적인 도움"
 "이 절실히 필요한 실정이다."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So far we have an Emacs text editor with Lisp for writing editor commands, a "
 "source level debugger, a yacc-compatible parser generator, a linker, and "
@@ -148,7 +162,7 @@
 "으로 우리는 일반적인 유닉스 시스템에 포함된 모든 
프로그램과 그 이상의 것들을 "
 "제공하게 되기를 희망한다."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU will be able to run Unix programs, but will not be identical to Unix.  "
 "We will make all improvements that are convenient, based on our experience "
@@ -170,7 +184,7 @@
 "다. 우리는 또한 통신을 위해 UUCP와 MIT Chaosnet 그리고 
인터넷 프로토콜들을 지"
 "원해 나갈 것이다."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is aimed initially at machines in the 68000/16000 class with virtual "
 "memory, because they are the easiest machines to make it run on.  The extra "
@@ -182,7 +196,7 @@
 "다 작은 컴퓨터에서 GNU를 작동시키기 위해서는 별도의 노ë 
¥ì´ 필요하며 이것은 ê·¸"
 "러한 시스템에서 GNU를 사용하고자 하는 사람의 몫으로 
남겨져 있다."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid horrible confusion, please pronounce the <em>g</em> in the word "
 "&ldquo;GNU&rdquo; when it is the name of this project."
@@ -191,11 +205,11 @@
 "트&rdquo;(new project)와 혼동되지 않도록, &ldquo;그뉴 프로ì 
íŠ¸&rdquo;라고 명"
 "확히 발음해 주기를 부탁한다."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why I Must Write GNU"
 msgstr "왜 GNU를 작성해야만 했는가?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I consider that the Golden Rule requires that if I like a program I must "
 "share it with other people who like it.  Software sellers want to divide the "
@@ -216,12 +230,12 @@
 "박정한 일들에 저항해 보았지만 결국 그들의 승리로 
끝나고 말았다. 내 의지에 역"
 "행하는 이런 일들이 일어나는 연구소에 나는 더이상 
머무를 수가 없었다."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | So that I can continue to use computers without dishonor, I have decided
 # | to put together a sufficient body of free software so that I will be able
 # | to get along without any software that is not free.  I have resigned from
 # | the AI Lab to deny MIT any legal excuse to prevent me from giving GNU
-# | [-away.-] {+away.<a href=\"#f2a\">(2)</a>+}
+# | [-away.-] {+away&#8239;<a class=\"ftn\" href=\"#f2a\">[2]</a>.+}
 #, fuzzy
 #| msgid ""
 #| "So that I can continue to use computers without dishonor, I have decided "
@@ -233,19 +247,19 @@
 "So that I can continue to use computers without dishonor, I have decided to "
 "put together a sufficient body of free software so that I will be able to "
 "get along without any software that is not free.  I have resigned from the "
-"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away.<a "
-"href=\"#f2a\">(2)</a>"
+"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away&#8239;"
+"<a class=\"ftn\" href=\"#f2a\">[2]</a>."
 msgstr ""
 "신념을 포기하지 않고도 컴퓨터를 계속 사용하기 위해서 
나는 사용이 제한되는 소"
 "프트웨어 없이도 작업을 해 나갈 수 있는 충분한 자유 
소프트웨어의 본체를 만들 "
 "결심을 했다. 나는 MIT측이 어떠한 법률적 근거에 의해서도 
GNU의 자유로운 배포"
 "를 제지하지 못하도록 하기 위해서 인공지능 연구소를 
그만두었다."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why GNU Will Be Compatible with Unix"
 msgstr "GNU가 유닉스와 호환되는 이유"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Unix is not my ideal system, but it is not too bad.  The essential features "
 "of Unix seem to be good ones, and I think I can fill in what Unix lacks "
@@ -257,11 +271,11 @@
 "을 메울 수 있으리라고 생각한다. 또한 유닉스와 호환성을 
갖는 시스템은 이를 채"
 "택할 다른 많은 사람들에게도 편리할 것이다. "
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How GNU Will Be Available"
 msgstr "GNU가 배포되는 방식"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is not in the public domain.  Everyone will be permitted to modify and "
 "redistribute GNU, but no distributor will be allowed to restrict its further "
@@ -275,11 +289,11 @@
 "categories.html#ProprietarySoftware\">독점</a>할 수 없다는 것이다. 
나는 모든 "
 "버전의 GNU가 자유롭게 남아 있기를 보장받고 싶은 것이다. 
"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why Many Other Programmers Want to Help"
 msgstr "많은 프로그래머들이 동참을 원하는 이유"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found many other programmers who are excited about GNU and want to "
 "help."
@@ -287,7 +301,7 @@
 "나는 그 동안 GNU에 흥미를 느끼고 돕고자 하는 많은 
프로그래머들을 찾을 수 있었"
 "다."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Many programmers are unhappy about the commercialization of system "
 "software.  It may enable them to make more money, but it requires them to "
@@ -311,7 +325,7 @@
 "수 없다. 그들은 냉소적이 되어 프로그래밍은 단지 돈을 
버는 수단이라고 생각하"
 "게 된다."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By working on and using GNU rather than proprietary programs, we can be "
 "hospitable to everyone and obey the law.  In addition, GNU serves as an "
@@ -327,11 +341,11 @@
 "다. 나와 대화한 프로그래머들 중 거의 절반 정도는 
이것이 돈으로 바꿀 수 없는 "
 "중요한 행복이라는데 공감했다."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How You Can Contribute"
 msgstr "당신이 공헌할 수 있는 방법"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "(Nowadays, for software tasks to work on, see the <a href=\"http://fsf.org/";
 "campaigns/priority-projects\">High Priority Projects list</a> and the <a "
@@ -341,7 +355,7 @@
 "a>.)"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am asking computer manufacturers for donations of machines and money.  I'm "
 "asking individuals for donations of programs and work."
@@ -349,7 +363,7 @@
 "나는 컴퓨터 제조업자에게는 기계와 돈을, 개인에게는 
프로그램과 노동을 지원해 "
 "줄 것을 요청한다."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One consequence you can expect if you donate machines is that GNU will run "
 "on them at an early date.  The machines should be complete, ready to use "
@@ -360,7 +374,7 @@
 "할 것이라는 점이다. 기증될 컴퓨터는 즉시 사용될 수 
있는 완제품으로서 주거 지"
 "역에서 사용될 수 있는 특별한 냉각 장치나 전력이 
필요하지 않은 것이어야 한다."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found very many programmers eager to contribute part-time work for "
 "GNU.  For most projects, such part-time distributed work would be very hard "
@@ -388,7 +402,7 @@
 "은 충분히 가능할 것이다. (커널을 만드는 작업에는 
세밀한 대화가 필요할 것이"
 "며, 소수의 호흡이 잘 맞는 집단이 적당할 것이다.)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If I get donations of money, I may be able to hire a few people full or part "
 "time.  The salary won't be high by programmers' standards, but I'm looking "
@@ -404,19 +418,26 @@
 "이 생계에 대한 부담에서 벗어나서 보다 자유롭게 그들의 
모든 역량을 GNU에 집중"
 "할 수 있도록 하는 방법이라고 나는 생각하고 있다."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why All Computer Users Will Benefit"
 msgstr "모든 컴퓨터 사용자가 이득을 얻게 되는 이유"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Once GNU is written, everyone will be able to obtain good system software
+# | free, just like [-air.<a href=\"#f2\">(3)</a>-] {+air&#8239;<a
+# | class=\"ftn\" href=\"#f2\">[3]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "Once GNU is written, everyone will be able to obtain good system software "
+#| "free, just like air.<a href=\"#f2\">(3)</a>"
 msgid ""
 "Once GNU is written, everyone will be able to obtain good system software "
-"free, just like air.<a href=\"#f2\">(3)</a>"
+"free, just like air&#8239;<a class=\"ftn\" href=\"#f2\">[3]</a>."
 msgstr ""
 "일단 GNU가 만들어지면, 모든 사람들은 훌륭한 시스템 
소프트웨어를 공기처럼 무료"
 "로 얻을 수 있게 될 것이다. <a href=\"#f2\">(2)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This means much more than just saving everyone the price of a Unix license.  "
 "It means that much wasteful duplication of system programming effort will be "
@@ -427,7 +448,7 @@
 "한 노력의 중복을 피할 수 있게 된다는 것을 의미하며, ì 
ˆì•½ëœ 노력은 기술 수준"
 "을 향상시키는데 사용될 수 있을 것이다. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Complete system sources will be available to everyone.  As a result, a user "
 "who needs changes in the system will always be free to make them himself, or "
@@ -441,7 +462,7 @@
 "점적으로 소유하기 때문에 이를 수정할 수 있는 유일한 
위치에 있는 프로그래머나 "
 "회사에 종속되지 않아도 된다. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Schools will be able to provide a much more educational environment by "
 "encouraging all students to study and improve the system code.  Harvard's "
@@ -456,7 +477,7 @@
 "제로 그러한 몇몇 프로그램을 설치하지 못하게 함으로써 
이 정책을 고수했다. 나"
 "는 이것에서 커다란 영감을 받게 되었다. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Finally, the overhead of considering who owns the system software and what "
 "one is or is not entitled to do with it will be lifted."
@@ -464,7 +485,7 @@
 "마지막으로, 누가 시스템 소프트웨어를 소유하고 있으며 
누구에게 사용 자격을 부"
 "여할 것인가를 결정하는 소모적인 문제들이 사라지게 될 
것이다. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Arrangements to make people pay for using a program, including licensing of "
 "copies, always incur a tremendous cost to society through the cumbersome "
@@ -488,7 +509,7 @@
 "나 항상 감시하고 있다면 이또한 옳지 않은 일이다. 
따라서 이보다는 사람들에게 "
 "일정한 인두세를 부과하고 마스크를 벗어 던지는 것이 
현명하다. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copying all or parts of a program is as natural to a programmer as "
 "breathing, and as productive.  It ought to be as free."
@@ -497,11 +518,11 @@
 "만큼이나 자연스럽고 생산적인 일이다. 따라서 
프로그램은 마땅히 자유롭게 사용"
 "될 수 있어야 한다. "
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Some Easily Rebutted Objections to GNU's Goals"
 msgstr "쉽게 반박될 수 있는 GNU의 목표에 대한 몇가지 반대 
의견"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Nobody will use it if it is free, because that means they "
 "can't rely on any support.&rdquo;</strong>"
@@ -510,7 +531,7 @@
 "료라는 것은 어떠한 지원도 기대할 수 없다는 것을 
의미하기 때문이다.&rdquo;</"
 "strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You have to charge for the program to pay for providing the "
 "support.&rdquo;</strong>"
@@ -518,18 +539,27 @@
 "<strong>&ldquo;지원 서비스를 제공하기 위해서는 프로그램에 
비용을 부과해야만 "
 "한다.&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | If people would rather pay for GNU plus service than get GNU free without
+# | service, a company to provide just service to people who have obtained GNU
+# | free ought to be [-profitable.<a href=\"#f3\">(4)</a>-]
+# | {+profitable&#8239;<a class=\"ftn\" href=\"#f3\">[4]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "If people would rather pay for GNU plus service than get GNU free without "
+#| "service, a company to provide just service to people who have obtained "
+#| "GNU free ought to be profitable.<a href=\"#f3\">(4)</a>"
 msgid ""
 "If people would rather pay for GNU plus service than get GNU free without "
 "service, a company to provide just service to people who have obtained GNU "
-"free ought to be profitable.<a href=\"#f3\">(4)</a>"
+"free ought to be profitable&#8239;<a class=\"ftn\" href=\"#f3\">[4]</a>."
 msgstr ""
 "단순히 GNU를 무료로 얻는 것보다 GNU와 이에 대한 지원 
서비스를 유료로 함께 구"
 "입하는 것을 사람들이 선호한다면, GNU를 무료로 구한 
사람들에게 지원 서비스만"
 "을 제공하는 것으로 수익을 얻는 업체도 생겨날 수 있을 
것이다. <a href=\"#f3\">"
 "(3)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We must distinguish between support in the form of real programming work and "
 "mere handholding.  The former is something one cannot rely on from a "
@@ -541,7 +571,7 @@
 "다. 만일 여러분의 문제가 다른 사람에게도 발생하는 
일반적으로 것이 아니라면, "
 "해당 업체는 그 문제를 쉽게 해결해 주려고 하지 않을 
것이다. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If your business needs to be able to rely on support, the only way is to "
 "have all the necessary sources and tools.  Then you can hire any available "
@@ -562,7 +592,7 @@
 "난할 수는 없다. GNU는 이 세계의 모든 문제를 해결하는 
것이 아니라 단지 그 중 "
 "일부를 해결할 수 있을 뿐이다. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Meanwhile, the users who know nothing about computers need handholding: "
 "doing things for them which they could easily do themselves but don't know "
@@ -572,7 +602,7 @@
 "러한 서비스는 사용자 스스로 능히 처리할 수 있는 종류의 
것들이지만 사용자들이 "
 "그 방법을 모르기 때문에 서비스가 필요한 것이다. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Such services could be provided by companies that sell just handholding and "
 "repair service.  If it is true that users would rather spend money and get a "
@@ -590,7 +620,7 @@
 "사람들은 서비스에 대한 비용을 들이지 않고도 
프로그램들을 사용할 수 있을 것이"
 "다."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You cannot reach many people without advertising, and you "
 "must charge for the program to support that.&rdquo;</strong>"
@@ -599,7 +629,7 @@
 "램을 널리 알리기 위해서는 프로그램에 광고 비용를 
부과해야만 한다.&rdquo;</"
 "strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;It's no use advertising a program people can get free.&rdquo;"
 "</strong>"
@@ -607,7 +637,7 @@
 "<strong>&ldquo;무료로 구할 수 있는 프로그램을 광고하는 
것은 무의미하다."
 "&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are various forms of free or very cheap publicity that can be used to "
 "inform numbers of computer users about something like GNU.  But it may be "
@@ -624,19 +654,30 @@
 "고 제품을 구입하는 등의 광고로부터 이익을 얻은 
사용자가 광고비를 부담한 것이 "
 "된다. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | On the other hand, if many people get GNU from their friends, and such
+# | companies don't succeed, this will show that advertising was not really
+# | necessary to spread GNU.  Why is it that free market advocates don't want
+# | to let the free market decide [-this?<a href=\"#f4\">(5)</a>-]
+# | {+this?&#8239;<a class=\"ftn\" href=\"#f4\">[5]</a>+}
+#, fuzzy
+#| msgid ""
+#| "On the other hand, if many people get GNU from their friends, and such "
+#| "companies don't succeed, this will show that advertising was not really "
+#| "necessary to spread GNU.  Why is it that free market advocates don't want "
+#| "to let the free market decide this?<a href=\"#f4\">(5)</a>"
 msgid ""
 "On the other hand, if many people get GNU from their friends, and such "
 "companies don't succeed, this will show that advertising was not really "
 "necessary to spread GNU.  Why is it that free market advocates don't want to "
-"let the free market decide this?<a href=\"#f4\">(5)</a>"
+"let the free market decide this?&#8239;<a class=\"ftn\" href=\"#f4\">[5]</a>"
 msgstr ""
 "반면에, 많은 사람들이 GNU를 그들의 친구로부터 구하고 
또한 위와 같은 회사가 성"
 "공하지 못한다면 그것은 GNU가 확산되는데 광고가 반드시 
필요하지 않다는 것을 의"
 "미하는 것이다. 자유 시장 옹호자들은 왜 이 문제를 자유 
시장이 결정하도록 놔두"
 "지 않는 것일까? <a href=\"#f4\">(4)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;My company needs a proprietary operating system to get a "
 "competitive edge.&rdquo;</strong>"
@@ -644,7 +685,7 @@
 "<strong>&ldquo;내 회사는 경쟁 우위를 차지하기 위해서 독점 
운영체제가 필요하"
 "다.&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU will remove operating system software from the realm of competition.  "
 "You will not be able to get an edge in this area, but neither will your "
@@ -662,15 +703,24 @@
 "사업이 다른 것이라면 GNU는 운영체제의 구입에 따른 
막대한 비용을 절감해 줄 수 "
 "있다. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | I would like to see GNU development supported by gifts from many
+# | manufacturers and users, reducing the cost to [-each.<a
+# | href=\"#f5\">(6)</a>-] {+each&#8239;<a class=\"ftn\"
+# | href=\"#f5\">[6]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "I would like to see GNU development supported by gifts from many "
+#| "manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
 msgid ""
 "I would like to see GNU development supported by gifts from many "
-"manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
+"manufacturers and users, reducing the cost to each&#8239;<a class=\"ftn\" "
+"href=\"#f5\">[6]</a>."
 msgstr ""
 "나는 많은 업체와 사용자들이 GNU의 발전에 기여해 
나감으로써 서로의 비용을 절감"
 "할 수 있기를 희망한다. <a href=\"#f5\">(5)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't programmers deserve a reward for their creativity?"
 "&rdquo;</strong>"
@@ -678,7 +728,7 @@
 "<strong>&ldquo;프로그래머는 자신의 창의력에 대한 보상을 
받을 자격이 있지 않은"
 "가?&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If anything deserves a reward, it is social contribution.  Creativity can be "
 "a social contribution, but only in so far as society is free to use the "
@@ -692,7 +742,7 @@
 "같은 맥락에서 그것을 자유롭게 사용하지 못하게 한다면 
그때는 처벌을 받아야 할 "
 "것이다. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Shouldn't a programmer be able to ask for a reward for his "
 "creativity?&rdquo;</strong>"
@@ -700,7 +750,7 @@
 "<strong>&ldquo;그렇다면, 프로그래머는 그의 창의력에 대한 
보상을 요구할 수 없"
 "단 말인가?&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is nothing wrong with wanting pay for work, or seeking to maximize "
 "one's income, as long as one does not use means that are destructive.  But "
@@ -710,7 +760,7 @@
 "를 바라는 것은 아무 문제가 없다. 그러나 지금까지 
소프트웨어 산업에서 보편화"
 "된 수단은 유해한 방법이다. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Extracting money from users of a program by restricting their use of it is "
 "destructive because the restrictions reduce the amount and the ways that the "
@@ -723,7 +773,7 @@
 "을 수 있는 인간적인 풍요로움을 전체적으로 감소시키는 
것이다. 프로그램의 자유"
 "로운 사용에 대한 제한은 결국, 유해한 파괴 행위라고 할 
수 있다."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The reason a good citizen does not use such destructive means to become "
 "wealthier is that, if everyone did so, we would all become poorer from the "
@@ -743,11 +793,11 @@
 "욕구가 일반적으로 전체의 창의성이나 혹은 ê·¸ 일부분을 ì 
€í•˜ì‹œí‚¤ëŠ” 행위를 정당화"
 "시키는 것은 옳지 않다. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid "<strong>&ldquo;Won't programmers starve?&rdquo;</strong>"
 msgstr "<strong>&ldquo;프로그래머는 밥줄이 끊기지 
않을까?&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "I could answer that nobody is forced to be a programmer.  Most of us cannot "
 "manage to get any money for standing on the street and making faces.  But we "
@@ -760,7 +810,7 @@
 "굶주려야 하는 것은 아니다. 왜냐하면 우리는 얼마든지 
다른 일을 할 수 있기 때문"
 "이다. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But that is the wrong answer because it accepts the questioner's implicit "
 "assumption: that without ownership of software, programmers cannot possibly "
@@ -770,7 +820,7 @@
 "라는 질문자의 맹목적인 가정을 인정하고 있다는 점에서 
잘못된 답변이라고 할 수 "
 "있다. 아마도 이런 생각은 극단적일 것이다. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The real reason programmers will not starve is that it will still be "
 "possible for them to get paid for programming; just not paid as much as now."
@@ -779,13 +829,28 @@
 "같은 수준의 보수는 아니겠지만 여전히 프로그래밍으로 
돈을 벌 방법들이 있기 때"
 "문이다."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | Restricting copying is not the only basis for business in software.  It is
+# | the most common [-basis<a href=\"#f8\">(7)</a>-] {+basis&#8239;<a
+# | class=\"ftn\" href=\"#f8\">[7]</a>+} because it brings in the most money. 
+# | If it were prohibited, or rejected by the customer, software business
+# | would move to other bases of organization which are now used less often. 
+# | There are always numerous ways to organize any kind of business.
+#, fuzzy
+#| msgid ""
+#| "Restricting copying is not the only basis for business in software.  It "
+#| "is the most common basis<a href=\"#f8\">(7)</a> because it brings in the "
+#| "most money.  If it were prohibited, or rejected by the customer, software "
+#| "business would move to other bases of organization which are now used "
+#| "less often.  There are always numerous ways to organize any kind of "
+#| "business."
 msgid ""
 "Restricting copying is not the only basis for business in software.  It is "
-"the most common basis<a href=\"#f8\">(7)</a> because it brings in the most "
-"money.  If it were prohibited, or rejected by the customer, software "
-"business would move to other bases of organization which are now used less "
-"often.  There are always numerous ways to organize any kind of business."
+"the most common basis&#8239;<a class=\"ftn\" href=\"#f8\">[7]</a> because it "
+"brings in the most money.  If it were prohibited, or rejected by the "
+"customer, software business would move to other bases of organization which "
+"are now used less often.  There are always numerous ways to organize any "
+"kind of business."
 msgstr ""
 "프로그램의 복제를 제한하는 것이 소프트웨어 사업을 유
지되기 위한 유일한 기반"
 "은 아니다. 이러한 방식이 보편화된 것은 이렇게 함으로써 
가장 돈을 많이 벌 수 "
@@ -794,7 +859,7 @@
 "수 있을 것이다. 어떠한 분야에 있어서도 사업 구조와 
수익 모델을 만드는 방법은 "
 "무궁 무진한 것이다. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Probably programming will not be as lucrative on the new basis as it is "
 "now.  But that is not an argument against the change.  It is not considered "
@@ -808,7 +873,7 @@
 "그래머에게 같은 방식이 적용된다고 해도 정당하지 못할 
이유가 없다. (그러나 현"
 "실적으로 볼 때, 프로그래머들은 여전히 그보다 많은 
소득을 올리고 있다.)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't people have a right to control how their creativity is "
 "used?&rdquo;</strong>"
@@ -816,7 +881,7 @@
 "<strong>&ldquo;창작자는 창작물의 사용을 통제할 권리를 갖고 
있지 않은가?"
 "&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "&ldquo;Control over the use of one's ideas&rdquo; really constitutes control "
 "over other people's lives; and it is usually used to make their lives more "
@@ -826,19 +891,32 @@
 "삶을 통제한다는 것이며, 이것은 타인의 삶을 위축시키기 
위해서 흔히 사용되는 것"
 "이다. "
 
-#. type: Content of: <p>
-msgid ""
-"People who have studied the issue of intellectual property rights<a href="
-"\"#f6\">(8)</a> carefully (such as lawyers) say that there is no intrinsic "
-"right to intellectual property.  The kinds of supposed intellectual property "
-"rights that the government recognizes were created by specific acts of "
-"legislation for specific purposes."
+#. type: Content of: <div><dl><dd><p>
+# | People who have studied the issue of intellectual property [-rights<a
+# | href=\"#f6\">(8)</a>-] {+rights&#8239;<a class=\"ftn\"
+# | href=\"#f6\">[8]</a>+} carefully (such as lawyers) say that there is no
+# | intrinsic right to intellectual property.  The kinds of supposed
+# | intellectual property rights that the government recognizes were created
+# | by specific acts of legislation for specific purposes.
+#, fuzzy
+#| msgid ""
+#| "People who have studied the issue of intellectual property rights<a href="
+#| "\"#f6\">(8)</a> carefully (such as lawyers) say that there is no "
+#| "intrinsic right to intellectual property.  The kinds of supposed "
+#| "intellectual property rights that the government recognizes were created "
+#| "by specific acts of legislation for specific purposes."
+msgid ""
+"People who have studied the issue of intellectual property rights&#8239;<a "
+"class=\"ftn\" href=\"#f6\">[8]</a> carefully (such as lawyers) say that "
+"there is no intrinsic right to intellectual property.  The kinds of supposed "
+"intellectual property rights that the government recognizes were created by "
+"specific acts of legislation for specific purposes."
 msgstr ""
 "변호사와 같이 지적 소유권 문제를 연구해 온 사람들은 
지적 소유물에는 본질적인 "
 "권리가 존재할 수 없다고 주의 깊게 말한다. 정부가 인ì 
•í•˜ëŠ” 가상의 지적 소유권"
 "은 특정한 목적을 위해 만들어진 특정 법률 조항으로부터 
발생한 것이다."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For example, the patent system was established to encourage inventors to "
 "disclose the details of their inventions.  Its purpose was to help society "
@@ -857,7 +935,7 @@
 "해 적기 때문에 그다지 해롭게 작용하지 않는다. 또한 
특허품을 사용하는 대부분"
 "의 개인에 대해서는 별다른 제한을 두지 않는다."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The idea of copyright did not exist in ancient times, when authors "
 "frequently copied other authors at length in works of nonfiction.  This "
@@ -875,7 +953,7 @@
 "영역에 속하는 책은 인쇄기를 통해서 경제적으로 
만들어질 수 있기 때문에 저작권"
 "은 그다지 해롭지 않았다. 또한 책을 읽는 대다수의 
사람들을 제한하지도 않았다."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "All intellectual property rights are just licenses granted by society "
 "because it was thought, rightly or wrongly, that society as a whole would "
@@ -888,7 +966,7 @@
 "우리는 &ldquo;그런 허가를 내주는 것이 정말 우리에게 유
익한가? 개인에게 어떤 "
 "종류의 행위를 허용하는 허가를 내줄 것인가?&rdquo;라는 
질문을 해보아야만 한다."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The case of programs today is very different from that of books a hundred "
 "years ago.  The fact that the easiest way to copy a program is from one "
@@ -906,13 +984,13 @@
 "적으로나 물질적으로 해를 끼치는 상황을 만들고 있으며 
법적 허용 여부에 관계없"
 "이 사용자들의 이용을 제한하고 있는 것이다."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Competition makes things get done better.&rdquo;</strong>"
 msgstr ""
 "<strong>&ldquo;경쟁을 통해서 보다 나은 결과를 얻을 수 
있다.&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The paradigm of competition is a race: by rewarding the winner, we encourage "
 "everyone to run faster.  When capitalism really works this way, it does a "
@@ -929,7 +1007,7 @@
 "착한다면 그들은 다른 주자를 공격한다든지 하는 색다른 ì 
„략을 찾게될 것이다. 주"
 "자들이 먼저 싸우기부터 한다면 그들은 결국 모두 늦어질 
수밖에 없는 것이다. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Proprietary and secret software is the moral equivalent of runners in a fist "
 "fight.  Sad to say, the only referee we've got does not seem to object to "
@@ -943,7 +1021,7 @@
 "수 있다.&rdquo;는 정도의 규정을 적용할 뿐이다. 공격하ë 
¤ëŠ” 시도만 해도 이를 저"
 "지하고 벌칙을 주어야 하는데도 말이다."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Won't everyone stop programming without a monetary incentive?"
 "&rdquo;</strong>"
@@ -951,7 +1029,7 @@
 "<strong>&ldquo;금전적인 특혜가 없다면 아무도 프로그래밍을 
하지 않을 것이다."
 "&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually, many people will program with absolutely no monetary incentive.  "
 "Programming has an irresistible fascination for some people, usually the "
@@ -963,7 +1041,7 @@
 "능숙한 사람일수록 더욱 그렇다. 생계를 유지할 희망이 
보이지 않더라도 꾸준히 활"
 "동을 계속하는 직업 음악인들이 많이 있듯이 말이다. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But really this question, though commonly asked, is not appropriate to the "
 "situation.  Pay for programmers will not disappear, only become less.  So "
@@ -976,7 +1054,7 @@
 "금전적인 보상이 줄어들더라도 프로그래밍을 계속할 
사람이 있을까?&rdquo;일 것이"
 "다. 내 경험에 비추어 보면 그렇게 할 것이라고 생각한다. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For more than ten years, many of the world's best programmers worked at the "
 "Artificial Intelligence Lab for far less money than they could have had "
@@ -988,7 +1066,7 @@
 "다. 그들은 사회적 존경이나 명성과 같은 다양한 종류의 
비금전적인 보상을 받았"
 "다. 그리고 창조적 작업은 이미 그 자체가 자신에게 
흥미와 보상을 주는 것이다."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Then most of them left when offered a chance to do the same interesting work "
 "for a lot of money."
@@ -996,7 +1074,7 @@
 "그러나 시간이 흐르자 이전의 작업처럼 그들이 흥미롭게 
생각하는 일을 높은 보수"
 "를 받으며 할 수 있는 기회가 주어지자 그들 중 대부분은 
연구소를 떠나갔다."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "What the facts show is that people will program for reasons other than "
 "riches; but if given a chance to make a lot of money as well, they will come "
@@ -1010,7 +1088,7 @@
 "은 조직은 높은 보수를 받는 조직과의 경쟁에서 뒤쳐지겠
지만, 만약 높은 보수를 "
 "받는 조직이 허용되지 않는다면 훌륭하게 활동할 수 있을 
것이다."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;We need the programmers desperately.  If they demand that we "
 "stop helping our neighbors, we have to obey.&rdquo;</strong>"
@@ -1018,7 +1096,7 @@
 "<strong>&ldquo;우리는 프로그래머가 절대적으로 필요하다. 
만약 그들이 우리에게 "
 "이웃을 돕지 말라고 하면 우리는 따를 수밖에 
없다.&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "You're never so desperate that you have to obey this sort of demand.  "
 "Remember: millions for defense, but not a cent for tribute!"
@@ -1026,14 +1104,14 @@
 "여러분은 결코 그런 종류의 요구에 굴복해야 할 만큼 ì 
ˆë°•í•˜ì§€ 않다. 옳은 길을 가"
 "기 위해서는 결코 타협해서는 안된다는 사실을 명심하라."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Programmers need to make a living somehow.&rdquo;</strong>"
 msgstr ""
 "<strong>&ldquo;프로그래머들도 어떤 식으로든 그들의 생계를 
꾸려 나가야 하지 않"
 "은가?&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In the short run, this is true.  However, there are plenty of ways that "
 "programmers could make a living without selling the right to use a program.  "
@@ -1047,7 +1125,7 @@
 "지 결코 이것이 생계를 유지할 수 있는 유일한 방법이기 
때문은 아니다. 다른 방법"
 "을 찾고자 한다면 얼마든지 가능할 것이다. 여기 여러 
가지 예들이 있다. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A manufacturer introducing a new computer will pay for the porting of "
 "operating systems onto the new hardware."
@@ -1055,7 +1133,7 @@
 "새로운 컴퓨터를 내놓는 제조업자는 새 기계에 운영체ì 
œë¥¼ 이식하기 위한 비용을 "
 "지불할 것이다."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The sale of teaching, handholding and maintenance services could also employ "
 "programmers."
@@ -1063,17 +1141,29 @@
 "교육이나 단순 관리 작업, 유지 보수 서비스를 제공하는 
회사에서도 역시 프로그래"
 "머를 고용할 것이다. "
 
-#. type: Content of: <p>
-msgid ""
-"People with new ideas could distribute programs as freeware<a href=\"#f7\">"
-"(9)</a>, asking for donations from satisfied users, or selling handholding "
-"services.  I have met people who are already working this way successfully."
+#. type: Content of: <div><dl><dd><p>
+# | People with new ideas could distribute programs as [-freeware<a
+# | href=\"#f7\">(9)</a>,-] {+freeware&#8239;<a class=\"ftn\"
+# | href=\"#f7\">[9]</a>,+} asking for donations from satisfied users, or
+# | selling handholding services.  I have met people who are already working
+# | this way successfully.
+#, fuzzy
+#| msgid ""
+#| "People with new ideas could distribute programs as freeware<a href="
+#| "\"#f7\">(9)</a>, asking for donations from satisfied users, or selling "
+#| "handholding services.  I have met people who are already working this way "
+#| "successfully."
+msgid ""
+"People with new ideas could distribute programs as freeware&#8239;<a class="
+"\"ftn\" href=\"#f7\">[9]</a>, asking for donations from satisfied users, or "
+"selling handholding services.  I have met people who are already working "
+"this way successfully."
 msgstr ""
 "프리웨어라는 이름으로 프로그램을 배포한 뒤에 사용자가 
제품에 만족한다면 이에 "
 "대한 기부금을 요청하거나 지원 서비스를 판매하는 
방식의 새로운 아이디어를 갖"
 "고 있는 사람들도 있다. 나는 이미 이러한 방법으로 
성공한 사람들을 알고 있다."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Users with related needs can form users' groups, and pay dues.  A group "
 "would contract with programming companies to write programs that the group's "
@@ -1083,13 +1173,13 @@
 "이다. 사용자 모임은 프로그래밍 회사와 계약을 맺고 
회원들이 원하는 프로그램을 "
 "주문 제작할 수 있을 것이다. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "All sorts of development can be funded with a Software Tax:"
 msgstr ""
 "모든 종류의 개발에 필요한 기금은 소프트웨어에 대한 
다음과 같은 세금으로 조성"
 "될 수 있다. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Suppose everyone who buys a computer has to pay x percent of the price as a "
 "software tax.  The government gives this to an agency like the NSF to spend "
@@ -1099,7 +1189,7 @@
 "과학재단 같은 기관으로 위임하여 소프트웨어 개발을 
위해서 사용되도록 할 수 있"
 "을 것이다. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But if the computer buyer makes a donation to software development himself, "
 "he can take a credit against the tax.  He can donate to the project of his "
@@ -1112,7 +1202,7 @@
 "될 수 있다. 기부자들은 때때로 그 결과물을 자신이 쓸 수 
있을 것이라는 기대를 "
 "갖고 기부할 프로젝트를 선택할 수 있을 것이다. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The total tax rate could be decided by a vote of the payers of the tax, "
 "weighted according to the amount they will be taxed on."
@@ -1120,19 +1210,19 @@
 "전체적인 세율은 납세자들의 투표를 통해 결정할 수 
있으며 구입액에 따른 누진율"
 "을 적용할 수도 있을 것이다. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "The consequences:"
 msgstr "이러한 결과는 다음과 같다."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "The computer-using community supports software development."
 msgstr "컴퓨터 사용자 공동체는 소프트웨어의 개발을 
지원한다."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "This community decides what level of support is needed."
 msgstr "어느 정도의 지원이 필요한가는 이 공동체가 ê²°ì 
•í•œë‹¤."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "Users who care which projects their share is spent on can choose this for "
 "themselves."
@@ -1140,7 +1230,7 @@
 "자신의 돈이 어떤 프로젝트에 지원되는가에 관심이 있는 
개인은 이를 직접 결정할 "
 "수 있다. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the long run, making programs free is a step toward the postscarcity "
 "world, where nobody will have to work very hard just to make a living.  "
@@ -1157,7 +1247,7 @@
 "를 갖게 될 것이다. 더이상 프로그래밍을 생계의 수단으로 
삼을 필요가 없게 될 것"
 "이다."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We have already greatly reduced the amount of work that the whole society "
 "must do for its actual productivity, but only a little of this has "
@@ -1176,11 +1266,11 @@
 "한 그렇게 해야만 소프트웨어 생산에 대한 기술적 
성과들이 우리들 자신의 노동량"
 "을 감소시키도록 할 수 있을 것이다. "
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "각주"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The wording here was careless.  The intention was that nobody would have to "
 "pay for <b>permission</b> to use the GNU system.  But the words don't make "
@@ -1209,7 +1299,7 @@
 "유 소프트웨어의 핵심은 소프트웨어의 자유로운 이용을 
통해서 사용자 상호간의 협"
 "력의 자유를 보장받는다는 데 있다."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The expression &ldquo;give away&rdquo; is another indication that I had not "
 "yet clearly separated the issue of price from that of freedom.  We now "
@@ -1218,10 +1308,21 @@
 "\">Confusing Words and Phrases</a>&rdquo; for more explanation."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+# | This is another place I failed to distinguish carefully between the two
+# | different meanings of [-&ldquo;free&rdquo;.-] {+&ldquo;free.&rdquo;+} The
+# | statement as it stands is not false&mdash;you can get copies of GNU
+# | software at no charge, from your friends or over the net.  But it does
+# | suggest the wrong idea.
+#, fuzzy
+#| msgid ""
+#| "This is another place I failed to distinguish carefully between the two "
+#| "different meanings of &ldquo;free&rdquo;.  The statement as it stands is "
+#| "not false&mdash;you can get copies of GNU software at no charge, from "
+#| "your friends or over the net.  But it does suggest the wrong idea."
 msgid ""
 "This is another place I failed to distinguish carefully between the two "
-"different meanings of &ldquo;free&rdquo;.  The statement as it stands is not "
+"different meanings of &ldquo;free.&rdquo; The statement as it stands is not "
 "false&mdash;you can get copies of GNU software at no charge, from your "
 "friends or over the net.  But it does suggest the wrong idea."
 msgstr ""
@@ -1230,11 +1331,11 @@
 "아도 된다는 뜻으로 사용된 것이다. 즉, GNU 소프트웨어는 
친구나 네트워크를 통해"
 "서 무료로 얻을 수 있다. "
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid "Several such companies now exist."
 msgstr "이러한 종류의 몇몇 회사들이 이미 존재하고 있다. "
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Although it is a charity rather than a company, the Free Software Foundation "
 "for 10 years raised most of its funds from its distribution service.  You "
@@ -1250,7 +1351,7 @@
 "한 방식으로 우리를 지원해 주기를 요청한다. 여러분이 할 
수 있는 방법으로 이미 "
 "참여하고 있는가?"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "A group of computer companies pooled funds around 1991 to support "
 "maintenance of the GNU C Compiler."
@@ -1258,7 +1359,7 @@
 "최근 들어 컴퓨터 회사들의 모임 중 하나는 GNU C 
컴파일러의 개발을 지원하기 위"
 "한 기금을 조성했다. "
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "I think I was mistaken in saying that proprietary software was the most "
 "common basis for making money in software.  It seems that actually the most "
@@ -1270,10 +1371,10 @@
 "less in a free software world."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "In the 1980s I had not yet realized how confusing it was to speak of &ldquo;"
-"the issue&rdquo; of &ldquo;intellectual property&rdquo;.  That term is "
+"the issue&rdquo; of &ldquo;intellectual property.&rdquo; That term is "
 "obviously biased; more subtle is the fact that it lumps together various "
 "disparate laws which raise very different issues.  Nowadays I urge people to "
 "reject the term &ldquo;intellectual property&rdquo; entirely, lest it lead "
@@ -1283,10 +1384,10 @@
 "spreads confusion and bias."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Subsequently we learned to distinguish between &ldquo;free software&rdquo; "
-"and &ldquo;freeware&rdquo;.  The term &ldquo;freeware&rdquo; means software "
+"and &ldquo;freeware.&rdquo; The term &ldquo;freeware&rdquo; means software "
 "you are free to redistribute, but usually you are not free to study and "
 "change the source code, so most of it is not free software.  See &ldquo;<a "
 "href=\"/philosophy/words-to-avoid.html#Freeware\">Confusing Words and "
@@ -1334,6 +1435,7 @@
 "있습니다. 끊어진 링크나 다른 수정 사항 또는 제안은 <a 
href=\"mailto:";
 "webmasters@gnu.org\">&lt;webmasters@gnu.org&gt;</a> 앞으로 보내 
주세요."
 
+# TODO: submitting -> contributing.
 #.  TRANSLATORS: Ignore the original text in this paragraph,
 #.         replace it with the translation of these two:
 #.         We work hard and do our best to provide accurate, good quality
@@ -1341,29 +1443,35 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "이 글의 다른 언어 번역문 작성이나 제출에 대한 정보는 <a 
href=\"/server/"
 "standards/README.translations.html\">번역 안내</a>를 참고해 
주세요."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, [-2010-]
-# | {+2010, 2014, 2015+} Free Software Foundation, Inc.
+# | Copyright &copy; 1985, 1993, 200[-3-]{+4+}, 2005, 2007, [-2008,-] 2009,
+# | [-2010-] {+2010, 2015, 2021+} Free Software Foundation, Inc.
 #, fuzzy
 #| msgid ""
 #| "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010 Free "
 #| "Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 1985, 1993, 2004, 2005, 2007, 2009, 2010, 2015, 2021 Free "
+"Software Foundation, Inc."
 msgstr "Copyright &copy; 1985, 1993 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>

Index: po/manifesto.nl.po
===================================================================
RCS file: /web/www/www/gnu/po/manifesto.nl.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- po/manifesto.nl.po  2 Nov 2021 13:56:41 -0000       1.13
+++ po/manifesto.nl.po  2 Nov 2021 14:41:53 -0000       1.14
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manifesto.html\n"
-"POT-Creation-Date: 2015-06-02 12:55+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Tom Uijldert <Tom.Uijldert@gmail.com>\n"
 "Language-Team: Dutch\n"
@@ -16,19 +16,34 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-11-02 14:27+0000\n"
 "X-Generator: Poedit 1.8.7.1\n"
 
 #. type: Content of: <title>
 msgid "The GNU Manifesto - GNU Project - Free Software Foundation"
 msgstr "Het GNU-manifest - GNU-project - Free Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "The GNU Manifesto"
 msgstr "Het GNU-manifest"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
+# | The GNU Manifesto (which appears below) was written by <a
+# | href=\"http{+s+}://www.stallman.org/\">Richard Stallman</a> in 1985 to ask
+# | for support in developing the GNU operating system.  Part of the text was
+# | taken from the original announcement of 1983.  Through 1987, it was
+# | updated in minor ways to account for developments; since then, it seems
+# | best to leave it unchanged.
+#, fuzzy
+#| msgid ""
+#| "The GNU Manifesto (which appears below) was written by <a href=\"http://";
+#| "www.stallman.org/\">Richard Stallman</a> in 1985 to ask for support in "
+#| "developing the GNU operating system.  Part of the text was taken from the "
+#| "original announcement of 1983.  Through 1987, it was updated in minor "
+#| "ways to account for developments; since then, it seems best to leave it "
+#| "unchanged."
 msgid ""
-"The GNU Manifesto (which appears below) was written by <a href=\"http://www.";
+"The GNU Manifesto (which appears below) was written by <a href=\"https://www.";
 "stallman.org/\">Richard Stallman</a> in 1985 to ask for support in "
 "developing the GNU operating system.  Part of the text was taken from the "
 "original announcement of 1983.  Through 1987, it was updated in minor ways "
@@ -41,7 +56,7 @@
 "kleine wijzigingen doorgemaakt om het relevant te houden; sindsdien lijkt "
 "het het beste om het daarbij te houden."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Since that time, we have learned about certain common misunderstandings that "
 "different wording could help avoid.  Footnotes added since 1993 help clarify "
@@ -51,7 +66,7 @@
 "veroorzaakt door onduidelijke bewoordingen. Na 1993 zijn daarom voetnoten "
 "toegevoegd op plaatsen waar dat nodig was."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If you want to install the GNU/Linux system, we recommend you use one of the "
 "<a href=\"/distros\">100% free software GNU/Linux distributions</a>.  For "
@@ -63,7 +78,7 @@
 "a> aan. Mocht je willen helpen, kijk dan op <a href=\"/help/help.html"
 "\">http://www.gnu.org/help</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The GNU Project is part of the Free Software Movement, a campaign for <a "
 "href=\"/philosophy/free-sw.html\">freedom for users of software</a>.  It is "
@@ -81,17 +96,30 @@
 "source-misses-the-point.html\">amorele benadering</a> te promoten over "
 "hetzelfde onderwerp."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "What's GNU? Gnu's Not Unix!"
 msgstr "Wat is GNU? Gnu is niet Unix!"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | GNU, which stands for Gnu's Not Unix, is the name for the complete
+# | Unix-compatible software system which I am writing so that I can give it
+# | away free to everyone who can use [-it.<a href=\"#f1\">(1)</a>-]
+# | {+it&#8239;<a class=\"ftn\" href=\"#f1\">[1]</a>.+} Several other
+# | volunteers are helping me.  Contributions of time, money, programs and
+# | equipment are greatly needed.
+#, fuzzy
+#| msgid ""
+#| "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
+#| "compatible software system which I am writing so that I can give it away "
+#| "free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
+#| "volunteers are helping me.  Contributions of time, money, programs and "
+#| "equipment are greatly needed."
 msgid ""
 "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
 "compatible software system which I am writing so that I can give it away "
-"free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
-"volunteers are helping me.  Contributions of time, money, programs and "
-"equipment are greatly needed."
+"free to everyone who can use it&#8239;<a class=\"ftn\" href=\"#f1\">[1]</a>. "
+"Several other volunteers are helping me.  Contributions of time, money, "
+"programs and equipment are greatly needed."
 msgstr ""
 "GNU, een afkorting van <em>Gnu's Not Unix</em>, is de naam van het complete "
 "softwaresysteem dat ik aan het schrijven ben dat uitwisselbaar is met Unix, "
@@ -99,7 +127,7 @@
 "\"#f1\">(1)</a> Meerdere vrijwilligers helpen mee. Er is behoefte aan "
 "bijdragen in de vorm van tijd, geld, programma's en apparatuur."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So far we have an Emacs text editor with Lisp for writing editor commands, a "
 "source level debugger, a yacc-compatible parser generator, a linker, and "
@@ -130,7 +158,7 @@
 "documentatie. We hopen uiteindelijk alles wat een Unix-systeem bruikbaar "
 "maakt aan te kunnen bieden."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU will be able to run Unix programs, but will not be identical to Unix.  "
 "We will make all improvements that are convenient, based on our experience "
@@ -154,7 +182,7 @@
 "proberen om UUCP, MIT Chaosnet en de Internet-protocollen voor communicatie "
 "te ondersteunen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is aimed initially at machines in the 68000/16000 class with virtual "
 "memory, because they are the easiest machines to make it run on.  The extra "
@@ -166,7 +194,7 @@
 "inspanning die nodig is om het op eenvoudiger computers te laten werken zal "
 "worden overgelaten aan degenen die GNU op dit soort machines wil draaien."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid horrible confusion, please pronounce the <em>g</em> in the word "
 "&ldquo;GNU&rdquo; when it is the name of this project."
@@ -174,11 +202,11 @@
 "Om spraakverwarring te voorkomen: De <em>g</em> in &lsquo;GNU&rsquo; dient "
 "uitgesproken te worden."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why I Must Write GNU"
 msgstr "Waarom ik GNU moet schrijven"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I consider that the Golden Rule requires that if I like a program I must "
 "share it with other people who like it.  Software sellers want to divide the "
@@ -201,13 +229,26 @@
 "te gaan, maar uiteindelijk gingen ze te ver: ik kon niet in een instelling "
 "aanblijven waar zulke dingen tegen mijn wil gedaan werden."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | So that I can continue to use computers without dishonor, I have decided
+# | to put together a sufficient body of free software so that I will be able
+# | to get along without any software that is not free.  I have resigned from
+# | the AI Lab to deny MIT any legal excuse to prevent me from giving GNU
+# | [-away.<a href=\"#f2a\">(2)</a>-] {+away&#8239;<a class=\"ftn\"
+# | href=\"#f2a\">[2]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "So that I can continue to use computers without dishonor, I have decided "
+#| "to put together a sufficient body of free software so that I will be able "
+#| "to get along without any software that is not free.  I have resigned from "
+#| "the AI Lab to deny MIT any legal excuse to prevent me from giving GNU "
+#| "away.<a href=\"#f2a\">(2)</a>"
 msgid ""
 "So that I can continue to use computers without dishonor, I have decided to "
 "put together a sufficient body of free software so that I will be able to "
 "get along without any software that is not free.  I have resigned from the "
-"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away.<a "
-"href=\"#f2a\">(2)</a>"
+"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away&#8239;"
+"<a class=\"ftn\" href=\"#f2a\">[2]</a>."
 msgstr ""
 "Omdat ik in staat wil zijn om op mijn manier met computers om te kunnen "
 "blijven gaan, heb ik besloten om voldoende vrije software te vergaren, zodat "
@@ -215,11 +256,11 @@
 "het KI lab om te zorgen dat het MIT niet op wettelijke gronden kan voorkomen "
 "dat ik GNU weggeef.<a href=\"#f2a\">(2)</a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why GNU Will Be Compatible with Unix"
 msgstr "Waarom GNU uitwisselbaar zal zijn met Unix"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Unix is not my ideal system, but it is not too bad.  The essential features "
 "of Unix seem to be good ones, and I think I can fill in what Unix lacks "
@@ -232,11 +273,11 @@
 "systeem dat uitwisselbaar is met Unix is natuurlijk veel makkelijker om op "
 "over te stappen voor de vele Unix-gebruikers."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How GNU Will Be Available"
 msgstr "Hoe GNU gepubliceerd zal worden"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is not in the public domain.  Everyone will be permitted to modify and "
 "redistribute GNU, but no distributor will be allowed to restrict its further "
@@ -250,11 +291,11 @@
 "html#ProprietarySoftware\">private</a> wijzigingen niet zijn toegestaan. Ik "
 "wil de vrijheid van alle GNU-versies veilig stellen."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why Many Other Programmers Want to Help"
 msgstr "Waarom veel programmeurs mee willen helpen"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found many other programmers who are excited about GNU and want to "
 "help."
@@ -262,7 +303,7 @@
 "Ik heb vele andere programmeurs gevonden die enthousiast zijn over GNU, en "
 "graag mee willen helpen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Many programmers are unhappy about the commercialization of system "
 "software.  It may enable them to make more money, but it requires them to "
@@ -285,7 +326,7 @@
 "zich daarbij niet op hun gemak. De cynici gaan geloven dat programmeren "
 "enkel broodwinning is."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By working on and using GNU rather than proprietary programs, we can be "
 "hospitable to everyone and obey the law.  In addition, GNU serves as an "
@@ -301,11 +342,11 @@
 "bij het gebruik van niet-vrije software. Ongeveer de helft van alle "
 "programmeurs waar ik mee praat vindt dit belangrijker dan geld."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How You Can Contribute"
 msgstr "Hoe jij kunt helpen"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "(Nowadays, for software tasks to work on, see the <a href=\"http://fsf.org/";
 "campaigns/priority-projects\">High Priority Projects list</a> and the <a "
@@ -321,7 +362,7 @@
 "mogelijkheden, zie de gids: <a href=\"/help/help.html\">helpen met het GNU-"
 "besturingssysteem</a>.)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am asking computer manufacturers for donations of machines and money.  I'm "
 "asking individuals for donations of programs and work."
@@ -329,7 +370,7 @@
 "Ik vraag computerfabrikanten om bijdragen in de vorm van computers en geld.  "
 "Ik vraag individuen om bijdragen in de vorm van programma's en werk."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One consequence you can expect if you donate machines is that GNU will run "
 "on them at an early date.  The machines should be complete, ready to use "
@@ -341,7 +382,7 @@
 "geschikt voor gebruik in woonwijken, en ze moeten geen ingewikkelde koeling- "
 "of energievoorziening eisen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found very many programmers eager to contribute part-time work for "
 "GNU.  For most projects, such part-time distributed work would be very hard "
@@ -369,7 +410,7 @@
 "natuurlijk een hechtere samenwerking eisen, en er zal door een kleine, "
 "hechte groep aan gewerkt worden.)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If I get donations of money, I may be able to hire a few people full or part "
 "time.  The salary won't be high by programmers' standards, but I'm looking "
@@ -385,19 +426,26 @@
 "toegewijde mensen in staat te stellen al hun aandacht op GNU te richten, "
 "zonder dat ze zich over geld zorgen hoeven te maken."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why All Computer Users Will Benefit"
 msgstr "Waarom dit voordeel oplevert voor alle computergebruikers"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Once GNU is written, everyone will be able to obtain good system software
+# | free, just like [-air.<a href=\"#f2\">(3)</a>-] {+air&#8239;<a
+# | class=\"ftn\" href=\"#f2\">[3]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "Once GNU is written, everyone will be able to obtain good system software "
+#| "free, just like air.<a href=\"#f2\">(3)</a>"
 msgid ""
 "Once GNU is written, everyone will be able to obtain good system software "
-"free, just like air.<a href=\"#f2\">(3)</a>"
+"free, just like air&#8239;<a class=\"ftn\" href=\"#f2\">[3]</a>."
 msgstr ""
 "Zodra GNU klaar is zal goede systeemsoftware net zo verkrijgbaar zijn als "
 "lucht.<a href=\"#f2\">(3)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This means much more than just saving everyone the price of a Unix license.  "
 "It means that much wasteful duplication of system programming effort will be "
@@ -408,7 +456,7 @@
 "vermeden zal worden. Deze besparing zal ten goede komen van de "
 "technologische vooruitgang."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Complete system sources will be available to everyone.  As a result, a user "
 "who needs changes in the system will always be free to make them himself, or "
@@ -424,7 +472,7 @@
 "alleenrecht op de broncode heeft en als enige het recht en de mogelijkheden "
 "om veranderingen aan te brengen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Schools will be able to provide a much more educational environment by "
 "encouraging all students to study and improve the system code.  Harvard's "
@@ -440,7 +488,7 @@
 "aan de regel door bepaalde programma's niet toe te staan.  Dit was een bron "
 "van inspiratie voor mij."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Finally, the overhead of considering who owns the system software and what "
 "one is or is not entitled to do with it will be lifted."
@@ -449,7 +497,7 @@
 "systeemsoftware bezit, en wat toegestaan is om te veranderen zullen niet "
 "meer bestaan."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Arrangements to make people pay for using a program, including licensing of "
 "copies, always incur a tremendous cost to society through the cumbersome "
@@ -474,7 +522,7 @@
 "stiekem afneemt. Dan kun je beter de kosten van de luchtfabriek hoofdelijk "
 "omslaan en je al die moeite besparen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copying all or parts of a program is as natural to a programmer as "
 "breathing, and as productive.  It ought to be as free."
@@ -482,13 +530,13 @@
 "Het overnemen van een programma, of delen daarvan, is iets dat voor een "
 "programmeur zo nuttig en natuurlijk is als ademen. Het hoort vrij te zijn."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Some Easily Rebutted Objections to GNU's Goals"
 msgstr ""
 "Een paar bezwaren tegen de doelstellingen van GNU die makkelijk te "
 "weerleggen zijn"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Nobody will use it if it is free, because that means they "
 "can't rely on any support.&rdquo;</strong>"
@@ -496,7 +544,7 @@
 "<strong>&ldquo;Als het gratis is zal niemand het gebruiken, omdat ze geen "
 "ondersteuning krijgen.&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You have to charge for the program to pay for providing the "
 "support.&rdquo;</strong>"
@@ -504,18 +552,27 @@
 "<strong>&ldquo;Je moet geld voor de programma's vragen om de technische "
 "ondersteuning te kunnen betalen.&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | If people would rather pay for GNU plus service than get GNU free without
+# | service, a company to provide just service to people who have obtained GNU
+# | free ought to be [-profitable.<a href=\"#f3\">(4)</a>-]
+# | {+profitable&#8239;<a class=\"ftn\" href=\"#f3\">[4]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "If people would rather pay for GNU plus service than get GNU free without "
+#| "service, a company to provide just service to people who have obtained "
+#| "GNU free ought to be profitable.<a href=\"#f3\">(4)</a>"
 msgid ""
 "If people would rather pay for GNU plus service than get GNU free without "
 "service, a company to provide just service to people who have obtained GNU "
-"free ought to be profitable.<a href=\"#f3\">(4)</a>"
+"free ought to be profitable&#8239;<a class=\"ftn\" href=\"#f3\">[4]</a>."
 msgstr ""
 "Als mensen liever geld zouden betalen voor GNU m&eacute;t service dan GNU "
 "gratis krijgen zonder service, lijkt het mij dat een bedrijf dat alleen "
 "service voor GNU programma's biedt toch met winst moet kunnen draaien.<a "
 "href=\"#f3\">(4)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We must distinguish between support in the form of real programming work and "
 "mere handholding.  The former is something one cannot rely on from a "
@@ -528,7 +585,7 @@
 "een specifiek probleem, dat zal de softwareverkoper zich niets van jouw "
 "klacht aantrekken."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If your business needs to be able to rely on support, the only way is to "
 "have all the necessary sources and tools.  Then you can hire any available "
@@ -547,7 +604,7 @@
 "Met GNU zal dit eenvoudig zijn. Het kan zijn dat er geen competente krachten "
 "beschikbaar zijn, maar dit is niet aan GNU te wijten."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Meanwhile, the users who know nothing about computers need handholding: "
 "doing things for them which they could easily do themselves but don't know "
@@ -557,7 +614,7 @@
 "nodig. Dingen die ze makkelijk zelf kunnen doen moeten voor hun gedaan "
 "worden omdat ze niet weten hoe het moet."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Such services could be provided by companies that sell just handholding and "
 "repair service.  If it is true that users would rather spend money and get a "
@@ -575,7 +632,7 @@
 "prijs, omdat gebruikers niet aan hen gebonden zijn. En gebruikers die dit "
 "soort diensten niet nodig hebben hoeven er ook niet voor te betalen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You cannot reach many people without advertising, and you "
 "must charge for the program to support that.&rdquo;</strong>"
@@ -584,7 +641,7 @@
 "reklame, en dus moet je geld voor je programma's vragen om dit te kunnen "
 "betalen&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;It's no use advertising a program people can get free.&rdquo;"
 "</strong>"
@@ -592,7 +649,7 @@
 "<strong>&ldquo;Het heeft geen zin om reclame te maken voor een programma wat "
 "toch gratis is.&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are various forms of free or very cheap publicity that can be used to "
 "inform numbers of computer users about something like GNU.  But it may be "
@@ -609,19 +666,30 @@
 "advertenties te kunnen betalen. Op deze manier betalen alleen de gebruikers "
 "die baat hebben gehad bij die advertenties."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | On the other hand, if many people get GNU from their friends, and such
+# | companies don't succeed, this will show that advertising was not really
+# | necessary to spread GNU.  Why is it that free market advocates don't want
+# | to let the free market decide [-this?<a href=\"#f4\">(5)</a>-]
+# | {+this?&#8239;<a class=\"ftn\" href=\"#f4\">[5]</a>+}
+#, fuzzy
+#| msgid ""
+#| "On the other hand, if many people get GNU from their friends, and such "
+#| "companies don't succeed, this will show that advertising was not really "
+#| "necessary to spread GNU.  Why is it that free market advocates don't want "
+#| "to let the free market decide this?<a href=\"#f4\">(5)</a>"
 msgid ""
 "On the other hand, if many people get GNU from their friends, and such "
 "companies don't succeed, this will show that advertising was not really "
 "necessary to spread GNU.  Why is it that free market advocates don't want to "
-"let the free market decide this?<a href=\"#f4\">(5)</a>"
+"let the free market decide this?&#8239;<a class=\"ftn\" href=\"#f4\">[5]</a>"
 msgstr ""
 "In het andere geval, als veel mensen GNU van vrienden krijgen, en zulke "
 "bedrijven niet succesvol zijn, zal dit bewijzen dat GNU geen reclame nodig "
 "had. Waarom zijn voorstanders van de vrije markt niet bereid de vrije markt "
 "dit te laten beslissen?<a href=\"#f4\">(5)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;My company needs a proprietary operating system to get a "
 "competitive edge.&rdquo;</strong>"
@@ -629,7 +697,7 @@
 "<strong>&ldquo;Mijn bedrijf heeft een commercieel besturingssysteem nodig om "
 "een voorsprong op de concurrentie te krijgen.&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU will remove operating system software from the realm of competition.  "
 "You will not be able to get an edge in this area, but neither will your "
@@ -646,16 +714,25 @@
 "jouw bedrijf iets anders verkoopt kan GNU voorkomen dat je de dure "
 "besturingssystemenbranche wordt ingeduwd."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | I would like to see GNU development supported by gifts from many
+# | manufacturers and users, reducing the cost to [-each.<a
+# | href=\"#f5\">(6)</a>-] {+each&#8239;<a class=\"ftn\"
+# | href=\"#f5\">[6]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "I would like to see GNU development supported by gifts from many "
+#| "manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
 msgid ""
 "I would like to see GNU development supported by gifts from many "
-"manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
+"manufacturers and users, reducing the cost to each&#8239;<a class=\"ftn\" "
+"href=\"#f5\">[6]</a>."
 msgstr ""
 "Ik zou graag zien dat de ontwikkeling van GNU ondersteund wordt door "
 "donaties van fabrikanten en gebruikers, zodat de kosten voor ons allemaal "
 "gedrukt worden.<a href=\"#f5\">(6)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't programmers deserve a reward for their creativity?"
 "&rdquo;</strong>"
@@ -663,7 +740,7 @@
 "<strong>&ldquo;Verdienen programmeurs geen beloning voor hun creativiteit?"
 "&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If anything deserves a reward, it is social contribution.  Creativity can be "
 "a social contribution, but only in so far as society is free to use the "
@@ -677,7 +754,7 @@
 "scheppen van innovatieve programma's, dienen ze volgens dezelfde logica "
 "gestraft te worden als ze het gebruik van die programma's beperken."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Shouldn't a programmer be able to ask for a reward for his "
 "creativity?&rdquo;</strong>"
@@ -685,7 +762,7 @@
 "<strong>&ldquo;Mag een programmeur niet om een beloning voor zijn "
 "creativiteit vragen?&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is nothing wrong with wanting pay for work, or seeking to maximize "
 "one's income, as long as one does not use means that are destructive.  But "
@@ -696,7 +773,7 @@
 "middelen niet destructief zijn. Maar de middelen die op dit moment gangbaar "
 "zijn in de softwarebranche zijn dat w&eacute;l."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Extracting money from users of a program by restricting their use of it is "
 "destructive because the restrictions reduce the amount and the ways that the "
@@ -711,7 +788,7 @@
 "halen.  Waar moedwillig voor beperkingen wordt gekozen, is vernietiging een "
 "van de vervelende gevolgen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The reason a good citizen does not use such destructive means to become "
 "wealthier is that, if everyone did so, we would all become poorer from the "
@@ -730,12 +807,12 @@
 "beloond te worden voor creativiteit is geen geldige reden om de wereld "
 "toegang tot creativiteit te ontzeggen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid "<strong>&ldquo;Won't programmers starve?&rdquo;</strong>"
 msgstr ""
 "<strong>&ldquo;Zullen programmeurs nog wel geld verdienen?&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "I could answer that nobody is forced to be a programmer.  Most of us cannot "
 "manage to get any money for standing on the street and making faces.  But we "
@@ -747,7 +824,7 @@
 "op straat gekke gezichten te trekken. Maar dit betekent niet dat we hiertoe "
 "gedwongen zijn, er is een keuze."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But that is the wrong answer because it accepts the questioner's implicit "
 "assumption: that without ownership of software, programmers cannot possibly "
@@ -757,7 +834,7 @@
 "vraag zit voor waar aanneemt; Dat zonder private software programmeurs niet "
 "betaald kunnen worden."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The real reason programmers will not starve is that it will still be "
 "possible for them to get paid for programming; just not paid as much as now."
@@ -766,13 +843,28 @@
 "steeds mogelijk zal zijn om voor programmeren betaald te krijgen, zij het "
 "niet zoveel als nu."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | Restricting copying is not the only basis for business in software.  It is
+# | the most common [-basis<a href=\"#f8\">(7)</a>-] {+basis&#8239;<a
+# | class=\"ftn\" href=\"#f8\">[7]</a>+} because it brings in the most money. 
+# | If it were prohibited, or rejected by the customer, software business
+# | would move to other bases of organization which are now used less often. 
+# | There are always numerous ways to organize any kind of business.
+#, fuzzy
+#| msgid ""
+#| "Restricting copying is not the only basis for business in software.  It "
+#| "is the most common basis<a href=\"#f8\">(7)</a> because it brings in the "
+#| "most money.  If it were prohibited, or rejected by the customer, software "
+#| "business would move to other bases of organization which are now used "
+#| "less often.  There are always numerous ways to organize any kind of "
+#| "business."
 msgid ""
 "Restricting copying is not the only basis for business in software.  It is "
-"the most common basis<a href=\"#f8\">(7)</a> because it brings in the most "
-"money.  If it were prohibited, or rejected by the customer, software "
-"business would move to other bases of organization which are now used less "
-"often.  There are always numerous ways to organize any kind of business."
+"the most common basis&#8239;<a class=\"ftn\" href=\"#f8\">[7]</a> because it "
+"brings in the most money.  If it were prohibited, or rejected by the "
+"customer, software business would move to other bases of organization which "
+"are now used less often.  There are always numerous ways to organize any "
+"kind of business."
 msgstr ""
 "Het beperken van de mate waarin software verspreid mag worden is niet de "
 "enige manier waarop handel kan worden gedreven in de softwarebranche. Het is "
@@ -781,7 +873,7 @@
 "zouden softwarebedrijven andere manieren zoeken om geld te verdienen. En die "
 "zijn er altijd."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Probably programming will not be as lucrative on the new basis as it is "
 "now.  But that is not an argument against the change.  It is not considered "
@@ -796,7 +888,7 @@
 "dit evenmin onrechtvaardig zijn. (In de praktijk zullen programmeurs echter "
 "meer verdienen dan dit salaris)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't people have a right to control how their creativity is "
 "used?&rdquo;</strong>"
@@ -804,7 +896,7 @@
 "<strong>&ldquo;Hebben mensen niet het recht om zelf te bepalen hoe hun "
 "creativiteit gebruikt wordt?&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "&ldquo;Control over the use of one's ideas&rdquo; really constitutes control "
 "over other people's lives; and it is usually used to make their lives more "
@@ -814,13 +906,26 @@
 "recht om het leven van anderen te manipuleren, en meestal wordt dit recht "
 "niet ten goede gebruikt."
 
-#. type: Content of: <p>
-msgid ""
-"People who have studied the issue of intellectual property rights<a href="
-"\"#f6\">(8)</a> carefully (such as lawyers) say that there is no intrinsic "
-"right to intellectual property.  The kinds of supposed intellectual property "
-"rights that the government recognizes were created by specific acts of "
-"legislation for specific purposes."
+#. type: Content of: <div><dl><dd><p>
+# | People who have studied the issue of intellectual property [-rights<a
+# | href=\"#f6\">(8)</a>-] {+rights&#8239;<a class=\"ftn\"
+# | href=\"#f6\">[8]</a>+} carefully (such as lawyers) say that there is no
+# | intrinsic right to intellectual property.  The kinds of supposed
+# | intellectual property rights that the government recognizes were created
+# | by specific acts of legislation for specific purposes.
+#, fuzzy
+#| msgid ""
+#| "People who have studied the issue of intellectual property rights<a href="
+#| "\"#f6\">(8)</a> carefully (such as lawyers) say that there is no "
+#| "intrinsic right to intellectual property.  The kinds of supposed "
+#| "intellectual property rights that the government recognizes were created "
+#| "by specific acts of legislation for specific purposes."
+msgid ""
+"People who have studied the issue of intellectual property rights&#8239;<a "
+"class=\"ftn\" href=\"#f6\">[8]</a> carefully (such as lawyers) say that "
+"there is no intrinsic right to intellectual property.  The kinds of supposed "
+"intellectual property rights that the government recognizes were created by "
+"specific acts of legislation for specific purposes."
 msgstr ""
 "Mensen die het principe van intellectueel eigendom goed hebben bestudeerd<a "
 "href=\"#f6\">(8)</a>  (zoals advocaten) zeggen dat er geen intrinsiek recht "
@@ -828,7 +933,7 @@
 "de (Amerikaanse) overheid bestaan bij gratie van specifieke wetten "
 "gecre&euml;erd voor specifieke doeleinden."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For example, the patent system was established to encourage inventors to "
 "disclose the details of their inventions.  Its purpose was to help society "
@@ -848,7 +953,7 @@
 "kosten van het opzetten van het fabricageproces, zijn patenten niet "
 "schadelijk voor mensen die een gepatenteerd product gebruiken."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The idea of copyright did not exist in ancient times, when authors "
 "frequently copied other authors at length in works of nonfiction.  This "
@@ -867,7 +972,7 @@
 "werd, toen boeken alleen goedkoop konden worden gekopieerd op een drukpers, "
 "deed het geen kwaad, omdat het de lezers niet hinderde."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "All intellectual property rights are just licenses granted by society "
 "because it was thought, rightly or wrongly, that society as a whole would "
@@ -881,7 +986,7 @@
 "situatie opnieuw een afweging gemaakt te worden. Hebben we er echt voordeel "
 "van? Wat voor rechten geven we de persoon in kwestie eigenlijk."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The case of programs today is very different from that of books a hundred "
 "years ago.  The fact that the easiest way to copy a program is from one "
@@ -902,14 +1007,14 @@
 "Iemand in de positie om dit recht uit te oefenen zou dit niet moeten doen, "
 "ook al stelt de wet hem daartoe in staat."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Competition makes things get done better.&rdquo;</strong>"
 msgstr ""
 "<strong>&ldquo;De concurrentie zorgt voor een hogere kwaliteit.&rdquo;</"
 "strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The paradigm of competition is a race: by rewarding the winner, we encourage "
 "everyone to run faster.  When capitalism really works this way, it does a "
@@ -928,7 +1033,7 @@
 "deelnemers. En als een vechtpartij ontstaat, komen ze allemaal te laat bij "
 "de eindstreep."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Proprietary and secret software is the moral equivalent of runners in a fist "
 "fight.  Sad to say, the only referee we've got does not seem to object to "
@@ -943,7 +1048,7 @@
 "uit elkaar moeten halen, en straffen uitdelen als ze zelfs maar "
 "<em>proberen</em> te vechten."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Won't everyone stop programming without a monetary incentive?"
 "&rdquo;</strong>"
@@ -951,7 +1056,7 @@
 "<strong>&ldquo;Zal niet iedereen stoppen met programmeren, als ze geen geld "
 "krijgen?&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually, many people will program with absolutely no monetary incentive.  "
 "Programming has an irresistible fascination for some people, usually the "
@@ -963,7 +1068,7 @@
 "is geen gebrek aan goede muzikanten die blijven musiceren, hoewel ze weinig "
 "hoop hebben er ooit hun brood mee te kunnen verdienen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But really this question, though commonly asked, is not appropriate to the "
 "situation.  Pay for programmers will not disappear, only become less.  So "
@@ -975,7 +1080,7 @@
 "programmeren voor een lager salaris? Gebaseerd op eigen ervaring kan ik "
 "zeggen: ja."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For more than ten years, many of the world's best programmers worked at the "
 "Artificial Intelligence Lab for far less money than they could have had "
@@ -988,7 +1093,7 @@
 "vorm: beroemdheid en waardering, bijvoorbeeld. En de mogelijkheid om hun "
 "creativiteit bot te vieren, hetgeen een beloning op zich is."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Then most of them left when offered a chance to do the same interesting work "
 "for a lot of money."
@@ -996,7 +1101,7 @@
 "Ze verlieten het lab pas toen ze de kans kregen om hetzelfde werk te doen "
 "voor meer geld."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "What the facts show is that people will program for reasons other than "
 "riches; but if given a chance to make a lot of money as well, they will come "
@@ -1010,7 +1115,7 @@
 "organisaties doen het slecht in vergelijking met goed betalende, maar dit "
 "gaat niet meer op als er geen goed betalende meer zijn."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;We need the programmers desperately.  If they demand that we "
 "stop helping our neighbors, we have to obey.&rdquo;</strong>"
@@ -1018,7 +1123,7 @@
 "<strong>&ldquo;We hebben programmeurs hard nodig. Als zij eisen dat we onze "
 "buren niet langer helpen, hebben we maar te gehoorzamen.&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "You're never so desperate that you have to obey this sort of demand.  "
 "Remember: millions for defense, but not a cent for tribute!"
@@ -1026,14 +1131,14 @@
 "Hoe hard we de programmeurs ook nodig hebben, aan dit soort eisen hoeft "
 "niemand te voldoen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Programmers need to make a living somehow.&rdquo;</strong>"
 msgstr ""
 "<strong>&ldquo;Programmeurs moeten toch op de een of andere manier hun geld "
 "verdienen.&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In the short run, this is true.  However, there are plenty of ways that "
 "programmers could make a living without selling the right to use a program.  "
@@ -1048,7 +1153,7 @@
 "<em>enige</em> winstgevende manier is. Het is makkelijk om andere manieren "
 "te bedenken, als je je er even toe zet. Een paar voorbeelden:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A manufacturer introducing a new computer will pay for the porting of "
 "operating systems onto the new hardware."
@@ -1057,7 +1162,7 @@
 "het vertalen van systeembesturingssoftware zodat deze ook op het nieuwe "
 "model werkt."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The sale of teaching, handholding and maintenance services could also employ "
 "programmers."
@@ -1065,18 +1170,30 @@
 "Het verkopen van onderwijs, begeleiding en onderhoudsdiensten kan ook "
 "werkgelegenheid bieden voor programmeurs."
 
-#. type: Content of: <p>
-msgid ""
-"People with new ideas could distribute programs as freeware<a href=\"#f7\">"
-"(9)</a>, asking for donations from satisfied users, or selling handholding "
-"services.  I have met people who are already working this way successfully."
+#. type: Content of: <div><dl><dd><p>
+# | People with new ideas could distribute programs as [-freeware<a
+# | href=\"#f7\">(9)</a>,-] {+freeware&#8239;<a class=\"ftn\"
+# | href=\"#f7\">[9]</a>,+} asking for donations from satisfied users, or
+# | selling handholding services.  I have met people who are already working
+# | this way successfully.
+#, fuzzy
+#| msgid ""
+#| "People with new ideas could distribute programs as freeware<a href="
+#| "\"#f7\">(9)</a>, asking for donations from satisfied users, or selling "
+#| "handholding services.  I have met people who are already working this way "
+#| "successfully."
+msgid ""
+"People with new ideas could distribute programs as freeware&#8239;<a class="
+"\"ftn\" href=\"#f7\">[9]</a>, asking for donations from satisfied users, or "
+"selling handholding services.  I have met people who are already working "
+"this way successfully."
 msgstr ""
 "Mensen die nieuwe idee&euml;n hebben kunnen hun programma's verspreiden als "
 "<em>freeware</em><a href=\"#f7\">(9)</a>, en tevreden gebruikers om donaties "
 "vragen, of ondersteuning verkopen. Ik heb mensen ontmoet die op deze manier "
 "met succes hun brood verdienden."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Users with related needs can form users' groups, and pay dues.  A group "
 "would contract with programming companies to write programs that the group's "
@@ -1087,13 +1204,13 @@
 "dienst kunnen nemen om programma's te schrijven die de leden van de groep "
 "nodig hebben."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "All sorts of development can be funded with a Software Tax:"
 msgstr ""
 "Allerlei soorten ontwikkeling kunnen worden betaald met een belasting op "
 "software:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Suppose everyone who buys a computer has to pay x percent of the price as a "
 "software tax.  The government gives this to an agency like the NSF to spend "
@@ -1103,7 +1220,7 @@
 "softwarebelasting. De overheid geeft dit aan een stichting die dit uitgeeft "
 "aan de ontwikkeling van software."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But if the computer buyer makes a donation to software development himself, "
 "he can take a credit against the tax.  He can donate to the project of his "
@@ -1118,7 +1235,7 @@
 "te gebruiken.  Hij kan dit bedrag terugvragen tot aan het maximale bedrag "
 "dat hij aan softwarebelasting heeft betaald."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The total tax rate could be decided by a vote of the payers of the tax, "
 "weighted according to the amount they will be taxed on."
@@ -1127,21 +1244,21 @@
 "laten stemmen, waarbij een stem zwaarder gewogen wordt naarmate de stemmer "
 "meer belasting betaald."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "The consequences:"
 msgstr "De gevolgen:"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "The computer-using community supports software development."
 msgstr ""
 "Degenen die computers gebruiken zijn degenen die de ontwikkeling van "
 "software betalen."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "This community decides what level of support is needed."
 msgstr "Deze gemeenschap bepaalt hoeveel er betaalt dient te worden."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "Users who care which projects their share is spent on can choose this for "
 "themselves."
@@ -1149,7 +1266,7 @@
 "Degenen die zelf willen bepalen aan wie ze hun geld geven hebben daartoe de "
 "mogelijkheid."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the long run, making programs free is a step toward the postscarcity "
 "world, where nobody will have to work very hard just to make a living.  "
@@ -1167,7 +1284,7 @@
 "robotreparatie en komeetverkennen.  Er zal geen noodzaak zijn om met "
 "programmeren je brood te verdienen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We have already greatly reduced the amount of work that the whole society "
 "must do for its actual productivity, but only a little of this has "
@@ -1187,11 +1304,11 @@
 "ontwikkeling van software. We moeten dit doen, zodat de technologische "
 "vooruitgang er voor kan zorgen dat wij minder hoeven te werken."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "Voetnoten"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The wording here was careless.  The intention was that nobody would have to "
 "pay for <b>permission</b> to use the GNU system.  But the words don't make "
@@ -1221,7 +1338,7 @@
 "van de software, is dat nog beter.  Het belangrijkste is dat iedereen die "
 "een exemplaar heeft de vrijheid heeft om het samen met anderen te gebruiken."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The expression &ldquo;give away&rdquo; is another indication that I had not "
 "yet clearly separated the issue of price from that of freedom.  We now "
@@ -1235,10 +1352,21 @@
 "href=\"/philosophy/words-to-avoid.html#GiveAwaySoftware\">de pagina over "
 "verwarrende woorden en teksten</a> voor verdere uitleg."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+# | This is another place I failed to distinguish carefully between the two
+# | different meanings of [-&ldquo;free&rdquo;.-] {+&ldquo;free.&rdquo;+} The
+# | statement as it stands is not false&mdash;you can get copies of GNU
+# | software at no charge, from your friends or over the net.  But it does
+# | suggest the wrong idea.
+#, fuzzy
+#| msgid ""
+#| "This is another place I failed to distinguish carefully between the two "
+#| "different meanings of &ldquo;free&rdquo;.  The statement as it stands is "
+#| "not false&mdash;you can get copies of GNU software at no charge, from "
+#| "your friends or over the net.  But it does suggest the wrong idea."
 msgid ""
 "This is another place I failed to distinguish carefully between the two "
-"different meanings of &ldquo;free&rdquo;.  The statement as it stands is not "
+"different meanings of &ldquo;free.&rdquo; The statement as it stands is not "
 "false&mdash;you can get copies of GNU software at no charge, from your "
 "friends or over the net.  But it does suggest the wrong idea."
 msgstr ""
@@ -1247,11 +1375,11 @@
 "gratis exemplaren van GNU software te krijgen, bijvoorbeeld van vrienden, of "
 "via het internet."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid "Several such companies now exist."
 msgstr "Er bestaan nu al een aantal van dit soort bedrijven."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Although it is a charity rather than a company, the Free Software Foundation "
 "for 10 years raised most of its funds from its distribution service.  You "
@@ -1262,7 +1390,7 @@
 "van software, hoewel het een stichting is, en geen bedrijf. Je kunt <a href="
 "\"/order/order.html\">dingen bestellen bij de FSF</a>."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "A group of computer companies pooled funds around 1991 to support "
 "maintenance of the GNU C Compiler."
@@ -1270,7 +1398,7 @@
 "Een groep computerbedrijven is recent samen gaan werken om de ondersteuning "
 "van de GNU C Compiler te betalen."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "I think I was mistaken in saying that proprietary software was the most "
 "common basis for making money in software.  It seems that actually the most "
@@ -1290,10 +1418,31 @@
 "dus niet meer dat de meeste programmeurs in een wereld met vrije software "
 "minder zullen verdienen dan in de huidige situatie."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+# | In the 1980s I had not yet realized how confusing it was to speak of
+# | &ldquo;the issue&rdquo; of &ldquo;intellectual [-property&rdquo;.-]
+# | {+property.&rdquo;+} That term is obviously biased; more subtle is the
+# | fact that it lumps together various disparate laws which raise very
+# | different issues.  Nowadays I urge people to reject the term
+# | &ldquo;intellectual property&rdquo; entirely, lest it lead others to
+# | suppose that those laws form one coherent issue.  The way to be clear is
+# | to discuss patents, copyrights, and trademarks separately.  See <a
+# | href=\"/philosophy/not-ipr.html\">further explanation</a> of how this term
+# | spreads confusion and bias.
+#, fuzzy
+#| msgid ""
+#| "In the 1980s I had not yet realized how confusing it was to speak of "
+#| "&ldquo;the issue&rdquo; of &ldquo;intellectual property&rdquo;.  That "
+#| "term is obviously biased; more subtle is the fact that it lumps together "
+#| "various disparate laws which raise very different issues.  Nowadays I "
+#| "urge people to reject the term &ldquo;intellectual property&rdquo; "
+#| "entirely, lest it lead others to suppose that those laws form one "
+#| "coherent issue.  The way to be clear is to discuss patents, copyrights, "
+#| "and trademarks separately.  See <a href=\"/philosophy/not-ipr.html"
+#| "\">further explanation</a> of how this term spreads confusion and bias."
 msgid ""
 "In the 1980s I had not yet realized how confusing it was to speak of &ldquo;"
-"the issue&rdquo; of &ldquo;intellectual property&rdquo;.  That term is "
+"the issue&rdquo; of &ldquo;intellectual property.&rdquo; That term is "
 "obviously biased; more subtle is the fact that it lumps together various "
 "disparate laws which raise very different issues.  Nowadays I urge people to "
 "reject the term &ldquo;intellectual property&rdquo; entirely, lest it lead "
@@ -1312,10 +1461,26 @@
 "html\">een verdere uitleg</a> over hoe de term verwarring en vooroordeel "
 "zaait."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+# | Subsequently we learned to distinguish between &ldquo;free software&rdquo;
+# | and [-&ldquo;freeware&rdquo;.-] {+&ldquo;freeware.&rdquo;+} The term
+# | &ldquo;freeware&rdquo; means software you are free to redistribute, but
+# | usually you are not free to study and change the source code, so most of
+# | it is not free software.  See &ldquo;<a
+# | href=\"/philosophy/words-to-avoid.html#Freeware\">Confusing Words and
+# | Phrases</a>&rdquo; for more explanation.
+#, fuzzy
+#| msgid ""
+#| "Subsequently we learned to distinguish between &ldquo;free "
+#| "software&rdquo; and &ldquo;freeware&rdquo;.  The term &ldquo;"
+#| "freeware&rdquo; means software you are free to redistribute, but usually "
+#| "you are not free to study and change the source code, so most of it is "
+#| "not free software.  See &ldquo;<a href=\"/philosophy/words-to-avoid."
+#| "html#Freeware\">Confusing Words and Phrases</a>&rdquo; for more "
+#| "explanation."
 msgid ""
 "Subsequently we learned to distinguish between &ldquo;free software&rdquo; "
-"and &ldquo;freeware&rdquo;.  The term &ldquo;freeware&rdquo; means software "
+"and &ldquo;freeware.&rdquo; The term &ldquo;freeware&rdquo; means software "
 "you are free to redistribute, but usually you are not free to study and "
 "change the source code, so most of it is not free software.  See &ldquo;<a "
 "href=\"/philosophy/words-to-avoid.html#Freeware\">Confusing Words and "
@@ -1354,14 +1519,20 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "We doen ons best om goede vertalingen te maken maar staan altijd open voor "
@@ -1371,9 +1542,15 @@
 "voor informatie over het onderhoud van vertalingen op deze website."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; 1985, 1993, 200[-3-]{+4+}, 2005, 2007, [-2008,-] 2009,
+# | 2010, [-2014, 2015-] {+2015, 2021+} Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, "
+#| "2015 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 1985, 1993, 2004, 2005, 2007, 2009, 2010, 2015, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015 "
 "Free Software Foundation, Inc."
@@ -1405,13 +1582,24 @@
 msgid "Updated:"
 msgstr "Bijgewerkt:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015, "
-"2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015, "
-"2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "We doen ons best om goede vertalingen te maken maar staan altijd open "
+#~ "voor verbeteringen. Suggesties, op- en aanmerkingen sturen aan: <a href="
+#~ "\"mailto:web-translators@gnu.org\";>&lt;web-translators@gnu.org&gt;</a>.</"
+#~ "p> <p>Zie <a href=\"/server/standards/README.translations.html\"> "
+#~ "Translations README</a> voor informatie over het onderhoud van "
+#~ "vertalingen op deze website."
+
+#~ msgid ""
+#~ "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, "
+#~ "2015, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, "
+#~ "2015, 2021 Free Software Foundation, Inc."
 
 #, fuzzy
 #~ msgid ""

Index: po/manifesto.pl.po
===================================================================
RCS file: /web/www/www/gnu/po/manifesto.pl.po,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- po/manifesto.pl.po  2 Nov 2021 13:56:41 -0000       1.25
+++ po/manifesto.pl.po  2 Nov 2021 14:41:54 -0000       1.26
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manifesto.html\n"
-"POT-Creation-Date: 2015-06-02 12:55+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2015-08-31 08:42-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-11-02 14:27+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"
@@ -26,13 +27,27 @@
 msgid "The GNU Manifesto - GNU Project - Free Software Foundation"
 msgstr "Manifest GNU - Projekt GNU - Fundacja Wolnego Oprogramowania (FSF)"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "The GNU Manifesto"
 msgstr "Manifest GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
+# | The GNU Manifesto (which appears below) was written by <a
+# | href=\"http{+s+}://www.stallman.org/\">Richard Stallman</a> in 1985 to ask
+# | for support in developing the GNU operating system.  Part of the text was
+# | taken from the original announcement of 1983.  Through 1987, it was
+# | updated in minor ways to account for developments; since then, it seems
+# | best to leave it unchanged.
+#, fuzzy
+#| msgid ""
+#| "The GNU Manifesto (which appears below) was written by <a href=\"http://";
+#| "www.stallman.org/\">Richard Stallman</a> in 1985 to ask for support in "
+#| "developing the GNU operating system.  Part of the text was taken from the "
+#| "original announcement of 1983.  Through 1987, it was updated in minor "
+#| "ways to account for developments; since then, it seems best to leave it "
+#| "unchanged."
 msgid ""
-"The GNU Manifesto (which appears below) was written by <a href=\"http://www.";
+"The GNU Manifesto (which appears below) was written by <a href=\"https://www.";
 "stallman.org/\">Richard Stallman</a> in 1985 to ask for support in "
 "developing the GNU operating system.  Part of the text was taken from the "
 "original announcement of 1983.  Through 1987, it was updated in minor ways "
@@ -45,7 +60,7 @@
 "z&nbsp;rozwojem projektu, lecz&nbsp;teraz najlepszym wyjściem jest "
 "przekazywanie go w&nbsp;stanie niezmiennym."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Since that time, we have learned about certain common misunderstandings that "
 "different wording could help avoid.  Footnotes added since 1993 help clarify "
@@ -55,7 +70,7 @@
 "których można uniknąć używając innego słownictwa. Przypisy dodane 
w&nbsp;"
 "roku 1993 powinny rozjaśnić te kwestie."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If you want to install the GNU/Linux system, we recommend you use one of the "
 "<a href=\"/distros\">100% free software GNU/Linux distributions</a>.  For "
@@ -67,7 +82,7 @@
 "wolne oprogramowanie</a>. Aby&nbsp;dowiedzieć się jak pomóc, odwiedźcie 
<a "
 "href=\"/help/help.html\">http://www.gnu.org/help</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The GNU Project is part of the Free Software Movement, a campaign for <a "
 "href=\"/philosophy/free-sw.html\">freedom for users of software</a>.  It is "
@@ -84,17 +99,30 @@
 "aby&nbsp;promować podejście <a href=\"/philosophy/open-source-misses-the-"
 "point.html\">bez&nbsp;morałów</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "What's GNU? Gnu's Not Unix!"
 msgstr "Czym jest GNU? GNU to Nie Unix!"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | GNU, which stands for Gnu's Not Unix, is the name for the complete
+# | Unix-compatible software system which I am writing so that I can give it
+# | away free to everyone who can use [-it.<a href=\"#f1\">(1)</a>-]
+# | {+it&#8239;<a class=\"ftn\" href=\"#f1\">[1]</a>.+} Several other
+# | volunteers are helping me.  Contributions of time, money, programs and
+# | equipment are greatly needed.
+#, fuzzy
+#| msgid ""
+#| "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
+#| "compatible software system which I am writing so that I can give it away "
+#| "free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
+#| "volunteers are helping me.  Contributions of time, money, programs and "
+#| "equipment are greatly needed."
 msgid ""
 "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
 "compatible software system which I am writing so that I can give it away "
-"free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
-"volunteers are helping me.  Contributions of time, money, programs and "
-"equipment are greatly needed."
+"free to everyone who can use it&#8239;<a class=\"ftn\" href=\"#f1\">[1]</a>. "
+"Several other volunteers are helping me.  Contributions of time, money, "
+"programs and equipment are greatly needed."
 msgstr ""
 "GNU, czyli&nbsp;GNU to Nie Unix (ang. GNU's Not Unix), jest nazwą "
 "kompletnego, kompatybilnego z&nbsp;Uniksem systemu, który piszę, aby&nbsp;"
@@ -102,7 +130,7 @@
 "</a> Pomaga mi również kilku wolontariuszy. Potrzebna jest nam pomoc 
w&nbsp;"
 "postaci poświęconego czasu, pieniędzy, programów oraz&nbsp;sprzętu."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So far we have an Emacs text editor with Lisp for writing editor commands, a "
 "source level debugger, a yacc-compatible parser generator, a linker, and "
@@ -132,7 +160,7 @@
 "z&nbsp;dokumentacją online. Mamy nadzieję dostarczyć wszystkie narzędzia "
 "zazwyczaj dołączane do&nbsp;systemów Uniksowych, a&nbsp;nawet więcej."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU will be able to run Unix programs, but will not be identical to Unix.  "
 "We will make all improvements that are convenient, based on our experience "
@@ -155,7 +183,7 @@
 "programowania systemu. Będziemy się starać wspierać UUCP, MIT Chaosnet "
 "i&nbsp;inne Internetowe protokoły komunikacyjne."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is aimed initially at machines in the 68000/16000 class with virtual "
 "memory, because they are the easiest machines to make it run on.  The extra "
@@ -167,7 +195,7 @@
 "do&nbsp;popisu dla tych, którzy chcieliby go uruchomić i&nbsp;używać 
na&nbsp;"
 "słabszych komputerach."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid horrible confusion, please pronounce the <em>g</em> in the word "
 "&ldquo;GNU&rdquo; when it is the name of this project."
@@ -177,11 +205,11 @@
 "projektu [standardowo w&nbsp;angielskim &bdquo;g&rdquo; w&nbsp;wyrazie "
 "&bdquo;gnu&rdquo; nie jest artykułowane]."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why I Must Write GNU"
 msgstr "Dlaczego muszę napisać GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I consider that the Golden Rule requires that if I like a program I must "
 "share it with other people who like it.  Software sellers want to divide the "
@@ -206,13 +234,26 @@
 "pozostać w&nbsp;instytucji, w&nbsp;której robi mi się takie rzeczy wbrew "
 "mojej woli."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | So that I can continue to use computers without dishonor, I have decided
+# | to put together a sufficient body of free software so that I will be able
+# | to get along without any software that is not free.  I have resigned from
+# | the AI Lab to deny MIT any legal excuse to prevent me from giving GNU
+# | [-away.<a href=\"#f2a\">(2)</a>-] {+away&#8239;<a class=\"ftn\"
+# | href=\"#f2a\">[2]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "So that I can continue to use computers without dishonor, I have decided "
+#| "to put together a sufficient body of free software so that I will be able "
+#| "to get along without any software that is not free.  I have resigned from "
+#| "the AI Lab to deny MIT any legal excuse to prevent me from giving GNU "
+#| "away.<a href=\"#f2a\">(2)</a>"
 msgid ""
 "So that I can continue to use computers without dishonor, I have decided to "
 "put together a sufficient body of free software so that I will be able to "
 "get along without any software that is not free.  I have resigned from the "
-"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away.<a "
-"href=\"#f2a\">(2)</a>"
+"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away&#8239;"
+"<a class=\"ftn\" href=\"#f2a\">[2]</a>."
 msgstr ""
 "Aby&nbsp;nadal używać komputerów z&nbsp;honorem, zdecydowałem się 
zebrać "
 "razem wystarczającą ilość wolnego oprogramowania, żeby obejść się 
bez&nbsp;"
@@ -220,11 +261,11 @@
 "wszelkie prawne preteksty do&nbsp;powstrzymania mnie przed rozdawaniem GNU."
 "<a href=\"#f2a\">(2)</a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why GNU Will Be Compatible with Unix"
 msgstr "Dlaczego GNU będzie zgodne z&nbsp;Uniksem"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Unix is not my ideal system, but it is not too bad.  The essential features "
 "of Unix seem to be good ones, and I think I can fill in what Unix lacks "
@@ -237,11 +278,11 @@
 "kompatybilny z&nbsp;Uniksem byłby dla wielu ludzi znacznie łatwiejszy "
 "do&nbsp;przyswojenia."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How GNU Will Be Available"
 msgstr "W&nbsp;jaki sposób GNU będzie rozpowszechniane"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is not in the public domain.  Everyone will be permitted to modify and "
 "redistribute GNU, but no distributor will be allowed to restrict its further "
@@ -255,11 +296,11 @@
 "html#ProprietarySoftware\">własnościowe</a> modyfikacje nie będą 
dozwolone. "
 "Chcę być pewien, że&nbsp;wszystkie wersje GNU pozostaną wolne."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why Many Other Programmers Want to Help"
 msgstr "Dlaczego wielu innych programistów chce pomóc"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found many other programmers who are excited about GNU and want to "
 "help."
@@ -267,7 +308,7 @@
 "Znalazłem wielu innych programistów, którzy są zachwyceni GNU i&nbsp;chcą
 "
 "pomóc."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Many programmers are unhappy about the commercialization of system "
 "software.  It may enable them to make more money, but it requires them to "
@@ -292,7 +333,7 @@
 "usatysfakcjonowani żadną z&nbsp;tych alternatyw. Stają się cyniczni 
i&nbsp;"
 "myślą, że&nbsp;programowanie to tylko sposób zarabiania pieniędzy."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By working on and using GNU rather than proprietary programs, we can be "
 "hospitable to everyone and obey the law.  In addition, GNU serves as an "
@@ -310,11 +351,11 @@
 "Około połowa z&nbsp;programistów, z&nbsp;którymi rozmawiam, uważa, 
że&nbsp;"
 "jest to ważne poczucie, którego pieniądze nie są w&nbsp;stanie zastą
pić. "
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How You Can Contribute"
 msgstr "Jak możecie pomóc"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "(Nowadays, for software tasks to work on, see the <a href=\"http://fsf.org/";
 "campaigns/priority-projects\">High Priority Projects list</a> and the <a "
@@ -330,7 +371,7 @@
 "dla paczek oprogramowania GNU. Inne sposoby pomocy są opisane w&nbsp;<a 
href="
 "\"/help/help.html\">przewodniku pomocy systemowi GNU</a>.)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am asking computer manufacturers for donations of machines and money.  I'm "
 "asking individuals for donations of programs and work."
@@ -338,7 +379,7 @@
 "Proszę producentów komputerów o&nbsp;darowizny w&nbsp;postaci sprzętu 
i&nbsp;"
 "pieniędzy. Proszę osoby prywatne o programy i&nbsp;wkład pracy."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One consequence you can expect if you donate machines is that GNU will run "
 "on them at an early date.  The machines should be complete, ready to use "
@@ -351,7 +392,7 @@
 "terenach mieszkalnych i&nbsp;mogących się obyć bez&nbsp;skomplikowanego "
 "chłodzenia lub&nbsp;źródeł energii."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found very many programmers eager to contribute part-time work for "
 "GNU.  For most projects, such part-time distributed work would be very hard "
@@ -383,7 +424,7 @@
 "wymagała ściślejszego kontaktu i&nbsp;będzie przeprowadzona przez małą, 
"
 "zwartą grupę.)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If I get donations of money, I may be able to hire a few people full or part "
 "time.  The salary won't be high by programmers' standards, but I'm looking "
@@ -400,19 +441,26 @@
 "swojego potencjału na&nbsp;prace nad&nbsp;GNU poprzez&nbsp;oszczędzenie im "
 "konieczności zarabiania na&nbsp;życie w&nbsp;inny sposób."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why All Computer Users Will Benefit"
 msgstr "Dlaczego wszyscy użytkownicy komputerów na&nbsp;tym zyskają"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Once GNU is written, everyone will be able to obtain good system software
+# | free, just like [-air.<a href=\"#f2\">(3)</a>-] {+air&#8239;<a
+# | class=\"ftn\" href=\"#f2\">[3]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "Once GNU is written, everyone will be able to obtain good system software "
+#| "free, just like air.<a href=\"#f2\">(3)</a>"
 msgid ""
 "Once GNU is written, everyone will be able to obtain good system software "
-"free, just like air.<a href=\"#f2\">(3)</a>"
+"free, just like air&#8239;<a class=\"ftn\" href=\"#f2\">[3]</a>."
 msgstr ""
 "Gdy GNU już zostanie napisane, wszyscy będą mogli zyskać dobry system "
 "bez&nbsp;żadnych ograniczeń, niczym powietrze.<a href=\"#f2\">(3)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This means much more than just saving everyone the price of a Unix license.  "
 "It means that much wasteful duplication of system programming effort will be "
@@ -424,7 +472,7 @@
 "i&nbsp;wysiłek będzie można zamiast tego przeznaczyć na&nbsp;postęp 
w&nbsp;"
 "dziedzinie programowania."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Complete system sources will be available to everyone.  As a result, a user "
 "who needs changes in the system will always be free to make them himself, or "
@@ -439,7 +487,7 @@
 "lub&nbsp;firmy posiadających na&nbsp;własność kod źródłowy 
i&nbsp;będących "
 "jedynymi uprawnionymi do&nbsp;wprowadzania zmian."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Schools will be able to provide a much more educational environment by "
 "encouraging all students to study and improve the system code.  Harvard's "
@@ -455,7 +503,7 @@
 "dostępne i&nbsp;stało na&nbsp;jej straży rzeczywiście zabraniając "
 "instalowania niektórych programów. Bardzo mnie ten fakt zainspirował."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Finally, the overhead of considering who owns the system software and what "
 "one is or is not entitled to do with it will be lifted."
@@ -464,7 +512,7 @@
 "oprogramowania systemowego oraz&nbsp;co można a&nbsp;czego nie można 
z&nbsp;"
 "nim robić."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Arrangements to make people pay for using a program, including licensing of "
 "copies, always incur a tremendous cost to society through the cumbersome "
@@ -491,7 +539,7 @@
 "nie zdejmuje maski, które są nie do&nbsp;pomyślenia. Lepiej już 
utrzymywać "
 "fabrykę powietrza z&nbsp;pogłównego a&nbsp;maski wywalić."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copying all or parts of a program is as natural to a programmer as "
 "breathing, and as productive.  It ought to be as free."
@@ -500,11 +548,11 @@
 "samo naturalne, jak oddychanie, i&nbsp;równie efektywne. Powinno być 
równie "
 "swobodne."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Some Easily Rebutted Objections to GNU's Goals"
 msgstr "Kilka łatwych do&nbsp;odparcia zarzutów wobec celów GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Nobody will use it if it is free, because that means they "
 "can't rely on any support.&rdquo;</strong>"
@@ -512,7 +560,7 @@
 "<strong>&bdquo;Nikt nie będzie go używał jeśli będzie darmowy, bo&nbsp;"
 "oznacza to brak jakiegokolwiek wsparcia technicznego.&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You have to charge for the program to pay for providing the "
 "support.&rdquo;</strong>"
@@ -520,18 +568,27 @@
 "<strong>&bdquo;Trzeba pobierać opłaty za&nbsp;program, żeby mieć 
za&nbsp;co "
 "zapewnić wsparcie techniczne.&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | If people would rather pay for GNU plus service than get GNU free without
+# | service, a company to provide just service to people who have obtained GNU
+# | free ought to be [-profitable.<a href=\"#f3\">(4)</a>-]
+# | {+profitable&#8239;<a class=\"ftn\" href=\"#f3\">[4]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "If people would rather pay for GNU plus service than get GNU free without "
+#| "service, a company to provide just service to people who have obtained "
+#| "GNU free ought to be profitable.<a href=\"#f3\">(4)</a>"
 msgid ""
 "If people would rather pay for GNU plus service than get GNU free without "
 "service, a company to provide just service to people who have obtained GNU "
-"free ought to be profitable.<a href=\"#f3\">(4)</a>"
+"free ought to be profitable&#8239;<a class=\"ftn\" href=\"#f3\">[4]</a>."
 msgstr ""
 "Jeśli ludzie woleliby płacić za&nbsp;GNU razem z&nbsp;obsługą zamiast "
 "dostawać GNU za&nbsp;darmo bez&nbsp;obsługi, to firma, która zapewniałaby 
"
 "obsługę dla ludzi, którzy uzyskali system GNU za&nbsp;darmo, powinna "
 "przynosić dochody.<a href=\"#f3\">(4)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We must distinguish between support in the form of real programming work and "
 "mere handholding.  The former is something one cannot rely on from a "
@@ -544,7 +601,7 @@
 "Jeśli Wasz problem nie dotyczy wystarczająco dużej liczby użytkowników, "
 "sprzedawca powie wam, żebyście się wypchali."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If your business needs to be able to rely on support, the only way is to "
 "have all the necessary sources and tools.  Then you can hire any available "
@@ -566,7 +623,7 @@
 "dystrybucji. GNU nie rozwiązuje wszystkich problemów świata, tylko 
niektóre "
 "z&nbsp;nich."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Meanwhile, the users who know nothing about computers need handholding: "
 "doing things for them which they could easily do themselves but don't know "
@@ -577,7 +634,7 @@
 "nich rzeczy, które z&nbsp;łatwością mogliby zrobić samodzielnie, tylko 
nie "
 "wiedzą jak."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Such services could be provided by companies that sell just handholding and "
 "repair service.  If it is true that users would rather spend money and get a "
@@ -596,7 +653,7 @@
 "wybór. Tymczasem ci z&nbsp;nas, którzy serwisu nie potrzebują, nie będą "
 "musieli za&nbsp;niego płacić."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You cannot reach many people without advertising, and you "
 "must charge for the program to support that.&rdquo;</strong>"
@@ -605,7 +662,7 @@
 "a&nbsp;żeby mieć na&nbsp;nią środki, trzeba pobierać opłaty 
za&nbsp;program."
 "&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;It's no use advertising a program people can get free.&rdquo;"
 "</strong>"
@@ -613,7 +670,7 @@
 "<strong>&bdquo;Reklamowanie programu, który można dostać za&nbsp;darmo, 
jest "
 "bezcelowe.&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are various forms of free or very cheap publicity that can be used to "
 "inform numbers of computer users about something like GNU.  But it may be "
@@ -631,12 +688,23 @@
 "coś zarobić. W&nbsp;ten sposób za&nbsp;reklamę płacą tylko ci 
użytkownicy, "
 "którzy na&nbsp;niej korzystają."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | On the other hand, if many people get GNU from their friends, and such
+# | companies don't succeed, this will show that advertising was not really
+# | necessary to spread GNU.  Why is it that free market advocates don't want
+# | to let the free market decide [-this?<a href=\"#f4\">(5)</a>-]
+# | {+this?&#8239;<a class=\"ftn\" href=\"#f4\">[5]</a>+}
+#, fuzzy
+#| msgid ""
+#| "On the other hand, if many people get GNU from their friends, and such "
+#| "companies don't succeed, this will show that advertising was not really "
+#| "necessary to spread GNU.  Why is it that free market advocates don't want "
+#| "to let the free market decide this?<a href=\"#f4\">(5)</a>"
 msgid ""
 "On the other hand, if many people get GNU from their friends, and such "
 "companies don't succeed, this will show that advertising was not really "
 "necessary to spread GNU.  Why is it that free market advocates don't want to "
-"let the free market decide this?<a href=\"#f4\">(5)</a>"
+"let the free market decide this?&#8239;<a class=\"ftn\" href=\"#f4\">[5]</a>"
 msgstr ""
 "Z&nbsp;drugiej strony, jeśli wielu ludzi dostanie GNU od&nbsp;swoich "
 "znajomych i&nbsp;takie firmy nie odniosą sukcesu, udowodni to, że&nbsp;"
@@ -644,7 +712,7 @@
 "Dlaczego zwolennicy wolnego rynku nie chcą pozwolić, by wolny rynek to "
 "rozstrzygnął?<a href=\"#f4\">(5)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;My company needs a proprietary operating system to get a "
 "competitive edge.&rdquo;</strong>"
@@ -652,7 +720,7 @@
 "<strong>&bdquo;Moja firma potrzebuje objętego restrykcyjną licencją 
systemu "
 "operacyjnego, żeby mieć przewagę nad&nbsp;konkurencją.&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU will remove operating system software from the realm of competition.  "
 "You will not be able to get an edge in this area, but neither will your "
@@ -671,16 +739,25 @@
 "uniknąć bycia wepchniętym w&nbsp;drogą zabawę w&nbsp;sprzedaż systemów 
"
 "operacyjnych."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | I would like to see GNU development supported by gifts from many
+# | manufacturers and users, reducing the cost to [-each.<a
+# | href=\"#f5\">(6)</a>-] {+each&#8239;<a class=\"ftn\"
+# | href=\"#f5\">[6]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "I would like to see GNU development supported by gifts from many "
+#| "manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
 msgid ""
 "I would like to see GNU development supported by gifts from many "
-"manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
+"manufacturers and users, reducing the cost to each&#8239;<a class=\"ftn\" "
+"href=\"#f5\">[6]</a>."
 msgstr ""
 "Chciałbym, żeby GNU rozwijało się poprzez&nbsp;dary od&nbsp;wielu "
 "producentów i&nbsp;użytkowników, obniżając im wszystkim koszty.<a href="
 "\"#f5\">(6)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't programmers deserve a reward for their creativity?"
 "&rdquo;</strong>"
@@ -688,7 +765,7 @@
 "<strong>&bdquo;Czy programiści nie zasługują na&nbsp;zapłatę 
za&nbsp;swoją "
 "kreatywność?&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If anything deserves a reward, it is social contribution.  Creativity can be "
 "a social contribution, but only in so far as society is free to use the "
@@ -703,7 +780,7 @@
 "programów, to z&nbsp;tego samego powodu zasługują na&nbsp;karę, jeśli "
 "ograniczają ich użycie."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Shouldn't a programmer be able to ask for a reward for his "
 "creativity?&rdquo;</strong>"
@@ -711,7 +788,7 @@
 "<strong>&bdquo;Czy programista nie powinien móc domagać się zapłaty 
za&nbsp;"
 "swoją kreatywność?&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is nothing wrong with wanting pay for work, or seeking to maximize "
 "one's income, as long as one does not use means that are destructive.  But "
@@ -723,7 +800,7 @@
 "będące w&nbsp;zwyczaju na&nbsp;polu oprogramowania opierają się na&nbsp;"
 "destrukcji."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Extracting money from users of a program by restricting their use of it is "
 "destructive because the restrictions reduce the amount and the ways that the "
@@ -738,7 +815,7 @@
 "ludzkość. Jeśli celowo się coś ogranicza, to szkodliwe tego konsekwencje 
są "
 "celową destrukcją."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The reason a good citizen does not use such destructive means to become "
 "wealthier is that, if everyone did so, we would all become poorer from the "
@@ -757,11 +834,11 @@
 "nagrodzonym za&nbsp;kreatywność nie usprawiedliwia pozbawiania całego 
świata "
 "jej części lub&nbsp;całości."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid "<strong>&ldquo;Won't programmers starve?&rdquo;</strong>"
 msgstr "<strong>&bdquo;Czy programiści nie będą głodować?&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "I could answer that nobody is forced to be a programmer.  Most of us cannot "
 "manage to get any money for standing on the street and making faces.  But we "
@@ -774,7 +851,7 @@
 "na&nbsp;spędzenie życia na&nbsp;staniu na&nbsp;ulicy, robieniu min i&nbsp;"
 "głodowaniu. Robimy coś innego."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But that is the wrong answer because it accepts the questioner's implicit "
 "assumption: that without ownership of software, programmers cannot possibly "
@@ -785,7 +862,7 @@
 "oprogramowania programiści nie zarobią ani&nbsp;centa. Czyli&nbsp;wszystko "
 "albo&nbsp;nic."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The real reason programmers will not starve is that it will still be "
 "possible for them to get paid for programming; just not paid as much as now."
@@ -794,13 +871,28 @@
 "nadal będzie się im płacić za&nbsp;programowanie, po&nbsp;prostu nie aż "
 "tyle, co teraz."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | Restricting copying is not the only basis for business in software.  It is
+# | the most common [-basis<a href=\"#f8\">(7)</a>-] {+basis&#8239;<a
+# | class=\"ftn\" href=\"#f8\">[7]</a>+} because it brings in the most money. 
+# | If it were prohibited, or rejected by the customer, software business
+# | would move to other bases of organization which are now used less often. 
+# | There are always numerous ways to organize any kind of business.
+#, fuzzy
+#| msgid ""
+#| "Restricting copying is not the only basis for business in software.  It "
+#| "is the most common basis<a href=\"#f8\">(7)</a> because it brings in the "
+#| "most money.  If it were prohibited, or rejected by the customer, software "
+#| "business would move to other bases of organization which are now used "
+#| "less often.  There are always numerous ways to organize any kind of "
+#| "business."
 msgid ""
 "Restricting copying is not the only basis for business in software.  It is "
-"the most common basis<a href=\"#f8\">(7)</a> because it brings in the most "
-"money.  If it were prohibited, or rejected by the customer, software "
-"business would move to other bases of organization which are now used less "
-"often.  There are always numerous ways to organize any kind of business."
+"the most common basis&#8239;<a class=\"ftn\" href=\"#f8\">[7]</a> because it "
+"brings in the most money.  If it were prohibited, or rejected by the "
+"customer, software business would move to other bases of organization which "
+"are now used less often.  There are always numerous ways to organize any "
+"kind of business."
 msgstr ""
 "Ograniczanie kopiowania nie jest dla firm programistycznych jedynym sposobem "
 "na&nbsp;uzyskiwanie dochodów. Jest po&nbsp;prostu najczęściej spotykanym<a 
"
@@ -809,7 +901,7 @@
 "z&nbsp;innych możliwości, po&nbsp;które teraz sięga rzadziej. Każdy 
interes "
 "można zawsze zorganizować na&nbsp;wiele sposobów."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Probably programming will not be as lucrative on the new basis as it is "
 "now.  But that is not an argument against the change.  It is not considered "
@@ -825,7 +917,7 @@
 "byłoby niesprawiedliwe. (Tak naprawdę i&nbsp;tak zarabialiby znacznie "
 "więcej.)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't people have a right to control how their creativity is "
 "used?&rdquo;</strong>"
@@ -833,7 +925,7 @@
 "<strong>&bdquo;Czy ludzie nie mają prawa kontrolować w&nbsp;jaki sposób "
 "używane są ich pomysły?&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "&ldquo;Control over the use of one's ideas&rdquo; really constitutes control "
 "over other people's lives; and it is usually used to make their lives more "
@@ -843,13 +935,26 @@
 "stanowi kontrolę nad&nbsp;życiem innych ludzi i&nbsp;zwykle jest używana "
 "do&nbsp;jego utrudnienia."
 
-#. type: Content of: <p>
-msgid ""
-"People who have studied the issue of intellectual property rights<a href="
-"\"#f6\">(8)</a> carefully (such as lawyers) say that there is no intrinsic "
-"right to intellectual property.  The kinds of supposed intellectual property "
-"rights that the government recognizes were created by specific acts of "
-"legislation for specific purposes."
+#. type: Content of: <div><dl><dd><p>
+# | People who have studied the issue of intellectual property [-rights<a
+# | href=\"#f6\">(8)</a>-] {+rights&#8239;<a class=\"ftn\"
+# | href=\"#f6\">[8]</a>+} carefully (such as lawyers) say that there is no
+# | intrinsic right to intellectual property.  The kinds of supposed
+# | intellectual property rights that the government recognizes were created
+# | by specific acts of legislation for specific purposes.
+#, fuzzy
+#| msgid ""
+#| "People who have studied the issue of intellectual property rights<a href="
+#| "\"#f6\">(8)</a> carefully (such as lawyers) say that there is no "
+#| "intrinsic right to intellectual property.  The kinds of supposed "
+#| "intellectual property rights that the government recognizes were created "
+#| "by specific acts of legislation for specific purposes."
+msgid ""
+"People who have studied the issue of intellectual property rights&#8239;<a "
+"class=\"ftn\" href=\"#f6\">[8]</a> carefully (such as lawyers) say that "
+"there is no intrinsic right to intellectual property.  The kinds of supposed "
+"intellectual property rights that the government recognizes were created by "
+"specific acts of legislation for specific purposes."
 msgstr ""
 "Ludzie, którzy dokładnie studiowali prawo własności intelektualnej<a 
href="
 "\"#f6\">(8)</a> (np. prawnicy), twierdzą, że&nbsp;nie ma żadnego 
wrodzonego "
@@ -857,7 +962,7 @@
 "intelektualnej uznawane przez rząd zostały wprowadzone przez konkretne akty 
"
 "legislacyjne dla osiągnięcia konkretnych celów."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For example, the patent system was established to encourage inventors to "
 "disclose the details of their inventions.  Its purpose was to help society "
@@ -877,7 +982,7 @@
 "porównaniu z&nbsp;kosztami rozpoczęcia produkcji. Nie zawadzają one "
 "większości indywidualnych użytkowników opatentowanych produktów."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The idea of copyright did not exist in ancient times, when authors "
 "frequently copied other authors at length in works of nonfiction.  This "
@@ -897,7 +1002,7 @@
 "kopiowane tylko na&nbsp;prasie drukarskiej&nbsp;&ndash; nie wyrządzał on "
 "dużo szkody i&nbsp;nie przeszkadzał większości czytelników książek."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "All intellectual property rights are just licenses granted by society "
 "because it was thought, rightly or wrongly, that society as a whole would "
@@ -911,7 +1016,7 @@
 "konkretnej sytuacji musimy zadać pytanie: czy&nbsp;naprawdę zyskujemy, gdy "
 "wydajemy taką licencję? Na&nbsp;jakiego rodzaju czyn udzielamy licencji?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The case of programs today is very different from that of books a hundred "
 "years ago.  The fact that the easiest way to copy a program is from one "
@@ -932,14 +1037,14 @@
 "w&nbsp;której nikt nie powinien tego robić niezależnie od&nbsp;tego, "
 "czy&nbsp;prawo na&nbsp;to zezwala."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Competition makes things get done better.&rdquo;</strong>"
 msgstr ""
 "<strong>&bdquo;Konkurencja poprawia jakość usług 
i&nbsp;produktów.&rdquo;</"
 "strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The paradigm of competition is a race: by rewarding the winner, we encourage "
 "everyone to run faster.  When capitalism really works this way, it does a "
@@ -959,7 +1064,7 @@
 "biegacze wdadzą się w&nbsp;bójkę, w&nbsp;rezultacie wszyscy dobiegną 
do&nbsp;"
 "mety spóźnieni."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Proprietary and secret software is the moral equivalent of runners in a fist "
 "fight.  Sad to say, the only referee we've got does not seem to object to "
@@ -974,7 +1079,7 @@
 "strzał&rdquo;), a&nbsp;powinien rozdzielić biegaczy i&nbsp;karać ich 
za&nbsp;"
 "najmniejszą próbę wszczęcia bójki."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Won't everyone stop programming without a monetary incentive?"
 "&rdquo;</strong>"
@@ -982,7 +1087,7 @@
 "<strong>&bdquo;Czy bez&nbsp;pieniężnej motywacji nie przestanie się "
 "programować?&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually, many people will program with absolutely no monetary incentive.  "
 "Programming has an irresistible fascination for some people, usually the "
@@ -996,7 +1101,7 @@
 "na&nbsp;to, że&nbsp;będą w&nbsp;stanie w&nbsp;ten sposób zarobić 
na&nbsp;"
 "życie."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But really this question, though commonly asked, is not appropriate to the "
 "situation.  Pay for programmers will not disappear, only become less.  So "
@@ -1009,7 +1114,7 @@
 "będzie chciał programować przy zmniejszonej motywacji finansowej? Z&nbsp;"
 "mojego doświadczenia wynika, że&nbsp;tak."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For more than ten years, many of the world's best programmers worked at the "
 "Artificial Intelligence Lab for far less money than they could have had "
@@ -1022,7 +1127,7 @@
 "zyskując sławę i&nbsp;uznanie. A&nbsp;kreatywność daje radość, jest 
nagrodą "
 "samą w&nbsp;sobie."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Then most of them left when offered a chance to do the same interesting work "
 "for a lot of money."
@@ -1030,7 +1135,7 @@
 "Potem większość z&nbsp;nich odeszła, kiedy dostali szansę wykonywania 
tej "
 "samej interesującej pracy w&nbsp;zamian za&nbsp;dużo pieniędzy."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "What the facts show is that people will program for reasons other than "
 "riches; but if given a chance to make a lot of money as well, they will come "
@@ -1044,7 +1149,7 @@
 "organizacje nie wypadają dobrze w&nbsp;konkurencji z&nbsp;tymi, które 
płacą "
 "dużo, ale&nbsp;mogłoby być inaczej, jeśli te drugie będą 
zdelegalizowane."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;We need the programmers desperately.  If they demand that we "
 "stop helping our neighbors, we have to obey.&rdquo;</strong>"
@@ -1053,7 +1158,7 @@
 "żebyśmy przestali pomagać swoim przyjaciołom, to musimy ich 
posłuchać.&rdquo;"
 "</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "You're never so desperate that you have to obey this sort of demand.  "
 "Remember: millions for defense, but not a cent for tribute!"
@@ -1063,14 +1168,14 @@
 "Millions for defense, but not one cent for tribute!&rdquo;&nbsp;&ndash; "
 "Robert Goodloe Harper]"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Programmers need to make a living somehow.&rdquo;</strong>"
 msgstr ""
 "<strong>&bdquo;Programiści muszą jakoś zarabiać na&nbsp;życie.&rdquo;</"
 "strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In the short run, this is true.  However, there are plenty of ways that "
 "programmers could make a living without selling the right to use a program.  "
@@ -1085,7 +1190,7 @@
 "nie dlatego, że&nbsp;jest to jedyny sposób na&nbsp;ich zarabianie. Jeśli "
 "tylko się chce, to łatwo znaleźć inne możliwości. Oto kilka 
przykładów:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A manufacturer introducing a new computer will pay for the porting of "
 "operating systems onto the new hardware."
@@ -1093,7 +1198,7 @@
 "Producent wprowadzający na&nbsp;rynek nowy komputer będzie płacił 
za&nbsp;"
 "dostosowanie do&nbsp;niego systemu operacyjnego."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The sale of teaching, handholding and maintenance services could also employ "
 "programmers."
@@ -1101,11 +1206,23 @@
 "W&nbsp;usługi sprzedaży kursów, prowadzenia za&nbsp;rękę oraz&nbsp;"
 "konserwacji mogliby angażować się także programiści."
 
-#. type: Content of: <p>
-msgid ""
-"People with new ideas could distribute programs as freeware<a href=\"#f7\">"
-"(9)</a>, asking for donations from satisfied users, or selling handholding "
-"services.  I have met people who are already working this way successfully."
+#. type: Content of: <div><dl><dd><p>
+# | People with new ideas could distribute programs as [-freeware<a
+# | href=\"#f7\">(9)</a>,-] {+freeware&#8239;<a class=\"ftn\"
+# | href=\"#f7\">[9]</a>,+} asking for donations from satisfied users, or
+# | selling handholding services.  I have met people who are already working
+# | this way successfully.
+#, fuzzy
+#| msgid ""
+#| "People with new ideas could distribute programs as freeware<a href="
+#| "\"#f7\">(9)</a>, asking for donations from satisfied users, or selling "
+#| "handholding services.  I have met people who are already working this way "
+#| "successfully."
+msgid ""
+"People with new ideas could distribute programs as freeware&#8239;<a class="
+"\"ftn\" href=\"#f7\">[9]</a>, asking for donations from satisfied users, or "
+"selling handholding services.  I have met people who are already working "
+"this way successfully."
 msgstr ""
 "Ludzie z&nbsp;innowacyjnymi pomysłami mogliby rozpowszechniać programy jako 
"
 "&bdquo;freeware&rdquo;<a href=\"#f7\">(9)</a>, prosząc zadowolonych "
@@ -1113,7 +1230,7 @@
 "rękę. Zdarzyło mi się spotkać ludzi, którzy już odnieśli w&nbsp;ten 
sposób "
 "sukces."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Users with related needs can form users' groups, and pay dues.  A group "
 "would contract with programming companies to write programs that the group's "
@@ -1123,13 +1240,13 @@
 "i&nbsp;płacić składki. Grupy takie mogłyby następnie podpisywać 
kontrakty "
 "z&nbsp;firmami programistycznymi, które pisałyby potrzebne im programy."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "All sorts of development can be funded with a Software Tax:"
 msgstr ""
 "Przeróżne drogi rozwoju mogą być finansowane przez Podatek Na&nbsp;Rzecz "
 "Oprogramowania:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Suppose everyone who buys a computer has to pay x percent of the price as a "
 "software tax.  The government gives this to an agency like the NSF to spend "
@@ -1140,7 +1257,7 @@
 "w&nbsp;ten sposób pieniądze agencji takiej jak NSF [National Science "
 "Foundation], żeby rozdysponowała je na&nbsp;rozwój oprogramowania."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But if the computer buyer makes a donation to software development himself, "
 "he can take a credit against the tax.  He can donate to the project of his "
@@ -1155,7 +1272,7 @@
 "będzie gotowy. Może odliczyć kwotę darowizny do&nbsp;wysokości całego "
 "podatku, który musiałby zapłacić."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The total tax rate could be decided by a vote of the payers of the tax, "
 "weighted according to the amount they will be taxed on."
@@ -1164,19 +1281,19 @@
 "opodatkowanych i&nbsp;wyważona stosownie do&nbsp;kwoty, która będzie "
 "opodatkowana."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "The consequences:"
 msgstr "Konsekwencje:"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "The computer-using community supports software development."
 msgstr "Społeczność użytkowników komputerów wspiera rozwój 
oprogramowania."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "This community decides what level of support is needed."
 msgstr "Ta sama społeczność decyduje, jak duże wsparcie jest potrzebne."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "Users who care which projects their share is spent on can choose this for "
 "themselves."
@@ -1184,7 +1301,7 @@
 "Użytkownicy, którym zależy, na&nbsp;co idą ich składki, samodzielnie 
mogą "
 "wybrać wspierany projekt."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the long run, making programs free is a step toward the postscarcity "
 "world, where nobody will have to work very hard just to make a living.  "
@@ -1202,7 +1319,7 @@
 "rodzinne, naprawy robotów i&nbsp;badania geologiczne asteroid. Nie trzeba "
 "już będzie zarabiać na&nbsp;życie programowaniem."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We have already greatly reduced the amount of work that the whole society "
 "must do for its actual productivity, but only a little of this has "
@@ -1221,11 +1338,11 @@
 "polu produkcji oprogramowania. Musimy to zrobić, żeby technologiczne zyski "
 "w&nbsp;wydajności przełożyły się na&nbsp;mniej pracy dla nas."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "Przypisy"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The wording here was careless.  The intention was that nobody would have to "
 "pay for <b>permission</b> to use the GNU system.  But the words don't make "
@@ -1260,7 +1377,7 @@
 "oprogramowanie, to tym lepiej. Ważne jest, że&nbsp;każdy, kto ma kopię, 
może "
 "swobodnie współpracować z&nbsp;innymi użytkownikami."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The expression &ldquo;give away&rdquo; is another indication that I had not "
 "yet clearly separated the issue of price from that of freedom.  We now "
@@ -1275,10 +1392,21 @@
 "words-to-avoid.html#GiveAwaySoftware\">Mylące słowa i&nbsp;sformułowania</"
 "a>&rdquo; po&nbsp;dokładniejsze wyjaśnienie."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+# | This is another place I failed to distinguish carefully between the two
+# | different meanings of [-&ldquo;free&rdquo;.-] {+&ldquo;free.&rdquo;+} The
+# | statement as it stands is not false&mdash;you can get copies of GNU
+# | software at no charge, from your friends or over the net.  But it does
+# | suggest the wrong idea.
+#, fuzzy
+#| msgid ""
+#| "This is another place I failed to distinguish carefully between the two "
+#| "different meanings of &ldquo;free&rdquo;.  The statement as it stands is "
+#| "not false&mdash;you can get copies of GNU software at no charge, from "
+#| "your friends or over the net.  But it does suggest the wrong idea."
 msgid ""
 "This is another place I failed to distinguish carefully between the two "
-"different meanings of &ldquo;free&rdquo;.  The statement as it stands is not "
+"different meanings of &ldquo;free.&rdquo; The statement as it stands is not "
 "false&mdash;you can get copies of GNU software at no charge, from your "
 "friends or over the net.  But it does suggest the wrong idea."
 msgstr ""
@@ -1288,11 +1416,11 @@
 "przyjaciół lub&nbsp;poprzez Internet&nbsp;&ndash; jednakże prowadzi ono "
 "do&nbsp;nieporozumień."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid "Several such companies now exist."
 msgstr "Istnieje teraz kilka takich firm."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Although it is a charity rather than a company, the Free Software Foundation "
 "for 10 years raised most of its funds from its distribution service.  You "
@@ -1305,7 +1433,7 @@
 "składać <a href=\"/order/order.html\">zamówienia na&nbsp;rzeczy 
z&nbsp;FSF</"
 "a>, by nas wspierać."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "A group of computer companies pooled funds around 1991 to support "
 "maintenance of the GNU C Compiler."
@@ -1313,7 +1441,7 @@
 "Grupa firm komputerowych ok. 1991 r. zebrała fundusze, aby&nbsp;wspomóc "
 "utrzymanie GNU C Compiler."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "I think I was mistaken in saying that proprietary software was the most "
 "common basis for making money in software.  It seems that actually the most "
@@ -1334,10 +1462,31 @@
 "oprogramowania. Zatem, moim zdaniem, zarobki najlepszych programistów nie "
 "będą się wiele różnić w&nbsp;świecie wolnego oprogramowania."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+# | In the 1980s I had not yet realized how confusing it was to speak of
+# | &ldquo;the issue&rdquo; of &ldquo;intellectual [-property&rdquo;.-]
+# | {+property.&rdquo;+} That term is obviously biased; more subtle is the
+# | fact that it lumps together various disparate laws which raise very
+# | different issues.  Nowadays I urge people to reject the term
+# | &ldquo;intellectual property&rdquo; entirely, lest it lead others to
+# | suppose that those laws form one coherent issue.  The way to be clear is
+# | to discuss patents, copyrights, and trademarks separately.  See <a
+# | href=\"/philosophy/not-ipr.html\">further explanation</a> of how this term
+# | spreads confusion and bias.
+#, fuzzy
+#| msgid ""
+#| "In the 1980s I had not yet realized how confusing it was to speak of "
+#| "&ldquo;the issue&rdquo; of &ldquo;intellectual property&rdquo;.  That "
+#| "term is obviously biased; more subtle is the fact that it lumps together "
+#| "various disparate laws which raise very different issues.  Nowadays I "
+#| "urge people to reject the term &ldquo;intellectual property&rdquo; "
+#| "entirely, lest it lead others to suppose that those laws form one "
+#| "coherent issue.  The way to be clear is to discuss patents, copyrights, "
+#| "and trademarks separately.  See <a href=\"/philosophy/not-ipr.html"
+#| "\">further explanation</a> of how this term spreads confusion and bias."
 msgid ""
 "In the 1980s I had not yet realized how confusing it was to speak of &ldquo;"
-"the issue&rdquo; of &ldquo;intellectual property&rdquo;.  That term is "
+"the issue&rdquo; of &ldquo;intellectual property.&rdquo; That term is "
 "obviously biased; more subtle is the fact that it lumps together various "
 "disparate laws which raise very different issues.  Nowadays I urge people to "
 "reject the term &ldquo;intellectual property&rdquo; entirely, lest it lead "
@@ -1358,10 +1507,26 @@
 "wyjaśnienie</a>, w&nbsp;którym opisano, w&nbsp;jaki sposób termin ten 
szerzy "
 "nieporozumienia i&nbsp;stronnicze podejście do&nbsp;pewnych kwestii."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+# | Subsequently we learned to distinguish between &ldquo;free software&rdquo;
+# | and [-&ldquo;freeware&rdquo;.-] {+&ldquo;freeware.&rdquo;+} The term
+# | &ldquo;freeware&rdquo; means software you are free to redistribute, but
+# | usually you are not free to study and change the source code, so most of
+# | it is not free software.  See &ldquo;<a
+# | href=\"/philosophy/words-to-avoid.html#Freeware\">Confusing Words and
+# | Phrases</a>&rdquo; for more explanation.
+#, fuzzy
+#| msgid ""
+#| "Subsequently we learned to distinguish between &ldquo;free "
+#| "software&rdquo; and &ldquo;freeware&rdquo;.  The term &ldquo;"
+#| "freeware&rdquo; means software you are free to redistribute, but usually "
+#| "you are not free to study and change the source code, so most of it is "
+#| "not free software.  See &ldquo;<a href=\"/philosophy/words-to-avoid."
+#| "html#Freeware\">Confusing Words and Phrases</a>&rdquo; for more "
+#| "explanation."
 msgid ""
 "Subsequently we learned to distinguish between &ldquo;free software&rdquo; "
-"and &ldquo;freeware&rdquo;.  The term &ldquo;freeware&rdquo; means software "
+"and &ldquo;freeware.&rdquo; The term &ldquo;freeware&rdquo; means software "
 "you are free to redistribute, but usually you are not free to study and "
 "change the source code, so most of it is not free software.  See &ldquo;<a "
 "href=\"/philosophy/words-to-avoid.html#Freeware\">Confusing Words and "
@@ -1402,14 +1567,20 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Staramy się, aby&nbsp;tłumaczenia były wierne i&nbsp;wysokiej jakości, "
@@ -1422,9 +1593,15 @@
 "tłumaczeń</a>."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; 1985, 1993, 200[-3-]{+4+}, 2005, 2007, [-2008,-] 2009,
+# | 2010, [-2014, 2015-] {+2015, 2021+} Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, "
+#| "2015 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 1985, 1993, 2004, 2005, 2007, 2009, 2010, 2015, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015 "
 "Free Software Foundation, Inc."
@@ -1465,10 +1642,9 @@
 msgid "Updated:"
 msgstr "Aktualizowane:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015, "
-"2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015, "
-"2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, "
+#~ "2015, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, "
+#~ "2015, 2021 Free Software Foundation, Inc."

Index: po/manifesto.pot
===================================================================
RCS file: /web/www/www/gnu/po/manifesto.pot,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- po/manifesto.pot    2 Jun 2015 12:55:47 -0000       1.22
+++ po/manifesto.pot    2 Nov 2021 14:41:54 -0000       1.23
@@ -1,4 +1,4 @@
-# LANGUAGE translation of http://www.gnu.org/gnu/manifesto.html
+# LANGUAGE translation of https://www.gnu.org/gnu/manifesto.html
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # This file is distributed under the same license as the original article.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -7,40 +7,41 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manifesto.html\n"
-"POT-Creation-Date: 2015-06-02 12:55+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <title>
 msgid "The GNU Manifesto - GNU Project - Free Software Foundation"
 msgstr ""
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "The GNU Manifesto"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The GNU Manifesto (which appears below) was written by <a "
-"href=\"http://www.stallman.org/\";>Richard Stallman</a> in 1985 to ask for "
+"href=\"https://www.stallman.org/\";>Richard Stallman</a> in 1985 to ask for "
 "support in developing the GNU operating system.  Part of the text was taken "
 "from the original announcement of 1983.  Through 1987, it was updated in "
 "minor ways to account for developments; since then, it seems best to leave "
 "it unchanged."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Since that time, we have learned about certain common misunderstandings that "
 "different wording could help avoid.  Footnotes added since 1993 help clarify "
 "these points."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If you want to install the GNU/Linux system, we recommend you use one of the "
 "<a href=\"/distros\">100% free software GNU/Linux distributions</a>.  For "
@@ -48,7 +49,7 @@
 "href=\"/help/help.html\">http://www.gnu.org/help</a>."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The GNU Project is part of the Free Software Movement, a campaign for <a "
 "href=\"/philosophy/free-sw.html\">freedom for users of software</a>.  It is "
@@ -59,20 +60,20 @@
 "to the same field."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "What's GNU? Gnu's Not Unix!"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU, which stands for Gnu's Not Unix, is the name for the complete "
 "Unix-compatible software system which I am writing so that I can give it "
-"away free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
-"volunteers are helping me.  Contributions of time, money, programs and "
-"equipment are greatly needed."
+"away free to everyone who can use it&#8239;<a class=\"ftn\" "
+"href=\"#f1\">[1]</a>. Several other volunteers are helping me.  "
+"Contributions of time, money, programs and equipment are greatly needed."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So far we have an Emacs text editor with Lisp for writing editor commands, a "
 "source level debugger, a yacc-compatible parser generator, a linker, and "
@@ -88,7 +89,7 @@
 "everything useful that normally comes with a Unix system, and more."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU will be able to run Unix programs, but will not be identical to Unix.  "
 "We will make all improvements that are convenient, based on our experience "
@@ -101,7 +102,7 @@
 "and Internet protocols for communication."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is aimed initially at machines in the 68000/16000 class with virtual "
 "memory, because they are the easiest machines to make it run on.  The extra "
@@ -109,17 +110,17 @@
 "to use it on them."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid horrible confusion, please pronounce the <em>g</em> in the word "
 "&ldquo;GNU&rdquo; when it is the name of this project."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why I Must Write GNU"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I consider that the Golden Rule requires that if I like a program I must "
 "share it with other people who like it.  Software sellers want to divide the "
@@ -132,20 +133,20 @@
 "against my will."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So that I can continue to use computers without dishonor, I have decided to "
 "put together a sufficient body of free software so that I will be able to "
 "get along without any software that is not free.  I have resigned from the "
-"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away.<a "
-"href=\"#f2a\">(2)</a>"
+"AI Lab to deny MIT any legal excuse to prevent me from giving GNU "
+"away&#8239;<a class=\"ftn\" href=\"#f2a\">[2]</a>."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why GNU Will Be Compatible with Unix"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Unix is not my ideal system, but it is not too bad.  The essential features "
 "of Unix seem to be good ones, and I think I can fill in what Unix lacks "
@@ -153,11 +154,11 @@
 "convenient for many other people to adopt."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How GNU Will Be Available"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is not in the public domain.  Everyone will be permitted to modify and "
 "redistribute GNU, but no distributor will be allowed to restrict its further "
@@ -167,17 +168,17 @@
 "GNU remain free."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why Many Other Programmers Want to Help"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found many other programmers who are excited about GNU and want to "
 "help."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Many programmers are unhappy about the commercialization of system "
 "software.  It may enable them to make more money, but it requires them to "
@@ -191,7 +192,7 @@
 "programming is just a way of making money."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By working on and using GNU rather than proprietary programs, we can be "
 "hospitable to everyone and obey the law.  In addition, GNU serves as an "
@@ -201,11 +202,11 @@
 "happiness that money cannot replace."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How You Can Contribute"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "(Nowadays, for software tasks to work on, see the <a "
 "href=\"http://fsf.org/campaigns/priority-projects\";>High Priority Projects "
@@ -215,13 +216,13 @@
 "GNU operating system</a>.)"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am asking computer manufacturers for donations of machines and money.  I'm "
 "asking individuals for donations of programs and work."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One consequence you can expect if you donate machines is that GNU will run "
 "on them at an early date.  The machines should be complete, ready to use "
@@ -229,7 +230,7 @@
 "sophisticated cooling or power."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found very many programmers eager to contribute part-time work for "
 "GNU.  For most projects, such part-time distributed work would be very hard "
@@ -245,7 +246,7 @@
 "communication and will be worked on by a small, tight group.)"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If I get donations of money, I may be able to hire a few people full or part "
 "time.  The salary won't be high by programmers' standards, but I'm looking "
@@ -255,24 +256,24 @@
 "another way."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why All Computer Users Will Benefit"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Once GNU is written, everyone will be able to obtain good system software "
-"free, just like air.<a href=\"#f2\">(3)</a>"
+"free, just like air&#8239;<a class=\"ftn\" href=\"#f2\">[3]</a>."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This means much more than just saving everyone the price of a Unix license.  "
 "It means that much wasteful duplication of system programming effort will be "
 "avoided.  This effort can go instead into advancing the state of the art."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Complete system sources will be available to everyone.  As a result, a user "
 "who needs changes in the system will always be free to make them himself, or "
@@ -281,7 +282,7 @@
 "sources and is in sole position to make changes."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Schools will be able to provide a much more educational environment by "
 "encouraging all students to study and improve the system code.  Harvard's "
@@ -291,13 +292,13 @@
 "this."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Finally, the overhead of considering who owns the system software and what "
 "one is or is not entitled to do with it will be lifted."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Arrangements to make people pay for using a program, including licensing of "
 "copies, always incur a tremendous cost to society through the cumbersome "
@@ -311,36 +312,36 @@
 "with a head tax and chuck the masks."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copying all or parts of a program is as natural to a programmer as "
 "breathing, and as productive.  It ought to be as free."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Some Easily Rebutted Objections to GNU's Goals"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Nobody will use it if it is free, because that means they "
 "can't rely on any support.&rdquo;</strong>"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You have to charge for the program to pay for providing the "
 "support.&rdquo;</strong>"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If people would rather pay for GNU plus service than get GNU free without "
 "service, a company to provide just service to people who have obtained GNU "
-"free ought to be profitable.<a href=\"#f3\">(4)</a>"
+"free ought to be profitable&#8239;<a class=\"ftn\" href=\"#f3\">[4]</a>."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We must distinguish between support in the form of real programming work and "
 "mere handholding.  The former is something one cannot rely on from a "
@@ -348,7 +349,7 @@
 "will tell you to get lost."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If your business needs to be able to rely on support, the only way is to "
 "have all the necessary sources and tools.  Then you can hire any available "
@@ -360,14 +361,14 @@
 "only some of them."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Meanwhile, the users who know nothing about computers need handholding: "
 "doing things for them which they could easily do themselves but don't know "
 "how."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Such services could be provided by companies that sell just handholding and "
 "repair service.  If it is true that users would rather spend money and get a "
@@ -378,19 +379,19 @@
 "for the service."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You cannot reach many people without advertising, and you "
 "must charge for the program to support that.&rdquo;</strong>"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;It's no use advertising a program people can get "
 "free.&rdquo;</strong>"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are various forms of free or very cheap publicity that can be used to "
 "inform numbers of computer users about something like GNU.  But it may be "
@@ -400,21 +401,21 @@
 "more.  This way, only the users who benefit from the advertising pay for it."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "On the other hand, if many people get GNU from their friends, and such "
 "companies don't succeed, this will show that advertising was not really "
 "necessary to spread GNU.  Why is it that free market advocates don't want to "
-"let the free market decide this?<a href=\"#f4\">(5)</a>"
+"let the free market decide this?&#8239;<a class=\"ftn\" href=\"#f4\">[5]</a>"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;My company needs a proprietary operating system to get a "
 "competitive edge.&rdquo;</strong>"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU will remove operating system software from the realm of competition.  "
 "You will not be able to get an edge in this area, but neither will your "
@@ -425,19 +426,20 @@
 "into the expensive business of selling operating systems."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "I would like to see GNU development supported by gifts from many "
-"manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
+"manufacturers and users, reducing the cost to each&#8239;<a class=\"ftn\" "
+"href=\"#f5\">[6]</a>."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't programmers deserve a reward for their "
 "creativity?&rdquo;</strong>"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If anything deserves a reward, it is social contribution.  Creativity can be "
 "a social contribution, but only in so far as society is free to use the "
@@ -446,20 +448,20 @@
 "use of these programs."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Shouldn't a programmer be able to ask for a reward for his "
 "creativity?&rdquo;</strong>"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is nothing wrong with wanting pay for work, or seeking to maximize "
 "one's income, as long as one does not use means that are destructive.  But "
 "the means customary in the field of software today are based on destruction."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Extracting money from users of a program by restricting their use of it is "
 "destructive because the restrictions reduce the amount and the ways that the "
@@ -468,7 +470,7 @@
 "the harmful consequences are deliberate destruction."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The reason a good citizen does not use such destructive means to become "
 "wealthier is that, if everyone did so, we would all become poorer from the "
@@ -479,11 +481,11 @@
 "general of all or part of that creativity."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid "<strong>&ldquo;Won't programmers starve?&rdquo;</strong>"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "I could answer that nobody is forced to be a programmer.  Most of us cannot "
 "manage to get any money for standing on the street and making faces.  But we "
@@ -491,29 +493,30 @@
 "making faces, and starving.  We do something else."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But that is the wrong answer because it accepts the questioner's implicit "
 "assumption: that without ownership of software, programmers cannot possibly "
 "be paid a cent.  Supposedly it is all or nothing."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The real reason programmers will not starve is that it will still be "
 "possible for them to get paid for programming; just not paid as much as now."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Restricting copying is not the only basis for business in software.  It is "
-"the most common basis<a href=\"#f8\">(7)</a> because it brings in the most "
-"money.  If it were prohibited, or rejected by the customer, software "
-"business would move to other bases of organization which are now used less "
-"often.  There are always numerous ways to organize any kind of business."
+"the most common basis&#8239;<a class=\"ftn\" href=\"#f8\">[7]</a> because it "
+"brings in the most money.  If it were prohibited, or rejected by the "
+"customer, software business would move to other bases of organization which "
+"are now used less often.  There are always numerous ways to organize any "
+"kind of business."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Probably programming will not be as lucrative on the new basis as it is "
 "now.  But that is not an argument against the change.  It is not considered "
@@ -522,29 +525,29 @@
 "practice they would still make considerably more than that.)"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't people have a right to control how their creativity is "
 "used?&rdquo;</strong>"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "&ldquo;Control over the use of one's ideas&rdquo; really constitutes control "
 "over other people's lives; and it is usually used to make their lives more "
 "difficult."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
-"People who have studied the issue of intellectual property rights<a "
-"href=\"#f6\">(8)</a> carefully (such as lawyers) say that there is no "
-"intrinsic right to intellectual property.  The kinds of supposed "
+"People who have studied the issue of intellectual property rights&#8239;<a "
+"class=\"ftn\" href=\"#f6\">[8]</a> carefully (such as lawyers) say that "
+"there is no intrinsic right to intellectual property.  The kinds of supposed "
 "intellectual property rights that the government recognizes were created by "
 "specific acts of legislation for specific purposes."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For example, the patent system was established to encourage inventors to "
 "disclose the details of their inventions.  Its purpose was to help society "
@@ -556,7 +559,7 @@
 "individuals who use patented products."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The idea of copyright did not exist in ancient times, when authors "
 "frequently copied other authors at length in works of nonfiction.  This "
@@ -568,7 +571,7 @@
 "who read the books."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "All intellectual property rights are just licenses granted by society "
 "because it was thought, rightly or wrongly, that society as a whole would "
@@ -577,7 +580,7 @@
 "licensing a person to do?"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The case of programs today is very different from that of books a hundred "
 "years ago.  The fact that the easiest way to copy a program is from one "
@@ -589,11 +592,11 @@
 "law enables him to."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid "<strong>&ldquo;Competition makes things get done 
better.&rdquo;</strong>"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The paradigm of competition is a race: by rewarding the winner, we encourage "
 "everyone to run faster.  When capitalism really works this way, it does a "
@@ -604,7 +607,7 @@
 "all finish late."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Proprietary and secret software is the moral equivalent of runners in a fist "
 "fight.  Sad to say, the only referee we've got does not seem to object to "
@@ -613,13 +616,13 @@
 "runners for even trying to fight."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Won't everyone stop programming without a monetary "
 "incentive?&rdquo;</strong>"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually, many people will program with absolutely no monetary incentive.  "
 "Programming has an irresistible fascination for some people, usually the "
@@ -627,7 +630,7 @@
 "who keep at it even though they have no hope of making a living that way."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But really this question, though commonly asked, is not appropriate to the "
 "situation.  Pay for programmers will not disappear, only become less.  So "
@@ -635,7 +638,7 @@
 "incentive? My experience shows that they will."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For more than ten years, many of the world's best programmers worked at the "
 "Artificial Intelligence Lab for far less money than they could have had "
@@ -643,13 +646,13 @@
 "appreciation, for example.  And creativity is also fun, a reward in itself."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Then most of them left when offered a chance to do the same interesting work "
 "for a lot of money."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "What the facts show is that people will program for reasons other than "
 "riches; but if given a chance to make a lot of money as well, they will come "
@@ -658,23 +661,23 @@
 "ones are banned."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;We need the programmers desperately.  If they demand that we "
 "stop helping our neighbors, we have to obey.&rdquo;</strong>"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "You're never so desperate that you have to obey this sort of demand.  "
 "Remember: millions for defense, but not a cent for tribute!"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid "<strong>&ldquo;Programmers need to make a living 
somehow.&rdquo;</strong>"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In the short run, this is true.  However, there are plenty of ways that "
 "programmers could make a living without selling the right to use a program.  "
@@ -683,45 +686,45 @@
 "find other ways if you want to find them.  Here are a number of examples."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A manufacturer introducing a new computer will pay for the porting of "
 "operating systems onto the new hardware."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The sale of teaching, handholding and maintenance services could also employ "
 "programmers."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
-"People with new ideas could distribute programs as freeware<a "
-"href=\"#f7\">(9)</a>, asking for donations from satisfied users, or selling "
-"handholding services.  I have met people who are already working this way "
-"successfully."
+"People with new ideas could distribute programs as freeware&#8239;<a "
+"class=\"ftn\" href=\"#f7\">[9]</a>, asking for donations from satisfied "
+"users, or selling handholding services.  I have met people who are already "
+"working this way successfully."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Users with related needs can form users' groups, and pay dues.  A group "
 "would contract with programming companies to write programs that the group's "
 "members would like to use."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "All sorts of development can be funded with a Software Tax:"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Suppose everyone who buys a computer has to pay x percent of the price as a "
 "software tax.  The government gives this to an agency like the NSF to spend "
 "on software development."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But if the computer buyer makes a donation to software development himself, "
 "he can take a credit against the tax.  He can donate to the project of his "
@@ -730,31 +733,31 @@
 "tax he had to pay."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The total tax rate could be decided by a vote of the payers of the tax, "
 "weighted according to the amount they will be taxed on."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "The consequences:"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "The computer-using community supports software development."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "This community decides what level of support is needed."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "Users who care which projects their share is spent on can choose this for "
 "themselves."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the long run, making programs free is a step toward the postscarcity "
 "world, where nobody will have to work very hard just to make a living.  "
@@ -765,7 +768,7 @@
 "programming."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We have already greatly reduced the amount of work that the whole society "
 "must do for its actual productivity, but only a little of this has "
@@ -777,11 +780,11 @@
 "to translate into less work for us."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The wording here was careless.  The intention was that nobody would have to "
 "pay for <b>permission</b> to use the GNU system.  But the words don't make "
@@ -798,7 +801,7 @@
 "with others in using it."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The expression &ldquo;give away&rdquo; is another indication that I had not "
 "yet clearly separated the issue of price from that of freedom.  We now "
@@ -808,19 +811,19 @@
 "and Phrases</a>&rdquo; for more explanation."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "This is another place I failed to distinguish carefully between the two "
-"different meanings of &ldquo;free&rdquo;.  The statement as it stands is not "
+"different meanings of &ldquo;free.&rdquo; The statement as it stands is not "
 "false&mdash;you can get copies of GNU software at no charge, from your "
 "friends or over the net.  But it does suggest the wrong idea."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid "Several such companies now exist."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Although it is a charity rather than a company, the Free Software Foundation "
 "for 10 years raised most of its funds from its distribution service.  You "
@@ -828,13 +831,13 @@
 "its work."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "A group of computer companies pooled funds around 1991 to support "
 "maintenance of the GNU C Compiler."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "I think I was mistaken in saying that proprietary software was the most "
 "common basis for making money in software.  It seems that actually the most "
@@ -846,11 +849,11 @@
 "less in a free software world."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "In the 1980s I had not yet realized how confusing it was to speak of "
-"&ldquo;the issue&rdquo; of &ldquo;intellectual property&rdquo;.  That term "
-"is obviously biased; more subtle is the fact that it lumps together various "
+"&ldquo;the issue&rdquo; of &ldquo;intellectual property.&rdquo; That term is "
+"obviously biased; more subtle is the fact that it lumps together various "
 "disparate laws which raise very different issues.  Nowadays I urge people to "
 "reject the term &ldquo;intellectual property&rdquo; entirely, lest it lead "
 "others to suppose that those laws form one coherent issue.  The way to be "
@@ -859,10 +862,10 @@
 "spreads confusion and bias."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Subsequently we learned to distinguish between &ldquo;free software&rdquo; "
-"and &ldquo;freeware&rdquo;.  The term &ldquo;freeware&rdquo; means software "
+"and &ldquo;freeware.&rdquo; The term &ldquo;freeware&rdquo; means software "
 "you are free to redistribute, but usually you are not free to study and "
 "change the source code, so most of it is not free software.  See &ldquo;<a "
 "href=\"/philosophy/words-to-avoid.html#Freeware\">Confusing Words and "
@@ -893,7 +896,7 @@
 #
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
 #
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
@@ -901,13 +904,14 @@
 msgid ""
 "Please see the <a "
 "href=\"/server/standards/README.translations.html\">Translations README</a> "
-"for information on coordinating and submitting translations of this article."
+"for information on coordinating and contributing translations of this "
+"article."
 msgstr ""
 
 #. type: Content of: <div><p>
 msgid ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 1985, 1993, 2004, 2005, 2007, 2009, 2010, 2015, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
 
 #. type: Content of: <div><p>

Index: po/manifesto.pt-br.po
===================================================================
RCS file: /web/www/www/gnu/po/manifesto.pt-br.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- po/manifesto.pt-br.po       2 Nov 2021 13:56:42 -0000       1.15
+++ po/manifesto.pt-br.po       2 Nov 2021 14:41:54 -0000       1.16
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manifesto.html\n"
-"POT-Creation-Date: 2015-06-02 12:55+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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-11-02 14:27+0000\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "X-Generator: Gtranslator 40.0\n"
 
@@ -23,13 +24,21 @@
 msgid "The GNU Manifesto - GNU Project - Free Software Foundation"
 msgstr "O Manifesto GNU - Projeto GNU - Free Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "The GNU Manifesto"
 msgstr "O Manifesto GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "The GNU Manifesto (which appears below) was written by <a href=\"http://";
+#| "www.stallman.org/\">Richard Stallman</a> in 1985 to ask for support in "
+#| "developing the GNU operating system.  Part of the text was taken from the "
+#| "original announcement of 1983.  Through 1987, it was updated in minor "
+#| "ways to account for developments; since then, it seems best to leave it "
+#| "unchanged."
 msgid ""
-"The GNU Manifesto (which appears below) was written by <a href=\"http://www.";
+"The GNU Manifesto (which appears below) was written by <a href=\"https://www.";
 "stallman.org/\">Richard Stallman</a> in 1985 to ask for support in "
 "developing the GNU operating system.  Part of the text was taken from the "
 "original announcement of 1983.  Through 1987, it was updated in minor ways "
@@ -42,7 +51,7 @@
 "para dar conta da evolução; desde então, parece ser melhor mantê-lo "
 "inalterado."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Since that time, we have learned about certain common misunderstandings that "
 "different wording could help avoid.  Footnotes added since 1993 help clarify "
@@ -52,7 +61,7 @@
 "poderiam ter sido evitados por meio de uma escolha diferente de palavras. "
 "Notas de rodapé adicionadas desde 1993 ajudam a clarear esses pontos."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If you want to install the GNU/Linux system, we recommend you use one of the "
 "<a href=\"/distros\">100% free software GNU/Linux distributions</a>.  For "
@@ -64,7 +73,7 @@
 "livre</a>. Para saber como contribuir, veja <a href=\"/help/help.html"
 "\">http://www.gnu.org/help</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The GNU Project is part of the Free Software Movement, a campaign for <a "
 "href=\"/philosophy/free-sw.html\">freedom for users of software</a>.  It is "
@@ -80,17 +89,24 @@
 "Software Livre. Eles o usam para promover uma <a href=\"/philosophy/open-"
 "source-misses-the-point.html\">abordagem imoral</a> para o mesmo campo."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "What's GNU? Gnu's Not Unix!"
 msgstr "O Que é o GNU? Gnu Não é Unix!"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
+#| "compatible software system which I am writing so that I can give it away "
+#| "free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
+#| "volunteers are helping me.  Contributions of time, money, programs and "
+#| "equipment are greatly needed."
 msgid ""
 "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
 "compatible software system which I am writing so that I can give it away "
-"free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
-"volunteers are helping me.  Contributions of time, money, programs and "
-"equipment are greatly needed."
+"free to everyone who can use it&#8239;<a class=\"ftn\" href=\"#f1\">[1]</a>. "
+"Several other volunteers are helping me.  Contributions of time, money, "
+"programs and equipment are greatly needed."
 msgstr ""
 "GNU, que significa Gnu Não é Unix (“GNU's Not Unix”), é o nome para um 
"
 "sistema de software completo e compatível com o Unix, que eu estou "
@@ -99,7 +115,7 @@
 "ajudando. Contribuições de tempo, dinheiro, programas e equipamentos são "
 "bastante necessários."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So far we have an Emacs text editor with Lisp for writing editor commands, a "
 "source level debugger, a yacc-compatible parser generator, a linker, and "
@@ -129,7 +145,7 @@
 "documentação on-line. Nós esperamos fornecer, eventualmente, tudo de útil 
"
 "que normalmente vem com um sistema Unix, e ainda mais."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU will be able to run Unix programs, but will not be identical to Unix.  "
 "We will make all improvements that are convenient, based on our experience "
@@ -153,7 +169,7 @@
 "tentaremos suportar UUCP, MIT Chaosnet, e protocolos da Internet para "
 "comunicação."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is aimed initially at machines in the 68000/16000 class with virtual "
 "memory, because they are the easiest machines to make it run on.  The extra "
@@ -165,7 +181,7 @@
 "esforço extra para fazê-lo funcionar em máquinas menores será deixado 
para "
 "alguém que deseje utilizá-lo nelas."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid horrible confusion, please pronounce the <em>g</em> in the word "
 "&ldquo;GNU&rdquo; when it is the name of this project."
@@ -173,11 +189,11 @@
 "Para evitar uma confusão horrível, por favor pronuncie a letra <em>g</em> 
na "
 "palavra “GNU” quando ela for o nome deste projeto."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why I Must Write GNU"
 msgstr "Por Que Eu Tenho que Escrever o GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I consider that the Golden Rule requires that if I like a program I must "
 "share it with other people who like it.  Software sellers want to divide the "
@@ -201,13 +217,20 @@
 "foram longe demais: eu não podia permanecer em uma instituição onde tais "
 "coisas eram feitas a mim contra a minha vontade."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "So that I can continue to use computers without dishonor, I have decided "
+#| "to put together a sufficient body of free software so that I will be able "
+#| "to get along without any software that is not free.  I have resigned from "
+#| "the AI Lab to deny MIT any legal excuse to prevent me from giving GNU "
+#| "away.<a href=\"#f2a\">(2)</a>"
 msgid ""
 "So that I can continue to use computers without dishonor, I have decided to "
 "put together a sufficient body of free software so that I will be able to "
 "get along without any software that is not free.  I have resigned from the "
-"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away.<a "
-"href=\"#f2a\">(2)</a>"
+"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away&#8239;"
+"<a class=\"ftn\" href=\"#f2a\">[2]</a>."
 msgstr ""
 "Portanto, de modo que eu possa continuar a usar computadores sem desonra, eu "
 "decidi juntar uma quantidade de software livre suficiente para que eu possa "
@@ -215,11 +238,11 @@
 "Laboratório de IA para impedir que o MIT tenha qualquer desculpa legal para "
 "me impedir de fornecer o GNU livremente.<a href=\"#f2a\">(2)</a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why GNU Will Be Compatible with Unix"
 msgstr "Por que o GNU Será Compatível com o Unix"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Unix is not my ideal system, but it is not too bad.  The essential features "
 "of Unix seem to be good ones, and I think I can fill in what Unix lacks "
@@ -231,11 +254,11 @@
 "fornecer o que falta no Unix sem comprometê-lo. E um sistema compatível com 
"
 "o Unix seria conveniente para muitas pessoas adotarem."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How GNU Will Be Available"
 msgstr "Como o GNU Estará Disponível"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is not in the public domain.  Everyone will be permitted to modify and "
 "redistribute GNU, but no distributor will be allowed to restrict its further "
@@ -249,11 +272,11 @@
 "href=\"/philosophy/categories.html#ProprietarySoftware\">privativa</a>. Eu "
 "quero ter certeza de que todas as versões do GNU permanecerão livres."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why Many Other Programmers Want to Help"
 msgstr "Por que Muitos Outros Programadores Desejam Ajudar"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found many other programmers who are excited about GNU and want to "
 "help."
@@ -261,7 +284,7 @@
 "Eu encontrei muitos outros programadores que estão excitados quanto ao GNU e 
"
 "querem ajudar."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Many programmers are unhappy about the commercialization of system "
 "software.  It may enable them to make more money, but it requires them to "
@@ -286,7 +309,7 @@
 "vontade com nenhuma das escolhas. Eles se tornam cínicos e passam a "
 "considerar que a programação é apenas uma maneira de ganhar dinheiro."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By working on and using GNU rather than proprietary programs, we can be "
 "hospitable to everyone and obey the law.  In addition, GNU serves as an "
@@ -303,11 +326,11 @@
 "aproximadamente metade dos programadores com quem eu falo, esta é uma "
 "importante alegria que dinheiro não pode substituir."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How You Can Contribute"
 msgstr "Como Você Pode Contribuir"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "(Nowadays, for software tasks to work on, see the <a href=\"http://fsf.org/";
 "campaigns/priority-projects\">High Priority Projects list</a> and the <a "
@@ -324,7 +347,7 @@
 "de ajudar, veja <a href=\"/help/help.html\">o guia de ajuda ao sistema "
 "operacional do GNU</a>.)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am asking computer manufacturers for donations of machines and money.  I'm "
 "asking individuals for donations of programs and work."
@@ -332,7 +355,7 @@
 "Eu estou pedindo aos fabricantes de computadores por doações de máquinas e 
"
 "dinheiro. Eu estou pedindo às pessoas por doações de programas e de 
trabalho."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One consequence you can expect if you donate machines is that GNU will run "
 "on them at an early date.  The machines should be complete, ready to use "
@@ -344,7 +367,7 @@
 "para uso, e aprovadas para utilização em áreas residenciais, e não devem "
 "necessitar de sistemas sofisticados de refrigeração ou energia."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found very many programmers eager to contribute part-time work for "
 "GNU.  For most projects, such part-time distributed work would be very hard "
@@ -374,7 +397,7 @@
 "trabalho viável. (O kernel irá necessitar comunicação mais próxima e 
será "
 "trabalhado por um grupo pequeno e coeso.)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If I get donations of money, I may be able to hire a few people full or part "
 "time.  The salary won't be high by programmers' standards, but I'm looking "
@@ -391,19 +414,23 @@
 "energias em trabalhar no GNU, sem que elas necessitem de uma outra maneira "
 "de ganhar a vida."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why All Computer Users Will Benefit"
 msgstr "Por que Todos os Usuários de Computadores Serão Beneficiados"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Once GNU is written, everyone will be able to obtain good system software "
+#| "free, just like air.<a href=\"#f2\">(3)</a>"
 msgid ""
 "Once GNU is written, everyone will be able to obtain good system software "
-"free, just like air.<a href=\"#f2\">(3)</a>"
+"free, just like air&#8239;<a class=\"ftn\" href=\"#f2\">[3]</a>."
 msgstr ""
 "Uma vez que o GNU esteja pronto, todos poderão obter um bom software de "
 "sistema, gratuitamente como o ar.<a href=\"#f2\">(3)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This means much more than just saving everyone the price of a Unix license.  "
 "It means that much wasteful duplication of system programming effort will be "
@@ -414,7 +441,7 @@
 "de sistemas será evitada. Este esforço poderá ser utilizado em avançar o "
 "estado-da-arte."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Complete system sources will be available to everyone.  As a result, a user "
 "who needs changes in the system will always be free to make them himself, or "
@@ -429,7 +456,7 @@
 "do programador ou empresa que é dono dos fontes e é o único que pode "
 "realizar mudanças."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Schools will be able to provide a much more educational environment by "
 "encouraging all students to study and improve the system code.  Harvard's "
@@ -445,7 +472,7 @@
 "esta posição foi sustentada quando o laboratório se recusou a instalar "
 "certos programas. Eu fui bastante inspirado por eles."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Finally, the overhead of considering who owns the system software and what "
 "one is or is not entitled to do with it will be lifted."
@@ -453,7 +480,7 @@
 "Finalmente, o esforço de localizar o dono do software de sistema e o que se "
 "pode ou não se pode fazer com ele será aliviado."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Arrangements to make people pay for using a program, including licensing of "
 "copies, always incur a tremendous cost to society through the cumbersome "
@@ -478,7 +505,7 @@
 "todo lado para verificar se alguém tirar a máscara é ultrajante. É melhor 
"
 "manter a fábrica de ar com uma taxa por pessoa e eliminar as máscaras."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copying all or parts of a program is as natural to a programmer as "
 "breathing, and as productive.  It ought to be as free."
@@ -486,11 +513,11 @@
 "Copiar todo ou parte de um programa é tão natural para um programador 
quanto "
 "respirar, e tão produtivo quanto. Isto tem que ser livre."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Some Easily Rebutted Objections to GNU's Goals"
 msgstr "Algumas Objeções Facilmente Refutadas aos Objetivos do GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Nobody will use it if it is free, because that means they "
 "can't rely on any support.&rdquo;</strong>"
@@ -498,25 +525,30 @@
 "<strong>“Ninguém vai utilizá-lo se for livre porque isto significa que 
não "
 "se pode contar com nenhum suporte.”</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You have to charge for the program to pay for providing the "
 "support.&rdquo;</strong>"
 msgstr ""
 "<strong>“Você tem que cobrar pelo programa para pagar pelo 
suporte.”</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "If people would rather pay for GNU plus service than get GNU free without "
+#| "service, a company to provide just service to people who have obtained "
+#| "GNU free ought to be profitable.<a href=\"#f3\">(4)</a>"
 msgid ""
 "If people would rather pay for GNU plus service than get GNU free without "
 "service, a company to provide just service to people who have obtained GNU "
-"free ought to be profitable.<a href=\"#f3\">(4)</a>"
+"free ought to be profitable&#8239;<a class=\"ftn\" href=\"#f3\">[4]</a>."
 msgstr ""
 "Se as pessoas puderem em vez disso pagar pelo GNU mais pelos serviços em vez 
"
 "de obter o GNU sem o serviço, uma empresa cujo objetivo seja somente "
 "fornecer serviços para as pessoas que obtiveram o GNU gratuitamente será "
 "rentável.<a href=\"#f3\">(4)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We must distinguish between support in the form of real programming work and "
 "mere handholding.  The former is something one cannot rely on from a "
@@ -528,7 +560,7 @@
 "contar em receber do vendedor de software. Se o seu problema não é o mesmo "
 "de muitas outras pessoas, o vendedor irá ignorá-lo."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If your business needs to be able to rely on support, the only way is to "
 "have all the necessary sources and tools.  Then you can hire any available "
@@ -548,7 +580,7 @@
 "contratos de distribuição. GNU não elimina todos os problemas do mundo, "
 "somente alguns deles."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Meanwhile, the users who know nothing about computers need handholding: "
 "doing things for them which they could easily do themselves but don't know "
@@ -558,7 +590,7 @@
 "ajuda: fazer coisas para eles que eles poderiam facilmente fazer eles mesmos "
 "mas eles não sabem como."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Such services could be provided by companies that sell just handholding and "
 "repair service.  If it is true that users would rather spend money and get a "
@@ -576,7 +608,7 @@
 "amarrados a nenhuma delas em particular. Enquanto isso, os usuários que não 
"
 "necessitam do serviço poderão usar o programa sem ter que pagar pelo 
serviço."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You cannot reach many people without advertising, and you "
 "must charge for the program to support that.&rdquo;</strong>"
@@ -584,7 +616,7 @@
 "<strong>“Você não pode atingir muitas pessoas sem propaganda, e você tem 
que "
 "cobrar pelo programa para pagar por isso.”</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;It's no use advertising a program people can get free.&rdquo;"
 "</strong>"
@@ -592,7 +624,7 @@
 "<strong>“Não tem sentido anunciar um programa que as pessoas podem pegar 
de "
 "graça.”</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are various forms of free or very cheap publicity that can be used to "
 "inform numbers of computer users about something like GNU.  But it may be "
@@ -609,19 +641,25 @@
 "seus anúncios e mais. Desta forma, somente os usuários que se beneficiam 
dos "
 "anúncios pagam por eles."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "On the other hand, if many people get GNU from their friends, and such "
+#| "companies don't succeed, this will show that advertising was not really "
+#| "necessary to spread GNU.  Why is it that free market advocates don't want "
+#| "to let the free market decide this?<a href=\"#f4\">(5)</a>"
 msgid ""
 "On the other hand, if many people get GNU from their friends, and such "
 "companies don't succeed, this will show that advertising was not really "
 "necessary to spread GNU.  Why is it that free market advocates don't want to "
-"let the free market decide this?<a href=\"#f4\">(5)</a>"
+"let the free market decide this?&#8239;<a class=\"ftn\" href=\"#f4\">[5]</a>"
 msgstr ""
 "Pelo outro lado, se muitas pessoas copiarem o GNU dos seus amigos, e tais "
 "empresas não tiverem sucesso, isto mostra que a propaganda não era 
realmente "
 "necessária para popularizar o GNU. Por que os advogados do mercado livre 
não "
 "deixam o mercado decidir quanto a isso?<a href=\"#f4\">(5)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;My company needs a proprietary operating system to get a "
 "competitive edge.&rdquo;</strong>"
@@ -629,7 +667,7 @@
 "<strong>“Minha empresa necessita de um sistema operacional privativo para "
 "obter uma vantagem competitiva.”</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU will remove operating system software from the realm of competition.  "
 "You will not be able to get an edge in this area, but neither will your "
@@ -647,15 +685,20 @@
 "negócio é outro, GNU pode poupá-lo de ser forçado para o negócio caro de 
"
 "vender sistemas operacionais."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "I would like to see GNU development supported by gifts from many "
+#| "manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
 msgid ""
 "I would like to see GNU development supported by gifts from many "
-"manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
+"manufacturers and users, reducing the cost to each&#8239;<a class=\"ftn\" "
+"href=\"#f5\">[6]</a>."
 msgstr ""
 "Eu gostaria de ver o desenvolvimento do GNU suportado por doações de 
várias "
 "empresas e usuários, reduzindo o custo para todos.<a href=\"#f5\">(6)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't programmers deserve a reward for their creativity?"
 "&rdquo;</strong>"
@@ -663,7 +706,7 @@
 "<strong>“Os programadores não merecem uma recompensa pela sua "
 "criatividade?”</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If anything deserves a reward, it is social contribution.  Creativity can be "
 "a social contribution, but only in so far as society is free to use the "
@@ -677,7 +720,7 @@
 "merecem ser recompensados por criarem programas inovadores, da mesma forma "
 "eles merecem ser punidos se eles restringem o uso destes programas."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Shouldn't a programmer be able to ask for a reward for his "
 "creativity?&rdquo;</strong>"
@@ -685,7 +728,7 @@
 "<strong>“Um programador não deveria poder pedir por uma recompensa pela 
sua "
 "criatividade?”</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is nothing wrong with wanting pay for work, or seeking to maximize "
 "one's income, as long as one does not use means that are destructive.  But "
@@ -696,7 +739,7 @@
 "destrutivos. Mas os meios comuns hoje no campo de software são baseados em "
 "destruição."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Extracting money from users of a program by restricting their use of it is "
 "destructive because the restrictions reduce the amount and the ways that the "
@@ -710,7 +753,7 @@
 "a humanidade deriva do programa. Quando há uma escolha deliberada em "
 "restringir, as consequências prejudiciais são destruição deliberada."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The reason a good citizen does not use such destructive means to become "
 "wealthier is that, if everyone did so, we would all become poorer from the "
@@ -728,11 +771,11 @@
 "isso. Especificamente, o desejo de ser recompensado pela minha criatividade "
 "não justifica privar o mundo em geral de tudo ou parte da minha 
criatividade."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid "<strong>&ldquo;Won't programmers starve?&rdquo;</strong>"
 msgstr "<strong>“Os programadores não irão morrer de fome?”</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "I could answer that nobody is forced to be a programmer.  Most of us cannot "
 "manage to get any money for standing on the street and making faces.  But we "
@@ -744,7 +787,7 @@
 "Mas nós não estamos, como resultado, condenados a passar nossas vidas "
 "pedindo na rua, fazendo caretas e passando fome. Nós fazemos outra coisa."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But that is the wrong answer because it accepts the questioner's implicit "
 "assumption: that without ownership of software, programmers cannot possibly "
@@ -754,7 +797,7 @@
 "questão: que sem a propriedade do software, os programadores não têm como "
 "receber um centavo. Supõe-se que seja tudo ou nada."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The real reason programmers will not starve is that it will still be "
 "possible for them to get paid for programming; just not paid as much as now."
@@ -763,13 +806,22 @@
 "possível para eles serem pagos para programar; somente não tão bem pagos "
 "como o são hoje."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Restricting copying is not the only basis for business in software.  It "
+#| "is the most common basis<a href=\"#f8\">(7)</a> because it brings in the "
+#| "most money.  If it were prohibited, or rejected by the customer, software "
+#| "business would move to other bases of organization which are now used "
+#| "less often.  There are always numerous ways to organize any kind of "
+#| "business."
 msgid ""
 "Restricting copying is not the only basis for business in software.  It is "
-"the most common basis<a href=\"#f8\">(7)</a> because it brings in the most "
-"money.  If it were prohibited, or rejected by the customer, software "
-"business would move to other bases of organization which are now used less "
-"often.  There are always numerous ways to organize any kind of business."
+"the most common basis&#8239;<a class=\"ftn\" href=\"#f8\">[7]</a> because it "
+"brings in the most money.  If it were prohibited, or rejected by the "
+"customer, software business would move to other bases of organization which "
+"are now used less often.  There are always numerous ways to organize any "
+"kind of business."
 msgstr ""
 "Restringir a cópia não é a única base para negócios com software. Ela é 
a "
 "mais comum<a href=\"#f8\">(7)</a> porque é a que traz mais dinheiro. Se ela "
@@ -778,7 +830,7 @@
 "utilizadas menos frequentemente. Existem várias formas de se organizar "
 "qualquer tipo de negócios."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Probably programming will not be as lucrative on the new basis as it is "
 "now.  But that is not an argument against the change.  It is not considered "
@@ -792,7 +844,7 @@
 "os programadores acontecer o mesmo, também não será uma injustiça. (Na "
 "prática eles ainda ganhariam consideravelmente mais do que os caixas.)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't people have a right to control how their creativity is "
 "used?&rdquo;</strong>"
@@ -800,7 +852,7 @@
 "<strong>“As pessoas não têm o direito de controlar como a sua 
criatividade é "
 "utilizada?”</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "&ldquo;Control over the use of one's ideas&rdquo; really constitutes control "
 "over other people's lives; and it is usually used to make their lives more "
@@ -809,13 +861,20 @@
 "“Controle sobre o uso das ideias” é na verdade controle sobre as vidas 
das "
 "pessoas; e isto em geral torna as vidas das pessoas mais difícil."
 
-#. type: Content of: <p>
-msgid ""
-"People who have studied the issue of intellectual property rights<a href="
-"\"#f6\">(8)</a> carefully (such as lawyers) say that there is no intrinsic "
-"right to intellectual property.  The kinds of supposed intellectual property "
-"rights that the government recognizes were created by specific acts of "
-"legislation for specific purposes."
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "People who have studied the issue of intellectual property rights<a href="
+#| "\"#f6\">(8)</a> carefully (such as lawyers) say that there is no "
+#| "intrinsic right to intellectual property.  The kinds of supposed "
+#| "intellectual property rights that the government recognizes were created "
+#| "by specific acts of legislation for specific purposes."
+msgid ""
+"People who have studied the issue of intellectual property rights&#8239;<a "
+"class=\"ftn\" href=\"#f6\">[8]</a> carefully (such as lawyers) say that "
+"there is no intrinsic right to intellectual property.  The kinds of supposed "
+"intellectual property rights that the government recognizes were created by "
+"specific acts of legislation for specific purposes."
 msgstr ""
 "As pessoas que estudaram a questão da propriedade intelectual<a 
href=\"#f6\">"
 "(8)</a> cuidadosamente (como os advogados) dizem que não existe direito "
@@ -823,7 +882,7 @@
 "intelectual que o governo reconhece foram criados por atos específicos de "
 "legislação para propósitos específicos."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For example, the patent system was established to encourage inventors to "
 "disclose the details of their inventions.  Its purpose was to help society "
@@ -843,7 +902,7 @@
 "custo de se montar uma fábrica, a patente não causou muito prejuízo. Elas "
 "não obstruíram a maioria das pessoas que utilizavam produtos patenteados."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The idea of copyright did not exist in ancient times, when authors "
 "frequently copied other authors at length in works of nonfiction.  This "
@@ -863,7 +922,7 @@
 "economicamente apenas pela prensa de uma gráfica – ele causou poucos 
danos, "
 "e não obstruiu a maioria das pessoas que liam os livros."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "All intellectual property rights are just licenses granted by society "
 "because it was thought, rightly or wrongly, that society as a whole would "
@@ -877,7 +936,7 @@
 "particular, temos que perguntar: nós estamos realmente melhor concedendo "
 "esta licença? Que tipo de atos nós estamos autorizando uma pessoa a 
cometer?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The case of programs today is very different from that of books a hundred "
 "years ago.  The fact that the easiest way to copy a program is from one "
@@ -897,13 +956,13 @@
 "um todo tanto material quanto espiritualmente; esta pessoa não deveria fazer 
"
 "isso apesar ou mesmo que a lei permita que ela faça."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Competition makes things get done better.&rdquo;</strong>"
 msgstr ""
 "<strong>“Competição faz com que as coisas sejam feitas 
melhor.”</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The paradigm of competition is a race: by rewarding the winner, we encourage "
 "everyone to run faster.  When capitalism really works this way, it does a "
@@ -922,7 +981,7 @@
 "por exemplo, atacar os outros corredores. Se os corredores se envolverem em "
 "uma luta corpo-a-corpo, todos eles chegarão mais tarde."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Proprietary and secret software is the moral equivalent of runners in a fist "
 "fight.  Sad to say, the only referee we've got does not seem to object to "
@@ -936,7 +995,7 @@
 "pode disparar um tiro”). Ele na verdade deveria encerrar com as lutas, e "
 "penalizar os corredores que tentarem lutar."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Won't everyone stop programming without a monetary incentive?"
 "&rdquo;</strong>"
@@ -944,7 +1003,7 @@
 "<strong>“Não irão todos parar de programar sem um incentivo 
monetário?”</"
 "strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually, many people will program with absolutely no monetary incentive.  "
 "Programming has an irresistible fascination for some people, usually the "
@@ -957,7 +1016,7 @@
 "músicos profissionais que se mantém na carreira mesmo quando não há "
 "esperança de se ganhar a vida desta forma."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But really this question, though commonly asked, is not appropriate to the "
 "situation.  Pay for programmers will not disappear, only become less.  So "
@@ -969,7 +1028,7 @@
 "apenas se pagará menos. Então a questão é, alguém irá programar com um "
 "incentivo monetário reduzido? Minha experiência mostra que sim."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For more than ten years, many of the world's best programmers worked at the "
 "Artificial Intelligence Lab for far less money than they could have had "
@@ -982,7 +1041,7 @@
 "recompensas não financeiras: fama e reconhecimento, por exemplo. E "
 "criatividade também é um entretenimento, uma recompensa em si mesma."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Then most of them left when offered a chance to do the same interesting work "
 "for a lot of money."
@@ -990,7 +1049,7 @@
 "Então a maioria deles saiu quando recebeu uma chance de fazer o mesmo "
 "trabalho interessante recebendo bastante dinheiro."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "What the facts show is that people will program for reasons other than "
 "riches; but if given a chance to make a lot of money as well, they will come "
@@ -1005,7 +1064,7 @@
 "se realizar seu trabalho de maneira ruim se as organizações que pagam bem "
 "forem banidas."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;We need the programmers desperately.  If they demand that we "
 "stop helping our neighbors, we have to obey.&rdquo;</strong>"
@@ -1014,7 +1073,7 @@
 "que nós paremos de ajudar nossos semelhantes, nós temos que obedecer.”</"
 "strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "You're never so desperate that you have to obey this sort of demand.  "
 "Remember: millions for defense, but not a cent for tribute!"
@@ -1022,13 +1081,13 @@
 "Você nunca está tão desesperado que você tenha que atender a este tipo de 
"
 "exigência. Lembre-se: milhões para a defesa, mas nenhum centavo como 
tributo!"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Programmers need to make a living somehow.&rdquo;</strong>"
 msgstr ""
 "<strong>“Os programadores têm que ganhar a vida de algum 
jeito.”</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In the short run, this is true.  However, there are plenty of ways that "
 "programmers could make a living without selling the right to use a program.  "
@@ -1043,7 +1102,7 @@
 "único modo de se ganhar a vida. É fácil encontrar outros modos de ganhar a 
"
 "vida se você deseja encontrá-los. Eis alguns exemplos."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A manufacturer introducing a new computer will pay for the porting of "
 "operating systems onto the new hardware."
@@ -1051,7 +1110,7 @@
 "Um fabricante lançando um novo computador irá pagar pelo porte do sistema "
 "operacional para o novo hardware."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The sale of teaching, handholding and maintenance services could also employ "
 "programmers."
@@ -1059,18 +1118,25 @@
 "A venda de serviços de treinamento, ajuda e manutenção também poderia "
 "empregar os programadores."
 
-#. type: Content of: <p>
-msgid ""
-"People with new ideas could distribute programs as freeware<a href=\"#f7\">"
-"(9)</a>, asking for donations from satisfied users, or selling handholding "
-"services.  I have met people who are already working this way successfully."
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "People with new ideas could distribute programs as freeware<a href="
+#| "\"#f7\">(9)</a>, asking for donations from satisfied users, or selling "
+#| "handholding services.  I have met people who are already working this way "
+#| "successfully."
+msgid ""
+"People with new ideas could distribute programs as freeware&#8239;<a class="
+"\"ftn\" href=\"#f7\">[9]</a>, asking for donations from satisfied users, or "
+"selling handholding services.  I have met people who are already working "
+"this way successfully."
 msgstr ""
 "Pessoas com novas ideias poderiam distribuir programas como freeware<a href="
 "\"#f7\">(9)</a>, pedindo por doações de usuários satisfeitos, ou vendendo "
 "serviços de ajuda [no uso do software]. Eu encontrei pessoas que já "
 "trabalham desta forma com sucesso."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Users with related needs can form users' groups, and pay dues.  A group "
 "would contract with programming companies to write programs that the group's "
@@ -1080,13 +1146,13 @@
 "anuidades. O grupo poderia contratar empresas de programação para escrever "
 "programas que os membros do grupo desejariam usar."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "All sorts of development can be funded with a Software Tax:"
 msgstr ""
 "Todos os tipos de desenvolvimento podem ser financiados com um Imposto de "
 "Software:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Suppose everyone who buys a computer has to pay x percent of the price as a "
 "software tax.  The government gives this to an agency like the NSF to spend "
@@ -1096,7 +1162,7 @@
 "do preço como um imposto de software. O governo daria este dinheiro a uma "
 "agência como a NSF para gastar em desenvolvimento de software."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But if the computer buyer makes a donation to software development himself, "
 "he can take a credit against the tax.  He can donate to the project of his "
@@ -1111,7 +1177,7 @@
 "um crédito por qualquer doação até o total do imposto que ele teria que "
 "pagar."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The total tax rate could be decided by a vote of the payers of the tax, "
 "weighted according to the amount they will be taxed on."
@@ -1120,21 +1186,21 @@
 "imposto, proporcionalmente à quantidade de dinheiro sobre a qual eles serão 
"
 "taxados."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "The consequences:"
 msgstr "As consequências:"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "The computer-using community supports software development."
 msgstr ""
 "A comunidade de usuários de computadores apoiaria o desenvolvimento de "
 "software."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "This community decides what level of support is needed."
 msgstr "Esta comunidade decidiria qual nível de suporte é necessário."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "Users who care which projects their share is spent on can choose this for "
 "themselves."
@@ -1142,7 +1208,7 @@
 "Usuários preocupados com quais projetos a sua parcela é gasta poderiam "
 "escolher por eles mesmos."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the long run, making programs free is a step toward the postscarcity "
 "world, where nobody will have to work very hard just to make a living.  "
@@ -1160,7 +1226,7 @@
 "aconselhamento de famílias, reparo de robôs e prospecção de asteroides. 
Eles "
 "não terão necessidade de ganhar a vida programando."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We have already greatly reduced the amount of work that the whole society "
 "must do for its actual productivity, but only a little of this has "
@@ -1180,11 +1246,11 @@
 "área de produção de software. Nós temos que fazer isso, para que os 
ganhos "
 "técnicos em produtividade sejam transformados em menos trabalho para nós."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "Notas de rodapé"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The wording here was careless.  The intention was that nobody would have to "
 "pay for <b>permission</b> to use the GNU system.  But the words don't make "
@@ -1215,7 +1281,7 @@
 "melhor ainda. O mais importante é que qualquer um que tenha uma cópia tenha 
"
 "a liberdade de cooperar com outras pessoas utilizando o software."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The expression &ldquo;give away&rdquo; is another indication that I had not "
 "yet clearly separated the issue of price from that of freedom.  We now "
@@ -1229,10 +1295,16 @@
 "words-to-avoid.html#GiveAwaySoftware\">Palavras e Frases Confusas</a>” para 
"
 "mais explicações."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "This is another place I failed to distinguish carefully between the two "
+#| "different meanings of &ldquo;free&rdquo;.  The statement as it stands is "
+#| "not false&mdash;you can get copies of GNU software at no charge, from "
+#| "your friends or over the net.  But it does suggest the wrong idea."
 msgid ""
 "This is another place I failed to distinguish carefully between the two "
-"different meanings of &ldquo;free&rdquo;.  The statement as it stands is not "
+"different meanings of &ldquo;free.&rdquo; The statement as it stands is not "
 "false&mdash;you can get copies of GNU software at no charge, from your "
 "friends or over the net.  But it does suggest the wrong idea."
 msgstr ""
@@ -1241,11 +1313,11 @@
 "obter cópias do GNU gratuitamente, dos seus amigos ou da Internet. Mas a "
 "afirmação sugere a ideia errada."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid "Several such companies now exist."
 msgstr "Várias dessas empresas existem hoje."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Although it is a charity rather than a company, the Free Software Foundation "
 "for 10 years raised most of its funds from its distribution service.  You "
@@ -1257,7 +1329,7 @@
 "seu serviço de distribuição. Você pode <a 
href=\"/order/order.html\">comprar "
 "itens da FSF</a> para apoiar seu trabalho."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "A group of computer companies pooled funds around 1991 to support "
 "maintenance of the GNU C Compiler."
@@ -1265,7 +1337,7 @@
 "Um grupo de fabricantes de computadores ofereceu fundos por volta de 1991 "
 "para apoiar a manutenção do Compilador C do GNU."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "I think I was mistaken in saying that proprietary software was the most "
 "common basis for making money in software.  It seems that actually the most "
@@ -1286,10 +1358,21 @@
 "livre. Portanto, eu não mais espero que os programadores mais bem pagos "
 "ganhariam menos em um mundo de software livre."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "In the 1980s I had not yet realized how confusing it was to speak of "
+#| "&ldquo;the issue&rdquo; of &ldquo;intellectual property&rdquo;.  That "
+#| "term is obviously biased; more subtle is the fact that it lumps together "
+#| "various disparate laws which raise very different issues.  Nowadays I "
+#| "urge people to reject the term &ldquo;intellectual property&rdquo; "
+#| "entirely, lest it lead others to suppose that those laws form one "
+#| "coherent issue.  The way to be clear is to discuss patents, copyrights, "
+#| "and trademarks separately.  See <a href=\"/philosophy/not-ipr.html"
+#| "\">further explanation</a> of how this term spreads confusion and bias."
 msgid ""
 "In the 1980s I had not yet realized how confusing it was to speak of &ldquo;"
-"the issue&rdquo; of &ldquo;intellectual property&rdquo;.  That term is "
+"the issue&rdquo; of &ldquo;intellectual property.&rdquo; That term is "
 "obviously biased; more subtle is the fact that it lumps together various "
 "disparate laws which raise very different issues.  Nowadays I urge people to "
 "reject the term &ldquo;intellectual property&rdquo; entirely, lest it lead "
@@ -1309,10 +1392,19 @@
 "\">explicação mais aprofundada</a> sobre como esse termo espalha confusão 
e "
 "distorcido."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "Subsequently we learned to distinguish between &ldquo;free "
+#| "software&rdquo; and &ldquo;freeware&rdquo;.  The term &ldquo;"
+#| "freeware&rdquo; means software you are free to redistribute, but usually "
+#| "you are not free to study and change the source code, so most of it is "
+#| "not free software.  See &ldquo;<a href=\"/philosophy/words-to-avoid."
+#| "html#Freeware\">Confusing Words and Phrases</a>&rdquo; for more "
+#| "explanation."
 msgid ""
 "Subsequently we learned to distinguish between &ldquo;free software&rdquo; "
-"and &ldquo;freeware&rdquo;.  The term &ldquo;freeware&rdquo; means software "
+"and &ldquo;freeware.&rdquo; The term &ldquo;freeware&rdquo; means software "
 "you are free to redistribute, but usually you are not free to study and "
 "change the source code, so most of it is not free software.  See &ldquo;<a "
 "href=\"/philosophy/words-to-avoid.html#Freeware\">Confusing Words and "
@@ -1351,14 +1443,14 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "A equipe de traduções para o português brasileiro se esforça para 
oferecer "
@@ -1366,13 +1458,17 @@
 "favor, envie seus comentários e sugestões em geral sobre as traduções 
para "
 "<a href=\"mailto:web-translators@gnu.org\";>&lt;web-translators@gnu.org&gt;</"
 "a>. </p><p>Consulte o <a href=\"/server/standards/README.translations.html"
-"\">Guia para as traduções</a> para mais informações sobre a coordenação 
e o "
-"envio de traduções das páginas deste site."
+"\">Guia para as traduções</a> para mais informações sobre a coordenação 
e a "
+"contribuição com traduções das páginas deste site."
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, "
+#| "2015 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 1985, 1993, 2004, 2005, 2007, 2009, 2010, 2015, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015 "
 "Free Software Foundation, Inc."
@@ -1405,13 +1501,12 @@
 msgid "Updated:"
 msgstr "Última atualização:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015, "
-"2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015, "
-"2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, "
+#~ "2015, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, "
+#~ "2015, 2021 Free Software Foundation, Inc."
 
 #, fuzzy
 #~| msgid ""

Index: po/manifesto.ro.po
===================================================================
RCS file: /web/www/www/gnu/po/manifesto.ro.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- po/manifesto.ro.po  2 Nov 2021 13:56:41 -0000       1.6
+++ po/manifesto.ro.po  2 Nov 2021 14:41:54 -0000       1.7
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manifesto.html\n"
-"POT-Creation-Date: 2015-06-02 12:55+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2017-07-07 20:59+0300\n"
 "Last-Translator: Răzvan Sandu <razvan.sandu@zando.ro>\n"
 "Language-Team: Romanian <web-translators@gnu.org>\n"
@@ -14,19 +14,34 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-11-02 14:27+0000\n"
 "X-Generator: Poedit 2.0.1\n"
 
 #. type: Content of: <title>
 msgid "The GNU Manifesto - GNU Project - Free Software Foundation"
 msgstr "Manifestul GNU - Proiectul GNU - Free Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "The GNU Manifesto"
 msgstr "Manifestul GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
+# | The GNU Manifesto (which appears below) was written by <a
+# | href=\"http{+s+}://www.stallman.org/\">Richard Stallman</a> in 1985 to ask
+# | for support in developing the GNU operating system.  Part of the text was
+# | taken from the original announcement of 1983.  Through 1987, it was
+# | updated in minor ways to account for developments; since then, it seems
+# | best to leave it unchanged.
+#, fuzzy
+#| msgid ""
+#| "The GNU Manifesto (which appears below) was written by <a href=\"http://";
+#| "www.stallman.org/\">Richard Stallman</a> in 1985 to ask for support in "
+#| "developing the GNU operating system.  Part of the text was taken from the "
+#| "original announcement of 1983.  Through 1987, it was updated in minor "
+#| "ways to account for developments; since then, it seems best to leave it "
+#| "unchanged."
 msgid ""
-"The GNU Manifesto (which appears below) was written by <a href=\"http://www.";
+"The GNU Manifesto (which appears below) was written by <a href=\"https://www.";
 "stallman.org/\">Richard Stallman</a> in 1985 to ask for support in "
 "developing the GNU operating system.  Part of the text was taken from the "
 "original announcement of 1983.  Through 1987, it was updated in minor ways "
@@ -40,7 +55,7 @@
 "apărute între timp; după acel moment, a-l lăsa neschimbat pare să fie 
cea "
 "mai bună soluție."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Since that time, we have learned about certain common misunderstandings that "
 "different wording could help avoid.  Footnotes added since 1993 help clarify "
@@ -50,7 +65,7 @@
 "folosirea unei anume terminologii le poate evita. Notele de subsol, adăugate 
"
 "manifestului începând cu anul 1993, ajută la clarificarea acestor aspecte."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If you want to install the GNU/Linux system, we recommend you use one of the "
 "<a href=\"/distros\">100% free software GNU/Linux distributions</a>.  For "
@@ -62,7 +77,7 @@
 "pe programe libere</a>. Despre cum puteți contribui, vedeți la <a href=\"/"
 "help/help.html\">http://www.gnu.org/help</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The GNU Project is part of the Free Software Movement, a campaign for <a "
 "href=\"/philosophy/free-sw.html\">freedom for users of software</a>.  It is "
@@ -79,17 +94,30 @@
 "Mișcării. Ei îl folosesc pentru a promova o <a href=\"/philosophy/open-"
 "source-misses-the-point.html\">viziune amorală</a> asupra aceluiași 
domeniu."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "What's GNU? Gnu's Not Unix!"
 msgstr "Ce este GNU? Gnu nu este Unix!"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | GNU, which stands for Gnu's Not Unix, is the name for the complete
+# | Unix-compatible software system which I am writing so that I can give it
+# | away free to everyone who can use [-it.<a href=\"#f1\">(1)</a>-]
+# | {+it&#8239;<a class=\"ftn\" href=\"#f1\">[1]</a>.+} Several other
+# | volunteers are helping me.  Contributions of time, money, programs and
+# | equipment are greatly needed.
+#, fuzzy
+#| msgid ""
+#| "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
+#| "compatible software system which I am writing so that I can give it away "
+#| "free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
+#| "volunteers are helping me.  Contributions of time, money, programs and "
+#| "equipment are greatly needed."
 msgid ""
 "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
 "compatible software system which I am writing so that I can give it away "
-"free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
-"volunteers are helping me.  Contributions of time, money, programs and "
-"equipment are greatly needed."
+"free to everyone who can use it&#8239;<a class=\"ftn\" href=\"#f1\">[1]</a>. "
+"Several other volunteers are helping me.  Contributions of time, money, "
+"programs and equipment are greatly needed."
 msgstr ""
 "GNU, care înseamnă „Gnu nu este Unix”, este numele unui sistem de 
programe "
 "complet compatibil cu Unix, pe care îl scriu ca să îl ofer liber&nbsp;<a "
@@ -99,7 +127,7 @@
 "t.). Mă ajută alți câțiva voluntari. Contribuții constând în timp, 
bani, "
 "programe și echipamente ne sunt foarte necesare."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So far we have an Emacs text editor with Lisp for writing editor commands, a "
 "source level debugger, a yacc-compatible parser generator, a linker, and "
@@ -137,7 +165,7 @@
 "utilă care, în mod normal, este livrată împreună cu Unix - și chiar mai 
mult "
 "decât atât."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU will be able to run Unix programs, but will not be identical to Unix.  "
 "We will make all improvements that are convenient, based on our experience "
@@ -161,7 +189,7 @@
 "UUCP, sistemul Chaosnet de la MIT și Internet, ca protocoale pentru "
 "comunicații."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is aimed initially at machines in the 68000/16000 class with virtual "
 "memory, because they are the easiest machines to make it run on.  The extra "
@@ -174,7 +202,7 @@
 "mașini mai puțin puternice va fi lăsat în seama celor care vor dori să-l 
"
 "folosească pe astfel de calculatoare."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid horrible confusion, please pronounce the <em>g</em> in the word "
 "&ldquo;GNU&rdquo; when it is the name of this project."
@@ -182,11 +210,11 @@
 "Pentru a evita o încurcătură de nedescris, vă rugăm să pronunțați 
<em>g</em>-"
 "ul din numele „GNU” când vine vorba de numele proiectului."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why I Must Write GNU"
 msgstr "De ce trebuie să scriu GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I consider that the Golden Rule requires that if I like a program I must "
 "share it with other people who like it.  Software sellers want to divide the "
@@ -209,13 +237,26 @@
 "depășit măsura: nu pot rămâne într-o instituție unde astfel de treburi 
se "
 "fac în numele meu, dar împotriva voinței mele."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | So that I can continue to use computers without dishonor, I have decided
+# | to put together a sufficient body of free software so that I will be able
+# | to get along without any software that is not free.  I have resigned from
+# | the AI Lab to deny MIT any legal excuse to prevent me from giving GNU
+# | [-away.<a href=\"#f2a\">(2)</a>-] {+away&#8239;<a class=\"ftn\"
+# | href=\"#f2a\">[2]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "So that I can continue to use computers without dishonor, I have decided "
+#| "to put together a sufficient body of free software so that I will be able "
+#| "to get along without any software that is not free.  I have resigned from "
+#| "the AI Lab to deny MIT any legal excuse to prevent me from giving GNU "
+#| "away.<a href=\"#f2a\">(2)</a>"
 msgid ""
 "So that I can continue to use computers without dishonor, I have decided to "
 "put together a sufficient body of free software so that I will be able to "
 "get along without any software that is not free.  I have resigned from the "
-"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away.<a "
-"href=\"#f2a\">(2)</a>"
+"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away&#8239;"
+"<a class=\"ftn\" href=\"#f2a\">[2]</a>."
 msgstr ""
 "Așa că, pentru a putea continua să utilizez calculatoarele fără să-mi 
pătez "
 "obrazul, am hotărât să acumulez o cantitate suficientă de programe 
libere, "
@@ -224,11 +265,11 @@
 "argument juridic cu care să mă împiedice să dăruiesc oricui sistemul 
GNU."
 "&nbsp;<a href=\"#f2a\">(2)</a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why GNU Will Be Compatible with Unix"
 msgstr "De ce GNU va fi compatibil cu Unix"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Unix is not my ideal system, but it is not too bad.  The essential features "
 "of Unix seem to be good ones, and I think I can fill in what Unix lacks "
@@ -240,11 +281,11 @@
 "ce îi lipsește fără să le afectez. Iar pentru adoptare, compatibilitatea 
cu "
 "Unix ar fi un avantaj pentru mulți."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How GNU Will Be Available"
 msgstr "Cum va fi disponibil GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is not in the public domain.  Everyone will be permitted to modify and "
 "redistribute GNU, but no distributor will be allowed to restrict its further "
@@ -258,11 +299,11 @@
 "\"/philosophy/categories.html#ProprietarySoftware\">proprietare</a> nu vor "
 "fi admise. Vreau să mă asigur că toate versiunile de GNU vor rămâne 
libere."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why Many Other Programmers Want to Help"
 msgstr "De ce mulți alți programatori vor să ne ajute"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found many other programmers who are excited about GNU and want to "
 "help."
@@ -270,7 +311,7 @@
 "Am găsit mulți programatori care sunt încântați de GNU și vor să dea o 
mână "
 "de ajutor."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Many programmers are unhappy about the commercialization of system "
 "software.  It may enable them to make more money, but it requires them to "
@@ -294,7 +335,7 @@
 "confortabil în nici una dintre ipostaze. Ei devin cinici și se gândesc că 
"
 "programarea reprezintă doar un mod de a face bani."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By working on and using GNU rather than proprietary programs, we can be "
 "hospitable to everyone and obey the law.  In addition, GNU serves as an "
@@ -311,11 +352,11 @@
 "Pentru circa jumătate dintre programatorii cu care țin legătura, e o 
bucurie "
 "importantă, pe care banii n-o pot înlocui."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How You Can Contribute"
 msgstr "Cum puteți contribui"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "(Nowadays, for software tasks to work on, see the <a href=\"http://fsf.org/";
 "campaigns/priority-projects\">High Priority Projects list</a> and the <a "
@@ -332,7 +373,7 @@
 "care puteți ajuta, citiți <a href=\"/help/help.html\">ghidul pentru cei 
care "
 "vor să ofere ajutor sistemului de operare GNU</a>.)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am asking computer manufacturers for donations of machines and money.  I'm "
 "asking individuals for donations of programs and work."
@@ -340,7 +381,7 @@
 "Solicit fabricanților de calculatoare donații constând în mașini de 
calcul "
 "și bani. Solicit persoanelor fizice donații în programe și muncă."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One consequence you can expect if you donate machines is that GNU will run "
 "on them at an early date.  The machines should be complete, ready to use "
@@ -353,7 +394,7 @@
 "rezidențială; nu trebuie să necesite metode sofisticate de răcire sau de "
 "alimentare electrică."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found very many programmers eager to contribute part-time work for "
 "GNU.  For most projects, such part-time distributed work would be very hard "
@@ -383,7 +424,7 @@
 "comunicare mai strânsă și va fi scris de un grup mai mic de persoane, bine 
"
 "integrat.)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If I get donations of money, I may be able to hire a few people full or part "
 "time.  The salary won't be high by programmers' standards, but I'm looking "
@@ -400,20 +441,27 @@
 "și consacre întreaga energie lucrului la GNU, scutindu-i de necesitatea de 
a-"
 "și câștiga traiul în alte moduri."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why All Computer Users Will Benefit"
 msgstr "De ce vor avea de câștigat toți utilizatorii de calculatoare"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Once GNU is written, everyone will be able to obtain good system software
+# | free, just like [-air.<a href=\"#f2\">(3)</a>-] {+air&#8239;<a
+# | class=\"ftn\" href=\"#f2\">[3]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "Once GNU is written, everyone will be able to obtain good system software "
+#| "free, just like air.<a href=\"#f2\">(3)</a>"
 msgid ""
 "Once GNU is written, everyone will be able to obtain good system software "
-"free, just like air.<a href=\"#f2\">(3)</a>"
+"free, just like air&#8239;<a class=\"ftn\" href=\"#f2\">[3]</a>."
 msgstr ""
 "Odată ce GNU este scris, va deveni posibil pentru oricine să obțină liber 
"
 "programe de sistem de bună calitate, exact ca pe aer.&nbsp;<a href=\"#f2\">"
 "(3)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This means much more than just saving everyone the price of a Unix license.  "
 "It means that much wasteful duplication of system programming effort will be "
@@ -424,7 +472,7 @@
 "risipește pentru scrierea programelor de sistem duplicate poate fi evitat. "
 "În schimb, efortul poate fi îndreptat către producerea de programe de 
vârf."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Complete system sources will be available to everyone.  As a result, a user "
 "who needs changes in the system will always be free to make them himself, or "
@@ -438,7 +486,7 @@
 "nu vor mai fi la mila unei companii care, deținând monopolul surselor, este 
"
 "și singura care le poate modifica."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Schools will be able to provide a much more educational environment by "
 "encouraging all students to study and improve the system code.  Harvard's "
@@ -455,7 +503,7 @@
 "instaleze unele programe. Personal, m-am simțit foarte inspirat de lucrul "
 "ăsta."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Finally, the overhead of considering who owns the system software and what "
 "one is or is not entitled to do with it will be lifted."
@@ -464,7 +512,7 @@
 "anume deține programele de sistem și ce vă este sau nu vă este îngăduit 
să "
 "faceți cu ele."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Arrangements to make people pay for using a program, including licensing of "
 "copies, always incur a tremendous cost to society through the cumbersome "
@@ -491,7 +539,7 @@
 "E mai bine să finanțăm instalația de producere a aerului dintr-o taxă 
fixă "
 "pe cap de locuitor și să renunțăm la măști."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copying all or parts of a program is as natural to a programmer as "
 "breathing, and as productive.  It ought to be as free."
@@ -500,11 +548,11 @@
 "natural ca și a respira - și la fel de productiv. De aceea, trebuie să fie 
"
 "și la fel de liber."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Some Easily Rebutted Objections to GNU's Goals"
 msgstr "Câteva critici ușor de demontat la adresa obiectivelor GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Nobody will use it if it is free, because that means they "
 "can't rely on any support.&rdquo;</strong>"
@@ -512,7 +560,7 @@
 "<strong>„Nimeni n-o să-l utilizeze dacă e pe gratis, pentru că asta 
înseamnă "
 "că nu se poate conta pe ajutorul furnizorului.”</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You have to charge for the program to pay for providing the "
 "support.&rdquo;</strong>"
@@ -520,18 +568,27 @@
 "<strong>„Ești obligat să ceri bani pentru program, ca plată pentru 
asistența "
 "pe care o acorzi.”</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | If people would rather pay for GNU plus service than get GNU free without
+# | service, a company to provide just service to people who have obtained GNU
+# | free ought to be [-profitable.<a href=\"#f3\">(4)</a>-]
+# | {+profitable&#8239;<a class=\"ftn\" href=\"#f3\">[4]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "If people would rather pay for GNU plus service than get GNU free without "
+#| "service, a company to provide just service to people who have obtained "
+#| "GNU free ought to be profitable.<a href=\"#f3\">(4)</a>"
 msgid ""
 "If people would rather pay for GNU plus service than get GNU free without "
 "service, a company to provide just service to people who have obtained GNU "
-"free ought to be profitable.<a href=\"#f3\">(4)</a>"
+"free ought to be profitable&#8239;<a class=\"ftn\" href=\"#f3\">[4]</a>."
 msgstr ""
 "Dacă publicul preferă să plătească pentru GNU plus acordarea de servicii 
"
 "adăugate în loc să obțină GNU gratis fără aceste servicii, atunci o 
companie "
 "care va furniza serviciile celor care au obținut GNU „la liber” trebuie 
să "
 "fie profitabilă.&nbsp;<a href=\"#f3\">(4)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We must distinguish between support in the form of real programming work and "
 "mere handholding.  The former is something one cannot rely on from a "
@@ -544,7 +601,7 @@
 "nu este întâlnită de suficienți alți oameni, furnizorul o să vă 
trimită la "
 "plimbare."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If your business needs to be able to rely on support, the only way is to "
 "have all the necessary sources and tools.  Then you can hire any available "
@@ -565,7 +622,7 @@
 "poate fi imputată modelului de distribuire. GNU nu înlătură toate 
problemele "
 "lumii, ci numai unele dintre ele."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Meanwhile, the users who know nothing about computers need handholding: "
 "doing things for them which they could easily do themselves but don't know "
@@ -575,7 +632,7 @@
 "nevoie de ajutor: trebuie făcute, în locul lor, lucruri pe care le-ar putea 
"
 "face ușor și singuri, dar nu știu cum."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Such services could be provided by companies that sell just handholding and "
 "repair service.  If it is true that users would rather spend money and get a "
@@ -594,7 +651,7 @@
 "parte, aceia dintre noi care nu avem nevoie de asistență vom putea utiliza "
 "produsul fără s-o plătim."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You cannot reach many people without advertising, and you "
 "must charge for the program to support that.&rdquo;</strong>"
@@ -602,7 +659,7 @@
 "<strong>„Nu vă puteți adresa prea multor clienți fără a avea 
publicitate și "
 "va trebui să cereți bani pentru program ca s-o suportați.”</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;It's no use advertising a program people can get free.&rdquo;"
 "</strong>"
@@ -610,7 +667,7 @@
 "<strong>„Nu are rost să faci publicitate unui program pe care lumea îl 
poate "
 "obține gratis.”</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are various forms of free or very cheap publicity that can be used to "
 "inform numbers of computer users about something like GNU.  But it may be "
@@ -628,12 +685,23 @@
 "plăti pentru a-i face reclamă - și nu numai atât. În felul ăsta, numai "
 "utilizatorii care beneficiază de publicitate vor plăti pentru ea."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | On the other hand, if many people get GNU from their friends, and such
+# | companies don't succeed, this will show that advertising was not really
+# | necessary to spread GNU.  Why is it that free market advocates don't want
+# | to let the free market decide [-this?<a href=\"#f4\">(5)</a>-]
+# | {+this?&#8239;<a class=\"ftn\" href=\"#f4\">[5]</a>+}
+#, fuzzy
+#| msgid ""
+#| "On the other hand, if many people get GNU from their friends, and such "
+#| "companies don't succeed, this will show that advertising was not really "
+#| "necessary to spread GNU.  Why is it that free market advocates don't want "
+#| "to let the free market decide this?<a href=\"#f4\">(5)</a>"
 msgid ""
 "On the other hand, if many people get GNU from their friends, and such "
 "companies don't succeed, this will show that advertising was not really "
 "necessary to spread GNU.  Why is it that free market advocates don't want to "
-"let the free market decide this?<a href=\"#f4\">(5)</a>"
+"let the free market decide this?&#8239;<a class=\"ftn\" href=\"#f4\">[5]</a>"
 msgstr ""
 "În celălalt caz, dacă mulți vor obține GNU de la prieteni și companiile 
de "
 "acest fel nu vor avea succes comercial, va însemna că publicitatea nu era "
@@ -641,7 +709,7 @@
 "cei care propovăduiesc piața liberă ca ea să decidă toate aceste 
aspecte?"
 "&nbsp;<a href=\"#f4\">(4)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;My company needs a proprietary operating system to get a "
 "competitive edge.&rdquo;</strong>"
@@ -649,7 +717,7 @@
 "<strong>„Compania mea are nevoie de un sistem de operare proprietar ca să "
 "obțină un avantaj în competiția de piață.”</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU will remove operating system software from the realm of competition.  "
 "You will not be able to get an edge in this area, but neither will your "
@@ -667,16 +735,25 @@
 "privesc. Dacă firma se ocupă cu altceva, GNU vă poate scuti de 
constrângerea "
 "de a intra în afacerea costisitoare a vânzării de sisteme de operare."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | I would like to see GNU development supported by gifts from many
+# | manufacturers and users, reducing the cost to [-each.<a
+# | href=\"#f5\">(6)</a>-] {+each&#8239;<a class=\"ftn\"
+# | href=\"#f5\">[6]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "I would like to see GNU development supported by gifts from many "
+#| "manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
 msgid ""
 "I would like to see GNU development supported by gifts from many "
-"manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
+"manufacturers and users, reducing the cost to each&#8239;<a class=\"ftn\" "
+"href=\"#f5\">[6]</a>."
 msgstr ""
 "Aș vrea să văd că dezvoltarea GNU este ajutată prin donații de la 
mulți "
 "producători și utilizatori, micșorând astfel costurile pentru toți cei "
 "implicați.&nbsp;<a href=\"#f5\">(6)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't programmers deserve a reward for their creativity?"
 "&rdquo;</strong>"
@@ -684,7 +761,7 @@
 "<strong>„Programatorii nu merită o recompensă pentru creativitatea 
lor?”</"
 "strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If anything deserves a reward, it is social contribution.  Creativity can be "
 "a social contribution, but only in so far as society is free to use the "
@@ -699,7 +776,7 @@
 "inovatoare, în aceeași măsură ei merită să fie pedepsiți când le "
 "restricționează utilizarea."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Shouldn't a programmer be able to ask for a reward for his "
 "creativity?&rdquo;</strong>"
@@ -707,7 +784,7 @@
 "<strong>„Nu ar trebui să poată programatorul să ceară o recompensă 
pentru "
 "creația lui?”</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is nothing wrong with wanting pay for work, or seeking to maximize "
 "one's income, as long as one does not use means that are destructive.  But "
@@ -718,7 +795,7 @@
 "distructive pentru asta. Dar mijloacele uzual folosite azi în domeniul "
 "programării se bazează pe distrugere."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Extracting money from users of a program by restricting their use of it is "
 "destructive because the restrictions reduce the amount and the ways that the "
@@ -733,7 +810,7 @@
 "programului. Acolo unde se face o alegere intenționată de a restricționa, "
 "consecințele negative apărute reprezintă distrugere deliberată."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The reason a good citizen does not use such destructive means to become "
 "wealthier is that, if everyone did so, we would all become poorer from the "
@@ -752,11 +829,11 @@
 "pentru creativitate nu scuză faptul de a priva omenirea, în sens larg, de "
 "obiectul creat, în tot sau în parte."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid "<strong>&ldquo;Won't programmers starve?&rdquo;</strong>"
 msgstr "<strong>„Nu vor muri programatorii de foame?”</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "I could answer that nobody is forced to be a programmer.  Most of us cannot "
 "manage to get any money for standing on the street and making faces.  But we "
@@ -768,7 +845,7 @@
 "suntem condamnați să stăm pe stradă și să cerșim, ajungând muritori 
de "
 "foame. Pur și simplu ne ocupăm cu altceva."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But that is the wrong answer because it accepts the questioner's implicit "
 "assumption: that without ownership of software, programmers cannot possibly "
@@ -779,7 +856,7 @@
 "programatorii n-ar putea să câștige nici măcar un cent. Se acreditează 
ideea "
 "că e totul sau nimic."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The real reason programmers will not starve is that it will still be "
 "possible for them to get paid for programming; just not paid as much as now."
@@ -788,13 +865,28 @@
 "putea în continuare să fie plătiți pentru munca lor: doar că nu vor mai 
fi "
 "plătiți atât de mult ca acum."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | Restricting copying is not the only basis for business in software.  It is
+# | the most common [-basis<a href=\"#f8\">(7)</a>-] {+basis&#8239;<a
+# | class=\"ftn\" href=\"#f8\">[7]</a>+} because it brings in the most money. 
+# | If it were prohibited, or rejected by the customer, software business
+# | would move to other bases of organization which are now used less often. 
+# | There are always numerous ways to organize any kind of business.
+#, fuzzy
+#| msgid ""
+#| "Restricting copying is not the only basis for business in software.  It "
+#| "is the most common basis<a href=\"#f8\">(7)</a> because it brings in the "
+#| "most money.  If it were prohibited, or rejected by the customer, software "
+#| "business would move to other bases of organization which are now used "
+#| "less often.  There are always numerous ways to organize any kind of "
+#| "business."
 msgid ""
 "Restricting copying is not the only basis for business in software.  It is "
-"the most common basis<a href=\"#f8\">(7)</a> because it brings in the most "
-"money.  If it were prohibited, or rejected by the customer, software "
-"business would move to other bases of organization which are now used less "
-"often.  There are always numerous ways to organize any kind of business."
+"the most common basis&#8239;<a class=\"ftn\" href=\"#f8\">[7]</a> because it "
+"brings in the most money.  If it were prohibited, or rejected by the "
+"customer, software business would move to other bases of organization which "
+"are now used less often.  There are always numerous ways to organize any "
+"kind of business."
 msgstr ""
 "Restricționarea copierii nu reprezintă singurul mod de a face afaceri cu "
 "programe. Este cea mai întâlnită metodă&nbsp;<a href=\"#f8\">(7)</a> 
pentru "
@@ -803,7 +895,7 @@
 "organizare, care acum sunt folosite mai rar. Există întotdeauna multe 
feluri "
 "în care poți organiza orice tip de afacere."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Probably programming will not be as lucrative on the new basis as it is "
 "now.  But that is not an argument against the change.  It is not considered "
@@ -818,7 +910,7 @@
 "nici atunci n-ar fi o nedreptate. (În practică, ei ar câștiga 
considerabil "
 "mai mult decât vânzătorii.)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't people have a right to control how their creativity is "
 "used?&rdquo;</strong>"
@@ -826,7 +918,7 @@
 "<strong>„Oamenii nu au dreptul să controleze felul cum este folosită 
creația "
 "lor?”</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "&ldquo;Control over the use of one's ideas&rdquo; really constitutes control "
 "over other people's lives; and it is usually used to make their lives more "
@@ -836,13 +928,26 @@
 "asupra vieților altor oameni; de obicei, el este folosit ca să le facă "
 "acelora viețile mai dificile."
 
-#. type: Content of: <p>
-msgid ""
-"People who have studied the issue of intellectual property rights<a href="
-"\"#f6\">(8)</a> carefully (such as lawyers) say that there is no intrinsic "
-"right to intellectual property.  The kinds of supposed intellectual property "
-"rights that the government recognizes were created by specific acts of "
-"legislation for specific purposes."
+#. type: Content of: <div><dl><dd><p>
+# | People who have studied the issue of intellectual property [-rights<a
+# | href=\"#f6\">(8)</a>-] {+rights&#8239;<a class=\"ftn\"
+# | href=\"#f6\">[8]</a>+} carefully (such as lawyers) say that there is no
+# | intrinsic right to intellectual property.  The kinds of supposed
+# | intellectual property rights that the government recognizes were created
+# | by specific acts of legislation for specific purposes.
+#, fuzzy
+#| msgid ""
+#| "People who have studied the issue of intellectual property rights<a href="
+#| "\"#f6\">(8)</a> carefully (such as lawyers) say that there is no "
+#| "intrinsic right to intellectual property.  The kinds of supposed "
+#| "intellectual property rights that the government recognizes were created "
+#| "by specific acts of legislation for specific purposes."
+msgid ""
+"People who have studied the issue of intellectual property rights&#8239;<a "
+"class=\"ftn\" href=\"#f6\">[8]</a> carefully (such as lawyers) say that "
+"there is no intrinsic right to intellectual property.  The kinds of supposed "
+"intellectual property rights that the government recognizes were created by "
+"specific acts of legislation for specific purposes."
 msgstr ""
 "Cei care au studiat atent problema drepturilor de proprietate "
 "intelectuală&nbsp;<a href=\"#f6\">(8)</a> (cum ar fi avocații) spun că nu "
@@ -850,7 +955,7 @@
 "proprietate intelectuală pe care le recunosc autoritățile au fost create 
de "
 "legi anumite, cu scopuri anume."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For example, the patent system was established to encourage inventors to "
 "disclose the details of their inventions.  Its purpose was to help society "
@@ -873,7 +978,7 @@
 "rău. Ele nu reprezentau o piedică pentru majoritatea persoanelor care "
 "utilizează produse patentate."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The idea of copyright did not exist in ancient times, when authors "
 "frequently copied other authors at length in works of nonfiction.  This "
@@ -893,7 +998,7 @@
 "cărțile, care puteau fi multiplicate ieftin numai folosind o tiparniță - 
nu "
 "a făcut mult rău și nu i-a obstrucționat pe cei care citeau aceste 
cărți."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "All intellectual property rights are just licenses granted by society "
 "because it was thought, rightly or wrongly, that society as a whole would "
@@ -907,7 +1012,7 @@
 "particular, trebuie să ne întrebăm: avem vreun avantaj din acordarea unei "
 "astfel de licențe? Pentru ce fel de acțiune împuternicim o persoană?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The case of programs today is very different from that of books a hundred "
 "years ago.  The fact that the easiest way to copy a program is from one "
@@ -927,13 +1032,13 @@
 "și spiritual; o situație în care nimeni n-ar trebui să se pună, chiar 
dacă "
 "legea îi dă voie s-o facă."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Competition makes things get done better.&rdquo;</strong>"
 msgstr ""
 "<strong>„Concurența înseamnă că lucrurile sunt făcute mai 
bine.”</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The paradigm of competition is a race: by rewarding the winner, we encourage "
 "everyone to run faster.  When capitalism really works this way, it does a "
@@ -952,7 +1057,7 @@
 "alergători. Și când concurenții se angajează într-o încăierare, vor 
întârzia "
 "toți la linia de sosire."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Proprietary and secret software is the moral equivalent of runners in a fist "
 "fight.  Sad to say, the only referee we've got does not seem to object to "
@@ -967,7 +1072,7 @@
 "i despartă pe concurenți și să-i penalizeze fie și doar pentru tentativa 
de "
 "a se încăiera."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Won't everyone stop programming without a monetary incentive?"
 "&rdquo;</strong>"
@@ -975,7 +1080,7 @@
 "<strong>„Nu vor înceta toți să scrie programe dacă nu există un 
stimulent "
 "material?”</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually, many people will program with absolutely no monetary incentive.  "
 "Programming has an irresistible fascination for some people, usually the "
@@ -987,7 +1092,7 @@
 "în domeniu. Nu ducem lipsă de muzicieni profesioniști care nu renunță de 
"
 "muzică, chiar dacă n-au nici o speranță să poată trăi din asta."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But really this question, though commonly asked, is not appropriate to the "
 "situation.  Pay for programmers will not disappear, only become less.  So "
@@ -999,7 +1104,7 @@
 "puțină. Așa că adevărata întrebare este: va mai programa cineva pentru 
mai "
 "puțini bani? Experiența mea îmi arată că da."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For more than ten years, many of the world's best programmers worked at the "
 "Artificial Intelligence Lab for far less money than they could have had "
@@ -1012,7 +1117,7 @@
 "exemplu, faimă și apreciere. În plus, a crea este amuzant: e o recompensă 
în "
 "sine."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Then most of them left when offered a chance to do the same interesting work "
 "for a lot of money."
@@ -1020,7 +1125,7 @@
 "Apoi, cei mai mulți dintre ei au plecat când li s-a oferit șansa să facă 
"
 "aceeași muncă interesantă contra unei grămezi de bani."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "What the facts show is that people will program for reasons other than "
 "riches; but if given a chance to make a lot of money as well, they will come "
@@ -1034,7 +1139,7 @@
 "salarii mici o duc prost în comparație cu cele care oferă salarii mari, 
dar "
 "nu e obligatoriu s-o ducă prost dacă cele cu salarii mari vor fi interzise."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;We need the programmers desperately.  If they demand that we "
 "stop helping our neighbors, we have to obey.&rdquo;</strong>"
@@ -1042,7 +1147,7 @@
 "<strong>„Avem nevoie disperată de programatori. Dacă ei ne cer să 
încetăm a "
 "ne mai ajuta vecinii, trebuie să ne supunem.”</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "You're never so desperate that you have to obey this sort of demand.  "
 "Remember: millions for defense, but not a cent for tribute!"
@@ -1051,12 +1156,12 @@
 "acestui gen de cereri. Țineți minte: dăm milioane pentru apărare, dar 
nici "
 "un cent ca tribut!"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Programmers need to make a living somehow.&rdquo;</strong>"
 msgstr "<strong>„Programatorii trebuie să trăiască din ceva.”</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In the short run, this is true.  However, there are plenty of ways that "
 "programmers could make a living without selling the right to use a program.  "
@@ -1071,7 +1176,7 @@
 "putea câștiga existența. Este ușor să găsești alte metode, dacă vrei 
s-o "
 "faci. Iată câteva exemple."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A manufacturer introducing a new computer will pay for the porting of "
 "operating systems onto the new hardware."
@@ -1079,7 +1184,7 @@
 "Un producător care lansează un nou model de calculator va plăti pentru "
 "portarea sistemului de operare pe noua mașină de calcul."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The sale of teaching, handholding and maintenance services could also employ "
 "programmers."
@@ -1087,18 +1192,30 @@
 "Vânzarea de cursuri, asistență și servicii de întreținere ar putea și 
ea să "
 "implice programatori."
 
-#. type: Content of: <p>
-msgid ""
-"People with new ideas could distribute programs as freeware<a href=\"#f7\">"
-"(9)</a>, asking for donations from satisfied users, or selling handholding "
-"services.  I have met people who are already working this way successfully."
+#. type: Content of: <div><dl><dd><p>
+# | People with new ideas could distribute programs as [-freeware<a
+# | href=\"#f7\">(9)</a>,-] {+freeware&#8239;<a class=\"ftn\"
+# | href=\"#f7\">[9]</a>,+} asking for donations from satisfied users, or
+# | selling handholding services.  I have met people who are already working
+# | this way successfully.
+#, fuzzy
+#| msgid ""
+#| "People with new ideas could distribute programs as freeware<a href="
+#| "\"#f7\">(9)</a>, asking for donations from satisfied users, or selling "
+#| "handholding services.  I have met people who are already working this way "
+#| "successfully."
+msgid ""
+"People with new ideas could distribute programs as freeware&#8239;<a class="
+"\"ftn\" href=\"#f7\">[9]</a>, asking for donations from satisfied users, or "
+"selling handholding services.  I have met people who are already working "
+"this way successfully."
 msgstr ""
 "Oamenii care dezvoltă idei inovatoare ar putea distribui programele ca "
 "„freeware”&nbsp;<a href=\"#f7\">(9)</a> , solicitând donații de la "
 "utilizatorii mulțumiți sau vânzând servicii de asistență. Am întâlnit 
"
 "persoane care deja lucrează în felul ăsta, cu succes."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Users with related needs can form users' groups, and pay dues.  A group "
 "would contract with programming companies to write programs that the group's "
@@ -1108,12 +1225,12 @@
 "Un grup va semna contracte cu firme de programare, pentru ca ele să scrie "
 "anume programe pe care membrii grupului doresc să le utilizeze."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "All sorts of development can be funded with a Software Tax:"
 msgstr ""
 "Toate felurile de dezvoltare pot fi finanțate printr-un impozit pe programe:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Suppose everyone who buys a computer has to pay x percent of the price as a "
 "software tax.  The government gives this to an agency like the NSF to spend "
@@ -1123,7 +1240,7 @@
 "<em>x</em> procent din preț ca impozit pe programe. Guvernul dă acești 
bani "
 "unei autorități, cum ar fi NSF, care să finanțeze dezvoltarea de 
programe."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But if the computer buyer makes a donation to software development himself, "
 "he can take a credit against the tax.  He can donate to the project of his "
@@ -1137,7 +1254,7 @@
 "fi gata. Și poate obține o reducere de impozit de orice valoare, în limita 
"
 "sumei totale pe care trebuie s-o plătească."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The total tax rate could be decided by a vote of the payers of the tax, "
 "weighted according to the amount they will be taxed on."
@@ -1145,20 +1262,20 @@
 "Procentul total de impozit poate fi stabilit prin vot de contribuabili, "
 "proporțional cu suma ce le va fi impozitată."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "The consequences:"
 msgstr "Ca urmare:"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "The computer-using community supports software development."
 msgstr ""
 "Comunitatea utilizatorilor de calculatoare sprijină dezvoltarea de programe."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "This community decides what level of support is needed."
 msgstr "Această comunitate hotărăște ce nivel de asistență îi este 
necesar."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "Users who care which projects their share is spent on can choose this for "
 "themselves."
@@ -1166,7 +1283,7 @@
 "Utilizatorii care sunt interesați pe ce este cheltuită cota lor de impozit "
 "pot alege ei înșiși."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the long run, making programs free is a step toward the postscarcity "
 "world, where nobody will have to work very hard just to make a living.  "
@@ -1184,7 +1301,7 @@
 "familială, repararea roboților și mineritul pe asteroizi. Nu va fi nevoie 
să-"
 "și poată câștiga existența din scrierea de programe."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We have already greatly reduced the amount of work that the whole society "
 "must do for its actual productivity, but only a little of this has "
@@ -1205,11 +1322,11 @@
 "producerii de programe. Trebuie să facem asta, pentru ca progresele tehnice "
 "care măresc productivitatea să însemne mai puțină muncă pentru noi."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "Note de subsol"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The wording here was careless.  The intention was that nobody would have to "
 "pay for <b>permission</b> to use the GNU system.  But the words don't make "
@@ -1240,7 +1357,7 @@
 "bine. Important este ca oricine deține o copie să aibă libertatea de a "
 "coopera cu alții în ceea ce privește folosirea ei."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The expression &ldquo;give away&rdquo; is another indication that I had not "
 "yet clearly separated the issue of price from that of freedom.  We now "
@@ -1254,10 +1371,21 @@
 "Vedeți <a 
href=\"/philosophy/words-to-avoid.html#GiveAwaySoftware\">„Cuvinte "
 "și fraze care produc confuzie”</a> pentru mai multe explicații."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+# | This is another place I failed to distinguish carefully between the two
+# | different meanings of [-&ldquo;free&rdquo;.-] {+&ldquo;free.&rdquo;+} The
+# | statement as it stands is not false&mdash;you can get copies of GNU
+# | software at no charge, from your friends or over the net.  But it does
+# | suggest the wrong idea.
+#, fuzzy
+#| msgid ""
+#| "This is another place I failed to distinguish carefully between the two "
+#| "different meanings of &ldquo;free&rdquo;.  The statement as it stands is "
+#| "not false&mdash;you can get copies of GNU software at no charge, from "
+#| "your friends or over the net.  But it does suggest the wrong idea."
 msgid ""
 "This is another place I failed to distinguish carefully between the two "
-"different meanings of &ldquo;free&rdquo;.  The statement as it stands is not "
+"different meanings of &ldquo;free.&rdquo; The statement as it stands is not "
 "false&mdash;you can get copies of GNU software at no charge, from your "
 "friends or over the net.  But it does suggest the wrong idea."
 msgstr ""
@@ -1266,11 +1394,11 @@
 "afirmația nu este falsă - puteți obține copii ale programelor GNU gratis, 
de "
 "la prieteni sau prin rețea. Dar exprimarea sugerează o altă idee."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid "Several such companies now exist."
 msgstr "Câteva firme de acest gen există, în prezent."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Although it is a charity rather than a company, the Free Software Foundation "
 "for 10 years raised most of its funds from its distribution service.  You "
@@ -1283,7 +1411,7 @@
 "distribuire propriu. Puteți <a href=\"/order/order.html\">comanda obiecte de 
"
 "la FSF</a> pentru a-i sprijini activitatea."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "A group of computer companies pooled funds around 1991 to support "
 "maintenance of the GNU C Compiler."
@@ -1291,7 +1419,7 @@
 "Prin 1991, câteva firme de calculatoare au colaborat în a colecta fonduri "
 "pentru sprijinirea întreținerii compilatorului GNU C."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "I think I was mistaken in saying that proprietary software was the most "
 "common basis for making money in software.  It seems that actually the most "
@@ -1312,10 +1440,31 @@
 "majoritatea programatorilor să câștige mai puțin, într-o lume dominată 
de "
 "astfel de programe libere."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+# | In the 1980s I had not yet realized how confusing it was to speak of
+# | &ldquo;the issue&rdquo; of &ldquo;intellectual [-property&rdquo;.-]
+# | {+property.&rdquo;+} That term is obviously biased; more subtle is the
+# | fact that it lumps together various disparate laws which raise very
+# | different issues.  Nowadays I urge people to reject the term
+# | &ldquo;intellectual property&rdquo; entirely, lest it lead others to
+# | suppose that those laws form one coherent issue.  The way to be clear is
+# | to discuss patents, copyrights, and trademarks separately.  See <a
+# | href=\"/philosophy/not-ipr.html\">further explanation</a> of how this term
+# | spreads confusion and bias.
+#, fuzzy
+#| msgid ""
+#| "In the 1980s I had not yet realized how confusing it was to speak of "
+#| "&ldquo;the issue&rdquo; of &ldquo;intellectual property&rdquo;.  That "
+#| "term is obviously biased; more subtle is the fact that it lumps together "
+#| "various disparate laws which raise very different issues.  Nowadays I "
+#| "urge people to reject the term &ldquo;intellectual property&rdquo; "
+#| "entirely, lest it lead others to suppose that those laws form one "
+#| "coherent issue.  The way to be clear is to discuss patents, copyrights, "
+#| "and trademarks separately.  See <a href=\"/philosophy/not-ipr.html"
+#| "\">further explanation</a> of how this term spreads confusion and bias."
 msgid ""
 "In the 1980s I had not yet realized how confusing it was to speak of &ldquo;"
-"the issue&rdquo; of &ldquo;intellectual property&rdquo;.  That term is "
+"the issue&rdquo; of &ldquo;intellectual property.&rdquo; That term is "
 "obviously biased; more subtle is the fact that it lumps together various "
 "disparate laws which raise very different issues.  Nowadays I urge people to "
 "reject the term &ldquo;intellectual property&rdquo; entirely, lest it lead "
@@ -1335,10 +1484,26 @@
 "philosophy/not-ipr.html\">mai multe explicații</a> despre cum răspândește 
"
 "acest termen confuzie și tendențiozitate."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+# | Subsequently we learned to distinguish between &ldquo;free software&rdquo;
+# | and [-&ldquo;freeware&rdquo;.-] {+&ldquo;freeware.&rdquo;+} The term
+# | &ldquo;freeware&rdquo; means software you are free to redistribute, but
+# | usually you are not free to study and change the source code, so most of
+# | it is not free software.  See &ldquo;<a
+# | href=\"/philosophy/words-to-avoid.html#Freeware\">Confusing Words and
+# | Phrases</a>&rdquo; for more explanation.
+#, fuzzy
+#| msgid ""
+#| "Subsequently we learned to distinguish between &ldquo;free "
+#| "software&rdquo; and &ldquo;freeware&rdquo;.  The term &ldquo;"
+#| "freeware&rdquo; means software you are free to redistribute, but usually "
+#| "you are not free to study and change the source code, so most of it is "
+#| "not free software.  See &ldquo;<a href=\"/philosophy/words-to-avoid."
+#| "html#Freeware\">Confusing Words and Phrases</a>&rdquo; for more "
+#| "explanation."
 msgid ""
 "Subsequently we learned to distinguish between &ldquo;free software&rdquo; "
-"and &ldquo;freeware&rdquo;.  The term &ldquo;freeware&rdquo; means software "
+"and &ldquo;freeware.&rdquo; The term &ldquo;freeware&rdquo; means software "
 "you are free to redistribute, but usually you are not free to study and "
 "change the source code, so most of it is not free software.  See &ldquo;<a "
 "href=\"/philosophy/words-to-avoid.html#Freeware\">Confusing Words and "
@@ -1377,29 +1542,39 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# | Please see the <a
+# | href=\"/server/standards/README.translations.html\">Translations
+# | README</a> for information on coordinating and [-submitting-]
+# | {+contributing+} translations of this article.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and submitting "
+#| "translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
-"Muncim din greu și facem tot ceea ce ne stă în putință să punem la "
-"dispoziție traduceri exacte, de o calitate bună.  Cu toate acestea, nu "
-"suntem perfecți. Vă rugăm să ne trimiteți comentariile și sugestiile 
dvs. "
-"generale în această privință la <a href=\"mailto:web-translators@gnu.org";
-"\">&lt;web-translators@gnu.org&gt;</a>.</p>\n"
-"<p>Pentru informații despre coordonarea și trimiterea de traduceri pentru "
-"paginile noastre, consultați <a 
href=\"/server/standards/README.translations."
-"html\">ghidul de traduceri</a>."
+"Puteți vizita <a href=\"/server/standards/README.translations.html\">README-"
+"ul despre traduceri</a> pentru informații despre coordonarea și trimiterea "
+"traducerilor pentru acest articol."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; 1985, 1993, 200[-3-]{+4+}, 2005, 2007, [-2008,-] 2009,
+# | 2010, [-2014, 2015-] {+2015, 2021+} Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, "
+#| "2015 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 1985, 1993, 2004, 2005, 2007, 2009, 2010, 2015, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015 "
 "Free Software Foundation, Inc."
@@ -1430,10 +1605,23 @@
 msgid "Updated:"
 msgstr "Actualizată:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015, "
-"2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015, "
-"2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "Muncim din greu și facem tot ceea ce ne stă în putință să punem la "
+#~ "dispoziție traduceri exacte, de o calitate bună.  Cu toate acestea, nu "
+#~ "suntem perfecți. Vă rugăm să ne trimiteți comentariile și sugestiile 
dvs. "
+#~ "generale în această privință la <a 
href=\"mailto:web-translators@gnu.org";
+#~ "\">&lt;web-translators@gnu.org&gt;</a>.</p>\n"
+#~ "<p>Pentru informații despre coordonarea și trimiterea de traduceri 
pentru "
+#~ "paginile noastre, consultați <a href=\"/server/standards/README."
+#~ "translations.html\">ghidul de traduceri</a>."
+
+#~ msgid ""
+#~ "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, "
+#~ "2015, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, "
+#~ "2015, 2021 Free Software Foundation, Inc."

Index: po/manifesto.ru.po
===================================================================
RCS file: /web/www/www/gnu/po/manifesto.ru.po,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- po/manifesto.ru.po  2 Nov 2021 13:56:41 -0000       1.25
+++ po/manifesto.ru.po  2 Nov 2021 14:41:54 -0000       1.26
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manifesto.html\n"
-"POT-Creation-Date: 2015-06-02 12:55+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2015-06-03 17:17+0000\n"
 "Last-Translator: Ineiev <ineiev@gnu.org>\n"
 "Language-Team: Russian <www-ru-list@gnu.org>\n"
@@ -15,18 +15,33 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-11-02 14:27+0000\n"
 
 #. type: Content of: <title>
 msgid "The GNU Manifesto - GNU Project - Free Software Foundation"
 msgstr "Манифест GNU - Проект GNU - Фонд 
свободного программного обеспечения"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "The GNU Manifesto"
 msgstr "Манифест GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
+# | The GNU Manifesto (which appears below) was written by <a
+# | href=\"http{+s+}://www.stallman.org/\">Richard Stallman</a> in 1985 to ask
+# | for support in developing the GNU operating system.  Part of the text was
+# | taken from the original announcement of 1983.  Through 1987, it was
+# | updated in minor ways to account for developments; since then, it seems
+# | best to leave it unchanged.
+#, fuzzy
+#| msgid ""
+#| "The GNU Manifesto (which appears below) was written by <a href=\"http://";
+#| "www.stallman.org/\">Richard Stallman</a> in 1985 to ask for support in "
+#| "developing the GNU operating system.  Part of the text was taken from the "
+#| "original announcement of 1983.  Through 1987, it was updated in minor "
+#| "ways to account for developments; since then, it seems best to leave it "
+#| "unchanged."
 msgid ""
-"The GNU Manifesto (which appears below) was written by <a href=\"http://www.";
+"The GNU Manifesto (which appears below) was written by <a href=\"https://www.";
 "stallman.org/\">Richard Stallman</a> in 1985 to ask for support in "
 "developing the GNU operating system.  Part of the text was taken from the "
 "original announcement of 1983.  Through 1987, it was updated in minor ways "
@@ -39,7 +54,7 @@
 "незначительно обновлялся, чтобы отметить 
развитие; с тех пор представляется "
 "наилучшим оставить его неизменным."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Since that time, we have learned about certain common misunderstandings that "
 "different wording could help avoid.  Footnotes added since 1993 help clarify "
@@ -50,7 +65,7 @@
 "могло бы помочь избежать их. Сноски, 
добавленные начиная с \n"
 "1993&nbsp;года, помогают прояснить эти 
аспекты."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If you want to install the GNU/Linux system, we recommend you use one of the "
 "<a href=\"/distros\">100% free software GNU/Linux distributions</a>.  For "
@@ -62,7 +77,7 @@
 "Linux</a>. О том, как помочь, см. на <a 
href=\"/help/help.html\">http://www.";
 "gnu.org/help</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The GNU Project is part of the Free Software Movement, a campaign for <a "
 "href=\"/philosophy/free-sw.html\">freedom for users of software</a>.  It is "
@@ -80,17 +95,30 @@
 "philosophy/open-source-misses-the-point.html\">аморальный подх
од</a> к той "
 "же сфере."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "What's GNU? Gnu's Not Unix!"
 msgstr "Что такое GNU? GNU&nbsp;&mdash; не Unix!"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | GNU, which stands for Gnu's Not Unix, is the name for the complete
+# | Unix-compatible software system which I am writing so that I can give it
+# | away free to everyone who can use [-it.<a href=\"#f1\">(1)</a>-]
+# | {+it&#8239;<a class=\"ftn\" href=\"#f1\">[1]</a>.+} Several other
+# | volunteers are helping me.  Contributions of time, money, programs and
+# | equipment are greatly needed.
+#, fuzzy
+#| msgid ""
+#| "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
+#| "compatible software system which I am writing so that I can give it away "
+#| "free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
+#| "volunteers are helping me.  Contributions of time, money, programs and "
+#| "equipment are greatly needed."
 msgid ""
 "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
 "compatible software system which I am writing so that I can give it away "
-"free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
-"volunteers are helping me.  Contributions of time, money, programs and "
-"equipment are greatly needed."
+"free to everyone who can use it&#8239;<a class=\"ftn\" href=\"#f1\">[1]</a>. "
+"Several other volunteers are helping me.  Contributions of time, money, "
+"programs and equipment are greatly needed."
 msgstr ""
 "GNU, что означает &ldquo;Gnu's Not Unix&rdquo; \n"
 "(GNU&nbsp;&mdash; это не Unix),&mdash; \n"
@@ -101,7 +129,7 @@
 "Мы очень нуждаемся в рабочих руках, 
деньгах, программах \n"
 "и оборудовании."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So far we have an Emacs text editor with Lisp for writing editor commands, a "
 "source level debugger, a yacc-compatible parser generator, a linker, and "
@@ -135,7 +163,7 @@
 "Мы надеемся выдать&nbsp;&mdash; со 
временем&nbsp;&mdash; всё то полезное, \n"
 "что обычно поставляется с системой 
семейства Unix, и даже больше."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU will be able to run Unix programs, but will not be identical to Unix.  "
 "We will make all improvements that are convenient, based on our experience "
@@ -161,7 +189,7 @@
 "Для сетевых соединений мы попытаемся 
поддерживать протоколы \n"
 "UUCP, Internet, а также Chaosnet Массачусетского тех
нологического института."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is aimed initially at machines in the 68000/16000 class with virtual "
 "memory, because they are the easiest machines to make it run on.  The extra "
@@ -174,7 +202,7 @@
 "работа для запуска её на меньших ЭВМ 
останется \n"
 "на долю того, кто захочет применять её на 
них."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid horrible confusion, please pronounce the <em>g</em> in the word "
 "&ldquo;GNU&rdquo; when it is the name of this project."
@@ -184,11 +212,11 @@
 "в слове &ldquo;GNU&rdquo;, когда оно \n"
 "обозначает этот проект<a href=\"#ft1\">[1]</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why I Must Write GNU"
 msgstr "Почему я должен писать GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I consider that the Golden Rule requires that if I like a program I must "
 "share it with other people who like it.  Software sellers want to divide the "
@@ -216,13 +244,26 @@
 "оставаться в институте, где такое делали 
за меня \n"
 "против моей воли."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | So that I can continue to use computers without dishonor, I have decided
+# | to put together a sufficient body of free software so that I will be able
+# | to get along without any software that is not free.  I have resigned from
+# | the AI Lab to deny MIT any legal excuse to prevent me from giving GNU
+# | [-away.<a href=\"#f2a\">(2)</a>-] {+away&#8239;<a class=\"ftn\"
+# | href=\"#f2a\">[2]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "So that I can continue to use computers without dishonor, I have decided "
+#| "to put together a sufficient body of free software so that I will be able "
+#| "to get along without any software that is not free.  I have resigned from "
+#| "the AI Lab to deny MIT any legal excuse to prevent me from giving GNU "
+#| "away.<a href=\"#f2a\">(2)</a>"
 msgid ""
 "So that I can continue to use computers without dishonor, I have decided to "
 "put together a sufficient body of free software so that I will be able to "
 "get along without any software that is not free.  I have resigned from the "
-"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away.<a "
-"href=\"#f2a\">(2)</a>"
+"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away&#8239;"
+"<a class=\"ftn\" href=\"#f2a\">[2]</a>."
 msgstr ""
 "Итак, чтобы иметь возможность продолжать 
\n"
 "пользоваться компьютерами без позора, я 
решил \n"
@@ -231,11 +272,11 @@
 "лаборатории, чтобы не оставить институту 
никакого законного повода \n"
 "удержать меня от раздачи<a href=\"#f2a\">(2)</a> GNU."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why GNU Will Be Compatible with Unix"
 msgstr "Почему GNU будет совместима с Unix"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Unix is not my ideal system, but it is not too bad.  The essential features "
 "of Unix seem to be good ones, and I think I can fill in what Unix lacks "
@@ -249,11 +290,11 @@
 "система, совместимая с Unix, будет удобна \n"
 "в освоении для многих."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How GNU Will Be Available"
 msgstr "Как GNU будет распространяться"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is not in the public domain.  Everyone will be permitted to modify and "
 "redistribute GNU, but no distributor will be allowed to restrict its further "
@@ -269,11 +310,11 @@
 "модификации будут запрещены. Я хочу 
гарантировать, что \n"
 "все версии GNU останутся свободными."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why Many Other Programmers Want to Help"
 msgstr "Почему многие программисты хотят 
помочь"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found many other programmers who are excited about GNU and want to "
 "help."
@@ -281,7 +322,7 @@
 "Я нашёл много программистов, которые \n"
 "сочувствуют GNU и хотят помочь."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Many programmers are unhappy about the commercialization of system "
 "software.  It may enable them to make more money, but it requires them to "
@@ -308,7 +349,7 @@
 "думать, что программирование&nbsp;&mdash; это 
только способ \n"
 "получить деньги."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By working on and using GNU rather than proprietary programs, we can be "
 "hospitable to everyone and obey the law.  In addition, GNU serves as an "
@@ -328,11 +369,11 @@
 "программистов, которых я спрашивал, это 
важное слагаемое счастья, \n"
 "которое деньги заменить не могут."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How You Can Contribute"
 msgstr "Чем вы можете помочь"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "(Nowadays, for software tasks to work on, see the <a href=\"http://fsf.org/";
 "campaigns/priority-projects\">High Priority Projects list</a> and the <a "
@@ -348,7 +389,7 @@
 "указаны на <a href=\"/help/help.html\">руководстве по 
помощи операционной "
 "системе GNU</a>)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am asking computer manufacturers for donations of machines and money.  I'm "
 "asking individuals for donations of programs and work."
@@ -357,7 +398,7 @@
 "машины и деньги. Я призываю частных лиц \n"
 "приносить в дар программы и труд."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One consequence you can expect if you donate machines is that GNU will run "
 "on them at an early date.  The machines should be complete, ready to use "
@@ -371,7 +412,7 @@
 "в жилых помещениях и не нуждающимися в х
итроумных \n"
 "системах охлаждения или питания."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found very many programmers eager to contribute part-time work for "
 "GNU.  For most projects, such part-time distributed work would be very hard "
@@ -404,7 +445,7 @@
 "(Ядро потребует более тесного общения. Над 
ним будет \n"
 "работать небольшая сплочённая группа.)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If I get donations of money, I may be able to hire a few people full or part "
 "time.  The salary won't be high by programmers' standards, but I'm looking "
@@ -423,20 +464,27 @@
 "силы работе над GNU, избавив их от нужды \n"
 "зарабатывать на жизнь другим способом."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why All Computer Users Will Benefit"
 msgstr "Чем это будет полезно всем 
пользователям компьютеров"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Once GNU is written, everyone will be able to obtain good system software
+# | free, just like [-air.<a href=\"#f2\">(3)</a>-] {+air&#8239;<a
+# | class=\"ftn\" href=\"#f2\">[3]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "Once GNU is written, everyone will be able to obtain good system software "
+#| "free, just like air.<a href=\"#f2\">(3)</a>"
 msgid ""
 "Once GNU is written, everyone will be able to obtain good system software "
-"free, just like air.<a href=\"#f2\">(3)</a>"
+"free, just like air&#8239;<a class=\"ftn\" href=\"#f2\">[3]</a>."
 msgstr ""
 "Как только GNU будет написана, каждый 
сможет \n"
 "получить хорошее системное программное \n"
 "обеспечение так же свободно, как воздух.<a 
href=\"#f2\">(3)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This means much more than just saving everyone the price of a Unix license.  "
 "It means that much wasteful duplication of system programming effort will be "
@@ -449,7 +497,7 @@
 "программистов. Вместо этого их труд может 
пойти \n"
 "на развитие уже существующего. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Complete system sources will be available to everyone.  As a result, a user "
 "who needs changes in the system will always be free to make them himself, or "
@@ -467,7 +515,7 @@
 "компании, владеющей исходными текстами и 
\n"
 "прерогативой вносить изменения."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Schools will be able to provide a much more educational environment by "
 "encouraging all students to study and improve the system code.  Harvard's "
@@ -486,7 +534,7 @@
 "отказываться от установки определённых 
программ. Я был в значительной мере "
 "вдохновлён этим."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Finally, the overhead of considering who owns the system software and what "
 "one is or is not entitled to do with it will be lifted."
@@ -496,7 +544,7 @@
 "дозволено, а что не дозволено делать с 
ними, \n"
 "будут сняты."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Arrangements to make people pay for using a program, including licensing of "
 "copies, always incur a tremendous cost to society through the cumbersome "
@@ -525,7 +573,7 @@
 "содержать воздушный завод \n"
 "поголовным налогом и сбросить 
противогазы."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copying all or parts of a program is as natural to a programmer as "
 "breathing, and as productive.  It ought to be as free."
@@ -535,11 +583,11 @@
 "дыхание, и так же продуктивно. Оно должно \n"
 "быть так же свободно."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Some Easily Rebutted Objections to GNU's Goals"
 msgstr "Некоторые легко отметаемые 
возражения против целей GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Nobody will use it if it is free, because that means they "
 "can't rely on any support.&rdquo;</strong>"
@@ -548,7 +596,7 @@
 "систему, потому что они не смогут \n"
 "рассчитывать ни на какую 
поддержку&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You have to charge for the program to pay for providing the "
 "support.&rdquo;</strong>"
@@ -556,11 +604,20 @@
 "<strong>&ldquo;Приходится брать плату за 
программу, \n"
 "чтобы оплатить поддержку&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | If people would rather pay for GNU plus service than get GNU free without
+# | service, a company to provide just service to people who have obtained GNU
+# | free ought to be [-profitable.<a href=\"#f3\">(4)</a>-]
+# | {+profitable&#8239;<a class=\"ftn\" href=\"#f3\">[4]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "If people would rather pay for GNU plus service than get GNU free without "
+#| "service, a company to provide just service to people who have obtained "
+#| "GNU free ought to be profitable.<a href=\"#f3\">(4)</a>"
 msgid ""
 "If people would rather pay for GNU plus service than get GNU free without "
 "service, a company to provide just service to people who have obtained GNU "
-"free ought to be profitable.<a href=\"#f3\">(4)</a>"
+"free ought to be profitable&#8239;<a class=\"ftn\" href=\"#f3\">[4]</a>."
 msgstr ""
 "Раз люди готовы скорее платить за GNU \n"
 "вместе с обслуживанием, чем взять GNU \n"
@@ -569,7 +626,7 @@
 "получившим GNU свободно, должно быть \n"
 "прибыльным.<a href=\"#f3\">(4)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We must distinguish between support in the form of real programming work and "
 "mere handholding.  The former is something one cannot rely on from a "
@@ -582,7 +639,7 @@
 "Если ваша проблема не касается 
достаточного \n"
 "числа людей, производитель попросит вас 
отвязаться."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If your business needs to be able to rely on support, the only way is to "
 "have all the necessary sources and tools.  Then you can hire any available "
@@ -605,7 +662,7 @@
 "незанятого компетентного лица, но порядок 
распространения тут ни при чём. "
 "GNU не решает всех мировых проблем, только 
некоторые из них."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Meanwhile, the users who know nothing about computers need handholding: "
 "doing things for them which they could easily do themselves but don't know "
@@ -616,7 +673,7 @@
 "за них того, что они сами легко \n"
 "бы сделали, но не знают, как."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Such services could be provided by companies that sell just handholding and "
 "repair service.  If it is true that users would rather spend money and get a "
@@ -637,7 +694,7 @@
 "одной. В то же время те из нас, кому не 
нужны эти услуги, смогут "
 "пользоваться программой без оплаты услуг."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You cannot reach many people without advertising, and you "
 "must charge for the program to support that.&rdquo;</strong>"
@@ -646,7 +703,7 @@
 "рекламы, а для этого придётся взимать 
плату \n"
 "за программу&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;It's no use advertising a program people can get free.&rdquo;"
 "</strong>"
@@ -654,7 +711,7 @@
 "<strong>&ldquo;Нет смысла рекламировать 
программу, \n"
 "которую можно получить свободно&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are various forms of free or very cheap publicity that can be used to "
 "inform numbers of computer users about something like GNU.  But it may be "
@@ -674,12 +731,23 @@
 "чтобы оплатить рекламу и прочее. Таким 
образом, \n"
 "за рекламу платят только те, кому она 
полезна."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | On the other hand, if many people get GNU from their friends, and such
+# | companies don't succeed, this will show that advertising was not really
+# | necessary to spread GNU.  Why is it that free market advocates don't want
+# | to let the free market decide [-this?<a href=\"#f4\">(5)</a>-]
+# | {+this?&#8239;<a class=\"ftn\" href=\"#f4\">[5]</a>+}
+#, fuzzy
+#| msgid ""
+#| "On the other hand, if many people get GNU from their friends, and such "
+#| "companies don't succeed, this will show that advertising was not really "
+#| "necessary to spread GNU.  Why is it that free market advocates don't want "
+#| "to let the free market decide this?<a href=\"#f4\">(5)</a>"
 msgid ""
 "On the other hand, if many people get GNU from their friends, and such "
 "companies don't succeed, this will show that advertising was not really "
 "necessary to spread GNU.  Why is it that free market advocates don't want to "
-"let the free market decide this?<a href=\"#f4\">(5)</a>"
+"let the free market decide this?&#8239;<a class=\"ftn\" href=\"#f4\">[5]</a>"
 msgstr ""
 "С другой стороны, если многие \n"
 "получат GNU от своих знакомых, и такие \n"
@@ -689,7 +757,7 @@
 "это приверженцы свободного рынка не хотят 
\n"
 "позволить решить это свободному рынку?<a 
href=\"#f4\">(5)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;My company needs a proprietary operating system to get a "
 "competitive edge.&rdquo;</strong>"
@@ -701,7 +769,7 @@
 #  that there will be no software in the realm of competition, rather
 #  than that software will be somewhere else; so "выведет" or 
"вынесет"
 #  are considered to be slightly worse
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU will remove operating system software from the realm of competition.  "
 "You will not be able to get an edge in this area, but neither will your "
@@ -721,16 +789,25 @@
 "занимаетесь чем-то другим, GNU не даст вас 
втянуть \n"
 "в дорогостоящее дело торговли 
операционными системами."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | I would like to see GNU development supported by gifts from many
+# | manufacturers and users, reducing the cost to [-each.<a
+# | href=\"#f5\">(6)</a>-] {+each&#8239;<a class=\"ftn\"
+# | href=\"#f5\">[6]</a>.+}
+#, fuzzy
+#| msgid ""
+#| "I would like to see GNU development supported by gifts from many "
+#| "manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
 msgid ""
 "I would like to see GNU development supported by gifts from many "
-"manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
+"manufacturers and users, reducing the cost to each&#8239;<a class=\"ftn\" "
+"href=\"#f5\">[6]</a>."
 msgstr ""
 "Я хотел бы увидеть, как разработку GNU \n"
 "поддерживают дары многих производителей 
и \n"
 "пользователей, снижая стоимость для 
каждого.<a href=\"#f5\">(6)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't programmers deserve a reward for their creativity?"
 "&rdquo;</strong>"
@@ -739,7 +816,7 @@
 "заслуживают награды за 
творчество?&rdquo;</strong>"
 
 #  Ожегов has no "инновационный" 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If anything deserves a reward, it is social contribution.  Creativity can be "
 "a social contribution, but only in so far as society is free to use the "
@@ -756,7 +833,7 @@
 "наказания, если они ограничивают 
пользование \n"
 "этими программами."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Shouldn't a programmer be able to ask for a reward for his "
 "creativity?&rdquo;</strong>"
@@ -764,7 +841,7 @@
 "<strong>&ldquo;Не должна ли у программиста быть \n"
 "возможность просить вознаграждения за 
своё творчество?&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is nothing wrong with wanting pay for work, or seeking to maximize "
 "one's income, as long as one does not use means that are destructive.  But "
@@ -776,7 +853,7 @@
 "не разрушительны. Но средства, обычные в 
отрасли \n"
 "программного обеспечения сегодня, 
основаны на разрушении."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Extracting money from users of a program by restricting their use of it is "
 "destructive because the restrictions reduce the amount and the ways that the "
@@ -792,7 +869,7 @@
 "из программы. Когда на ограничения идут 
умышленно, вредные последствия&nbsp;"
 "&mdash; это умышленное разрушение."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The reason a good citizen does not use such destructive means to become "
 "wealthier is that, if everyone did so, we would all become poorer from the "
@@ -813,11 +890,11 @@
 "вознаграждённым за своё творчество не 
оправдывает \n"
 "лишение мира в целом всего или части этого 
творчества."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid "<strong>&ldquo;Won't programmers starve?&rdquo;</strong>"
 msgstr "<strong>&ldquo;Не будут ли программисты 
голодать?&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "I could answer that nobody is forced to be a programmer.  Most of us cannot "
 "manage to get any money for standing on the street and making faces.  But we "
@@ -831,7 +908,7 @@
 "проводить нашу жизнь, прося подаяния и 
голодая. \n"
 "Мы делаем что-нибудь другое."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But that is the wrong answer because it accepts the questioner's implicit "
 "assumption: that without ownership of software, programmers cannot possibly "
@@ -842,7 +919,7 @@
 "собственности на программы программисты, 
возможно, не получат ни гроша. "
 "Предполагается, всё или ничего."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The real reason programmers will not starve is that it will still be "
 "possible for them to get paid for programming; just not paid as much as now."
@@ -851,13 +928,28 @@
 "не будут голодать&nbsp;&mdash; то, что они всё 
равно смогут \n"
 "получать плату за программирование, 
только не так много, как сейчас."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+# | Restricting copying is not the only basis for business in software.  It is
+# | the most common [-basis<a href=\"#f8\">(7)</a>-] {+basis&#8239;<a
+# | class=\"ftn\" href=\"#f8\">[7]</a>+} because it brings in the most money. 
+# | If it were prohibited, or rejected by the customer, software business
+# | would move to other bases of organization which are now used less often. 
+# | There are always numerous ways to organize any kind of business.
+#, fuzzy
+#| msgid ""
+#| "Restricting copying is not the only basis for business in software.  It "
+#| "is the most common basis<a href=\"#f8\">(7)</a> because it brings in the "
+#| "most money.  If it were prohibited, or rejected by the customer, software "
+#| "business would move to other bases of organization which are now used "
+#| "less often.  There are always numerous ways to organize any kind of "
+#| "business."
 msgid ""
 "Restricting copying is not the only basis for business in software.  It is "
-"the most common basis<a href=\"#f8\">(7)</a> because it brings in the most "
-"money.  If it were prohibited, or rejected by the customer, software "
-"business would move to other bases of organization which are now used less "
-"often.  There are always numerous ways to organize any kind of business."
+"the most common basis&#8239;<a class=\"ftn\" href=\"#f8\">[7]</a> because it "
+"brings in the most money.  If it were prohibited, or rejected by the "
+"customer, software business would move to other bases of organization which "
+"are now used less often.  There are always numerous ways to organize any "
+"kind of business."
 msgstr ""
 "Ограничение копирования&nbsp;&mdash; не 
единственное, на чём могут быть "
 "основаны предприятия по производству 
программ. На это опираются чаще \n"
@@ -868,7 +960,7 @@
 "привлекаются реже. Всегда есть 
многочисленные способы организации "
 "предприятий любого рода."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Probably programming will not be as lucrative on the new basis as it is "
 "now.  But that is not an argument against the change.  It is not considered "
@@ -885,7 +977,7 @@
 "не было бы несправедливостью. (На практике 
\n"
 "они получали бы всё-таки значительно 
больше этого.)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't people have a right to control how their creativity is "
 "used?&rdquo;</strong>"
@@ -893,7 +985,7 @@
 "<strong>&ldquo;Разве люди не имеют права \n"
 "контролировать, как используется их 
творчество?&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "&ldquo;Control over the use of one's ideas&rdquo; really constitutes control "
 "over other people's lives; and it is usually used to make their lives more "
@@ -904,13 +996,26 @@
 "контроль над жизнью людей; и обычно \n"
 "его используют, чтобы затруднить им жизнь."
 
-#. type: Content of: <p>
-msgid ""
-"People who have studied the issue of intellectual property rights<a href="
-"\"#f6\">(8)</a> carefully (such as lawyers) say that there is no intrinsic "
-"right to intellectual property.  The kinds of supposed intellectual property "
-"rights that the government recognizes were created by specific acts of "
-"legislation for specific purposes."
+#. type: Content of: <div><dl><dd><p>
+# | People who have studied the issue of intellectual property [-rights<a
+# | href=\"#f6\">(8)</a>-] {+rights&#8239;<a class=\"ftn\"
+# | href=\"#f6\">[8]</a>+} carefully (such as lawyers) say that there is no
+# | intrinsic right to intellectual property.  The kinds of supposed
+# | intellectual property rights that the government recognizes were created
+# | by specific acts of legislation for specific purposes.
+#, fuzzy
+#| msgid ""
+#| "People who have studied the issue of intellectual property rights<a href="
+#| "\"#f6\">(8)</a> carefully (such as lawyers) say that there is no "
+#| "intrinsic right to intellectual property.  The kinds of supposed "
+#| "intellectual property rights that the government recognizes were created "
+#| "by specific acts of legislation for specific purposes."
+msgid ""
+"People who have studied the issue of intellectual property rights&#8239;<a "
+"class=\"ftn\" href=\"#f6\">[8]</a> carefully (such as lawyers) say that "
+"there is no intrinsic right to intellectual property.  The kinds of supposed "
+"intellectual property rights that the government recognizes were created by "
+"specific acts of legislation for specific purposes."
 msgstr ""
 "Те, кто тщательно изучил вопрос о правах 
на \n"
 "интеллектуальную собственность<a 
href=\"#f6\">(8)</a> \n"
@@ -919,7 +1024,7 @@
 "виды так называемых прав на 
интеллектуальную собственность, которые \n"
 "признаются государством, созданы особыми 
правовыми актами для особых целей."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For example, the patent system was established to encourage inventors to "
 "disclose the details of their inventions.  Its purpose was to help society "
@@ -940,7 +1045,7 @@
 "не обременяют большинство частных лиц, 
пользующихся патентованными "
 "продуктами."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The idea of copyright did not exist in ancient times, when authors "
 "frequently copied other authors at length in works of nonfiction.  This "
@@ -963,7 +1068,7 @@
 "она не обременяла \n"
 "большинство лиц, читавших книги."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "All intellectual property rights are just licenses granted by society "
 "because it was thought, rightly or wrongly, that society as a whole would "
@@ -978,7 +1083,7 @@
 "случае мы должны спросить: действительно 
ли мы \n"
 "выигрываем, давая такое дозволение? 
Какого рода действия мы дозволяем?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The case of programs today is very different from that of books a hundred "
 "years ago.  The fact that the easiest way to copy a program is from one "
@@ -1000,12 +1105,12 @@
 "и материально, и морально; в котором 
личность не \n"
 "должна этого делать независимо от того, 
позволяет ли это закон."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Competition makes things get done better.&rdquo;</strong>"
 msgstr "<strong>&ldquo;Конкуренция ведёт к 
прогрессу&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The paradigm of competition is a race: by rewarding the winner, we encourage "
 "everyone to run faster.  When capitalism really works this way, it does a "
@@ -1025,7 +1130,7 @@
 "стратегии&nbsp;&mdash; например, нападение на 
других бегунов. \n"
 "Если бег перейдёт в кулачный бой, они все 
придут поздно."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Proprietary and secret software is the moral equivalent of runners in a fist "
 "fight.  Sad to say, the only referee we've got does not seem to object to "
@@ -1041,7 +1146,7 @@
 "удар&rdquo;). На самом деле он должен разнять 
\n"
 "их и наказать бегунов за одну только 
попытку затеять драку."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Won't everyone stop programming without a monetary incentive?"
 "&rdquo;</strong>"
@@ -1049,7 +1154,7 @@
 "<strong>&ldquo;Разве без денежного стимула все \n"
 "не прекратят программировать?&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually, many people will program with absolutely no monetary incentive.  "
 "Programming has an irresistible fascination for some people, usually the "
@@ -1063,7 +1168,7 @@
 "профессиональных музыкантах, которые 
продолжают заниматься этим, даже когда "
 "у них нет надежды заработать этим на 
жизнь."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But really this question, though commonly asked, is not appropriate to the "
 "situation.  Pay for programmers will not disappear, only become less.  So "
@@ -1077,7 +1182,7 @@
 "кто-нибудь программировать при снижении 
денежного \n"
 "стимула?&rdquo; По моему опыту, будут."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For more than ten years, many of the world's best programmers worked at the "
 "Artificial Intelligence Lab for far less money than they could have had "
@@ -1093,7 +1198,7 @@
 "Кроме того, творчество&nbsp;&mdash; это 
удовольствие и \n"
 "награда само по себе."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Then most of them left when offered a chance to do the same interesting work "
 "for a lot of money."
@@ -1102,7 +1207,7 @@
 "представился случай делать ту же \n"
 "интересную работу и получать много денег."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "What the facts show is that people will program for reasons other than "
 "riches; but if given a chance to make a lot of money as well, they will come "
@@ -1118,7 +1223,7 @@
 "они могли бы быть на том же уровне, если бы 
высокооплачивающие были "
 "запрещены."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;We need the programmers desperately.  If they demand that we "
 "stop helping our neighbors, we have to obey.&rdquo;</strong>"
@@ -1127,7 +1232,7 @@
 "если они требуют, чтобы мы прекратили 
помогать \n"
 "ближнему своему, мы должны 
повиноваться&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "You're never so desperate that you have to obey this sort of demand.  "
 "Remember: millions for defense, but not a cent for tribute!"
@@ -1137,12 +1242,12 @@
 "оборону, чем выплатить хоть один цент 
контрибуции!&rdquo;<a href=\"#ft2\">[2]"
 "</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Programmers need to make a living somehow.&rdquo;</strong>"
 msgstr "<strong>&ldquo;Должны же программисты чем-то 
жить!&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In the short run, this is true.  However, there are plenty of ways that "
 "programmers could make a living without selling the right to use a program.  "
@@ -1159,7 +1264,7 @@
 "на жизнь. Если вы захотите, то легко 
найдёте другие пути. \n"
 "Вот несколько примеров."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A manufacturer introducing a new computer will pay for the porting of "
 "operating systems onto the new hardware."
@@ -1168,7 +1273,7 @@
 "заплатит за перенос операционной системы 
на новую \n"
 "аппаратуру."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The sale of teaching, handholding and maintenance services could also employ "
 "programmers."
@@ -1176,18 +1281,30 @@
 "Предприятие, предоставляющее услуги по 
обучению, \n"
 "помощи и поддержке,  могло бы также нанять 
программистов."
 
-#. type: Content of: <p>
-msgid ""
-"People with new ideas could distribute programs as freeware<a href=\"#f7\">"
-"(9)</a>, asking for donations from satisfied users, or selling handholding "
-"services.  I have met people who are already working this way successfully."
+#. type: Content of: <div><dl><dd><p>
+# | People with new ideas could distribute programs as [-freeware<a
+# | href=\"#f7\">(9)</a>,-] {+freeware&#8239;<a class=\"ftn\"
+# | href=\"#f7\">[9]</a>,+} asking for donations from satisfied users, or
+# | selling handholding services.  I have met people who are already working
+# | this way successfully.
+#, fuzzy
+#| msgid ""
+#| "People with new ideas could distribute programs as freeware<a href="
+#| "\"#f7\">(9)</a>, asking for donations from satisfied users, or selling "
+#| "handholding services.  I have met people who are already working this way "
+#| "successfully."
+msgid ""
+"People with new ideas could distribute programs as freeware&#8239;<a class="
+"\"ftn\" href=\"#f7\">[9]</a>, asking for donations from satisfied users, or "
+"selling handholding services.  I have met people who are already working "
+"this way successfully."
 msgstr ""
 "Люди с новыми идеями могли бы поставлять \n"
 "бесплатные программы<a href=\"#f7\">(9)</a>, 
принимая \n"
 "дары от довольных пользователей или 
продавая услуги \n"
 "по помощи. Я встречал людей, которые уже 
успешно работают так."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Users with related needs can form users' groups, and pay dues.  A group "
 "would contract with programming companies to write programs that the group's "
@@ -1198,11 +1315,11 @@
 "заключал бы с программистскими 
компаниями договора \n"
 "на выпуск программ, которые члены союза х
отели бы получить."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "All sorts of development can be funded with a Software Tax:"
 msgstr "Все виды разработок можно 
финансировать программными налогами:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Suppose everyone who buys a computer has to pay x percent of the price as a "
 "software tax.  The government gives this to an agency like the NSF to spend "
@@ -1214,7 +1331,7 @@
 "вроде Национального научного фонда для 
вклада в развитие программ."
 
 #  "often": Ожегов saith "зачастую" is colloquial
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But if the computer buyer makes a donation to software development himself, "
 "he can take a credit against the tax.  He can donate to the project of his "
@@ -1230,7 +1347,7 @@
 "любое количество \n"
 "пожертвований, вплоть до выплаты налога 
полностью."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The total tax rate could be decided by a vote of the payers of the tax, "
 "weighted according to the amount they will be taxed on."
@@ -1239,19 +1356,19 @@
 "голосованием налогоплательщиков, \n"
 "взвешенным в соответствии с облагаемой 
суммой."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "The consequences:"
 msgstr "Последствия:"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "The computer-using community supports software development."
 msgstr "Общество пользователей компьютеров 
поддерживает разработку программ."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "This community decides what level of support is needed."
 msgstr "Это общество определяет необходимый 
уровень поддержки."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "Users who care which projects their share is spent on can choose this for "
 "themselves."
@@ -1259,7 +1376,7 @@
 "Пользователи, которым небезразлично, на 
какие \n"
 "проекты потратят их долю, могут выбрать 
это сами."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the long run, making programs free is a step toward the postscarcity "
 "world, where nobody will have to work very hard just to make a living.  "
@@ -1278,7 +1395,7 @@
 "безопасность. \n"
 "Там не нужна будет возможность 
зарабатывать на жизнь программированием."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We have already greatly reduced the amount of work that the whole society "
 "must do for its actual productivity, but only a little of this has "
@@ -1302,11 +1419,11 @@
 "сокращение нашей работы."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "Примечания"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The wording here was careless.  The intention was that nobody would have to "
 "pay for <b>permission</b> to use the GNU system.  But the words don't make "
@@ -1337,7 +1454,7 @@
 "другими в ее применении."
 
 # type: Content of: <ol><li>
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The expression &ldquo;give away&rdquo; is another indication that I had not "
 "yet clearly separated the issue of price from that of freedom.  We now "
@@ -1351,10 +1468,21 @@
 "см. на странице &ldquo;<a href=\"/philosophy/words-to-avoid."
 "html#GiveAwaySoftware\">Слова и фразы, вводящие в 
заблуждение</a>&rdquo;."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+# | This is another place I failed to distinguish carefully between the two
+# | different meanings of [-&ldquo;free&rdquo;.-] {+&ldquo;free.&rdquo;+} The
+# | statement as it stands is not false&mdash;you can get copies of GNU
+# | software at no charge, from your friends or over the net.  But it does
+# | suggest the wrong idea.
+#, fuzzy
+#| msgid ""
+#| "This is another place I failed to distinguish carefully between the two "
+#| "different meanings of &ldquo;free&rdquo;.  The statement as it stands is "
+#| "not false&mdash;you can get copies of GNU software at no charge, from "
+#| "your friends or over the net.  But it does suggest the wrong idea."
 msgid ""
 "This is another place I failed to distinguish carefully between the two "
-"different meanings of &ldquo;free&rdquo;.  The statement as it stands is not "
+"different meanings of &ldquo;free.&rdquo; The statement as it stands is not "
 "false&mdash;you can get copies of GNU software at no charge, from your "
 "friends or over the net.  But it does suggest the wrong idea."
 msgstr ""
@@ -1363,11 +1491,11 @@
 "можете получить копии программ GNU 
бесплатно&nbsp;&mdash; от знакомых или по "
 "сети. Но оно предполагает неверную мысль."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid "Several such companies now exist."
 msgstr "Несколько таких компаний уже есть."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Although it is a charity rather than a company, the Free Software Foundation "
 "for 10 years raised most of its funds from its distribution service.  You "
@@ -1379,7 +1507,7 @@
 "организация. Вы можете <a 
href=\"/order/order.html\">сделать заказ в фонде</"
 "a> для поддержки нашей работы."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "A group of computer companies pooled funds around 1991 to support "
 "maintenance of the GNU C Compiler."
@@ -1388,7 +1516,7 @@
 "компилятора Си GNU."
 
 # type: Content of: <ol><li>
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "I think I was mistaken in saying that proprietary software was the most "
 "common basis for making money in software.  It seems that actually the most "
@@ -1409,10 +1537,31 @@
 "ожидаю, что большинство профессиональных 
программистов будет меньше "
 "зарабатывать в мире свободных программ."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+# | In the 1980s I had not yet realized how confusing it was to speak of
+# | &ldquo;the issue&rdquo; of &ldquo;intellectual [-property&rdquo;.-]
+# | {+property.&rdquo;+} That term is obviously biased; more subtle is the
+# | fact that it lumps together various disparate laws which raise very
+# | different issues.  Nowadays I urge people to reject the term
+# | &ldquo;intellectual property&rdquo; entirely, lest it lead others to
+# | suppose that those laws form one coherent issue.  The way to be clear is
+# | to discuss patents, copyrights, and trademarks separately.  See <a
+# | href=\"/philosophy/not-ipr.html\">further explanation</a> of how this term
+# | spreads confusion and bias.
+#, fuzzy
+#| msgid ""
+#| "In the 1980s I had not yet realized how confusing it was to speak of "
+#| "&ldquo;the issue&rdquo; of &ldquo;intellectual property&rdquo;.  That "
+#| "term is obviously biased; more subtle is the fact that it lumps together "
+#| "various disparate laws which raise very different issues.  Nowadays I "
+#| "urge people to reject the term &ldquo;intellectual property&rdquo; "
+#| "entirely, lest it lead others to suppose that those laws form one "
+#| "coherent issue.  The way to be clear is to discuss patents, copyrights, "
+#| "and trademarks separately.  See <a href=\"/philosophy/not-ipr.html"
+#| "\">further explanation</a> of how this term spreads confusion and bias."
 msgid ""
 "In the 1980s I had not yet realized how confusing it was to speak of &ldquo;"
-"the issue&rdquo; of &ldquo;intellectual property&rdquo;.  That term is "
+"the issue&rdquo; of &ldquo;intellectual property.&rdquo; That term is "
 "obviously biased; more subtle is the fact that it lumps together various "
 "disparate laws which raise very different issues.  Nowadays I urge people to "
 "reject the term &ldquo;intellectual property&rdquo; entirely, lest it lead "
@@ -1432,10 +1581,26 @@
 "См. <a href=\"/philosophy/not-ipr.html\">дальнейшее 
объяснение</a> того, "
 "почему этот термин вносит путаницу и 
необъективность."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+# | Subsequently we learned to distinguish between &ldquo;free software&rdquo;
+# | and [-&ldquo;freeware&rdquo;.-] {+&ldquo;freeware.&rdquo;+} The term
+# | &ldquo;freeware&rdquo; means software you are free to redistribute, but
+# | usually you are not free to study and change the source code, so most of
+# | it is not free software.  See &ldquo;<a
+# | href=\"/philosophy/words-to-avoid.html#Freeware\">Confusing Words and
+# | Phrases</a>&rdquo; for more explanation.
+#, fuzzy
+#| msgid ""
+#| "Subsequently we learned to distinguish between &ldquo;free "
+#| "software&rdquo; and &ldquo;freeware&rdquo;.  The term &ldquo;"
+#| "freeware&rdquo; means software you are free to redistribute, but usually "
+#| "you are not free to study and change the source code, so most of it is "
+#| "not free software.  See &ldquo;<a href=\"/philosophy/words-to-avoid."
+#| "html#Freeware\">Confusing Words and Phrases</a>&rdquo; for more "
+#| "explanation."
 msgid ""
 "Subsequently we learned to distinguish between &ldquo;free software&rdquo; "
-"and &ldquo;freeware&rdquo;.  The term &ldquo;freeware&rdquo; means software "
+"and &ldquo;freeware.&rdquo; The term &ldquo;freeware&rdquo; means software "
 "you are free to redistribute, but usually you are not free to study and "
 "change the source code, so most of it is not free software.  See &ldquo;<a "
 "href=\"/philosophy/words-to-avoid.html#Freeware\">Confusing Words and "
@@ -1482,14 +1647,20 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Мы старались сделать этот перевод точным 
и качественным, но исключить "
@@ -1500,9 +1671,15 @@
 "translations.html\">&ldquo;Руководстве по 
переводам&rdquo;</a>."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; 1985, 1993, 200[-3-]{+4+}, 2005, 2007, [-2008,-] 2009,
+# | 2010, [-2014, 2015-] {+2015, 2021+} Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, "
+#| "2015 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 1985, 1993, 2004, 2005, 2007, 2009, 2010, 2015, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015 "
 "Free Software Foundation, Inc."
@@ -1545,10 +1722,9 @@
 msgid "Updated:"
 msgstr "Обновлено:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015, "
-"2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015, "
-"2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, "
+#~ "2015, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, "
+#~ "2015, 2021 Free Software Foundation, Inc."

Index: po/manifesto.sq.po
===================================================================
RCS file: /web/www/www/gnu/po/manifesto.sq.po,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- po/manifesto.sq.po  25 Jul 2020 14:01:00 -0000      1.38
+++ po/manifesto.sq.po  2 Nov 2021 14:41:54 -0000       1.39
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manifesto.html\n"
-"POT-Creation-Date: 2015-06-02 12:55+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2020-07-25 16:47+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-11-02 14:27+0000\n"
 "X-Generator: Poedit 2.3.1\n"
 
 # type: Content of: <title>
@@ -22,14 +23,22 @@
 msgstr "Manifesti i GNU-së - Projekti GNU - Free Software Foundation"
 
 # type: Content of: <h2>
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "The GNU Manifesto"
 msgstr "Manifesti i GNU-së"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "The GNU Manifesto (which appears below) was written by <a href=\"http://";
+#| "www.stallman.org/\">Richard Stallman</a> in 1985 to ask for support in "
+#| "developing the GNU operating system.  Part of the text was taken from the "
+#| "original announcement of 1983.  Through 1987, it was updated in minor "
+#| "ways to account for developments; since then, it seems best to leave it "
+#| "unchanged."
 msgid ""
-"The GNU Manifesto (which appears below) was written by <a href=\"http://www.";
+"The GNU Manifesto (which appears below) was written by <a href=\"https://www.";
 "stallman.org/\">Richard Stallman</a> in 1985 to ask for support in "
 "developing the GNU operating system.  Part of the text was taken from the "
 "original announcement of 1983.  Through 1987, it was updated in minor ways "
@@ -43,7 +52,7 @@
 "është të lihet i pandryshuar."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Since that time, we have learned about certain common misunderstandings that "
 "different wording could help avoid.  Footnotes added since 1993 help clarify "
@@ -53,7 +62,7 @@
 "të cilat, me ndihmën e një shprehjeje ndryshe, mund të shmangen.  "
 "Poshtëshënimet e shtuara më 1993 ndihmojnë në kthjellimin e këtyre 
pikave."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If you want to install the GNU/Linux system, we recommend you use one of the "
 "<a href=\"/distros\">100% free software GNU/Linux distributions</a>.  For "
@@ -65,7 +74,7 @@
 "a>.  Rreth se si të jepni ndihmesë, shihni <a href=\"/help/help.html"
 "\">http://www.gnu.org/help</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The GNU Project is part of the Free Software Movement, a campaign for <a "
 "href=\"/philosophy/free-sw.html\">freedom for users of software</a>.  It is "
@@ -83,18 +92,25 @@
 "së njëjtës fushë."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "What's GNU? Gnu's Not Unix!"
 msgstr "Ç’është GNU-ja? Gnu-ja Nuk Është Unix!"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
+#| "compatible software system which I am writing so that I can give it away "
+#| "free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
+#| "volunteers are helping me.  Contributions of time, money, programs and "
+#| "equipment are greatly needed."
 msgid ""
 "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
 "compatible software system which I am writing so that I can give it away "
-"free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
-"volunteers are helping me.  Contributions of time, money, programs and "
-"equipment are greatly needed."
+"free to everyone who can use it&#8239;<a class=\"ftn\" href=\"#f1\">[1]</a>. "
+"Several other volunteers are helping me.  Contributions of time, money, "
+"programs and equipment are greatly needed."
 msgstr ""
 "GNU-ja, që është shkurtim për Gnu's Not Unix, është emri i një sistemi 
të "
 "plotë software-i, të ngjashëm me Unix, të cilin po e shkruaj që ta jap "
@@ -103,7 +119,7 @@
 "pajisje na janë shumë të nevojshme."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So far we have an Emacs text editor with Lisp for writing editor commands, a "
 "source level debugger, a yacc-compatible parser generator, a linker, and "
@@ -135,7 +151,7 @@
 "normalisht vjen me një sistem Unix, dhe më tepër."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU will be able to run Unix programs, but will not be identical to Unix.  "
 "We will make all improvements that are convenient, based on our experience "
@@ -159,7 +175,7 @@
 "provojmë të ofrojmë mbulim për UUCP, MIT Chaosnet, dhe protokollet 
Internet."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is aimed initially at machines in the 68000/16000 class with virtual "
 "memory, because they are the easiest machines to make it run on.  The extra "
@@ -172,7 +188,7 @@
 "atyre që duan ta përdorin në to."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid horrible confusion, please pronounce the <em>g</em> in the word "
 "&ldquo;GNU&rdquo; when it is the name of this project."
@@ -181,12 +197,12 @@
 "në te fjala &lsquo;GNU&rsquo;, kur është fjala për emrin e projektit."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why I Must Write GNU"
 msgstr "Pse Duhet Ta Shkruaj GNU-në"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I consider that the Golden Rule requires that if I like a program I must "
 "share it with other people who like it.  Software sellers want to divide the "
@@ -210,13 +226,20 @@
 "institucion ku gjëra të tilla bëhen kundër vullnetit tim."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "So that I can continue to use computers without dishonor, I have decided "
+#| "to put together a sufficient body of free software so that I will be able "
+#| "to get along without any software that is not free.  I have resigned from "
+#| "the AI Lab to deny MIT any legal excuse to prevent me from giving GNU "
+#| "away.<a href=\"#f2a\">(2)</a>"
 msgid ""
 "So that I can continue to use computers without dishonor, I have decided to "
 "put together a sufficient body of free software so that I will be able to "
 "get along without any software that is not free.  I have resigned from the "
-"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away.<a "
-"href=\"#f2a\">(2)</a>"
+"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away&#8239;"
+"<a class=\"ftn\" href=\"#f2a\">[2]</a>."
 msgstr ""
 "Ndaj që të mund të vazhdoj të përdor kompjuterat pa humbur në nder, kam 
"
 "vendosur të bëj tok një trupë të mjaftueshme software-i të lirë që 
të mund "
@@ -226,12 +249,12 @@
 "\"#f2a\">(2)</a>"
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why GNU Will Be Compatible with Unix"
 msgstr "Pse GNU-ja Do Të Jetë i Përputhshëm me Unix-in"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Unix is not my ideal system, but it is not too bad.  The essential features "
 "of Unix seem to be good ones, and I think I can fill in what Unix lacks "
@@ -245,12 +268,12 @@
 "tjerë."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How GNU Will Be Available"
 msgstr "Si Do të Mund të Kihet GNU-ja"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is not in the public domain.  Everyone will be permitted to modify and "
 "redistribute GNU, but no distributor will be allowed to restrict its further "
@@ -265,12 +288,12 @@
 "lejohen.  Dua të sigurohem që çdo version i GNU-së do të mbesë i lirë."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why Many Other Programmers Want to Help"
 msgstr "Pse Duan të Ndihmojnë Kaq Shumë Programues"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found many other programmers who are excited about GNU and want to "
 "help."
@@ -279,7 +302,7 @@
 "duan të ndihmojnë."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Many programmers are unhappy about the commercialization of system "
 "software.  It may enable them to make more money, but it requires them to "
@@ -304,7 +327,7 @@
 "mendojnë se programimi është thjesht një rrugë për të bërë para."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By working on and using GNU rather than proprietary programs, we can be "
 "hospitable to everyone and obey the law.  In addition, GNU serves as an "
@@ -322,12 +345,12 @@
 "është ndjenjë e rëndësishme gëzimi që nuk mund ta zëvendësojë 
paraja."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How You Can Contribute"
 msgstr "Si Mund të Kontribuoni"
 
 # type: Content of: <blockquote><p>
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "(Nowadays, for software tasks to work on, see the <a href=\"http://fsf.org/";
 "campaigns/priority-projects\">High Priority Projects list</a> and the <a "
@@ -345,7 +368,7 @@
 "operativ GNU</a>.)"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am asking computer manufacturers for donations of machines and money.  I'm "
 "asking individuals for donations of programs and work."
@@ -354,7 +377,7 @@
 "kërkoj individëve të dhurojnë në formë programesh dhe pune."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One consequence you can expect if you donate machines is that GNU will run "
 "on them at an early date.  The machines should be complete, ready to use "
@@ -367,7 +390,7 @@
 "ftohje ose ushqim të sofistikuar."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found very many programmers eager to contribute part-time work for "
 "GNU.  For most projects, such part-time distributed work would be very hard "
@@ -399,7 +422,7 @@
 "i vogël, i ngushtë.)"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If I get donations of money, I may be able to hire a few people full or part "
 "time.  The salary won't be high by programmers' standards, but I'm looking "
@@ -417,22 +440,26 @@
 "fitimit të bukës së përditshme me mënyra të tjera."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why All Computer Users Will Benefit"
 msgstr "Pse Do të Kenë Përfitim të Gjithë Përdoruesit"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Once GNU is written, everyone will be able to obtain good system software "
+#| "free, just like air.<a href=\"#f2\">(3)</a>"
 msgid ""
 "Once GNU is written, everyone will be able to obtain good system software "
-"free, just like air.<a href=\"#f2\">(3)</a>"
+"free, just like air&#8239;<a class=\"ftn\" href=\"#f2\">[3]</a>."
 msgstr ""
 "Pasi GNU-ja të jetë shkruar, gjithkush do të jetë në gjendje të ketë "
 "<em>software</em> sistemi të mirë dhe lirisht, njësoj si ajrin.<a href="
 "\"#f2\">(3)</a>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This means much more than just saving everyone the price of a Unix license.  "
 "It means that much wasteful duplication of system programming effort will be "
@@ -445,7 +472,7 @@
 "gjërave."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Complete system sources will be available to everyone.  As a result, a user "
 "who needs changes in the system will always be free to make them himself, or "
@@ -461,7 +488,7 @@
 "ndryshimet."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Schools will be able to provide a much more educational environment by "
 "encouraging all students to study and improve the system code.  Harvard's "
@@ -478,7 +505,7 @@
 "programeve.  Kjo më ka frymëzuar jo pak."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Finally, the overhead of considering who owns the system software and what "
 "one is or is not entitled to do with it will be lifted."
@@ -487,7 +514,7 @@
 "ka ose nuk ka të drejtë të bëjë me të, do të zhduket."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Arrangements to make people pay for using a program, including licensing of "
 "copies, always incur a tremendous cost to society through the cumbersome "
@@ -514,7 +541,7 @@
 "tokë."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copying all or parts of a program is as natural to a programmer as "
 "breathing, and as productive.  It ought to be as free."
@@ -524,12 +551,12 @@
 "lirë."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Some Easily Rebutted Objections to GNU's Goals"
 msgstr "Disa Kundërshtime ndaj Synimeve të GNU-së Që Hidhen Poshtë Lehtë"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Nobody will use it if it is free, because that means they "
 "can't rely on any support.&rdquo;</strong>"
@@ -538,7 +565,7 @@
 "do të thotë se nuk mund të kenë shpresa për asistencë.&rdquo;</strong>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You have to charge for the program to pay for providing the "
 "support.&rdquo;</strong>"
@@ -547,11 +574,16 @@
 "dhënie asistence.&rdquo;</strong>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "If people would rather pay for GNU plus service than get GNU free without "
+#| "service, a company to provide just service to people who have obtained "
+#| "GNU free ought to be profitable.<a href=\"#f3\">(4)</a>"
 msgid ""
 "If people would rather pay for GNU plus service than get GNU free without "
 "service, a company to provide just service to people who have obtained GNU "
-"free ought to be profitable.<a href=\"#f3\">(4)</a>"
+"free ought to be profitable&#8239;<a class=\"ftn\" href=\"#f3\">[4]</a>."
 msgstr ""
 "Nëse njerëzit më mirë do të paguanin për GNU-në plus shërbim, se sa 
të "
 "merrnin GNU-në falas pa shërbim, një shoqëri që do të ofronte thjesht "
@@ -559,7 +591,7 @@
 "href=\"#f3\">(4)</a>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We must distinguish between support in the form of real programming work and "
 "mere handholding.  The former is something one cannot rely on from a "
@@ -573,7 +605,7 @@
 "qafën!\"."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If your business needs to be able to rely on support, the only way is to "
 "have all the necessary sources and tools.  Then you can hire any available "
@@ -594,7 +626,7 @@
 "problemet e botës, vetëm disa prej tyre."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Meanwhile, the users who know nothing about computers need handholding: "
 "doing things for them which they could easily do themselves but don't know "
@@ -605,7 +637,7 @@
 "që nuk dinë se si."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Such services could be provided by companies that sell just handholding and "
 "repair service.  If it is true that users would rather spend money and get a "
@@ -626,7 +658,7 @@
 "shërbimin."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You cannot reach many people without advertising, and you "
 "must charge for the program to support that.&rdquo;</strong>"
@@ -635,7 +667,7 @@
 "të vini një çmim për programin që ta bëni të mundur 
këtë.&rdquo;</strong>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;It's no use advertising a program people can get free.&rdquo;"
 "</strong>"
@@ -644,7 +676,7 @@
 "marrin falas.&rdquo;</strong>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are various forms of free or very cheap publicity that can be used to "
 "inform numbers of computer users about something like GNU.  But it may be "
@@ -663,12 +695,18 @@
 "prej reklamës paguajnë për të."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "On the other hand, if many people get GNU from their friends, and such "
+#| "companies don't succeed, this will show that advertising was not really "
+#| "necessary to spread GNU.  Why is it that free market advocates don't want "
+#| "to let the free market decide this?<a href=\"#f4\">(5)</a>"
 msgid ""
 "On the other hand, if many people get GNU from their friends, and such "
 "companies don't succeed, this will show that advertising was not really "
 "necessary to spread GNU.  Why is it that free market advocates don't want to "
-"let the free market decide this?<a href=\"#f4\">(5)</a>"
+"let the free market decide this?&#8239;<a class=\"ftn\" href=\"#f4\">[5]</a>"
 msgstr ""
 "Nga ana tjetër, nëse mjaft njerëz e marrin GNU-në nga miq të tyre, dhe "
 "shoqëri të tilla nuk kanë sukses, kjo do të tregonte që reklama nuk do 
të qe "
@@ -676,7 +714,7 @@
 "nuk duan ta lënë tregun e lirë të vendosë këtu?<a href=\"#f4\">(5)</a>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;My company needs a proprietary operating system to get a "
 "competitive edge.&rdquo;</strong>"
@@ -685,7 +723,7 @@
 "ketë një shans në konkurrencë.&rdquo;</strong>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU will remove operating system software from the realm of competition.  "
 "You will not be able to get an edge in this area, but neither will your "
@@ -706,17 +744,22 @@
 "operativë."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "I would like to see GNU development supported by gifts from many "
+#| "manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
 msgid ""
 "I would like to see GNU development supported by gifts from many "
-"manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
+"manufacturers and users, reducing the cost to each&#8239;<a class=\"ftn\" "
+"href=\"#f5\">[6]</a>."
 msgstr ""
 "Do të doja ta shihja zhvillimin e GNU-së të mbështetur përmes dhurimesh 
nga "
 "plot prodhues dhe përdorues, duke ulur kështu kostot për të dy palët.<a 
href="
 "\"#f5\">(6)</a>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't programmers deserve a reward for their creativity?"
 "&rdquo;</strong>"
@@ -725,7 +768,7 @@
 "e tyre?&rdquo;</strong>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If anything deserves a reward, it is social contribution.  Creativity can be "
 "a social contribution, but only in so far as society is free to use the "
@@ -740,7 +783,7 @@
 "ndëshkohen, në rast se kufizojnë përdorimin e këtyre programeve."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Shouldn't a programmer be able to ask for a reward for his "
 "creativity?&rdquo;</strong>"
@@ -749,7 +792,7 @@
 "kërkonte një shpërblim për krijimtarinë e tij?&rdquo;</strong>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is nothing wrong with wanting pay for work, or seeking to maximize "
 "one's income, as long as one does not use means that are destructive.  But "
@@ -761,7 +804,7 @@
 "shkatërrimin."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Extracting money from users of a program by restricting their use of it is "
 "destructive because the restrictions reduce the amount and the ways that the "
@@ -776,7 +819,7 @@
 "dashje të kufizimit, pasojat e dëmshme janë shkatërrim me dashje."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The reason a good citizen does not use such destructive means to become "
 "wealthier is that, if everyone did so, we would all become poorer from the "
@@ -795,12 +838,12 @@
 "nuk përligj lënies e botës pa këtë krijimtari ose një pjesë të saj."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid "<strong>&ldquo;Won't programmers starve?&rdquo;</strong>"
 msgstr "<strong>&ldquo;A nuk do të vdesin urie programuesit?&rdquo;</strong>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "I could answer that nobody is forced to be a programmer.  Most of us cannot "
 "manage to get any money for standing on the street and making faces.  But we "
@@ -814,7 +857,7 @@
 "diçka tjetër."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But that is the wrong answer because it accepts the questioner's implicit "
 "assumption: that without ownership of software, programmers cannot possibly "
@@ -825,7 +868,7 @@
 "ndonjë qindarkë.  Pra, sikur të qe ose gjithçka, ose asgjë."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The real reason programmers will not starve is that it will still be "
 "possible for them to get paid for programming; just not paid as much as now."
@@ -835,13 +878,22 @@
 "tani."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Restricting copying is not the only basis for business in software.  It "
+#| "is the most common basis<a href=\"#f8\">(7)</a> because it brings in the "
+#| "most money.  If it were prohibited, or rejected by the customer, software "
+#| "business would move to other bases of organization which are now used "
+#| "less often.  There are always numerous ways to organize any kind of "
+#| "business."
 msgid ""
 "Restricting copying is not the only basis for business in software.  It is "
-"the most common basis<a href=\"#f8\">(7)</a> because it brings in the most "
-"money.  If it were prohibited, or rejected by the customer, software "
-"business would move to other bases of organization which are now used less "
-"often.  There are always numerous ways to organize any kind of business."
+"the most common basis&#8239;<a class=\"ftn\" href=\"#f8\">[7]</a> because it "
+"brings in the most money.  If it were prohibited, or rejected by the "
+"customer, software business would move to other bases of organization which "
+"are now used less often.  There are always numerous ways to organize any "
+"kind of business."
 msgstr ""
 "Kufizimi i kopjimit nuk është baza e vetme për biznes me software-in.  
Është "
 "baza më e zakonshme<a href=\"#f8\">(7)</a>, sepse sjell më shumë para.  Po 
"
@@ -850,7 +902,7 @@
 "Gjithmonë ka shumë mënyra për organizimin e çfarëdo lloji biznesi."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Probably programming will not be as lucrative on the new basis as it is "
 "now.  But that is not an argument against the change.  It is not considered "
@@ -865,7 +917,7 @@
 "do të fitonin prapë shumë më tepër se aq.)"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't people have a right to control how their creativity is "
 "used?&rdquo;</strong>"
@@ -874,7 +926,7 @@
 "krijimtaria e tyre?&rdquo;</strong>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "&ldquo;Control over the use of one's ideas&rdquo; really constitutes control "
 "over other people's lives; and it is usually used to make their lives more "
@@ -885,13 +937,20 @@
 "më të vështirë."
 
 # type: Content of: <p>
-#. type: Content of: <p>
-msgid ""
-"People who have studied the issue of intellectual property rights<a href="
-"\"#f6\">(8)</a> carefully (such as lawyers) say that there is no intrinsic "
-"right to intellectual property.  The kinds of supposed intellectual property "
-"rights that the government recognizes were created by specific acts of "
-"legislation for specific purposes."
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "People who have studied the issue of intellectual property rights<a href="
+#| "\"#f6\">(8)</a> carefully (such as lawyers) say that there is no "
+#| "intrinsic right to intellectual property.  The kinds of supposed "
+#| "intellectual property rights that the government recognizes were created "
+#| "by specific acts of legislation for specific purposes."
+msgid ""
+"People who have studied the issue of intellectual property rights&#8239;<a "
+"class=\"ftn\" href=\"#f6\">[8]</a> carefully (such as lawyers) say that "
+"there is no intrinsic right to intellectual property.  The kinds of supposed "
+"intellectual property rights that the government recognizes were created by "
+"specific acts of legislation for specific purposes."
 msgstr ""
 "Njerëzit që kanë studiuar me kujdes çështjen e të drejtave të 
pronësisë "
 "intelektuale<a href=\"#f6\">(8)</a> (juristët, fjala vjen) thonë se nuk ka "
@@ -900,7 +959,7 @@
 "akte të veçanta ligjvënieje, për qëllime të veçanta."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For example, the patent system was established to encourage inventors to "
 "disclose the details of their inventions.  Its purpose was to help society "
@@ -922,7 +981,7 @@
 "individëve që përdorin produkte të patentuar."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The idea of copyright did not exist in ancient times, when authors "
 "frequently copied other authors at length in works of nonfiction.  This "
@@ -943,7 +1002,7 @@
 "shumicës së individëve që lexojnë libra."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "All intellectual property rights are just licenses granted by society "
 "because it was thought, rightly or wrongly, that society as a whole would "
@@ -958,7 +1017,7 @@
 "Ç’lloj veprimi po i lejojmë një personi të kryejë?"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The case of programs today is very different from that of books a hundred "
 "years ago.  The fact that the easiest way to copy a program is from one "
@@ -979,14 +1038,14 @@
 "person nuk duhej të bënte kështu, pavarësisht se e lejon a jo ligji."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Competition makes things get done better.&rdquo;</strong>"
 msgstr ""
 "<strong>&ldquo;Konkurrenca i bën gjërat të bëhen më 
mirë.&rdquo;</strong>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The paradigm of competition is a race: by rewarding the winner, we encourage "
 "everyone to run faster.  When capitalism really works this way, it does a "
@@ -1006,7 +1065,7 @@
 "finish."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Proprietary and secret software is the moral equivalent of runners in a fist "
 "fight.  Sad to say, the only referee we've got does not seem to object to "
@@ -1021,7 +1080,7 @@
 "ndante, dhe të dënonte vrapuesit edhe nëse vetëm provonin të ziheshin."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Won't everyone stop programming without a monetary incentive?"
 "&rdquo;</strong>"
@@ -1030,7 +1089,7 @@
 "monetare?&rdquo;</strong>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually, many people will program with absolutely no monetary incentive.  "
 "Programming has an irresistible fascination for some people, usually the "
@@ -1044,7 +1103,7 @@
 "mund të fitojnë jetesën."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But really this question, though commonly asked, is not appropriate to the "
 "situation.  Pay for programmers will not disappear, only become less.  So "
@@ -1057,7 +1116,7 @@
 "monetare më të ulët? Përvoja ime tregon se kjo do të ndodhë."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For more than ten years, many of the world's best programmers worked at the "
 "Artificial Intelligence Lab for far less money than they could have had "
@@ -1071,7 +1130,7 @@
 "ky."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Then most of them left when offered a chance to do the same interesting work "
 "for a lot of money."
@@ -1080,7 +1139,7 @@
 "interesante për goxha para."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "What the facts show is that people will program for reasons other than "
 "riches; but if given a chance to make a lot of money as well, they will come "
@@ -1095,7 +1154,7 @@
 "dalin keq, nëse ato ku paguhet shumë nxirren jashtë loje."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;We need the programmers desperately.  If they demand that we "
 "stop helping our neighbors, we have to obey.&rdquo;</strong>"
@@ -1104,7 +1163,7 @@
 "reshtim së ndihmuari fqinjët tanë, duhet të bindemi.&rdquo;</strong>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "You're never so desperate that you have to obey this sort of demand.  "
 "Remember: millions for defense, but not a cent for tribute!"
@@ -1113,7 +1172,7 @@
 "lloji.  Mos harroni: miliona për mbrojtjen, por as edhe një dysh për 
tribute!"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Programmers need to make a living somehow.&rdquo;</strong>"
 msgstr ""
@@ -1121,7 +1180,7 @@
 "farë mënyre.&rdquo;</strong>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In the short run, this is true.  However, there are plenty of ways that "
 "programmers could make a living without selling the right to use a program.  "
@@ -1137,7 +1196,7 @@
 "gjenden mënyra të tjera nëse doni t’i gjeni ato.  Ja një numër 
shembujsh."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A manufacturer introducing a new computer will pay for the porting of "
 "operating systems onto the new hardware."
@@ -1146,7 +1205,7 @@
 "sistemeve operative në hardware-in e ri."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The sale of teaching, handholding and maintenance services could also employ "
 "programmers."
@@ -1155,11 +1214,18 @@
 "shërbime të mirëmbajtjes me pagesë."
 
 # type: Content of: <p>
-#. type: Content of: <p>
-msgid ""
-"People with new ideas could distribute programs as freeware<a href=\"#f7\">"
-"(9)</a>, asking for donations from satisfied users, or selling handholding "
-"services.  I have met people who are already working this way successfully."
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "People with new ideas could distribute programs as freeware<a href="
+#| "\"#f7\">(9)</a>, asking for donations from satisfied users, or selling "
+#| "handholding services.  I have met people who are already working this way "
+#| "successfully."
+msgid ""
+"People with new ideas could distribute programs as freeware&#8239;<a class="
+"\"ftn\" href=\"#f7\">[9]</a>, asking for donations from satisfied users, or "
+"selling handholding services.  I have met people who are already working "
+"this way successfully."
 msgstr ""
 "Njerëzit me ide të reja mund t’i shpërndanin programet si \"freeware\"<a 
"
 "href=\"#f7\">(9)</a>, duke kërkuar dhurime nga përdorues të kënaqur, ose "
@@ -1167,7 +1233,7 @@
 "këtë mënyrë."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Users with related needs can form users' groups, and pay dues.  A group "
 "would contract with programming companies to write programs that the group's "
@@ -1178,13 +1244,13 @@
 "për shkrim programesh të cilat anëtarët e grupit do të donin t’i 
përdornin."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "All sorts of development can be funded with a Software Tax:"
 msgstr ""
 "Me një Taksë Software-i mund të financoheshin krejt llojet e programimeve:"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Suppose everyone who buys a computer has to pay x percent of the price as a "
 "software tax.  The government gives this to an agency like the NSF to spend "
@@ -1195,7 +1261,7 @@
 "NSF për ta shpenzuar për zhvillim software-i."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But if the computer buyer makes a donation to software development himself, "
 "he can take a credit against the tax.  He can donate to the project of his "
@@ -1210,7 +1276,7 @@
 "gjithsej që i duhet të paguajë për taksën."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The total tax rate could be decided by a vote of the payers of the tax, "
 "weighted according to the amount they will be taxed on."
@@ -1219,24 +1285,24 @@
 "të taksës, peshuar në përputhje me sasinë mbi të cilën do të vendoset 
taksa."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "The consequences:"
 msgstr "Pasojat:"
 
 # type: Content of: <ul><li>
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "The computer-using community supports software development."
 msgstr ""
 "Bashkësia e përdorimit të kompjuterave e mbështet zhvillimin e 
<em>software</"
 "em>-it."
 
 # type: Content of: <ul><li>
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "This community decides what level of support is needed."
 msgstr "Kjo bashkësi vendos se çfarë shkalle mbështetje lypset."
 
 # type: Content of: <ul><li>
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "Users who care which projects their share is spent on can choose this for "
 "themselves."
@@ -1245,7 +1311,7 @@
 "mund ta zgjedhin vetë këtë."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the long run, making programs free is a step toward the postscarcity "
 "world, where nobody will have to work very hard just to make a living.  "
@@ -1264,7 +1330,7 @@
 "ketë nevojë të jesh në gjendje të sigurosh jetesën nga programimi."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We have already greatly reduced the amount of work that the whole society "
 "must do for its actual productivity, but only a little of this has "
@@ -1284,12 +1350,12 @@
 "Duhet ta bëjmë këtë, me qëllim që përfitimet teknike në prodhimtari 
të "
 "pasqyrohen si më pak punë për ne."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "Poshtëshënime"
 
 # type: Content of: <ol><li>
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The wording here was careless.  The intention was that nobody would have to "
 "pay for <b>permission</b> to use the GNU system.  But the words don't make "
@@ -1321,7 +1387,7 @@
 "bashkëpunojë me të tjerët gjatë përdorimit të saj."
 
 # type: Content of: <ol><li>
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The expression &ldquo;give away&rdquo; is another indication that I had not "
 "yet clearly separated the issue of price from that of freedom.  We now "
@@ -1336,10 +1402,16 @@
 "html#GiveAwaySoftware\"> <q>Fjalë dhe Fjali Që të Ngatërrojnë</q></a>."
 
 # type: Content of: <ol><li>
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "This is another place I failed to distinguish carefully between the two "
+#| "different meanings of &ldquo;free&rdquo;.  The statement as it stands is "
+#| "not false&mdash;you can get copies of GNU software at no charge, from "
+#| "your friends or over the net.  But it does suggest the wrong idea."
 msgid ""
 "This is another place I failed to distinguish carefully between the two "
-"different meanings of &ldquo;free&rdquo;.  The statement as it stands is not "
+"different meanings of &ldquo;free.&rdquo; The statement as it stands is not "
 "false&mdash;you can get copies of GNU software at no charge, from your "
 "friends or over the net.  But it does suggest the wrong idea."
 msgstr ""
@@ -1349,12 +1421,12 @@
 "prej miqve apo nga rrjeti.  Por ta shpie mendjen te ideja e gabuar."
 
 # type: Content of: <ol><li>
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid "Several such companies now exist."
 msgstr "Ekzistojnë disa shoqëri të tilla."
 
 # type: Content of: <ol><li>
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Although it is a charity rather than a company, the Free Software Foundation "
 "for 10 years raised most of its funds from its distribution service.  You "
@@ -1367,7 +1439,7 @@
 "order.html\">porosisni gjëra prej FSF-së</a>."
 
 # type: Content of: <ol><li>
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "A group of computer companies pooled funds around 1991 to support "
 "maintenance of the GNU C Compiler."
@@ -1376,7 +1448,7 @@
 "të mirëmbajtjes së përpiluesit GNU C Compiler."
 
 # type: Content of: <ol><li>
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "I think I was mistaken in saying that proprietary software was the most "
 "common basis for making money in software.  It seems that actually the most "
@@ -1397,10 +1469,21 @@
 "botën e software-it të lirë."
 
 # type: Content of: <ol><li>
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "In the 1980s I had not yet realized how confusing it was to speak of "
+#| "&ldquo;the issue&rdquo; of &ldquo;intellectual property&rdquo;.  That "
+#| "term is obviously biased; more subtle is the fact that it lumps together "
+#| "various disparate laws which raise very different issues.  Nowadays I "
+#| "urge people to reject the term &ldquo;intellectual property&rdquo; "
+#| "entirely, lest it lead others to suppose that those laws form one "
+#| "coherent issue.  The way to be clear is to discuss patents, copyrights, "
+#| "and trademarks separately.  See <a href=\"/philosophy/not-ipr.html"
+#| "\">further explanation</a> of how this term spreads confusion and bias."
 msgid ""
 "In the 1980s I had not yet realized how confusing it was to speak of &ldquo;"
-"the issue&rdquo; of &ldquo;intellectual property&rdquo;.  That term is "
+"the issue&rdquo; of &ldquo;intellectual property.&rdquo; That term is "
 "obviously biased; more subtle is the fact that it lumps together various "
 "disparate laws which raise very different issues.  Nowadays I urge people to "
 "reject the term &ldquo;intellectual property&rdquo; entirely, lest it lead "
@@ -1422,10 +1505,19 @@
 "njëanshmëri."
 
 # type: Content of: <ol><li>
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "Subsequently we learned to distinguish between &ldquo;free "
+#| "software&rdquo; and &ldquo;freeware&rdquo;.  The term &ldquo;"
+#| "freeware&rdquo; means software you are free to redistribute, but usually "
+#| "you are not free to study and change the source code, so most of it is "
+#| "not free software.  See &ldquo;<a href=\"/philosophy/words-to-avoid."
+#| "html#Freeware\">Confusing Words and Phrases</a>&rdquo; for more "
+#| "explanation."
 msgid ""
 "Subsequently we learned to distinguish between &ldquo;free software&rdquo; "
-"and &ldquo;freeware&rdquo;.  The term &ldquo;freeware&rdquo; means software "
+"and &ldquo;freeware.&rdquo; The term &ldquo;freeware&rdquo; means software "
 "you are free to redistribute, but usually you are not free to study and "
 "change the source code, so most of it is not free software.  See &ldquo;<a "
 "href=\"/philosophy/words-to-avoid.html#Freeware\">Confusing Words and "
@@ -1460,6 +1552,7 @@
 "të dërgohen te <a href=\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu."
 "org&gt;</a>."
 
+# TODO: submitting -> contributing.
 #.  TRANSLATORS: Ignore the original text in this paragraph,
 #.         replace it with the translation of these two:
 #.         We work hard and do our best to provide accurate, good quality
@@ -1467,14 +1560,19 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Përpiqemi fort dhe bëjmë sa mundemi për të ofruar përkthime me cilësi 
të "
@@ -1487,9 +1585,13 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, "
+#| "2015 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 1985, 1993, 2004, 2005, 2007, 2009, 2010, 2015, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
 "Të drejta kopjimi &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, "
 "2014, 2015 Free Software Foundation, Inc."

Index: po/manifesto.sr.po
===================================================================
RCS file: /web/www/www/gnu/po/manifesto.sr.po,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- po/manifesto.sr.po  31 May 2021 09:06:18 -0000      1.30
+++ po/manifesto.sr.po  2 Nov 2021 14:41:54 -0000       1.31
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manifesto.html\n"
-"POT-Creation-Date: 2015-06-02 12:55+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2008-08-13 20:12+0200\n"
 "Last-Translator: Strahinya Radich <vilinkamen@mail.ru>\n"
 "Language-Team: Serbian <www-sr-dev@lists.gnu.org>\n"
@@ -22,11 +22,11 @@
 msgid "The GNU Manifesto - GNU Project - Free Software Foundation"
 msgstr "Манифест ГНУ-а — Пројекат ГНУ — 
Задужбина за слободни софтвер"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "The GNU Manifesto"
 msgstr "Манифест ГНУ-а"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 #, fuzzy
 #| msgid ""
 #| "The GNU Manifesto (which appears below) was written by <a href=\"http://";
@@ -35,7 +35,7 @@
 #| "it was updated in minor ways to account for developments, but now it "
 #| "seems best to leave it unchanged as most people have seen it."
 msgid ""
-"The GNU Manifesto (which appears below) was written by <a href=\"http://www.";
+"The GNU Manifesto (which appears below) was written by <a href=\"https://www.";
 "stallman.org/\">Richard Stallman</a> in 1985 to ask for support in "
 "developing the GNU operating system.  Part of the text was taken from the "
 "original announcement of 1983.  Through 1987, it was updated in minor ways "
@@ -47,7 +47,7 @@
 "сада изгледа да је најбоље да се остави 
неизмењен јер га је видела већина "
 "људи."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 #, fuzzy
 #| msgid ""
 #| "Since that time, we have learned about certain common misunderstandings "
@@ -62,7 +62,7 @@
 "избегнути другачијим избором речи. 
Фусноте додане 1993. помажу да се ти "
 "делови разјасне."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 #, fuzzy
 #| msgid ""
 #| "For up-to-date information about the available GNU software, please see "
@@ -82,7 +82,7 @@
 "информације о начину на који нам можете 
помоћи, погледајте <a href=\"/help/"
 "help.html\">http://www.gnu.org/help/help.html</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The GNU Project is part of the Free Software Movement, a campaign for <a "
 "href=\"/philosophy/free-sw.html\">freedom for users of software</a>.  It is "
@@ -92,24 +92,31 @@
 "open-source-misses-the-point.html\">amoral approach</a> to the same field."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "What's GNU? Gnu's Not Unix!"
 msgstr "Шта је ГНУ? Гну није Уникс!"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
+#| "compatible software system which I am writing so that I can give it away "
+#| "free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
+#| "volunteers are helping me.  Contributions of time, money, programs and "
+#| "equipment are greatly needed."
 msgid ""
 "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
 "compatible software system which I am writing so that I can give it away "
-"free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
-"volunteers are helping me.  Contributions of time, money, programs and "
-"equipment are greatly needed."
+"free to everyone who can use it&#8239;<a class=\"ftn\" href=\"#f1\">[1]</a>. "
+"Several other volunteers are helping me.  Contributions of time, money, "
+"programs and equipment are greatly needed."
 msgstr ""
 "ГНУ, што значи Гну није Уникс, је назив 
потпуног софтверског система "
 "сагласног са Униксом, који пишем да бих га 
бесплатно дао свима који могу да "
 "га користе. <a href=\"#f1\">(1)</a> Помаже ми 
неколицина других добровољаца. "
 "Прилози у времену, новцу, програмима и 
опреми су нам веома потребни."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So far we have an Emacs text editor with Lisp for writing editor commands, a "
 "source level debugger, a yacc-compatible parser generator, a linker, and "
@@ -137,7 +144,7 @@
 "документацијом. Надамо се да ћемо на крају 
обезбедити све оне корисне ствари "
 "које се обично испоручују са системом 
Уникс и више од тога."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU will be able to run Unix programs, but will not be identical to Unix.  "
 "We will make all improvements that are convenient, based on our experience "
@@ -159,7 +166,7 @@
 "као системски програмски језици. 
Покушаћемо да подржимо <em>UUCP</em>, МИТ-"
 "ов Хаоснет и Интернетске протоколе за 
комуницирање."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is aimed initially at machines in the 68000/16000 class with virtual "
 "memory, because they are the easiest machines to make it run on.  The extra "
@@ -170,7 +177,7 @@
 "68000/16000, јер су оне најлакше за 
прилагођавање. Додатни труд да се он "
 "прилагоди мањим машинама је остављен 
неком ко жели да га користи на њима."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid horrible confusion, please pronounce the <em>g</em> in the word "
 "&ldquo;GNU&rdquo; when it is the name of this project."
@@ -179,11 +186,11 @@
 "изговарате као „Г“, када се та реч односи 
на наш пројекат.<sup><a href="
 "\"#TransNote1\">[1]</a></sup>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why I Must Write GNU"
 msgstr "Зашто морам да направим ГНУ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I consider that the Golden Rule requires that if I like a program I must "
 "share it with other people who like it.  Software sellers want to divide the "
@@ -205,7 +212,7 @@
 "негостољубивостима, али на крају су 
претерали: нисам могао да останем у "
 "институцији где ми се тако нешто намеће 
против моје воље."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "So that I can continue to use computers without dishonor, I have decided "
@@ -217,19 +224,19 @@
 "So that I can continue to use computers without dishonor, I have decided to "
 "put together a sufficient body of free software so that I will be able to "
 "get along without any software that is not free.  I have resigned from the "
-"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away.<a "
-"href=\"#f2a\">(2)</a>"
+"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away&#8239;"
+"<a class=\"ftn\" href=\"#f2a\">[2]</a>."
 msgstr ""
 "Како бих могао да наставим да користим 
рачунаре чиста образа, одлучио сам да "
 "саставим довољан корпус слободног 
софтвера како бих био у могућности да "
 "уопште не користим софтвер који није 
слободан. Напустио сам ЛВИ како бих "
 "ускратио МИТ-у сваки правни изговор да ме 
спрече од расподеле ГНУ-а."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why GNU Will Be Compatible with Unix"
 msgstr "Зашто ће ГНУ бити сагласан са Униксом"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Unix is not my ideal system, but it is not too bad.  The essential features "
 "of Unix seem to be good ones, and I think I can fill in what Unix lacks "
@@ -241,11 +248,11 @@
 "без њиховог кварења. Осим тога, систем 
сагласан са Униксом би многи "
 "прихватили."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How GNU Will Be Available"
 msgstr "Како ће ГНУ бити доступан"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is not in the public domain.  Everyone will be permitted to modify and "
 "redistribute GNU, but no distributor will be allowed to restrict its further "
@@ -259,18 +266,18 @@
 "html#ProprietarySoftware\">власничке</a> измене неће 
бити дозвољене. Хоћу да "
 "осигурам да све верзије ГНУ-а остану 
слободне."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why Many Other Programmers Want to Help"
 msgstr "Зашто многи програмери желе да 
помогну"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found many other programmers who are excited about GNU and want to "
 "help."
 msgstr ""
 "Нашао сам много других програмера који су 
загрејани за ГНУ и желе да помогну."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Many programmers are unhappy about the commercialization of system "
 "software.  It may enable them to make more money, but it requires them to "
@@ -294,7 +301,7 @@
 "лагодно ни са једним избором. Они постају 
цинични и почињу да мисле да је "
 "програмирање само начин за стицање новца."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By working on and using GNU rather than proprietary programs, we can be "
 "hospitable to everyone and obey the law.  In addition, GNU serves as an "
@@ -310,11 +317,11 @@
 "софтвер. За половину програмера са којима 
разговарам, ово је важна врста "
 "среће коју новац не може да замени."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How You Can Contribute"
 msgstr "Како можете помоћи"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><p>
 #, fuzzy
 #| msgid ""
 #| "(Nowadays, for software tasks to work on, see the <a href=\"http://fsf.";
@@ -337,7 +344,7 @@
 "начине на које можете помоћи, погледајте <a 
href=\"/help/help.html\">http://";
 "www.gnu.org/help/help.html</a>.)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am asking computer manufacturers for donations of machines and money.  I'm "
 "asking individuals for donations of programs and work."
@@ -345,7 +352,7 @@
 "Молим произвођаче рачунара за прилоге у 
машинама и новцу. Молим појединце за "
 "прилоге у програмима и раду."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One consequence you can expect if you donate machines is that GNU will run "
 "on them at an early date.  The machines should be complete, ready to use "
@@ -357,7 +364,7 @@
 "спремни за употребу, дозвољени за 
употребу у стамбеној зони, и без потребе "
 "за компликованим хлађењем или напајањем."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found very many programmers eager to contribute part-time work for "
 "GNU.  For most projects, such part-time distributed work would be very hard "
@@ -385,7 +392,7 @@
 "изводљив задатак. (Језгро ће захтевати 
ближу сарадњу и њега ће развијати "
 "мања, компактнија група.)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If I get donations of money, I may be able to hire a few people full or part "
 "time.  The salary won't be high by programmers' standards, but I'm looking "
@@ -401,23 +408,23 @@
 "омогућавања посвећеним људима да посвете 
њихову пуну снагу раду на ГНУ-у "
 "поштеђујући их потребе да зарађују за 
живот на други начин."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why All Computer Users Will Benefit"
 msgstr "Зашто ће сви корисници рачунара имати 
користи"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "Once GNU is written, everyone will be able to obtain good system software "
 #| "free, just like air.<a href=\"#f2\">(2)</a>"
 msgid ""
 "Once GNU is written, everyone will be able to obtain good system software "
-"free, just like air.<a href=\"#f2\">(3)</a>"
+"free, just like air&#8239;<a class=\"ftn\" href=\"#f2\">[3]</a>."
 msgstr ""
 "Када се једном направи ГНУ, свако ће моћи 
да набави добар системски софтвер "
 "бесплатно, баш као што дише ваздух.<a 
href=\"#f2\">(2)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This means much more than just saving everyone the price of a Unix license.  "
 "It means that much wasteful duplication of system programming effort will be "
@@ -427,7 +434,7 @@
 "се избећи много непотребног 
удвостручавања труда у системском 
програмирању. "
 "Овај труд може да се уместо тога усмери у 
унапређивање могућности софтвера."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Complete system sources will be available to everyone.  As a result, a user "
 "who needs changes in the system will always be free to make them himself, or "
@@ -441,7 +448,7 @@
 "Корисници више неће бити препуштени на 
милост и немилост једном програмеру "
 "или фирми која поседује изворни код а у 
позицији је да једина мења софтвер."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Schools will be able to provide a much more educational environment by "
 "encouraging all students to study and improve the system code.  Harvard's "
@@ -457,7 +464,7 @@
 "придржавали тог правила, одбијајући да 
инсталирају одређене програме. То ме "
 "је веома инспирисало."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Finally, the overhead of considering who owns the system software and what "
 "one is or is not entitled to do with it will be lifted."
@@ -465,7 +472,7 @@
 "На крају, престаће сувишна разматрања о 
томе ко поседује системски софтвер, "
 "и шта са њим сме а шта не сме да се ради."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Arrangements to make people pay for using a program, including licensing of "
 "copies, always incur a tremendous cost to society through the cumbersome "
@@ -490,7 +497,7 @@
 "Боље је подржати фабрику ваздуха порезом 
по глави становника и отарасити се "
 "маски."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copying all or parts of a program is as natural to a programmer as "
 "breathing, and as productive.  It ought to be as free."
@@ -499,11 +506,11 @@
 "и дисање, и исто толико продуктивно. И 
морало би да буде исто толико "
 "бесплатно."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Some Easily Rebutted Objections to GNU's Goals"
 msgstr "Неки приговори циљевима ГНУ-а који се 
са лакоћом оповргавају"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Nobody will use it if it is free, because that means they "
 "can't rely on any support.&rdquo;</strong>"
@@ -511,7 +518,7 @@
 "<strong>„Нико га неће користити ако је 
бесплатан, јер то значи да се не може "
 "поуздати у подршку.“</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You have to charge for the program to pay for providing the "
 "support.&rdquo;</strong>"
@@ -519,7 +526,7 @@
 "<strong>„Мора се платити за програм да би се 
платило обезбеђивање подршке.“</"
 "strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 #, fuzzy
 #| msgid ""
 #| "If people would rather pay for GNU plus service than get GNU free without "
@@ -528,13 +535,13 @@
 msgid ""
 "If people would rather pay for GNU plus service than get GNU free without "
 "service, a company to provide just service to people who have obtained GNU "
-"free ought to be profitable.<a href=\"#f3\">(4)</a>"
+"free ought to be profitable&#8239;<a class=\"ftn\" href=\"#f3\">[4]</a>."
 msgstr ""
 "Ако би људи радије платили за ГНУ и 
подршку него набавили ГНУ бесплатно без "
 "подршке, фирма која обезбеђује само 
подршку људима који су набавили ГНУ "
 "бесплатно би требало да буде 
профитабилна.<a href=\"#f3\">(3)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We must distinguish between support in the form of real programming work and "
 "mere handholding.  The former is something one cannot rely on from a "
@@ -546,7 +553,7 @@
 "продаваца софтвера. Ако ваш проблем не 
мучи довољно људи, продавац ће вам "
 "рећи да се губите."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If your business needs to be able to rely on support, the only way is to "
 "have all the necessary sources and tools.  Then you can hire any available "
@@ -565,7 +572,7 @@
 "не постоји компетентна особа, али за овај 
проблем није крив начин расподеле. "
 "ГНУ не решава све светске проблеме, већ 
само неке од њих."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Meanwhile, the users who know nothing about computers need handholding: "
 "doing things for them which they could easily do themselves but don't know "
@@ -574,7 +581,7 @@
 "У међувремену, корисницима који не знају 
ништа о рачунарима је потребно "
 "одржавање: обављање послова које би они 
лако урадили, само што не знају како."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Such services could be provided by companies that sell just handholding and "
 "repair service.  If it is true that users would rather spend money and get a "
@@ -592,7 +599,7 @@
 "они од нас којима подршка није потребна ће 
моћи да користе програм без "
 "потребе да плаћају подршку."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You cannot reach many people without advertising, and you "
 "must charge for the program to support that.&rdquo;</strong>"
@@ -600,7 +607,7 @@
 "<strong>„Не можете да досегнете много људи 
без рекламе, а да бисте то "
 "омогућили морате да наплаћујете за 
програм.“</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;It's no use advertising a program people can get free.&rdquo;"
 "</strong>"
@@ -608,7 +615,7 @@
 "<strong>„Не вреди рекламирати програм који 
људи могу да добију бесплатно.“</"
 "strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are various forms of free or very cheap publicity that can be used to "
 "inform numbers of computer users about something like GNU.  But it may be "
@@ -625,7 +632,7 @@
 "рекламирање и створи зараду. На тај начин 
ће га плаћати само корисници који "
 "имају користи од рекламирања."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 #, fuzzy
 #| msgid ""
 #| "On the other hand, if many people get GNU from their friends, and such "
@@ -636,14 +643,14 @@
 "On the other hand, if many people get GNU from their friends, and such "
 "companies don't succeed, this will show that advertising was not really "
 "necessary to spread GNU.  Why is it that free market advocates don't want to "
-"let the free market decide this?<a href=\"#f4\">(5)</a>"
+"let the free market decide this?&#8239;<a class=\"ftn\" href=\"#f4\">[5]</a>"
 msgstr ""
 "Са друге стране, уколико много људи добије 
ГНУ од својих пријатеља, и такве "
 "фирме не успеју, ово ће показати да 
реклама није била стварно потребна за "
 "ширење ГНУ-а. Зашто заговорници слободног 
тржишта не пусте слободно тржиште "
 "да о овоме само одлучи?<a href=\"#f4\">(4)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;My company needs a proprietary operating system to get a "
 "competitive edge.&rdquo;</strong>"
@@ -651,7 +658,7 @@
 "<strong>„Мојој фирми је за остваривање 
предности над конкуренцијом потребан "
 "власнички оперативни систем.“</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU will remove operating system software from the realm of competition.  "
 "You will not be able to get an edge in this area, but neither will your "
@@ -669,25 +676,26 @@
 "ваш проблем. Ако је ваша делатност нешто 
друго, ГНУ вас може спасти од "
 "увлачења у скупи посао продаје 
оперативних система."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 #, fuzzy
 #| msgid ""
 #| "I would like to see GNU development supported by gifts from many "
 #| "manufacturers and users, reducing the cost to each.<a href=\"#f5\">(5)</a>"
 msgid ""
 "I would like to see GNU development supported by gifts from many "
-"manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
+"manufacturers and users, reducing the cost to each&#8239;<a class=\"ftn\" "
+"href=\"#f5\">[6]</a>."
 msgstr ""
 "Волео бих да видим како се изградња ГНУ-а 
подржава поклонима великог броја "
 "произвођача и корисника, смањујући 
трошкове за све.<a href=\"#f5\">(5)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't programmers deserve a reward for their creativity?"
 "&rdquo;</strong>"
 msgstr "<strong>„Зар програмери не заслужују 
награду за креативност?“</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If anything deserves a reward, it is social contribution.  Creativity can be "
 "a social contribution, but only in so far as society is free to use the "
@@ -701,7 +709,7 @@
 "иновативних програма, по некој аналогији 
заслужују и да буду кажњени ако "
 "спречавају коришћење тих програма."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Shouldn't a programmer be able to ask for a reward for his "
 "creativity?&rdquo;</strong>"
@@ -709,7 +717,7 @@
 "<strong>„Зар програмеру не би требало 
дозволити да тражи награду за своју "
 "креативност?“</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is nothing wrong with wanting pay for work, or seeking to maximize "
 "one's income, as long as one does not use means that are destructive.  But "
@@ -719,7 +727,7 @@
 "приход, све док се не користе деструктивна 
средства. Али средства која су "
 "данас уобичајена на пољу софтвера су 
заснована на деструкцији."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Extracting money from users of a program by restricting their use of it is "
 "destructive because the restrictions reduce the amount and the ways that the "
@@ -733,7 +741,7 @@
 "добија од програма. Када је намерно 
одлучено да се ограничи, штетне "
 "последице те одлуке представљају намерну 
деструкцију."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The reason a good citizen does not use such destructive means to become "
 "wealthier is that, if everyone did so, we would all become poorer from the "
@@ -751,11 +759,11 @@
 "жеља да се буде награђен за креативност не 
оправдава лишавање света у целини "
 "те креативности или њеног дела."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid "<strong>&ldquo;Won't programmers starve?&rdquo;</strong>"
 msgstr "<strong>„Неће ли програмери умрети од 
глади?“</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "I could answer that nobody is forced to be a programmer.  Most of us cannot "
 "manage to get any money for standing on the street and making faces.  But we "
@@ -767,7 +775,7 @@
 "нисмо осуђени да проведемо животе у 
стајању на улици и кревељењу, и "
 "гладовању. Једноставно, радимо нешто 
друго."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But that is the wrong answer because it accepts the questioner's implicit "
 "assumption: that without ownership of software, programmers cannot possibly "
@@ -777,7 +785,7 @@
 "поставио то питање да програмерима неће 
бити исплаћен ни динар без "
 "власништва над софтвером. Све или ништа."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The real reason programmers will not starve is that it will still be "
 "possible for them to get paid for programming; just not paid as much as now."
@@ -785,7 +793,7 @@
 "Међутим, прави разлог зашто програмери 
неће умрети од глади је што ће још "
 "увек бити могуће да буду плаћени за 
програмирање, само не толико као сада."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 #, fuzzy
 #| msgid ""
 #| "Restricting copying is not the only basis for business in software.  It "
@@ -795,10 +803,11 @@
 #| "always numerous ways to organize any kind of business."
 msgid ""
 "Restricting copying is not the only basis for business in software.  It is "
-"the most common basis<a href=\"#f8\">(7)</a> because it brings in the most "
-"money.  If it were prohibited, or rejected by the customer, software "
-"business would move to other bases of organization which are now used less "
-"often.  There are always numerous ways to organize any kind of business."
+"the most common basis&#8239;<a class=\"ftn\" href=\"#f8\">[7]</a> because it "
+"brings in the most money.  If it were prohibited, or rejected by the "
+"customer, software business would move to other bases of organization which "
+"are now used less often.  There are always numerous ways to organize any "
+"kind of business."
 msgstr ""
 "Спречавање копирања није једина основа за 
пословање засновано на софтверу. "
 "То је најчешћа основа јер доноси највише 
новца. Кад би било забрањено или "
@@ -806,7 +815,7 @@
 "организације који се сада ређе користе. 
Увек постоје разни начини да се "
 "организује било који посао."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Probably programming will not be as lucrative on the new basis as it is "
 "now.  But that is not an argument against the change.  It is not considered "
@@ -819,7 +828,7 @@
 "садашњих плата продаваца. Када би 
програмери исто толико зарађивали, и то би "
 "била неправда. (У пракси би они и даље 
значајно више зарађивали.)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't people have a right to control how their creativity is "
 "used?&rdquo;</strong>"
@@ -827,7 +836,7 @@
 "<strong>„Зар људи немају право да контролишу 
како им се користи "
 "креативност?“</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "&ldquo;Control over the use of one's ideas&rdquo; really constitutes control "
 "over other people's lives; and it is usually used to make their lives more "
@@ -836,7 +845,7 @@
 "„Контрола над коришћењем идеја“ заправо 
представља контролу над животима "
 "других људи, и обично се користи да им 
загорча живот."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 #, fuzzy
 #| msgid ""
 #| "People who have studied the issue of intellectual property rights<a href="
@@ -845,18 +854,18 @@
 #| "intellectual property rights that the government recognizes were created "
 #| "by specific acts of legislation for specific purposes."
 msgid ""
-"People who have studied the issue of intellectual property rights<a href="
-"\"#f6\">(8)</a> carefully (such as lawyers) say that there is no intrinsic "
-"right to intellectual property.  The kinds of supposed intellectual property "
-"rights that the government recognizes were created by specific acts of "
-"legislation for specific purposes."
+"People who have studied the issue of intellectual property rights&#8239;<a "
+"class=\"ftn\" href=\"#f6\">[8]</a> carefully (such as lawyers) say that "
+"there is no intrinsic right to intellectual property.  The kinds of supposed "
+"intellectual property rights that the government recognizes were created by "
+"specific acts of legislation for specific purposes."
 msgstr ""
 "Људи који су пажљиво проучавали питање 
права интелектуалне својине<a href="
 "\"#f6\">(6)</a> (на пример правници) кажу да не 
постоје суштинска права на "
 "интелектуалну својину. Врсте такозваних 
права на интелектуалну својину које "
 "прописује влада су створене посебним 
правним актима у конкретне сврхе."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For example, the patent system was established to encourage inventors to "
 "disclose the details of their inventions.  Its purpose was to help society "
@@ -875,7 +884,7 @@
 "упореде са успостављањем производње, 
патенти често не чине много штете. Они "
 "не сметају већини појединаца који користе 
патентиране производе."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The idea of copyright did not exist in ancient times, when authors "
 "frequently copied other authors at length in works of nonfiction.  This "
@@ -894,7 +903,7 @@
 "преко штампарске пресе — он је чинио мало 
штете, и није представљао препреку "
 "већини појединаца који читају књиге."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "All intellectual property rights are just licenses granted by society "
 "because it was thought, rightly or wrongly, that society as a whole would "
@@ -907,7 +916,7 @@
 "користи. Али у конкретној ситуацији 
морамо да се запитамо: да ли је за нас "
 "боље да дозволимо такво лиценцирање? За 
шта овлашћујемо одређену особу?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The case of programs today is very different from that of books a hundred "
 "years ago.  The fact that the easiest way to copy a program is from one "
@@ -926,12 +935,12 @@
 "као целини и материјално и духовно, а то не 
би смела да ради без обзира на "
 "то да ли јој закон то дозвољава или не."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Competition makes things get done better.&rdquo;</strong>"
 msgstr "<strong>„Уз конкуренцију се боље 
ради.“</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The paradigm of competition is a race: by rewarding the winner, we encourage "
 "everyone to run faster.  When capitalism really works this way, it does a "
@@ -948,7 +957,7 @@
 "могу да развију другачије стратегије, као 
што је нападање других тркача. Ако "
 "се тркачи потуку, сви ће закаснити."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Proprietary and secret software is the moral equivalent of runners in a fist "
 "fight.  Sad to say, the only referee we've got does not seem to object to "
@@ -961,7 +970,7 @@
 "само прописује („На сваких десет метара 
противника можете да ударите "
 "једном“). А требало би да их раздвоји и 
казни за сам покушај туче."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Won't everyone stop programming without a monetary incentive?"
 "&rdquo;</strong>"
@@ -969,7 +978,7 @@
 "<strong>„Неће ли сви престати да 
програмирају без новчаног подстицаја?“</"
 "strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually, many people will program with absolutely no monetary incentive.  "
 "Programming has an irresistible fascination for some people, usually the "
@@ -981,7 +990,7 @@
 "су у њему најбољи. Не мањка професионалних 
музичара који се баве музиком, "
 "иако тако не постоји нада да тиме зараде 
за живот."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But really this question, though commonly asked, is not appropriate to the "
 "situation.  Pay for programmers will not disappear, only become less.  So "
@@ -993,7 +1002,7 @@
 "питање је да ли ће ико програмирати са 
смањеним новчаним подстицајем? Моје "
 "искуство показује да хоће."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For more than ten years, many of the world's best programmers worked at the "
 "Artificial Intelligence Lab for far less money than they could have had "
@@ -1006,7 +1015,7 @@
 "награда: на пример, славу и захвалност. 
Осим тога, креативност је и забавна, "
 "што је само по себи награда."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Then most of them left when offered a chance to do the same interesting work "
 "for a lot of money."
@@ -1014,7 +1023,7 @@
 "Али, када им је понуђена прилика да 
обављају исти интересантан посао за "
 "много новца, већина њих је напустила 
посао."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "What the facts show is that people will program for reasons other than "
 "riches; but if given a chance to make a lot of money as well, they will come "
@@ -1028,7 +1037,7 @@
 "зарадама, али се то не би дешавало уколико 
би оне са већим зарадама биле "
 "забрањене."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;We need the programmers desperately.  If they demand that we "
 "stop helping our neighbors, we have to obey.&rdquo;</strong>"
@@ -1036,7 +1045,7 @@
 "<strong>„Очајнички су нам потребни 
програмери. Уколико они захтевају да "
 "престанемо да помажемо ближњима, морамо 
да их послушамо.“</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "You're never so desperate that you have to obey this sort of demand.  "
 "Remember: millions for defense, but not a cent for tribute!"
@@ -1045,12 +1054,12 @@
 "се: „Милионе за одбрану, али ни динара за х
арач!“<sup><a href="
 "\"#TransNote2\">[2]</a></sup>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Programmers need to make a living somehow.&rdquo;</strong>"
 msgstr "<strong>„Програмери морају некако да 
зарађују за живот.“</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In the short run, this is true.  However, there are plenty of ways that "
 "programmers could make a living without selling the right to use a program.  "
@@ -1064,7 +1073,7 @@
 "највише новца, а не зато што је једини 
начин да се зарађује за живот. Лако "
 "је наћи друге начине уколико желите да их 
нађете. Ево неколико примера."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A manufacturer introducing a new computer will pay for the porting of "
 "operating systems onto the new hardware."
@@ -1072,13 +1081,13 @@
 "Произвођач који направи нову врсту 
рачунара ће платити за прилагођавање "
 "оперативног система новом хардверу."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The sale of teaching, handholding and maintenance services could also employ "
 "programmers."
 msgstr "Продаја услуга обуке и одржавања може 
такође да упосли програмере."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 #, fuzzy
 #| msgid ""
 #| "People with new ideas could distribute programs as freeware<a href="
@@ -1086,15 +1095,16 @@
 #| "handholding services.  I have met people who are already working this way "
 #| "successfully."
 msgid ""
-"People with new ideas could distribute programs as freeware<a href=\"#f7\">"
-"(9)</a>, asking for donations from satisfied users, or selling handholding "
-"services.  I have met people who are already working this way successfully."
+"People with new ideas could distribute programs as freeware&#8239;<a class="
+"\"ftn\" href=\"#f7\">[9]</a>, asking for donations from satisfied users, or "
+"selling handholding services.  I have met people who are already working "
+"this way successfully."
 msgstr ""
 "Људи са новим идејама би могли да 
расподељују програме као фривер<a href="
 "\"#f7\">(7)</a>, тражећи прилоге од задовољних 
корисника, или продајући "
 "услуге одржавања. Сретао сам људе који већ 
успешно раде на такав начин."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Users with related needs can form users' groups, and pay dues.  A group "
 "would contract with programming companies to write programs that the group's "
@@ -1104,11 +1114,11 @@
 "чланарину. Група би склопила уговор са 
програмерским фирмама да пишу "
 "програме које би чланови групе желели да 
користе."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "All sorts of development can be funded with a Software Tax:"
 msgstr "Све врсте изградње могу се 
финансирати софтверским порезом:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Suppose everyone who buys a computer has to pay x percent of the price as a "
 "software tax.  The government gives this to an agency like the NSF to spend "
@@ -1119,7 +1129,7 @@
 "што је НЗС (Национална задужбина за 
софтвер) за покривање трошкова развоја "
 "софтвера."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But if the computer buyer makes a donation to software development himself, "
 "he can take a credit against the tax.  He can donate to the project of his "
@@ -1133,7 +1143,7 @@
 "буде заслужан за било који износ прилога 
до пуног износа пореза који је "
 "морао да плати."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The total tax rate could be decided by a vote of the payers of the tax, "
 "weighted according to the amount they will be taxed on."
@@ -1141,19 +1151,19 @@
 "Укупни порез би могао да буде изабран 
гласањем опорезованих, и изваган у "
 "складу са износом који ће им бити 
наплаћен."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "The consequences:"
 msgstr "Последице би биле следеће:"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "The computer-using community supports software development."
 msgstr "Заједница корисника рачунара би 
подржавала изградњу софтвера."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "This community decides what level of support is needed."
 msgstr "Ова заједница би одлучивала о томе 
који ниво подршке јој је потребан."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "Users who care which projects their share is spent on can choose this for "
 "themselves."
@@ -1161,7 +1171,7 @@
 "Корисници који посвећују посебну пажњу 
томе на које пројекте је потрошен "
 "њихов део могу ово сами да изаберу."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the long run, making programs free is a step toward the postscarcity "
 "world, where nobody will have to work very hard just to make a living.  "
@@ -1179,7 +1189,7 @@
 "истраживање астероида. Неће бити потребе 
да се зарађује за живот од "
 "програмирања."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We have already greatly reduced the amount of work that the whole society "
 "must do for its actual productivity, but only a little of this has "
@@ -1198,11 +1208,11 @@
 "производњи софтвера. Ми то морамо да 
урадимо, како би се технички добици у "
 "продуктивности претворили у смањење 
посла који морамо да обавимо."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "Фусноте"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The wording here was careless.  The intention was that nobody would have to "
 "pay for <b>permission</b> to use the GNU system.  But the words don't make "
@@ -1231,7 +1241,7 @@
 "унапређењу софтвера, тим боље. Битно је да 
свако ко поседује примерак има "
 "слободу да сарађује у његовом коришћењу 
са другима."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The expression &ldquo;give away&rdquo; is another indication that I had not "
 "yet clearly separated the issue of price from that of freedom.  We now "
@@ -1240,10 +1250,16 @@
 "\">Confusing Words and Phrases</a>&rdquo; for more explanation."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "This is another place I failed to distinguish carefully between the two "
+#| "different meanings of &ldquo;free&rdquo;.  The statement as it stands is "
+#| "not false&mdash;you can get copies of GNU software at no charge, from "
+#| "your friends or over the net.  But it does suggest the wrong idea."
 msgid ""
 "This is another place I failed to distinguish carefully between the two "
-"different meanings of &ldquo;free&rdquo;.  The statement as it stands is not "
+"different meanings of &ldquo;free.&rdquo; The statement as it stands is not "
 "false&mdash;you can get copies of GNU software at no charge, from your "
 "friends or over the net.  But it does suggest the wrong idea."
 msgstr ""
@@ -1253,11 +1269,11 @@
 "примерке ГНУ-овог софтвера бесплатно, од 
ваших пријатеља или преко мреже. "
 "Али она наводи на погрешан закључак."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid "Several such companies now exist."
 msgstr "Данас постоји неколико таквих фирми."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Although it is a charity rather than a company, the Free Software Foundation "
 "for 10 years raised most of its funds from its distribution service.  You "
@@ -1268,7 +1284,7 @@
 "расподелу, иако је добротворна 
организација, а не фирма. Можете и да <a href="
 "\"/order/order.html\">наручујете ствари од ЗСС-а</a>."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "A group of computer companies pooled funds around 1991 to support "
 "maintenance of the GNU C Compiler."
@@ -1276,7 +1292,7 @@
 "Неколико рачунарских фирми је 1991. 
спонзорисало одржавање ГНУ-овог "
 "преводиоца за Це."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "I think I was mistaken in saying that proprietary software was the most "
 "common basis for making money in software.  It seems that actually the most "
@@ -1288,10 +1304,21 @@
 "less in a free software world."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "In the 1980s I had not yet realized how confusing it was to speak of "
+#| "&ldquo;the issue&rdquo; of &ldquo;intellectual property&rdquo;.  That "
+#| "term is obviously biased; more subtle is the fact that it lumps together "
+#| "various disparate laws which raise very different issues.  Nowadays I "
+#| "urge people to reject the term &ldquo;intellectual property&rdquo; "
+#| "entirely, lest it lead others to suppose that those laws form one "
+#| "coherent issue.  The way to be clear is to discuss patents, copyrights, "
+#| "and trademarks separately.  See <a href=\"/philosophy/not-ipr.html"
+#| "\">further explanation</a> of how this term spreads confusion and bias."
 msgid ""
 "In the 1980s I had not yet realized how confusing it was to speak of &ldquo;"
-"the issue&rdquo; of &ldquo;intellectual property&rdquo;.  That term is "
+"the issue&rdquo; of &ldquo;intellectual property.&rdquo; That term is "
 "obviously biased; more subtle is the fact that it lumps together various "
 "disparate laws which raise very different issues.  Nowadays I urge people to "
 "reject the term &ldquo;intellectual property&rdquo; entirely, lest it lead "
@@ -1310,10 +1337,19 @@
 "Погледајте <a href=\"/philosophy/not-ipr.html\">даље 
објашњење</a> начина на "
 "који овај израз шири конфузију и 
двосмисленост."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "Subsequently we learned to distinguish between &ldquo;free "
+#| "software&rdquo; and &ldquo;freeware&rdquo;.  The term &ldquo;"
+#| "freeware&rdquo; means software you are free to redistribute, but usually "
+#| "you are not free to study and change the source code, so most of it is "
+#| "not free software.  See &ldquo;<a href=\"/philosophy/words-to-avoid."
+#| "html#Freeware\">Confusing Words and Phrases</a>&rdquo; for more "
+#| "explanation."
 msgid ""
 "Subsequently we learned to distinguish between &ldquo;free software&rdquo; "
-"and &ldquo;freeware&rdquo;.  The term &ldquo;freeware&rdquo; means software "
+"and &ldquo;freeware.&rdquo; The term &ldquo;freeware&rdquo; means software "
 "you are free to redistribute, but usually you are not free to study and "
 "change the source code, so most of it is not free software.  See &ldquo;<a "
 "href=\"/philosophy/words-to-avoid.html#Freeware\">Confusing Words and "
@@ -1350,6 +1386,7 @@
 "везе и друге исправке (или предлоге) на 
адресу <a href=\"mailto:mailto:";
 "webmasters@gnu.org\">&lt;mailto:webmasters@gnu.org&gt;</a>."
 
+# type: Content of: <div><p>
 #.  TRANSLATORS: Ignore the original text in this paragraph,
 #.         replace it with the translation of these two:
 #.         We work hard and do our best to provide accurate, good quality
@@ -1357,22 +1394,24 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 #, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and submitting "
+#| "translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Молимо да погледате <a 
href=\"/server/standards/README.translations.html"
 "\">ПРОЧИТАЈМЕ за преводе</a> за више 
информација о координисању и слању "
-"превода овог чланка. (За допринос српском 
преводу, корисно је да погледате и "
-"<a href=\"http://alas.matf.bg.ac.rs/~mr99164/uput/kakoda-prevodim-gnu-ov-veb.";
-"html\"> КАКОДА прeводим ГНУ-ов веб</a>.)"
+"превода овог чланка."
 
 #. type: Content of: <div><p>
 #, fuzzy
@@ -1380,8 +1419,8 @@
 #| "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008 Free Software "
 #| "Foundation, Inc.,"
 msgid ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 1985, 1993, 2004, 2005, 2007, 2009, 2010, 2015, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
 "<b>Ауторска права:</b><br />Copyright &copy; 1985, 1993, 2003, 
2005, 2007, "
 "2008 Free Software Foundation, Inc."
@@ -1418,6 +1457,18 @@
 msgid "Updated:"
 msgstr "Ажурирано:"
 
+#, fuzzy
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "Молимо да погледате <a 
href=\"/server/standards/README.translations.html"
+#~ "\">ПРОЧИТАЈМЕ за преводе</a> за више 
информација о координисању и слању "
+#~ "превода овог чланка. (За допринос 
српском преводу, корисно је да "
+#~ "погледате и <a 
href=\"http://alas.matf.bg.ac.rs/~mr99164/uput/kakoda-";
+#~ "prevodim-gnu-ov-veb.html\"> КАКОДА прeводим ГНУ-ов 
веб</a>.)"
+
 # type: Content of: <p>
 #~ msgid ""
 #~ "For up-to-date information about the available GNU software, please see "

Index: po/manifesto.sv.po
===================================================================
RCS file: /web/www/www/gnu/po/manifesto.sv.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- po/manifesto.sv.po  2 Jun 2015 18:00:35 -0000       1.3
+++ po/manifesto.sv.po  2 Nov 2021 14:41:54 -0000       1.4
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manifesto.html\n"
-"POT-Creation-Date: 2015-06-02 12:55+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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"
@@ -21,29 +21,35 @@
 msgid "The GNU Manifesto - GNU Project - Free Software Foundation"
 msgstr "GNU-manifestet - GNU Projektet - Free Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "The GNU Manifesto"
 msgstr "GNU-manifestet"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
+# | {+The GNU Manifesto (which appears below) was written+} by [-Richard
+# | Stallman-] {+<a href=\"https://www.stallman.org/\";>Richard Stallman</a> in
+# | 1985 to ask for support in developing the GNU operating system.  Part of
+# | the text was taken from the original announcement of 1983.  Through 1987,
+# | it was updated in minor ways to account for developments; since then, it
+# | seems best to leave it unchanged.+}
 #, fuzzy
 #| msgid "by Richard Stallman"
 msgid ""
-"The GNU Manifesto (which appears below) was written by <a href=\"http://www.";
+"The GNU Manifesto (which appears below) was written by <a href=\"https://www.";
 "stallman.org/\">Richard Stallman</a> in 1985 to ask for support in "
 "developing the GNU operating system.  Part of the text was taken from the "
 "original announcement of 1983.  Through 1987, it was updated in minor ways "
 "to account for developments; since then, it seems best to leave it unchanged."
 msgstr "av Richard Stallman"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Since that time, we have learned about certain common misunderstandings that "
 "different wording could help avoid.  Footnotes added since 1993 help clarify "
 "these points."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If you want to install the GNU/Linux system, we recommend you use one of the "
 "<a href=\"/distros\">100% free software GNU/Linux distributions</a>.  For "
@@ -51,7 +57,7 @@
 "a>."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The GNU Project is part of the Free Software Movement, a campaign for <a "
 "href=\"/philosophy/free-sw.html\">freedom for users of software</a>.  It is "
@@ -61,18 +67,18 @@
 "open-source-misses-the-point.html\">amoral approach</a> to the same field."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "What's GNU? Gnu's Not Unix!"
 msgstr "I. GNU ÄR NÅGOT ANNAT ÄN Unix!"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 #, fuzzy
 msgid ""
 "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
 "compatible software system which I am writing so that I can give it away "
-"free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
-"volunteers are helping me.  Contributions of time, money, programs and "
-"equipment are greatly needed."
+"free to everyone who can use it&#8239;<a class=\"ftn\" href=\"#f1\">[1]</a>. "
+"Several other volunteers are helping me.  Contributions of time, money, "
+"programs and equipment are greatly needed."
 msgstr ""
 "GNU står för Gnu's Not Unix (ung. GNU är Något annat än Unix) och så 
kallas "
 "det helt Unix-kompatibla mjukvarusystem som jag håller på att skriva, för "
@@ -80,7 +86,7 @@
 "antal frivilliga medarbetare hjälper mig. Vi har ett stort behov av bidrag i 
"
 "form av tid, pengar, program och utrustning."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So far we have an Emacs text editor with Lisp for writing editor commands, a "
 "source level debugger, a yacc-compatible parser generator, a linker, and "
@@ -110,7 +116,7 @@
 "småningom hoppas vi kunna tillhandahålla allt användbart som normalt 
följer "
 "med ett Unix-system och mer därtill."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU will be able to run Unix programs, but will not be identical to Unix.  "
 "We will make all improvements that are convenient, based on our experience "
@@ -132,7 +138,7 @@
 "Lisp. Vi kommer att försöka stödja följande kommunikationsprotokoll: 
UUCP, "
 "MIT chaosnet och IP."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is aimed initially at machines in the 68000/16000 class with virtual "
 "memory, because they are the easiest machines to make it run on.  The extra "
@@ -144,17 +150,17 @@
 "Arbetet med att få det att köra på mindre maskiner lämnas till dem som 
vill "
 "använda det på sådana maskiner."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid horrible confusion, please pronounce the <em>g</em> in the word "
 "&ldquo;GNU&rdquo; when it is the name of this project."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why I Must Write GNU"
 msgstr "II. DÄRFÖR MÅSTE JAG SKRIVA GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I consider that the Golden Rule requires that if I like a program I must "
 "share it with other people who like it.  Software sellers want to divide the "
@@ -177,14 +183,14 @@
 "det för långt. Jag kunde omöjligt stanna kvar på en institution där man "
 "gjorde dessa saker åt mig, mot min vilja."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 #, fuzzy
 msgid ""
 "So that I can continue to use computers without dishonor, I have decided to "
 "put together a sufficient body of free software so that I will be able to "
 "get along without any software that is not free.  I have resigned from the "
-"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away.<a "
-"href=\"#f2a\">(2)</a>"
+"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away&#8239;"
+"<a class=\"ftn\" href=\"#f2a\">[2]</a>."
 msgstr ""
 "För att jag skall kunna fortsätta använda datorer utan att skämmas har 
jag "
 "bestämt mig för att sammanställa tillräckligt med fri mjukvara för att 
jag "
@@ -192,11 +198,11 @@
 "från AI-labbet så att MIT inte skall ha någon juridisk möjlighet att 
hindra "
 "mig från att ge bort GNU."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why GNU Will Be Compatible with Unix"
 msgstr "III. DÄRFÖR SKALL GNU VARA KOMPATIBELT MED Unix"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Unix is not my ideal system, but it is not too bad.  The essential features "
 "of Unix seem to be good ones, and I think I can fill in what Unix lacks "
@@ -208,11 +214,11 @@
 "utan att förstöra dem. Ett unixkompatibelt system skulle också vara "
 "praktiskt för många andra att börja använda."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How GNU Will Be Available"
 msgstr "IV. SÅ HÄR KOMMER GNU ATT GÖRAS TILLGÄNGLIGT"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is not in the public domain.  Everyone will be permitted to modify and "
 "redistribute GNU, but no distributor will be allowed to restrict its further "
@@ -226,18 +232,18 @@
 "gör att koden blir upphovsrättsligt skyddad kommer inte att tillåtas. Jag "
 "vill se till att alla versioner av GNU förblir gratis."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why Many Other Programmers Want to Help"
 msgstr "V. MÅNGA PROGRAMMERARE KOMMER ATT HJÄLPA TILL"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found many other programmers who are excited about GNU and want to "
 "help."
 msgstr ""
 "Jag har träffat på många programmerare som gillar GNU och vill hjälpa 
till."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Many programmers are unhappy about the commercialization of system "
 "software.  It may enable them to make more money, but it requires them to "
@@ -261,7 +267,7 @@
 "inte väl till mods med något av valen. De blir cyniska och tror att "
 "programmering bara är ett sätt att tjäna pengar."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By working on and using GNU rather than proprietary programs, we can be "
 "hospitable to everyone and obey the law.  In addition, GNU serves as an "
@@ -278,11 +284,11 @@
 "märkesmjukvara. För ungefär hälften av de programmerare som jag kommer i "
 "kontakt med är detta en viktig glädjekälla som inte kan ersättas av 
pengar."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How You Can Contribute"
 msgstr "VI. SÅ HÄR KAN DU HJÄLPA TILL"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "(Nowadays, for software tasks to work on, see the <a href=\"http://fsf.org/";
 "campaigns/priority-projects\">High Priority Projects list</a> and the <a "
@@ -292,7 +298,7 @@
 "a>.)"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am asking computer manufacturers for donations of machines and money.  I'm "
 "asking individuals for donations of programs and work."
@@ -300,7 +306,7 @@
 "Jag ber datortillverkare donera maskiner och pengar. Jag ber enskilda "
 "individer donera program och arbete."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One consequence you can expect if you donate machines is that GNU will run "
 "on them at an early date.  The machines should be complete, ready to use "
@@ -312,7 +318,7 @@
 "system som är klara för användning, godkända för användning i 
bostadsområden "
 "och utan behov av sofistikerad kylning eller energiförsörjning."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found very many programmers eager to contribute part-time work for "
 "GNU.  For most projects, such part-time distributed work would be very hard "
@@ -342,7 +348,7 @@
 "kärnan kommer tätare kommunikation att krävas och det arbetet kommer att "
 "utföras av en liten, sammansvetsad grupp.)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If I get donations of money, I may be able to hire a few people full or part "
 "time.  The salary won't be high by programmers' standards, but I'm looking "
@@ -358,20 +364,20 @@
 "hängivna människor ägna all sin energi åt att arbeta på GNU, genom att 
de "
 "slipper förtjäna sitt levebröd på något annat sätt."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why All Computer Users Will Benefit"
 msgstr "VII. DÄRFÖR KOMMER ALLA DATORANVÄNDARE ATT GAGNAS"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 #, fuzzy
 msgid ""
 "Once GNU is written, everyone will be able to obtain good system software "
-"free, just like air.<a href=\"#f2\">(3)</a>"
+"free, just like air&#8239;<a class=\"ftn\" href=\"#f2\">[3]</a>."
 msgstr ""
 "Så snart GNU är färdigskrivet kan vem som helst få tag på bra 
systemmjukvara "
 "helt fritt, precis som luft."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This means much more than just saving everyone the price of a Unix license.  "
 "It means that much wasteful duplication of system programming effort will be "
@@ -382,7 +388,7 @@
 "systemprogrammering kan undvikas. I stället kan dessa ansträngningar "
 "användas för att flytta frontlinjen framåt."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Complete system sources will be available to everyone.  As a result, a user "
 "who needs changes in the system will always be free to make them himself, or "
@@ -397,7 +403,7 @@
 "att vara utlämnade till den programmerare, eller det företag, som äger "
 "källkoden, och därmed är de enda som kan göra förändringar."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Schools will be able to provide a much more educational environment by "
 "encouraging all students to study and improve the system code.  Harvard's "
@@ -413,7 +419,7 @@
 "levde som man lärde och vägrade faktiskt att installera vissa program. Jag "
 "påverkades mycket av detta."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Finally, the overhead of considering who owns the system software and what "
 "one is or is not entitled to do with it will be lifted."
@@ -421,7 +427,7 @@
 "Slutligen kommer det återkommande bekymret med att reda ut vem som äger "
 "mjukvaran och vad man har eller inte har rätt att göra med den att 
försvinna."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Arrangements to make people pay for using a program, including licensing of "
 "copies, always incur a tremendous cost to society through the cumbersome "
@@ -446,7 +452,7 @@
 "vara skandalöst. Det vore bättre att avgiftsbekosta lufttillverkningen med "
 "och slänga maskerna."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copying all or parts of a program is as natural to a programmer as "
 "breathing, and as productive.  It ought to be as free."
@@ -454,11 +460,11 @@
 "Att kopiera program, helt eller delvis, är lika naturligt för en "
 "programmerare som att andas, och lika produktivt. Det borde vara lika fritt."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Some Easily Rebutted Objections to GNU's Goals"
 msgstr "VIII. NÅGRA LÄTT TILLBAKAVISADE INVÄNDNINGAR MOT GNU:S MÅL"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Nobody will use it if it is free, because that means they "
 "can't rely on any support.&rdquo;</strong>"
@@ -466,7 +472,7 @@
 "<strong>“Ingen kommer att använda det om det är fritt, för då har de 
ingen "
 "support att luta sig mot.”</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You have to charge for the program to pay for providing the "
 "support.&rdquo;</strong>"
@@ -474,18 +480,18 @@
 "<strong>“Man måste ta betalt för programmet för att kunna ge 
support.”</"
 "strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 #, fuzzy
 msgid ""
 "If people would rather pay for GNU plus service than get GNU free without "
 "service, a company to provide just service to people who have obtained GNU "
-"free ought to be profitable.<a href=\"#f3\">(4)</a>"
+"free ought to be profitable&#8239;<a class=\"ftn\" href=\"#f3\">[4]</a>."
 msgstr ""
 "Om folk hellre betalar för GNU plus service än får GNU gratis utan 
service, "
 "så borde ett företag som ger service till dem som fått GNU gratis vara "
 "lönsamt."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We must distinguish between support in the form of real programming work and "
 "mere handholding.  The former is something one cannot rely on from a "
@@ -497,7 +503,7 @@
 "är inget man kan lita på att få från en mjukvaruförsäljare. Om ditt 
problem "
 "inte delas av tillräckligt många andra så kommer försäljaren att be dig 
dra."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If your business needs to be able to rely on support, the only way is to "
 "have all the necessary sources and tools.  Then you can hire any available "
@@ -518,7 +524,7 @@
 "som inte kan skyllas på distributionsmetoden. GNU löser inte alla världens 
"
 "problem, bara somliga."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Meanwhile, the users who know nothing about computers need handholding: "
 "doing things for them which they could easily do themselves but don't know "
@@ -528,7 +534,7 @@
 "någon som hjälper dem med sådant som de lätt hade kunnat göra själva, 
men "
 "inte vet hur."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Such services could be provided by companies that sell just handholding and "
 "repair service.  If it is true that users would rather spend money and get a "
@@ -547,7 +553,7 @@
 "vi som inte behöver denna tjänst få använda programmet utan att betala 
för "
 "servicen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You cannot reach many people without advertising, and you "
 "must charge for the program to support that.&rdquo;</strong>"
@@ -555,7 +561,7 @@
 "<strong>“Utan reklam är det omöjligt att nå många människor och man 
måste ta "
 "betalt för programmet för att möjliggöra det.”</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;It's no use advertising a program people can get free.&rdquo;"
 "</strong>"
@@ -563,7 +569,7 @@
 "<strong>“Det är inte lönt att göra reklam för ett program som folk kan 
få "
 "gratis.”</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are various forms of free or very cheap publicity that can be used to "
 "inform numbers of computer users about something like GNU.  But it may be "
@@ -580,20 +586,20 @@
 "det kan betala reklamkostnaderna och mer därtill. På så sätt är det bara 
de "
 "användare som drar nytta av reklamen som betalar för den."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 #, fuzzy
 msgid ""
 "On the other hand, if many people get GNU from their friends, and such "
 "companies don't succeed, this will show that advertising was not really "
 "necessary to spread GNU.  Why is it that free market advocates don't want to "
-"let the free market decide this?<a href=\"#f4\">(5)</a>"
+"let the free market decide this?&#8239;<a class=\"ftn\" href=\"#f4\">[5]</a>"
 msgstr ""
 "Om å andra sidan många människor får GNU av vänner så kommer den här 
typen "
 "av företag inte att lyckas, vilket kommer att visa att reklam inte var "
 "nödvändigt för att sprida GNU. Varför är den fria marknadens 
förespråkare så "
 "ovilliga att låta marknaden avgöra frågan?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;My company needs a proprietary operating system to get a "
 "competitive edge.&rdquo;</strong>"
@@ -601,7 +607,7 @@
 "<strong>“Mitt företag behöver ett operativsystem med ett välkänt 
varumärke "
 "för att få en konkurrensfördel.”</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU will remove operating system software from the realm of competition.  "
 "You will not be able to get an edge in this area, but neither will your "
@@ -619,16 +625,17 @@
 "dig från att skuffas in i den kostsamma bransch som är "
 "operativsystemförsäljarens."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 #, fuzzy
 msgid ""
 "I would like to see GNU development supported by gifts from many "
-"manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
+"manufacturers and users, reducing the cost to each&#8239;<a class=\"ftn\" "
+"href=\"#f5\">[6]</a>."
 msgstr ""
 "Jag hoppas att utvecklandet av GNU kommer att få stöd i form av gåvor 
från "
 "tillverkare och användare, som därmed minskar kostnaden för var och en."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't programmers deserve a reward for their creativity?"
 "&rdquo;</strong>"
@@ -636,7 +643,7 @@
 "<strong>“Förtjänar inte programmerarna någon belöning för sin 
kreativitet?”</"
 "strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If anything deserves a reward, it is social contribution.  Creativity can be "
 "a social contribution, but only in so far as society is free to use the "
@@ -650,7 +657,7 @@
 "förtjänar att belönas för  innovativa program, följer det logiskt att de 
"
 "också  förtjänar att straffas om de begränsar användandet  av dessa 
program."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Shouldn't a programmer be able to ask for a reward for his "
 "creativity?&rdquo;</strong>"
@@ -658,7 +665,7 @@
 "<strong>“Skall inte en programmerare kunna begära någon ersättning för 
sin "
 "kreativitet?”</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is nothing wrong with wanting pay for work, or seeking to maximize "
 "one's income, as long as one does not use means that are destructive.  But "
@@ -668,7 +675,7 @@
 "försöka maximera sin inkomst, så länge man inte använder destruktiva 
medel. "
 "Men det är just sådana medel som vanligen används på mjukvaruområdet 
idag."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Extracting money from users of a program by restricting their use of it is "
 "destructive because the restrictions reduce the amount and the ways that the "
@@ -682,7 +689,7 @@
 "medvetet inskränker andra möjligheter, blir de skadliga följderna ett "
 "medvetet förstörande."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The reason a good citizen does not use such destructive means to become "
 "wealthier is that, if everyone did so, we would all become poorer from the "
@@ -701,11 +708,11 @@
 "berättiga att man helt eller delvis berövar resten av världen denna "
 "kreativitet."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid "<strong>&ldquo;Won't programmers starve?&rdquo;</strong>"
 msgstr "<strong>“Kommer inte programmerarna att få gå 
hungriga?”</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "I could answer that nobody is forced to be a programmer.  Most of us cannot "
 "manage to get any money for standing on the street and making faces.  But we "
@@ -717,7 +724,7 @@
 "grimaser. Men det innebär inte att vi är dömda att stå på gatan, göra "
 "grimaser, och svälta. Vi gör något annat."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But that is the wrong answer because it accepts the questioner's implicit "
 "assumption: that without ownership of software, programmers cannot possibly "
@@ -727,7 +734,7 @@
 "att utan en äganderätt till mjukvaran får programmeraren inte ett öre i "
 "ersättning. Att det skulle vara allt eller inget."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The real reason programmers will not starve is that it will still be "
 "possible for them to get paid for programming; just not paid as much as now."
@@ -736,14 +743,15 @@
 "verket att de fortfarande kommer att kunna få betalt för att programmera, "
 "bara inte lika mycket som idag."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 #, fuzzy
 msgid ""
 "Restricting copying is not the only basis for business in software.  It is "
-"the most common basis<a href=\"#f8\">(7)</a> because it brings in the most "
-"money.  If it were prohibited, or rejected by the customer, software "
-"business would move to other bases of organization which are now used less "
-"often.  There are always numerous ways to organize any kind of business."
+"the most common basis&#8239;<a class=\"ftn\" href=\"#f8\">[7]</a> because it "
+"brings in the most money.  If it were prohibited, or rejected by the "
+"customer, software business would move to other bases of organization which "
+"are now used less often.  There are always numerous ways to organize any "
+"kind of business."
 msgstr ""
 "Att inskränka kopieringsrätten är inte det enda sättet att göra affärer 
i "
 "mjukvarubranchen. Det är det vanligaste eftersom det inbringar mest pengar. "
@@ -751,7 +759,7 @@
 "andra slags organisationer som är mindre vanliga idag. Det finns alltid ett "
 "antal olika sätt att organisera en affärsverksamhet."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Probably programming will not be as lucrative on the new basis as it is "
 "now.  But that is not an argument against the change.  It is not considered "
@@ -765,7 +773,7 @@
 "programmerare tjänade detsamma skulle inte heller det vara en orättvisa. (I 
"
 "praktiken skulle de fortfarande tjäna mycket mer än så.)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't people have a right to control how their creativity is "
 "used?&rdquo;</strong>"
@@ -773,7 +781,7 @@
 "<strong>“Har man inte rätt att kontrollera hur ens kreativitet 
används?”</"
 "strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "&ldquo;Control over the use of one's ideas&rdquo; really constitutes control "
 "over other people's lives; and it is usually used to make their lives more "
@@ -783,21 +791,21 @@
 "kontrollera andras liv, och det används oftast för att göra deras liv "
 "besvärligare."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 #, fuzzy
 msgid ""
-"People who have studied the issue of intellectual property rights<a href="
-"\"#f6\">(8)</a> carefully (such as lawyers) say that there is no intrinsic "
-"right to intellectual property.  The kinds of supposed intellectual property "
-"rights that the government recognizes were created by specific acts of "
-"legislation for specific purposes."
+"People who have studied the issue of intellectual property rights&#8239;<a "
+"class=\"ftn\" href=\"#f6\">[8]</a> carefully (such as lawyers) say that "
+"there is no intrinsic right to intellectual property.  The kinds of supposed "
+"intellectual property rights that the government recognizes were created by "
+"specific acts of legislation for specific purposes."
 msgstr ""
 "De som har analyserat frågan om skydd för intellektuella prestationer "
 "ingående (jurister till exempel) säger att det inte finns någon inneboende 
"
 "rätt till intellektuell egendom. Den immaterialrätt som skyddar vissa "
 "intellektuella prestationer har lagstiftaren skapat i vissa speciella syften."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For example, the patent system was established to encourage inventors to "
 "disclose the details of their inventions.  Its purpose was to help society "
@@ -817,7 +825,7 @@
 "produktionen, så ställer patent oftast inte till någon skada. De sätter 
inga "
 "hinder i vägen för de flesta enskilda som använder patentskyddade 
produkter."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The idea of copyright did not exist in ancient times, when authors "
 "frequently copied other authors at length in works of nonfiction.  This "
@@ -836,7 +844,7 @@
 "-- så gjorde det ingen särskild skada och störde inte de flesta av bokens "
 "läsare."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "All intellectual property rights are just licenses granted by society "
 "because it was thought, rightly or wrongly, that society as a whole would "
@@ -851,7 +859,7 @@
 "att bevilja en sådan licens. Hur tillåter vi en person att handla genom att 
"
 "ge honom eller henne en sådan licens?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The case of programs today is very different from that of books a hundred "
 "years ago.  The fact that the easiest way to copy a program is from one "
@@ -871,13 +879,13 @@
 "andligen, och där man därför inte bör bete sig så oavsett av om lagen "
 "tillåter det."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Competition makes things get done better.&rdquo;</strong>"
 msgstr ""
 "<strong>“Med lite konkurrens blir saker och ting bättre 
gjorda.”</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The paradigm of competition is a race: by rewarding the winner, we encourage "
 "everyone to run faster.  When capitalism really works this way, it does a "
@@ -895,7 +903,7 @@
 "strategier -- som att angripa de andra löparna. Om löparna hamnar i ett "
 "råkurr kommer de alla att bli försenade."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Proprietary and secret software is the moral equivalent of runners in a fist "
 "fight.  Sad to say, the only referee we've got does not seem to object to "
@@ -909,7 +917,7 @@
 "skjuta ett skott”). Vad han borde göra är att stoppa löparna och straffa 
dem "
 "för att en ha försökt starta ett slagsmål."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Won't everyone stop programming without a monetary incentive?"
 "&rdquo;</strong>"
@@ -917,7 +925,7 @@
 "<strong>“Kommer inte alla att sluta programmera om det inte finns något "
 "ekonomiskt incitament?”</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually, many people will program with absolutely no monetary incentive.  "
 "Programming has an irresistible fascination for some people, usually the "
@@ -929,7 +937,7 @@
 "oemotståndligt lockande. Det finns ingen brist på proffsiga musiker som "
 "fortsätter spela utan att ha något hopp om att kunna försörja sig på 
det."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But really this question, though commonly asked, is not appropriate to the "
 "situation.  Pay for programmers will not disappear, only become less.  So "
@@ -941,7 +949,7 @@
 "frågan att ställa är alltså huruvida någon kommer att programmera när 
det "
 "ekonomiska incitamentet minskar. Min erfarenhet säger mig att svaret är ja."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For more than ten years, many of the world's best programmers worked at the "
 "Artificial Intelligence Lab for far less money than they could have had "
@@ -954,7 +962,7 @@
 "och uppskattning till exempel. Och kreativitet är kul, den är en belöning 
i "
 "sig själv."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Then most of them left when offered a chance to do the same interesting work "
 "for a lot of money."
@@ -962,7 +970,7 @@
 "Senare slutade de flesta av dem när de erbjöds lika intressanta arbeten, 
men "
 "med högre lön."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "What the facts show is that people will program for reasons other than "
 "riches; but if given a chance to make a lot of money as well, they will come "
@@ -976,7 +984,7 @@
 "inte så bra gentemot dem som betalar höga, men så behöver det inte vara 
om "
 "de som betalar höga löner förbjuds."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;We need the programmers desperately.  If they demand that we "
 "stop helping our neighbors, we have to obey.&rdquo;</strong>"
@@ -984,7 +992,7 @@
 "<strong>“Vi har ett desperat behov av programmerare. Om de kräver att vi "
 "slutar hjälpa våra grannar så måste vi lyda.”</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "You're never so desperate that you have to obey this sort of demand.  "
 "Remember: millions for defense, but not a cent for tribute!"
@@ -993,13 +1001,13 @@
 "Thomas Jeffersons valspråk när USA:s handelsfartyg kapades i Medelhavet: "
 "“miljoner till försvaret, men inte ett öre i lösen!”"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Programmers need to make a living somehow.&rdquo;</strong>"
 msgstr ""
 "<strong>“På något sätt måste ju programmerare tjäna sitt 
uppehälle.”</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In the short run, this is true.  However, there are plenty of ways that "
 "programmers could make a living without selling the right to use a program.  "
@@ -1014,7 +1022,7 @@
 "tjäna pengar. Det är lätt att hitta på andra sätt om man bara vill. Här 
"
 "följer ett antal exempel:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A manufacturer introducing a new computer will pay for the porting of "
 "operating systems onto the new hardware."
@@ -1022,7 +1030,7 @@
 "En datortillverkare som introducerar en ny modell betalar för att "
 "operativsystem skall portas till den nya hårdvaran."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The sale of teaching, handholding and maintenance services could also employ "
 "programmers."
@@ -1030,18 +1038,19 @@
 "Programmerare skulle också kunna anställas i företag som säljer "
 "undervisning, “hålla handen-support” och underhåll."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 #, fuzzy
 msgid ""
-"People with new ideas could distribute programs as freeware<a href=\"#f7\">"
-"(9)</a>, asking for donations from satisfied users, or selling handholding "
-"services.  I have met people who are already working this way successfully."
+"People with new ideas could distribute programs as freeware&#8239;<a class="
+"\"ftn\" href=\"#f7\">[9]</a>, asking for donations from satisfied users, or "
+"selling handholding services.  I have met people who are already working "
+"this way successfully."
 msgstr ""
 "Den som har en ny idé kan distribuera program som freeware och be nöjda "
 "användare om bidrag eller sälja “hålla handen-support” och underhåll. 
Jag "
 "har stött på folk som redan framgångsrikt arbetar så här."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Users with related needs can form users' groups, and pay dues.  A group "
 "would contract with programming companies to write programs that the group's "
@@ -1051,11 +1060,11 @@
 "En sådan grupp kontrakterar sedan ett programmeringsföretag för att skriva 
"
 "de program som användarna skulle vilja använda."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "All sorts of development can be funded with a Software Tax:"
 msgstr "All slags utveckling skulle kunna bekostas med en mjukvaruskatt."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Suppose everyone who buys a computer has to pay x percent of the price as a "
 "software tax.  The government gives this to an agency like the NSF to spend "
@@ -1065,7 +1074,7 @@
 "mjukvaruskatt kan regeringen ge pengarna till en organisation som lägger dem 
"
 "på mjukvaruutveckling."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But if the computer buyer makes a donation to software development himself, "
 "he can take a credit against the tax.  He can donate to the project of his "
@@ -1079,7 +1088,7 @@
 "slutresultatet. De kan få göra avdrag för donationer som sammanlagt 
uppgår "
 "till samma summa som den skatt de skall betala."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The total tax rate could be decided by a vote of the payers of the tax, "
 "weighted according to the amount they will be taxed on."
@@ -1088,19 +1097,19 @@
 "skattebetalarna, där deras röster är viktade efter det belopp de skulle "
 "betala skatt på."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "The consequences:"
 msgstr "Konsekvenserna blir:"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "The computer-using community supports software development."
 msgstr "Att gruppen av datoranvändare stödjer mjukvaruutvecklingen."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "This community decides what level of support is needed."
 msgstr "Att denna grupp avgör vilken nivå stödet skall ligga på."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "Users who care which projects their share is spent on can choose this for "
 "themselves."
@@ -1108,7 +1117,7 @@
 "Användare som är intresserade av att själva bestämma på vilket projekt 
deras "
 "stöd skall läggas kan göra det."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the long run, making programs free is a step toward the postscarcity "
 "world, where nobody will have to work very hard just to make a living.  "
@@ -1126,7 +1135,7 @@
 "ge familjerådgivning, reparera robotar och söka mineraler på asteroider. 
Det "
 "kommer inte att vara nödvändigt att programmera för att tjäna sitt 
uppehälle."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We have already greatly reduced the amount of work that the whole society "
 "must do for its actual productivity, but only a little of this has "
@@ -1146,11 +1155,11 @@
 "mjukvaruområdet. Det är en åtgärd som vi måste vidta för att tekniska "
 "framsteg skall leda till mindre arbete för oss."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The wording here was careless.  The intention was that nobody would have to "
 "pay for <b>permission</b> to use the GNU system.  But the words don't make "
@@ -1167,7 +1176,7 @@
 "with others in using it."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The expression &ldquo;give away&rdquo; is another indication that I had not "
 "yet clearly separated the issue of price from that of freedom.  We now "
@@ -1176,19 +1185,19 @@
 "\">Confusing Words and Phrases</a>&rdquo; for more explanation."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "This is another place I failed to distinguish carefully between the two "
-"different meanings of &ldquo;free&rdquo;.  The statement as it stands is not "
+"different meanings of &ldquo;free.&rdquo; The statement as it stands is not "
 "false&mdash;you can get copies of GNU software at no charge, from your "
 "friends or over the net.  But it does suggest the wrong idea."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid "Several such companies now exist."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Although it is a charity rather than a company, the Free Software Foundation "
 "for 10 years raised most of its funds from its distribution service.  You "
@@ -1196,13 +1205,13 @@
 "its work."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "A group of computer companies pooled funds around 1991 to support "
 "maintenance of the GNU C Compiler."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "I think I was mistaken in saying that proprietary software was the most "
 "common basis for making money in software.  It seems that actually the most "
@@ -1214,10 +1223,10 @@
 "less in a free software world."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "In the 1980s I had not yet realized how confusing it was to speak of &ldquo;"
-"the issue&rdquo; of &ldquo;intellectual property&rdquo;.  That term is "
+"the issue&rdquo; of &ldquo;intellectual property.&rdquo; That term is "
 "obviously biased; more subtle is the fact that it lumps together various "
 "disparate laws which raise very different issues.  Nowadays I urge people to "
 "reject the term &ldquo;intellectual property&rdquo; entirely, lest it lead "
@@ -1227,10 +1236,10 @@
 "spreads confusion and bias."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Subsequently we learned to distinguish between &ldquo;free software&rdquo; "
-"and &ldquo;freeware&rdquo;.  The term &ldquo;freeware&rdquo; means software "
+"and &ldquo;freeware.&rdquo; The term &ldquo;freeware&rdquo; means software "
 "you are free to redistribute, but usually you are not free to study and "
 "change the source code, so most of it is not free software.  See &ldquo;<a "
 "href=\"/philosophy/words-to-avoid.html#Freeware\">Confusing Words and "
@@ -1284,15 +1293,23 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# | Please see the <a
+# | href=\"/server/standards/README.translations.html\">Translations
+# | README</a> for information on coordinating and [-submitting-]
+# | {+contributing+} translations of this article.
 #, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and submitting "
+#| "translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Var god läs <a href=\"/server/standards/README.translations.html\">README "
@@ -1300,13 +1317,15 @@
 "översättningar till den här artikeln."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; 1985, 1993, 200[-3-]{+4+}, 2005, 2007, [-2008,-] 2009,
+# | 2010, [-2014-] {+2015, 2021+} Free Software Foundation, Inc.
 #, fuzzy
 #| msgid ""
 #| "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014 "
 #| "Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 1985, 1993, 2004, 2005, 2007, 2009, 2010, 2015, 2021 Free "
+"Software Foundation, Inc."
 msgstr "Copyright &copy; 1985, 1993 Free Software Foundation Inc."
 
 #. type: Content of: <div><p>
@@ -1334,3 +1353,13 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Updaterat:"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "Var god läs <a href=\"/server/standards/README.translations.html\">README 
"
+#~ "för Översättningar</a> för information om att samarbeta och skicka in "
+#~ "översättningar till den här artikeln."

Index: po/manifesto.ta.po
===================================================================
RCS file: /web/www/www/gnu/po/manifesto.ta.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/manifesto.ta.po  12 Feb 2017 09:17:19 -0000      1.1
+++ po/manifesto.ta.po  2 Nov 2021 14:41:54 -0000       1.2
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manifesto.html\n"
-"POT-Creation-Date: 2015-06-02 12:55+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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"
@@ -21,27 +21,27 @@
 msgid "The GNU Manifesto - GNU Project - Free Software Foundation"
 msgstr "The GNU Manifesto - குனு திட்டம் - 
கட்டற்ற மென்பொருள் அ
றக்கட்டளை"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "The GNU Manifesto"
 msgstr "The GNU Manifesto"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
-"The GNU Manifesto (which appears below) was written by <a href=\"http://www.";
+"The GNU Manifesto (which appears below) was written by <a href=\"https://www.";
 "stallman.org/\">Richard Stallman</a> in 1985 to ask for support in "
 "developing the GNU operating system.  Part of the text was taken from the "
 "original announcement of 1983.  Through 1987, it was updated in minor ways "
 "to account for developments; since then, it seems best to leave it unchanged."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Since that time, we have learned about certain common misunderstandings that "
 "different wording could help avoid.  Footnotes added since 1993 help clarify "
 "these points."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If you want to install the GNU/Linux system, we recommend you use one of the "
 "<a href=\"/distros\">100% free software GNU/Linux distributions</a>.  For "
@@ -49,7 +49,7 @@
 "a>."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The GNU Project is part of the Free Software Movement, a campaign for <a "
 "href=\"/philosophy/free-sw.html\">freedom for users of software</a>.  It is "
@@ -59,16 +59,16 @@
 "open-source-misses-the-point.html\">amoral approach</a> to the same field."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "What's GNU? Gnu's Not Unix!"
 msgstr "GNU என்றால் என்ன? Gnu's Not Unix!"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | GNU, which stands for Gnu's Not Unix, is the name for the complete
 # | Unix-compatible software system which I am writing so that I can give it
-# | away free to everyone who can use [-it.-] {+it.<a href=\"#f1\">(1)</a>+}
-# | Several other volunteers are helping me.  Contributions of time, money,
-# | programs and equipment are greatly needed.
+# | away free to everyone who can use [-it.-] {+it&#8239;<a class=\"ftn\"
+# | href=\"#f1\">[1]</a>.+} Several other volunteers are helping me. 
+# | Contributions of time, money, programs and equipment are greatly needed.
 #, fuzzy
 #| msgid ""
 #| "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
@@ -78,16 +78,16 @@
 msgid ""
 "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
 "compatible software system which I am writing so that I can give it away "
-"free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
-"volunteers are helping me.  Contributions of time, money, programs and "
-"equipment are greatly needed."
+"free to everyone who can use it&#8239;<a class=\"ftn\" href=\"#f1\">[1]</a>. "
+"Several other volunteers are helping me.  Contributions of time, money, "
+"programs and equipment are greatly needed."
 msgstr ""
 "யூனிக்ஸுடன் ஒத்தியலும் கனு 
(GNU - short for Gnu's Not Unix) என்னும் 
மென்பொருளை நான் "
 "மற்றவர்களுக்குச் 
சுதந்திரமாக வழங்கும் 
நோக்கத்துடன் 
எழுதிக்கொண்டிருக்கின்றேன். 
இதில் எனக்கு "
 "பலர் உதவுகிறார்கள். நேரம், 
பணம், நிரலிகள் (programs), சாதனங்கள் 
போன்றவைகளின் வடிவிலான "
 "உதவிகள் எங்களுக்கு மிகவும் 
தேவை."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So far we have an Emacs text editor with Lisp for writing editor commands, a "
 "source level debugger, a yacc-compatible parser generator, a linker, and "
@@ -114,7 +114,7 @@
 "சேர்த்துக் கொள்வோம். 
இறுதியில் யூனிக்ஸுடன் வரும் 
அனைத்து உபயோகமுள்ள 
நிரலிகளையும் நாங்கள் "
 "வழங்குவோம்."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU will be able to run Unix programs, but will not be identical to Unix.  "
 "We will make all improvements that are convenient, based on our experience "
@@ -135,7 +135,7 @@
 "உபயோகிப்போம். UUCP, MIT Chaosnet 
மற்றும் இணைய நெறிமுறைகளைத் 
தகவல் தொடர்பிற்கு "
 "உபயோகிப்போம்."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is aimed initially at machines in the 68000/16000 class with virtual "
 "memory, because they are the easiest machines to make it run on.  The extra "
@@ -146,7 +146,7 @@
 "அதில் இயங்கவைப்பதற்கு 
எளிதாக இருக்கும். சிறிய 
கணினிகளில் இயங்க வைப்பதைத் 
தேவையானவர்கள் "
 "செய்துகொள்ள விட்டு 
விடுவோம்."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid horrible confusion, please pronounce the <em>g</em> in the word "
 "&ldquo;GNU&rdquo; when it is the name of this project."
@@ -154,11 +154,11 @@
 "இந்த செயல்திட்டத்தின் பெயரை 
உபயோகிக்கும் பொழுது, GNU 
என்னும் வார்த்தையில் <em>G</em> யை "
 "உச்சரியுங்கள்."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why I Must Write GNU"
 msgstr "நான் ஏன் கனுவை எழுத 
வேண்டும்?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I consider that the Golden Rule requires that if I like a program I must "
 "share it with other people who like it.  Software sellers want to divide the "
@@ -179,12 +179,12 @@
 "Intelligence ஆய்வகத்தில் இது போன்ற 
மனோபாவங்களை எதிர்த்தேன், 
ஆனால் கை நழுவி விட்டது: "
 "எனக்குப் பிடிக்காதவற்றை 
எனக்குச் செய்யும் 
ஸ்தாபனத்தில் என்னால் இருக்க 
முடியவில்லை."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | So that I can continue to use computers without dishonor, I have decided
 # | to put together a sufficient body of free software so that I will be able
 # | to get along without any software that is not free.  I have resigned from
 # | the AI Lab to deny MIT any legal excuse to prevent me from giving GNU
-# | [-away.-] {+away.<a href=\"#f2a\">(2)</a>+}
+# | [-away.-] {+away&#8239;<a class=\"ftn\" href=\"#f2a\">[2]</a>.+}
 #, fuzzy
 #| msgid ""
 #| "So that I can continue to use computers without dishonor, I have decided "
@@ -196,8 +196,8 @@
 "So that I can continue to use computers without dishonor, I have decided to "
 "put together a sufficient body of free software so that I will be able to "
 "get along without any software that is not free.  I have resigned from the "
-"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away.<a "
-"href=\"#f2a\">(2)</a>"
+"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away&#8239;"
+"<a class=\"ftn\" href=\"#f2a\">[2]</a>."
 msgstr ""
 "கணினிகளை எனக்கு அ
வமதிப்பில்லாத வகையில் 
உபயோகிக்கப் போதுமான தளையறு 
மென்பொருளை "
 "(Swatantra Software or Free Software) எழுத முடிவு 
செய்திருக்கிறேன். இதனால் "
@@ -205,11 +205,11 @@
 "கொள்வதைச் சட்டபூர்வமாக 
மறுக்கும் உரிமையை MITக்கு 
நிராகரிக்க நான் MIT AI "
 "ஆய்வகத்திலிருந்து ராஜினாமா 
செய்துவிட்டேன்."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why GNU Will Be Compatible with Unix"
 msgstr "ஏன் யுனிக்ஸோடு கனு 
ஒத்துப்போகிறது(compatible)?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Unix is not my ideal system, but it is not too bad.  The essential features "
 "of Unix seem to be good ones, and I think I can fill in what Unix lacks "
@@ -221,11 +221,11 @@
 "யுனிக்ஸைக் கெடுக்காமல் அதை 
மேம்படுத்த முடியும் என்று 
நம்புகிறேன் 
(மொழிபெயர்ப்பாளரின் "
 "குறிப்பு : கனுவை எழுத அ
ரம்பித்த பொழுது, 
யூனிக்ஸ்தான் பெரிதும் 
உபயோகத்தில் இருந்தது)."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How GNU Will Be Available"
 msgstr "கனு எப்படிக் கிடைக்கும்?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is not in the public domain.  Everyone will be permitted to modify and "
 "redistribute GNU, but no distributor will be allowed to restrict its further "
@@ -239,17 +239,17 @@
 "அனுமதிக்கப்பட மாட்டா. 
கனுவின் எல்லா 
பரிமாணங்களிலும் இந்தச் 
சுதந்திரங்கள் இருக்க நான் "
 "தேவையான எச்சரிக்கைகளை 
எடுத்திருக்கிறேன்."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why Many Other Programmers Want to Help"
 msgstr "ஏன் மற்ற நிரலாளர்கள் (programmers) 
உதவுகிறார்கள்"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found many other programmers who are excited about GNU and want to "
 "help."
 msgstr "பல நிரலாளர்கள் கனுவில் 
ஆர்வம் காட்டுகிறார்கள். 
உதவவும் விரும்புகிறார்கள்."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Many programmers are unhappy about the commercialization of system "
 "software.  It may enable them to make more money, but it requires them to "
@@ -272,7 +272,7 @@
 "அடைவதில்லை. அவர்களுக்கு 
மற்றவர்களின் நல்லெண்ணத்தின் 
மீது நம்பிக்கையின்மை 
ஏற்படுகின்றது. "
 "மேலும், நிரல் எழுதுவதை 
வெறும் பணம் சம்பாதிக்கும் 
ஒரு வழியாக 
கருதிவிடுகிறார்கள்."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By working on and using GNU rather than proprietary programs, we can be "
 "hospitable to everyone and obey the law.  In addition, GNU serves as an "
@@ -287,11 +287,11 @@
 "மென்பொருள் 
உபயோகிக்கும்பொழுது 
கிடைக்கும் ஒற்றுமையுணர்வு 
கிடைக்காது. நான சந்தித்த பல "
 "நிரலாளர்களுக்குப், பணத்தால் 
ஈடு செய்ய முடியாத 
மகிழ்ச்சியை இதுவே தரும்."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How You Can Contribute"
 msgstr "நீங்கள் எப்படி உதவலாம்?"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "(Nowadays, for software tasks to work on, see the <a href=\"http://fsf.org/";
 "campaigns/priority-projects\">High Priority Projects list</a> and the <a "
@@ -301,7 +301,7 @@
 "a>.)"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am asking computer manufacturers for donations of machines and money.  I'm "
 "asking individuals for donations of programs and work."
@@ -309,7 +309,7 @@
 "நான் கணினி 
உற்பத்தியாளர்களிடம் பணம் 
மற்றும் கணினியின் மூலம் 
நன்கொடைகள் கேட்கிறேன். தனி "
 "நபர்களிடமிருந்து 
நன்கொடையாக உழைப்பு மற்றும 
நிரல்களைக் கேட்கிறேன்."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One consequence you can expect if you donate machines is that GNU will run "
 "on them at an early date.  The machines should be complete, ready to use "
@@ -320,7 +320,7 @@
 "நன்கொடையாக அளிக்கப்படும் 
கணினிகள் உபயோகத்திற்கு 
ஏற்கனவே தயாராக இருக்க 
வேண்டும். மேலும, "
 "அதை உபயோகிப்பதற்குத் 
தனிப்பட்ட குளிரூட்டும் 
இயந்திரங்கள் தேவைப் 
படக்கூடாது."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found very many programmers eager to contribute part-time work for "
 "GNU.  For most projects, such part-time distributed work would be very hard "
@@ -345,7 +345,7 @@
 "அனைத்தையும் ஒன்றாகச் 
சேர்க்கும்பொழுது சரியாக 
இயங்கும். Murphyயின் கூற்றினால் 
சில "
 "எதிர்பாராத பிரச்சனைகள் 
வந்தாலும் இந்த இணைப்பு 
இயன்றதே."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If I get donations of money, I may be able to hire a few people full or part "
 "time.  The salary won't be high by programmers' standards, but I'm looking "
@@ -360,25 +360,26 @@
 "அர்ப்பணம் செய்ய 
விரும்புவர்கள், தங்களுடைய 
முழு சக்தியையும் கனுவில் 
செலுத்த இந்த "
 "உத்தியோகங்கள் உதவும்."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why All Computer Users Will Benefit"
 msgstr "எப்படி எல்லா கணினி 
பயனாளர்களும் பயன் அ
டைவார்கள்?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Once GNU is written, everyone will be able to obtain good system software
-# | free, just like [-air.-] {+air.<a href=\"#f2\">(3)</a>+}
+# | free, just like [-air.-] {+air&#8239;<a class=\"ftn\"
+# | href=\"#f2\">[3]</a>.+}
 #, fuzzy
 #| msgid ""
 #| "Once GNU is written, everyone will be able to obtain good system software "
 #| "free, just like air."
 msgid ""
 "Once GNU is written, everyone will be able to obtain good system software "
-"free, just like air.<a href=\"#f2\">(3)</a>"
+"free, just like air&#8239;<a class=\"ftn\" href=\"#f2\">[3]</a>."
 msgstr ""
 "கனுவை எழுதிய பிறகு 
எல்லோருக்கும் இயங்குதள 
மென்பொருள் (Operating system software) "
 "காற்றுபோல எளிதாகக் 
கிடைக்கும்."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This means much more than just saving everyone the price of a Unix license.  "
 "It means that much wasteful duplication of system programming effort will be "
@@ -388,7 +389,7 @@
 "திரும்பத்திரும்ப அதே 
இயங்குதள நிரலிகள் 
எழுதுவதைத் தவிர்க்கலாம். 
இந்த உழைப்பைத் தொழில்நுட்ப "
 "முன்னேற்றத்தில் 
செலுத்தலாம்."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Complete system sources will be available to everyone.  As a result, a user "
 "who needs changes in the system will always be free to make them himself, or "
@@ -401,7 +402,7 @@
 "செய்துக்கொள்ளலாம், அல்லது 
எந்த நிரலாளரையும் பணியில் அ
மர்த்தி மாற்றிக்கொள்ளலாம். 
மென்பொருள் "
 "பயனாளர்கள் ஒரு நிரலாளர் அ
ல்லது ஒரு நிறுவனத்தின் 
தயவில் வாழ வேண்டிய அவசியம் 
இருக்காது."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Schools will be able to provide a much more educational environment by "
 "encouraging all students to study and improve the system code.  Harvard's "
@@ -415,7 +416,7 @@
 "எந்தவொரு நிரலையும் அதன் 
ஆணைமூலங்களைப் பகிரங்கமாக 
வெளியிடாவிட்டால், அதனை 
நிறுவப் "
 "(install) போவதில்லை என்ற கொள்கை 
வைத்திருந்தனர். நான் அதைக் 
கண்டு மிகவும் ஊக்கம் அ
டைந்தேன்."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Finally, the overhead of considering who owns the system software and what "
 "one is or is not entitled to do with it will be lifted."
@@ -423,7 +424,7 @@
 "கடைசியாக, யார் இயங்குதள 
மென்பொருளை உரிமை 
கொண்டாடுவது, அதைவைத்து 
ஒருவர் என்ன "
 "செய்யலாம், என்ன 
செய்யக்கூடாது போன்ற 
தொல்லைகள் இருக்காது."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Arrangements to make people pay for using a program, including licensing of "
 "copies, always incur a tremendous cost to society through the cumbersome "
@@ -447,7 +448,7 @@
 "கொடுமையானது. அதற்குப் பதில் 
அந்த இடத்திற்கு மொத்தமாக ஒரு 
வரி நிர்ணயித்து முகமூடிகளை "
 "தூக்கியெறிந்துவிடலாம்."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copying all or parts of a program is as natural to a programmer as "
 "breathing, and as productive.  It ought to be as free."
@@ -455,17 +456,17 @@
 "சுவாசிப்பதைப் போல, ஒரு 
நிரலியின் அனைத்து அல்லது சில 
பகுதிகளை படி எடுத்தல் "
 "இயற்கையானதே. அது அந்த அளவு 
சுதந்திரமாக இருக்க 
வேண்டியது."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Some Easily Rebutted Objections to GNU's Goals"
 msgstr "கனுவின் 
குறிக்கோள்களுக்கு எதிராகக் 
கூறப்படும் சில வாதங்கள்"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Nobody will use it if it is free, because that means they "
 "can't rely on any support.&rdquo;</strong>"
 msgstr "<strong>“இலவசமாகக் கிடைத்தால் 
யாரும் உபயோகிக்க 
மாட்டார்கள்.”</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You have to charge for the program to pay for providing the "
 "support.&rdquo;</strong>"
@@ -473,12 +474,12 @@
 "<strong>“சேவை அளிக்க 
வேண்டுமென்றால் அதற்குக் 
காசு வசூல் செய்துதான் ஆக 
வேண்டும்.”</"
 "strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 #, fuzzy
 msgid ""
 "If people would rather pay for GNU plus service than get GNU free without "
 "service, a company to provide just service to people who have obtained GNU "
-"free ought to be profitable.<a href=\"#f3\">(4)</a>"
+"free ought to be profitable&#8239;<a class=\"ftn\" href=\"#f3\">[4]</a>."
 msgstr ""
 "இலவசமான கனுவை விட கனுவுடன் 
கட்டணச் சேவையைப் பொது மக்கள் 
விரும்பினால், வெறும் சேவையை "
 "அளிக்கும் நிறுவனங்கள் 
லாபத்துடன் இயங்கலாம் வெறும் 
கைப்பிடித்து உதவியளிக்கும் 
சேவையையும், "
@@ -487,7 +488,7 @@
 "அதே மாற்றம் தேவையில்லை 
என்றால் மென்பொருள் 
விற்பனையாளன் செய்து தர 
மாட்டான்.<a href="
 "\"#f3\">(1)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We must distinguish between support in the form of real programming work and "
 "mere handholding.  The former is something one cannot rely on from a "
@@ -495,7 +496,7 @@
 "will tell you to get lost."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If your business needs to be able to rely on support, the only way is to "
 "have all the necessary sources and tools.  Then you can hire any available "
@@ -514,7 +515,7 @@
 "உடையவர்கள் இல்லாமல் 
போகலாம். அதற்கு கனுவின் 
பரிமாறும் முறையைக் குறை கூற 
முடியாது. கனு "
 "உலகத்திலுள்ள எல்லாப் 
பிரச்சனைகளையும் தீர்க்காது."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Meanwhile, the users who know nothing about computers need handholding: "
 "doing things for them which they could easily do themselves but don't know "
@@ -523,7 +524,7 @@
 "கணினி பற்றி ஒன்றும் 
தெரியாதவர்களுக்குக் 
கைப்பிடித்து உதவ 
வேண்டியிருக்கும். அதாவது "
 "அவர்களுக்குச் செய்யத் 
தெரியாதவைகளைச் செய்து 
கொடுப்பது."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Such services could be provided by companies that sell just handholding and "
 "repair service.  If it is true that users would rather spend money and get a "
@@ -540,13 +541,13 @@
 "வேண்டியிருக்காது. மேலும் 
சேவை வேண்டாமென்று 
நினைப்பவர்கள் நிரலுக்கான 
சேவை வாங்காமல் "
 "உபயோகிக்கலாம்."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You cannot reach many people without advertising, and you "
 "must charge for the program to support that.&rdquo;</strong>"
 msgstr "<strong>“விளம்பரமின்றி 
மென்பொருளை விற்பனை செய்ய 
முடியாது.”</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;It's no use advertising a program people can get free.&rdquo;"
 "</strong>"
@@ -554,7 +555,7 @@
 "<strong>“விளம்பரம் செய்ய 
வேண்டுமென்றால், 
மென்பொருளுக்குக் காசு 
வசூலிக்க வேண்டும்.”</"
 "strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are various forms of free or very cheap publicity that can be used to "
 "inform numbers of computer users about something like GNU.  But it may be "
@@ -568,11 +569,12 @@
 "நகலெடுத்து விற்கும் 
நிறுவனங்கள் கனுவையும் 
விளம்பரப்படுத்தலாம். 
இதன்மூலம் "
 "விளம்பரத்திலிருந்து பயன் அ
டைபவர்கள் மட்டும்தான் அ
தற்குச் செலவு செய்வார்கள். "
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 # | On the other hand, if many people get GNU from their friends, and such
 # | companies don't succeed, this will show that advertising was not really
 # | necessary to spread GNU.  Why is it that free market advocates don't want
-# | to let the free market decide this?<a href=\"#f4\">([-2-]{+5+})</a>
+# | to let the free market decide [-this?<a href=\"#f4\">(2)</a>-]
+# | {+this?&#8239;<a class=\"ftn\" href=\"#f4\">[5]</a>+}
 #, fuzzy
 #| msgid ""
 #| "On the other hand, if many people get GNU from their friends, and such "
@@ -583,12 +585,12 @@
 "On the other hand, if many people get GNU from their friends, and such "
 "companies don't succeed, this will show that advertising was not really "
 "necessary to spread GNU.  Why is it that free market advocates don't want to "
-"let the free market decide this?<a href=\"#f4\">(5)</a>"
+"let the free market decide this?&#8239;<a class=\"ftn\" href=\"#f4\">[5]</a>"
 msgstr ""
 "பெரும்பாலானோர் கனுவை 
நண்பர்களிடம் இருந்து பெற்று 
இதுபோன்ற நிறுவனங்கள் வெற்றி 
அடையவில்லை "
 "என்றால், கனுவிற்கு 
விளம்பரம் தேவையில்லை என்று 
முடிவுசெய்யலாம்.<a href=\"#f4\">(2)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;My company needs a proprietary operating system to get a "
 "competitive edge.&rdquo;</strong>"
@@ -596,7 +598,7 @@
 "<strong>“எனது நிறுவனம் 
மற்றவர்களோடு 
போட்டியிடுவதற்குத் தனியுரிம 
(proprietary) "
 "மென்பொருள் தேவை.”</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU will remove operating system software from the realm of competition.  "
 "You will not be able to get an edge in this area, but neither will your "
@@ -613,22 +615,24 @@
 "உங்களது தொழில் வேறாக 
இருந்தால் கனு உங்களை 
இயங்குதளங்களை விற்கும் 
விலையுயர்ந்த "
 "வியாபாரத்திலிருந்து 
காப்பாற்றும்."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 # | I would like to see GNU development supported by gifts from many
-# | manufacturers and users, reducing the cost to each.<a
-# | href=\"#f5\">([-3-]{+6+})</a>
+# | manufacturers and users, reducing the cost to [-each.<a
+# | href=\"#f5\">(3)</a>-] {+each&#8239;<a class=\"ftn\"
+# | href=\"#f5\">[6]</a>.+}
 #, fuzzy
 #| msgid ""
 #| "I would like to see GNU development supported by gifts from many "
 #| "manufacturers and users, reducing the cost to each.<a href=\"#f5\">(3)</a>"
 msgid ""
 "I would like to see GNU development supported by gifts from many "
-"manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
+"manufacturers and users, reducing the cost to each&#8239;<a class=\"ftn\" "
+"href=\"#f5\">[6]</a>."
 msgstr ""
 "நான் எதிர்காலத்தில் கனுவின் 
முன்னேற்றத்திற்குப் பல 
நிறுவனங்களும், பயனாளர்களும் 
உதவி செய்து, "
 "ஒவ்வொருவரின் செலவைக் 
குறைப்பதைக் காண 
விரும்புகிறேன்.<a href=\"#f5\">(3)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't programmers deserve a reward for their creativity?"
 "&rdquo;</strong>"
@@ -636,7 +640,7 @@
 "<strong>“நிரலாளர்கள் தங்களது 
படைக்கும் திறனிற்கு வெகுமதி 
பெறத் தகுதியற்றவர்களா?”</"
 "strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If anything deserves a reward, it is social contribution.  Creativity can be "
 "a social contribution, but only in so far as society is free to use the "
@@ -650,14 +654,14 @@
 "வெகுமதி பெறத் 
தகுதியானவர்கள் என்றால், அதே 
கோணத்தில், அந்த நிரலியின் 
உபயோகிப்பதை அவர்கள் "
 "தடுத்தால் தண்டனைக்கு 
உண்டாகவும் தகுதியானவர்களே."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Shouldn't a programmer be able to ask for a reward for his "
 "creativity?&rdquo;</strong>"
 msgstr ""
 "<strong>“ஒரு பயனாளர் தனது 
படைக்கும் திறனிற்கு வெகுமதி 
கேட்கக்கூடாதா?”</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is nothing wrong with wanting pay for work, or seeking to maximize "
 "one's income, as long as one does not use means that are destructive.  But "
@@ -667,7 +671,7 @@
 "நினைப்பதிலும் எந்தத் தவறும் 
இல்லை. ஆனால் சேதம் 
விளைவிக்கும் வழிகள் 
உபயோகிக்கக்கூடாது. "
 "இன்றைய மென்பொருள் உலகத்தில் 
இது போன்ற சேதம் விளைவிக்கும் 
வழிகள்தான் 
உபயோகிக்கிறார்கள்."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Extracting money from users of a program by restricting their use of it is "
 "destructive because the restrictions reduce the amount and the ways that the "
@@ -680,7 +684,7 @@
 "வாய்ப்புகளைக் குறைகிறது. 
இத்தடைகள், மனித இனம் அந்த 
நிரலியிடமிருந்து பெறக்கூடிய 
லாபத்தை "
 "குறைத்துவிடுகிறது."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The reason a good citizen does not use such destructive means to become "
 "wealthier is that, if everyone did so, we would all become poorer from the "
@@ -696,11 +700,11 @@
 "விதிப்பதால் ஏற்படும் 
விளைவுகள் எனக்குப் 
பிடிக்காததால், நான் இதை யார் 
செய்தாலும் தவறு எனக் "
 "கருதுகிறேன்."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid "<strong>&ldquo;Won't programmers starve?&rdquo;</strong>"
 msgstr "<strong>“நிரலாளர்கள் 
பட்டினியால் இறந்துவிட 
மாட்டார்களா?”</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "I could answer that nobody is forced to be a programmer.  Most of us cannot "
 "manage to get any money for standing on the street and making faces.  But we "
@@ -711,7 +715,7 @@
 "தெருவில் வேஷம் போட்டு 
நின்று காசு சம்பாதிக்க 
முடியாது. இதனால் நாம் யாரும் 
தெருவில் "
 "வேஷம் போட்டு நின்று பசியால் 
செத்துப்போவதில்லை. நாம் வேறு 
ஏதாவது வேலை செய்கிறோம்."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But that is the wrong answer because it accepts the questioner's implicit "
 "assumption: that without ownership of software, programmers cannot possibly "
@@ -721,7 +725,7 @@
 "மென்பொருளிற்கு உரிமையாளர் 
என்னும் நிலைமை இல்லாமல் 
நிரலாளர்களுக்கு ஒரு நயா 
பைசாக் கூடக் "
 "கிடைக்காது என்ற அனுமானத்தை 
ஏற்படுத்தும்."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The real reason programmers will not starve is that it will still be "
 "possible for them to get paid for programming; just not paid as much as now."
@@ -729,13 +733,13 @@
 "நிரலாளர்கள் பட்டினியால் 
இறந்துவிடமாட்டார்கள், 
ஏனென்றால், இன்னமும், இன்றைய அ
ளவிற்கு "
 "இல்லாவிடினும், அவர்களால் 
நிரல் எழுதி காசு சம்பாதிக்க 
முடியும்."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 # | Restricting copying is not the only basis for business in software.  It is
-# | the most common [-basis-] {+basis<a href=\"#f8\">(7)</a>+} because it
-# | brings in the most money.  If it were prohibited, or rejected by the
-# | customer, software business would move to other bases of organization
-# | which are now used less often.  There are always numerous ways to organize
-# | any kind of business.
+# | the most common [-basis-] {+basis&#8239;<a class=\"ftn\"
+# | href=\"#f8\">[7]</a>+} because it brings in the most money.  If it were
+# | prohibited, or rejected by the customer, software business would move to
+# | other bases of organization which are now used less often.  There are
+# | always numerous ways to organize any kind of business.
 #, fuzzy
 #| msgid ""
 #| "Restricting copying is not the only basis for business in software. It is "
@@ -745,10 +749,11 @@
 #| "always numerous ways to organize any kind of business."
 msgid ""
 "Restricting copying is not the only basis for business in software.  It is "
-"the most common basis<a href=\"#f8\">(7)</a> because it brings in the most "
-"money.  If it were prohibited, or rejected by the customer, software "
-"business would move to other bases of organization which are now used less "
-"often.  There are always numerous ways to organize any kind of business."
+"the most common basis&#8239;<a class=\"ftn\" href=\"#f8\">[7]</a> because it "
+"brings in the most money.  If it were prohibited, or rejected by the "
+"customer, software business would move to other bases of organization which "
+"are now used less often.  There are always numerous ways to organize any "
+"kind of business."
 msgstr ""
 "நகலெடுப்பதில் தடை விதிப்பது 
மட்டுமே மென்பொருள் 
வாணிகத்தின் அடிப்படையில்லை. 
ஆனாலும் அதனை "
 "அடிப்படையாகக் கொள்ளக் 
காரணம், அதனால் கிடைக்கும் 
பெரும் இலாபம்தான். 
வாடிக்கையாளர்கள் "
@@ -756,7 +761,7 @@
 "வியாபார முறைகளுக்கு, 
இந்நிறுவனங்கள் தாவி விடும். 
எப்போதுமே, வியாபாரத்தை அ
மைக்க "
 "நூற்றுக்கணக்கான வழிகள் 
உள்ளன."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Probably programming will not be as lucrative on the new basis as it is "
 "now.  But that is not an argument against the change.  It is not considered "
@@ -769,7 +774,7 @@
 "அநியாயமாகக் கருதுவதில்லை. அ
தே அளவு ஊதியத்தைப் 
நிரலாளர்கள் பெறுவது அ
நியாயம் ஆகாது. "
 "(அப்பொழுதும் கூட, 
நடைமுறையில் நிரலாளர்கள் அ
திகம் பெறுவார்கள்)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't people have a right to control how their creativity is "
 "used?&rdquo;</strong>"
@@ -777,7 +782,7 @@
 "<strong>“நிரலாளர்களுக்குத் 
தங்களது சிருஷ்டிக்கும் அ
றிவை மற்றவர்கள் எப்படி 
உபயோகிக்க "
 "வேண்டும் என்பதை நிர்ணயிக்க 
உரிமை இல்லையா?”</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "&ldquo;Control over the use of one's ideas&rdquo; really constitutes control "
 "over other people's lives; and it is usually used to make their lives more "
@@ -786,12 +791,13 @@
 "“ஒருவரின் எண்ணங்களை 
மற்றவர்கள் உபயோகிப்பதில் அ
வருக்கு உள்ள அதிகாரம்” 
என்பது மற்றவர்களின் "
 "வாழ்க்கையில் பாதிப்பை 
உண்டாக்குகிறது; அது அ
வர்களின் வாழ்க்கையை மேலும் 
சிக்கலானதாக்குகிறது."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 # | People who have studied the issue of intellectual property [-rights-]
-# | {+rights<a href=\"#f6\">(8)</a>+} carefully (such as lawyers) say that
-# | there is no intrinsic right to intellectual property.  The kinds of
-# | supposed intellectual property rights that the government recognizes were
-# | created by specific acts of legislation for specific purposes.
+# | {+rights&#8239;<a class=\"ftn\" href=\"#f6\">[8]</a>+} carefully (such as
+# | lawyers) say that there is no intrinsic right to intellectual property. 
+# | The kinds of supposed intellectual property rights that the government
+# | recognizes were created by specific acts of legislation for specific
+# | purposes.
 #, fuzzy
 #| msgid ""
 #| "People who have studied the issue of intellectual property rights "
@@ -800,18 +806,18 @@
 #| "rights that the government recognizes were created by specific acts of "
 #| "legislation for specific purposes."
 msgid ""
-"People who have studied the issue of intellectual property rights<a href="
-"\"#f6\">(8)</a> carefully (such as lawyers) say that there is no intrinsic "
-"right to intellectual property.  The kinds of supposed intellectual property "
-"rights that the government recognizes were created by specific acts of "
-"legislation for specific purposes."
+"People who have studied the issue of intellectual property rights&#8239;<a "
+"class=\"ftn\" href=\"#f6\">[8]</a> carefully (such as lawyers) say that "
+"there is no intrinsic right to intellectual property.  The kinds of supposed "
+"intellectual property rights that the government recognizes were created by "
+"specific acts of legislation for specific purposes."
 msgstr ""
 "அறிவுச் சொத்து (Intellectual Property) 
பற்றித் தெளிவாகக் 
கற்றறிந்தவர்கள் 
(வழக்கறிஞர்கள் "
 "போன்றோர்), உண்மையில் அறிவுச் 
சொத்து அதிகாரம் என்பது 
இயற்கையான அதிகாரம் இல்லை 
என்று "
 "கூறுவர். அரசு 
ஒப்புக்கொள்ளும் அறிவுச் 
சொத்து அதிகாரங்கள், 
குறிப்பிட்ட சில 
விஷயங்களுக்காக, "
 "மசோதாக்கள் மூலம் 
உருவாக்கப்பட்டவை."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For example, the patent system was established to encourage inventors to "
 "disclose the details of their inventions.  Its purpose was to help society "
@@ -831,7 +837,7 @@
 "எந்தவித பாதிப்புமில்லை. அவை 
எந்தவொரு தனிமனிதனையும் 
காப்புரிமை செய்யப்பட்ட 
பொருளை "
 "உபயோகிப்பதைத் தடை 
செய்வதில்லை."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The idea of copyright did not exist in ancient times, when authors "
 "frequently copied other authors at length in works of nonfiction.  This "
@@ -850,7 +856,7 @@
 "புத்தகங்களைச் சிக்கனமாக அ
ச்சகத்தில்தான் நகல் செய்ய 
முடிந்தது. இதனால் 
வாசகர்களுக்கு எந்த வித "
 "பாதிப்பும் ஏற்படவில்லை."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "All intellectual property rights are just licenses granted by society "
 "because it was thought, rightly or wrongly, that society as a whole would "
@@ -862,7 +868,7 @@
 "உரிமங்கள் தான். ஆனால் எந்த 
ஒரு சூழ்நிலையிலும், நாம் 
கேட்கவேண்டியது: இது போன்ற 
உரிமங்களைக் "
 "கொடுப்பது நமக்கு பயன் அ
ளிக்கின்றதா? என்ன மாதிரி அ
திகாரங்களுக்கு நாம் உரிமம் அ
ளிக்கிறோம்?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The case of programs today is very different from that of books a hundred "
 "years ago.  The fact that the easiest way to copy a program is from one "
@@ -881,12 +887,12 @@
 "சமுதாயத்தைச் சீரழிக்கும் 
சூழ்நிலையை உருவாக்குகின்றன; 
அந்தச் சூழ்நிலையில் சட்டம் "
 "அனுமதித்தாலும் கூட அவர் அ
தைச் செய்யக்கூடாது."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Competition makes things get done better.&rdquo;</strong>"
 msgstr "<strong>“போட்டியே ஒரு செயல் 
சிறப்பாகச் செயல்பட 
உறுதுணையாயிருக்கும்.”</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The paradigm of competition is a race: by rewarding the winner, we encourage "
 "everyone to run faster.  When capitalism really works this way, it does a "
@@ -903,7 +909,7 @@
 "தாக்குவது. ஒருவேளை 
போட்டியாளர்கள் 
கைச்சண்டையில் 
ஈடுப்பட்டார்களேயானால் அ
வர்கள் எல்லோரும "
 "பின்தங்க வேண்டிய நிலை வரும்."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Proprietary and secret software is the moral equivalent of runners in a fist "
 "fight.  Sad to say, the only referee we've got does not seem to object to "
@@ -917,7 +923,7 @@
 "குத்து குத்தலாம்). ஆனால் அவர் 
உண்மையில் சண்டையை நிறுத்தி அ
தற்குக் காரணமான 
போட்டியாளர்களைத் "
 "தண்டிக்க வேண்டும்."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Won't everyone stop programming without a monetary incentive?"
 "&rdquo;</strong>"
@@ -925,7 +931,7 @@
 "<strong>“ஊக்கத்தொகை இல்லாததால் 
நிரலாளர்கள் நிரல் எழுதுவதை 
நிறுத்திவிடமாட்டார்களா?”</"
 "strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually, many people will program with absolutely no monetary incentive.  "
 "Programming has an irresistible fascination for some people, usually the "
@@ -937,7 +943,7 @@
 "வாழ்க்கையை நடத்தும் 
கட்டாயம் இல்லாவிட்டாலும் 
கூட, பல சங்கீத மேதைகளுக்குச் 
சங்கீதத்தில் உள்ள "
 "ஈடுபாடு குறைவதில்லை."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But really this question, though commonly asked, is not appropriate to the "
 "situation.  Pay for programmers will not disappear, only become less.  So "
@@ -949,7 +955,7 @@
 "என்னவென்றால், குறைந்த 
ஊக்கத்தொகையை நிரலாளர்கள் 
ஏற்பார்களா? அவர்கள் 
ஏற்பார்கள் என்று எனது "
 "அனுபவம் சொல்கிறது."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For more than ten years, many of the world's best programmers worked at the "
 "Artificial Intelligence Lab for far less money than they could have had "
@@ -961,7 +967,7 @@
 "ஊக்க விருதுகள் கிடைத்தன. 
உதாரணத்திற்குப் புகழ் 
மற்றும் பாராட்டு. மேலும், 
படைப்பு "
 "மகிழ்ச்சியைத் தரக்கூடியது, அ
துவே ஒரு விருதாகும்."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Then most of them left when offered a chance to do the same interesting work "
 "for a lot of money."
@@ -969,7 +975,7 @@
 "பின்னர், கூடுதல் 
ஊதியத்திற்கு இதே மாதிரி 
வேலையைச் செய்ய வாய்ப்பு 
கிடைத்ததால் பலர் "
 "வெளியேறினர்."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "What the facts show is that people will program for reasons other than "
 "riches; but if given a chance to make a lot of money as well, they will come "
@@ -982,7 +988,7 @@
 "அமைப்புகளுடன் போட்டியிடத் 
திணறுகின்றனர். ஆனால், அதிக 
ஊதியத்தை அளிக்கும் அ
மைப்புகள் "
 "ஒடுக்கப்பட்டால், அவர்கள 
மோசமாக செயல்பட 
வேண்டியதில்லை."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;We need the programmers desperately.  If they demand that we "
 "stop helping our neighbors, we have to obey.&rdquo;</strong>"
@@ -990,7 +996,7 @@
 "<strong>“எங்களுக்கு நிரலாளர்கள் 
மிகவும் தேவை. நாங்கள் 
பிறருக்கு உதவக் கூடாது என்று "
 "நிரலாளர்கள் வாதிட்டால், அ
தனை நாங்கள் 
ஏற்றுக்கொள்ளத்தான் 
வேண்டும்.”</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "You're never so desperate that you have to obey this sort of demand.  "
 "Remember: millions for defense, but not a cent for tribute!"
@@ -998,12 +1004,12 @@
 "இது போன்ற வாதங்களை 
ஏற்றுக்கொள்ள வேண்டிய அ
ளவிற்கு உங்கள் நிலைமை 
எப்பொழுதும், மோசமாக "
 "இருக்காது. நினைவில் 
கொள்ளுங்கள்: கப்பம் 
கட்டுவதைவிட விடுதலைக்காகப் 
போராடுவதே சிறந்தது!"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Programmers need to make a living somehow.&rdquo;</strong>"
 msgstr "<strong>“நிரலாளர்கள் 
எப்படியாவது வாழ்க்கையை 
நடத்த வேண்டுமே.”</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In the short run, this is true.  However, there are plenty of ways that "
 "programmers could make a living without selling the right to use a program.  "
@@ -1017,7 +1023,7 @@
 "தரக்கூடியதே தவிர, அது 
நிரல்கள் மூலம் 
சம்பாதிப்பதற்கு ஒரே வழி 
கிடையாது. மற்ற வழிகள் "
 "தேடினால் எளிதாகக் 
கிடைக்கும். இதோ சில 
எடுத்துக்காட்டுகள்."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A manufacturer introducing a new computer will pay for the porting of "
 "operating systems onto the new hardware."
@@ -1025,33 +1031,33 @@
 "கணினி தயாரிப்பாளர்கள் புது 
கணினியை அறிமுகப்படுத்தும் 
பொழுது, அந்தக் கணினியில் "
 "இயங்குதளங்களை 
இயங்கவைப்பதற்கு 
நிரலாளர்களுக்குக் காசு 
கொடுப்பார்கள்."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The sale of teaching, handholding and maintenance services could also employ "
 "programmers."
 msgstr "நிரலியைக் கற்பிப்பதும், 
பராமரிப்பதும 
நிரலாளர்களுக்கு உத்தியோகம் அ
ளிக்கலாம்."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 # | People with new ideas could distribute programs as [-freeware,-]
-# | {+freeware<a href=\"#f7\">(9)</a>,+} asking for donations from satisfied
-# | users, or selling handholding services.  I have met people who are already
-# | working this way successfully.
+# | {+freeware&#8239;<a class=\"ftn\" href=\"#f7\">[9]</a>,+} asking for
+# | donations from satisfied users, or selling handholding services.  I have
+# | met people who are already working this way successfully.
 #, fuzzy
 #| msgid ""
 #| "People with new ideas could distribute programs as freeware, asking for "
 #| "donations from satisfied users, or selling handholding services. I have "
 #| "met people who are already working this way successfully."
 msgid ""
-"People with new ideas could distribute programs as freeware<a href="
-"\"#f7\">(9)</a>, asking for donations from satisfied users, or selling "
-"handholding services.  I have met people who are already working this way "
-"successfully."
+"People with new ideas could distribute programs as freeware&#8239;<a class="
+"\"ftn\" href=\"#f7\">[9]</a>, asking for donations from satisfied users, or "
+"selling handholding services.  I have met people who are already working "
+"this way successfully."
 msgstr ""
 "புதிய எண்ணங்களை உடையோர் 
தங்களது நிரலை இலவசமாகக் 
கொடுத்து, திருப்தி "
 "அடைந்தவர்களிடமிருந்து 
நன்கொடைகள் கேட்கலாம். இது போல 
வெற்றிகரமாக வழி 
நடத்துபவர்களை நான் "
 "சந்தித்துள்ளேன்."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Users with related needs can form users' groups, and pay dues.  A group "
 "would contract with programming companies to write programs that the group's "
@@ -1060,11 +1066,11 @@
 "சம்பந்தப்பட்ட தேவைகளை 
உடையோர் குழுக்கள் அமைத்து 
சந்தா கட்டலாம். அந்தக் 
குழுக்கள் நிரல் "
 "எழுதும் நிறுவனத்துடன் 
ஒப்பந்தம் வைத்து அ
வர்களுக்குத் தேவையான 
நிரல்களை எழுதலாம்."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "All sorts of development can be funded with a Software Tax:"
 msgstr "எல்லா விதமான மென்பொருள் 
தயாரிப்பிற்கும் மென்பொருள் 
வரி மூலம் நிதி திரட்டலாம்"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Suppose everyone who buys a computer has to pay x percent of the price as a "
 "software tax.  The government gives this to an agency like the NSF to spend "
@@ -1073,7 +1079,7 @@
 "கணினி வாங்கும் ஒவ்வொருவரும் 
அதன் விலையில் ஒரு 
குறிப்பிட்ட சதவீதத்தை 
மென்பொருள் வரியாகக் "
 "கட்ட வேண்டும்."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But if the computer buyer makes a donation to software development himself, "
 "he can take a credit against the tax.  He can donate to the project of his "
@@ -1085,25 +1091,25 @@
 "வரி கட்ட வேண்டியதில்லை. அவர் 
அவருக்கு விருப்பமான 
செயல்திட்டத்திற்கு நன்கொடை 
கொடுக்கலாம. "
 "அவர் நன்கொடை கொடுத்த அ
ளவிற்கு வரி கட்டத் 
தேவையில்லை."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The total tax rate could be decided by a vote of the payers of the tax, "
 "weighted according to the amount they will be taxed on."
 msgstr "மொத்த வரியின் சதவீதத்தை 
வரி கட்டுபவர்களின் 
வாக்களிப்பின் மூலம் 
தீர்மானம் செய்யலாம்."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "The consequences:"
 msgstr "இதன் விளைவுகள்:"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "The computer-using community supports software development."
 msgstr "கணினி உபயோகிப்பவர்கள் 
மென்பொருள் தயாரிப்பிற்கு 
நிதி அளிக்கிறார்கள்."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "This community decides what level of support is needed."
 msgstr "எந்த அளவிற்கு ஆதரவு தேவை 
என்பதை அவர்களே முடிவு 
செய்கிறார்கள்."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "Users who care which projects their share is spent on can choose this for "
 "themselves."
@@ -1111,7 +1117,7 @@
 "எந்தச் 
செயல்திட்டத்திற்குத் 
தங்களது பங்கு செல்ல வேண்டும் 
என்பதைப் பற்றிக் கவனமாக 
இருப்பவர்கள், "
 "அவர்கள் விரும்பியதைத் 
தேர்ந்தேடுக்கலாம்."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the long run, making programs free is a step toward the postscarcity "
 "world, where nobody will have to work very hard just to make a living.  "
@@ -1127,7 +1133,7 @@
 "தயாரித்தல் போன்ற 
கேளிக்கைகளில் செலவிடலாம். 
மென்போருள் தயாரித்து 
வாழ்க்கையை வாழ வேண்டிய "
 "அவசியம் இருக்காது."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We have already greatly reduced the amount of work that the whole society "
 "must do for its actual productivity, but only a little of this has "
@@ -1146,11 +1152,11 @@
 "மென்பொருள் முடிந்த மட்டும் 
குறைத்துவிடும். 
உற்பத்தித்திறனில் 
தொழில்நுட்ப இலாபம் பெற்று அ
தை "
 "நமக்குக் குறைந்த 
விலையாக்கிட நாம் இதைச் 
செய்தாக வேண்டும்."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "பின்குறிப்புகள்"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The wording here was careless.  The intention was that nobody would have to "
 "pay for <b>permission</b> to use the GNU system.  But the words don't make "
@@ -1167,7 +1173,7 @@
 "with others in using it."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The expression &ldquo;give away&rdquo; is another indication that I had not "
 "yet clearly separated the issue of price from that of freedom.  We now "
@@ -1176,19 +1182,19 @@
 "\">Confusing Words and Phrases</a>&rdquo; for more explanation."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "This is another place I failed to distinguish carefully between the two "
-"different meanings of &ldquo;free&rdquo;.  The statement as it stands is not "
+"different meanings of &ldquo;free.&rdquo; The statement as it stands is not "
 "false&mdash;you can get copies of GNU software at no charge, from your "
 "friends or over the net.  But it does suggest the wrong idea."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid "Several such companies now exist."
 msgstr "இது போன்ற பல நிறுவனங்கள் 
இப்போது உள்ளன."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 # | [-The-]{+Although it is a charity rather than a company, the+} Free
 # | Software Foundation [-raises-] {+for 10 years raised+} most of its funds
 # | from [-a-] {+its+} distribution [-service, although it is a charity rather
@@ -1225,7 +1231,7 @@
 "எனவே பயனாளர்கள் இந்த 
வழியில் எங்களுக்கு ஆதரவு அ
ளிக்குமாறு வேண்டுகிறோம். 
நீங்கள் உங்கள் "
 "பங்களிப்பைத் 
தந்துவிட்டீர்களா?"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 # | A group of computer companies [-recently-] pooled funds {+around 1991+} to
 # | support maintenance of the GNU C Compiler.
 #, fuzzy
@@ -1239,7 +1245,7 @@
 "சமீபத்தில் கணினி 
நிறுவனங்களில் ஒரு சாரார் GNU C 
compilerஐப் பராமரிக்க நிதியை அ
ள்ளிக் "
 "கொடுத்துள்ளனர்."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "I think I was mistaken in saying that proprietary software was the most "
 "common basis for making money in software.  It seems that actually the most "
@@ -1251,10 +1257,10 @@
 "less in a free software world."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "In the 1980s I had not yet realized how confusing it was to speak of &ldquo;"
-"the issue&rdquo; of &ldquo;intellectual property&rdquo;.  That term is "
+"the issue&rdquo; of &ldquo;intellectual property.&rdquo; That term is "
 "obviously biased; more subtle is the fact that it lumps together various "
 "disparate laws which raise very different issues.  Nowadays I urge people to "
 "reject the term &ldquo;intellectual property&rdquo; entirely, lest it lead "
@@ -1264,10 +1270,10 @@
 "spreads confusion and bias."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Subsequently we learned to distinguish between &ldquo;free software&rdquo; "
-"and &ldquo;freeware&rdquo;.  The term &ldquo;freeware&rdquo; means software "
+"and &ldquo;freeware.&rdquo; The term &ldquo;freeware&rdquo; means software "
 "you are free to redistribute, but usually you are not free to study and "
 "change the source code, so most of it is not free software.  See &ldquo;<a "
 "href=\"/philosophy/words-to-avoid.html#Freeware\">Confusing Words and "
@@ -1300,15 +1306,20 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
 #, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "இந்த கட்டுரையின் 
மொழிபெயர்ப்பை 
ஒருங்கிணைப்பது, 
சமர்ப்பிப்பது தொடர்பான 
விவரங்களுக்கு <a "
@@ -1316,13 +1327,13 @@
 "கோப்பைக்</a> காணவும்."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 1985, [-1993-] {+1993, 2003, 2005, 2007, 2008, 2009,
-# | 2010, 2014, 2015+} Free Software Foundation, Inc.
+# | Copyright &copy; 1985, [-1993-] {+1993, 2004, 2005, 2007, 2009, 2010,
+# | 2015, 2021+} Free Software Foundation, Inc.
 #, fuzzy
 #| msgid "Copyright &copy; 1985, 1993 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 1985, 1993, 2004, 2005, 2007, 2009, 2010, 2015, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1985, 1993 Free Software Foundation, Inc. 
(கட்டற்ற மென்பொருள் "
 "அறக்கட்டளை, நிறுவப்பட்டது.)"
@@ -1349,6 +1360,16 @@
 msgid "Updated:"
 msgstr "புதுப்பிக்கப் பட்ட 
விவரம்:"
 
+#, fuzzy
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "இந்த கட்டுரையின் 
மொழிபெயர்ப்பை 
ஒருங்கிணைப்பது, 
சமர்ப்பிப்பது தொடர்பான 
விவரங்களுக்கு <a "
+#~ 
"href=\"/server/standards/README.translations.html\">மொழிபெயர்ப்புகள்
 README "
+#~ "கோப்பைக்</a> காணவும்."
+
 #~ msgid ""
 #~ "The Free Software Foundation raises most of its funds from a distribution "
 #~ "service, although it is a charity rather than a company.  If *no one* "

Index: po/manifesto.tr.po
===================================================================
RCS file: /web/www/www/gnu/po/manifesto.tr.po,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- po/manifesto.tr.po  2 Nov 2021 13:56:41 -0000       1.32
+++ po/manifesto.tr.po  2 Nov 2021 14:41:54 -0000       1.33
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manifesto.html\n"
-"POT-Creation-Date: 2015-06-02 12:55+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2020-04-01 22:17+0300\n"
 "Last-Translator: The FLOSS Information <theflossinformation@gmail.com>\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-11-02 14:27+0000\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Lokalize 19.12.3\n"
 
@@ -26,13 +27,21 @@
 msgid "The GNU Manifesto - GNU Project - Free Software Foundation"
 msgstr "GNU Bildirisi - GNU Projesi - Özgür Yazılım Vakfı"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "The GNU Manifesto"
 msgstr "GNU Bildirisi"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "The GNU Manifesto (which appears below) was written by <a href=\"http://";
+#| "www.stallman.org/\">Richard Stallman</a> in 1985 to ask for support in "
+#| "developing the GNU operating system.  Part of the text was taken from the "
+#| "original announcement of 1983.  Through 1987, it was updated in minor "
+#| "ways to account for developments; since then, it seems best to leave it "
+#| "unchanged."
 msgid ""
-"The GNU Manifesto (which appears below) was written by <a href=\"http://www.";
+"The GNU Manifesto (which appears below) was written by <a href=\"https://www.";
 "stallman.org/\">Richard Stallman</a> in 1985 to ask for support in "
 "developing the GNU operating system.  Part of the text was taken from the "
 "original announcement of 1983.  Through 1987, it was updated in minor ways "
@@ -45,7 +54,7 @@
 "açıklamak amacıyla küçük değişikliklere uğramıştır; o tarihten 
sonra en "
 "iyisi değiştirmeden bırakmaktır."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Since that time, we have learned about certain common misunderstandings that "
 "different wording could help avoid.  Footnotes added since 1993 help clarify "
@@ -55,7 +64,7 @@
 "anlamaları öğrendik ve bu yanlış anlamaları açıklamak için 1993'ten 
beri "
 "dipnotlar ekledik."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If you want to install the GNU/Linux system, we recommend you use one of the "
 "<a href=\"/distros\">100% free software GNU/Linux distributions</a>.  For "
@@ -67,7 +76,7 @@
 "öneriyoruz. Nasıl katkı sağlarım diyorsanız, <a href=\"/help/help.html"
 "\">http://www.gnu.org/help</a> sayfasına bakabilirsiniz."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The GNU Project is part of the Free Software Movement, a campaign for <a "
 "href=\"/philosophy/free-sw.html\">freedom for users of software</a>.  It is "
@@ -84,17 +93,24 @@
 "the-point.html\">etik olmayan bir yaklaşımı</a> teşvik etmek için "
 "kullanıyorlar."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "What's GNU? Gnu's Not Unix!"
 msgstr "GNU nedir? Gnu Unix Değildir!"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
+#| "compatible software system which I am writing so that I can give it away "
+#| "free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
+#| "volunteers are helping me.  Contributions of time, money, programs and "
+#| "equipment are greatly needed."
 msgid ""
 "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
 "compatible software system which I am writing so that I can give it away "
-"free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
-"volunteers are helping me.  Contributions of time, money, programs and "
-"equipment are greatly needed."
+"free to everyone who can use it&#8239;<a class=\"ftn\" href=\"#f1\">[1]</a>. "
+"Several other volunteers are helping me.  Contributions of time, money, "
+"programs and equipment are greatly needed."
 msgstr ""
 "Gnu Unix Değildir [:Gnu’s Not Unix] anlamına gelen GNU, yazmakta olduğum 
"
 "Unix-uyumlu yazılım sisteminin adıdır, bu yazılımı, kullanabilen 
herkese "
@@ -102,7 +118,7 @@
 "bana yardım etmektedir. Zaman, para, program ve cihaz katkıları büyük 
ölçüde "
 "gereklidir."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So far we have an Emacs text editor with Lisp for writing editor commands, a "
 "source level debugger, a yacc-compatible parser generator, a linker, and "
@@ -132,7 +148,7 @@
 "belgeyi ekleyeceğiz. Sonunda, bir Unix sisteminin sahip olduğu her şeyi ve 
"
 "daha da fazlasını sağlamayı umuyoruz."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU will be able to run Unix programs, but will not be identical to Unix.  "
 "We will make all improvements that are convenient, based on our experience "
@@ -154,7 +170,7 @@
 "Lisp sistem programlama dilleri olarak mevcut olacaktır. Haberleşme için "
 "İnternet protokollerini, UUCP’yi, MIT Chaosnet’i desteklemeye 
çalışacağız."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is aimed initially at machines in the 68000/16000 class with virtual "
 "memory, because they are the easiest machines to make it run on.  The extra "
@@ -166,7 +182,7 @@
 "küçük makineler üzerinde çalışması için fazladan çaba, onu bunlar 
üzerinde "
 "kullanmak isteyen kimselere kalmıştır."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid horrible confusion, please pronounce the <em>g</em> in the word "
 "&ldquo;GNU&rdquo; when it is the name of this project."
@@ -174,11 +190,11 @@
 "Ciddi bir karışıklığı önlemek için, bu projenin adı olan ‘GNU’ 
sözcüğündeki "
 "‘G’ harfini dikkatli telaffuz edin."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why I Must Write GNU"
 msgstr "GNU'yu niçin yazmalıydım"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I consider that the Golden Rule requires that if I like a program I must "
 "share it with other people who like it.  Software sellers want to divide the "
@@ -200,13 +216,20 @@
 "sonunda çok ileri gittiler: benim irademe karşı bazı şeylerin 
yapıldığı bir "
 "kurumda kalamazdım."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "So that I can continue to use computers without dishonor, I have decided "
+#| "to put together a sufficient body of free software so that I will be able "
+#| "to get along without any software that is not free.  I have resigned from "
+#| "the AI Lab to deny MIT any legal excuse to prevent me from giving GNU "
+#| "away.<a href=\"#f2a\">(2)</a>"
 msgid ""
 "So that I can continue to use computers without dishonor, I have decided to "
 "put together a sufficient body of free software so that I will be able to "
 "get along without any software that is not free.  I have resigned from the "
-"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away.<a "
-"href=\"#f2a\">(2)</a>"
+"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away&#8239;"
+"<a class=\"ftn\" href=\"#f2a\">[2]</a>."
 msgstr ""
 "Bilgisayarları onurlu bir biçimde kullanabilmek amacıyla, yeterli bir 
bütünü "
 "oluşturacak özgür yazılımları bir araya getirmeye karar verdim. Bunu 
özgür "
@@ -214,11 +237,11 @@
 "herhangi bir yasal durum yaratmasını önlemek için YZ laboratuvarından 
istifa "
 "ettim.<a href=\"#f2a\">(2)</a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why GNU Will Be Compatible with Unix"
 msgstr "GNU niçin Unix ile Uyumlu Olacaktır"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Unix is not my ideal system, but it is not too bad.  The essential features "
 "of Unix seem to be good ones, and I think I can fill in what Unix lacks "
@@ -230,11 +253,11 @@
 "eksiklerini tamamlayabilirim. Ve Unix ile uyumlu bir sistem başka birçok "
 "insanın benimseyebileceği şekilde uygun olacaktır."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How GNU Will Be Available"
 msgstr "GNU Nasıl Erişebilir Olacaktır"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is not in the public domain.  Everyone will be permitted to modify and "
 "redistribute GNU, but no distributor will be allowed to restrict its further "
@@ -249,11 +272,11 @@
 "verilmeyecektir. GNU’nun tüm sürümlerinin özgür kalacağından emin 
olmak "
 "isterim."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why Many Other Programmers Want to Help"
 msgstr "Niçin Başka Birçok Programcı Yardım Etmek İstemektedir"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found many other programmers who are excited about GNU and want to "
 "help."
@@ -261,7 +284,7 @@
 "GNU konusunda heyecanlı olan ve yardım etmek isteyen çok sayıda 
programcı "
 "ile karşılaştım."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Many programmers are unhappy about the commercialization of system "
 "software.  It may enable them to make more money, but it requires them to "
@@ -286,7 +309,7 @@
 "iyiliğe inanmaz hale gelir ve programlamanın yalnızca para kazanmanın bir 
"
 "yolu olduğuna inanırlar."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By working on and using GNU rather than proprietary programs, we can be "
 "hospitable to everyone and obey the law.  In addition, GNU serves as an "
@@ -303,11 +326,11 @@
 "Konuştuğum programcıların yaklaşık olarak yarısı için, bu, paranın 
yerini "
 "alan önemli bir mutluluktur."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How You Can Contribute"
 msgstr "Nasıl Katkı Sunabilirsiniz"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "(Nowadays, for software tasks to work on, see the <a href=\"http://fsf.org/";
 "campaigns/priority-projects\">High Priority Projects list</a> and the <a "
@@ -324,7 +347,7 @@
 "help.html\">GNU işletim sistemine yardım etme rehberini</"
 "a>inceleyebilirsiniz.)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am asking computer manufacturers for donations of machines and money.  I'm "
 "asking individuals for donations of programs and work."
@@ -333,7 +356,7 @@
 "bulunuyorum. Bireylere program ve çalışma konusunda bağışta 
bulunmaları "
 "konusunda istekte bulunuyorum."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One consequence you can expect if you donate machines is that GNU will run "
 "on them at an early date.  The machines should be complete, ready to use "
@@ -346,7 +369,7 @@
 "onaylı olmalıdır ve gelişmiş soğutma ya da güç gereksinimi içinde "
 "olmamalıdır."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found very many programmers eager to contribute part-time work for "
 "GNU.  For most projects, such part-time distributed work would be very hard "
@@ -376,7 +399,7 @@
 "yakın bir haberleşme gerektirecektir ve küçük ve sıkı bir grup 
tarafından "
 "üzerinde çalışılacaktır.)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If I get donations of money, I may be able to hire a few people full or part "
 "time.  The salary won't be high by programmers' standards, but I'm looking "
@@ -393,19 +416,23 @@
 "görüyorum, bu insanlar hayatlarını kazanmak için başka bir yol tercih "
 "edebilirler."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why All Computer Users Will Benefit"
 msgstr "Niçin Tüm Bilgisayar Kullanıcıları Yararlanacaktır"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Once GNU is written, everyone will be able to obtain good system software "
+#| "free, just like air.<a href=\"#f2\">(3)</a>"
 msgid ""
 "Once GNU is written, everyone will be able to obtain good system software "
-"free, just like air.<a href=\"#f2\">(3)</a>"
+"free, just like air&#8239;<a class=\"ftn\" href=\"#f2\">[3]</a>."
 msgstr ""
 "GNU yazıldıktan sonra, aynen hava almak gibi herkes iyi sistem 
yazılımını "
 "ücretsiz bir şekilde edinebilecektir.<a href=\"#f2\">(3)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This means much more than just saving everyone the price of a Unix license.  "
 "It means that much wasteful duplication of system programming effort will be "
@@ -416,7 +443,7 @@
 "kopyalama işinden kaçınılması anlamına gelmektedir. Bu çaba, bunun 
yerine  "
 "projede aşama kaydedilmesi için harcanabilir."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Complete system sources will be available to everyone.  As a result, a user "
 "who needs changes in the system will always be free to make them himself, or "
@@ -431,7 +458,7 @@
 "böyle kaynakların sahibi olan tek bir programlayıcının ya da firmanın "
 "insafına kalmayacaktır ve değişiklik yapma hakkına sahip olacaklardır."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Schools will be able to provide a much more educational environment by "
 "encouraging all students to study and improve the system code.  Harvard's "
@@ -447,7 +474,7 @@
 "ve belirli programları kurmayı reddederek bu kararlılığını korudu. 
Bundan "
 "çok etkilenmiş ve ilham almıştım."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Finally, the overhead of considering who owns the system software and what "
 "one is or is not entitled to do with it will be lifted."
@@ -455,7 +482,7 @@
 "Son olarak, sistem yazılımına kimin sahip olduğu ve bu yazılımla ne 
yapılıp "
 "yapılamayacağı özgür hale gelmektedir."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Arrangements to make people pay for using a program, including licensing of "
 "copies, always incur a tremendous cost to society through the cumbersome "
@@ -481,7 +508,7 @@
 "kameralarının konulması ahlaka aykırıdır. Kişi başına vergi 
alınması ve "
 "maskelerin atılması daha iyidir."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copying all or parts of a program is as natural to a programmer as "
 "breathing, and as productive.  It ought to be as free."
@@ -490,11 +517,11 @@
 "nefes almak kadar doğal bir şeydir, aynı zamanda da üretkenliğini 
artırır. "
 "Bu, özgür olmalıdır."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Some Easily Rebutted Objections to GNU's Goals"
 msgstr "Bazı kimseler GNU’nun hedeflerine kolayca karşı çıkmaktadır"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Nobody will use it if it is free, because that means they "
 "can't rely on any support.&rdquo;</strong>"
@@ -502,7 +529,7 @@
 "<strong>\"Özgür olursa yazılımı hiç kimse kullanmayacaktır, çünkü 
bu, "
 "herhangi bir desteğe güvenilmeyeceği anlamına gelmektedir.\"</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You have to charge for the program to pay for providing the "
 "support.&rdquo;</strong>"
@@ -510,17 +537,22 @@
 "<strong>\"Desteği sağlamak üzere ödeme yapabilmek için programa ait bir "
 "ücret almalısınız.\"</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "If people would rather pay for GNU plus service than get GNU free without "
+#| "service, a company to provide just service to people who have obtained "
+#| "GNU free ought to be profitable.<a href=\"#f3\">(4)</a>"
 msgid ""
 "If people would rather pay for GNU plus service than get GNU free without "
 "service, a company to provide just service to people who have obtained GNU "
-"free ought to be profitable.<a href=\"#f3\">(4)</a>"
+"free ought to be profitable&#8239;<a class=\"ftn\" href=\"#f3\">[4]</a>."
 msgstr ""
 "İnsanlar, ek hizmetler içermeyen özgür GNU’yu almaktan ek hizmetleri 
içeren "
 "GNU'ya ödeme yapmayı tercih ederlerse, GNU’yu özgür olarak edinen 
insanlara "
 "yalnızca hizmet sağlayan bir firma kârda olacaktır.<a 
href=\"#f3\">(4)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We must distinguish between support in the form of real programming work and "
 "mere handholding.  The former is something one cannot rely on from a "
@@ -532,7 +564,7 @@
 "alınamayan bir şeydir. Probleminiz yeterince sayıda insanda yoksa, 
satıcı "
 "size kaybolmanızı söyleyecektir."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If your business needs to be able to rely on support, the only way is to "
 "have all the necessary sources and tools.  Then you can hire any available "
@@ -552,7 +584,7 @@
 "bağlanamaz. GNU dünyanın tüm problemlerini ortadan kaldırmaz, yalnızca "
 "bazılarını ortadan kaldırır."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Meanwhile, the users who know nothing about computers need handholding: "
 "doing things for them which they could easily do themselves but don't know "
@@ -563,7 +595,7 @@
 "yapabilecekleri ama nasıl yapacaklarını bilmedikleri şeylerin onlar için 
"
 "yapılması gibi."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Such services could be provided by companies that sell just handholding and "
 "repair service.  If it is true that users would rather spend money and get a "
@@ -581,7 +613,7 @@
 "hizmete ihtiyaç duymayanlar, hizmete para ödemeden programı "
 "kullanabilmelidir."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You cannot reach many people without advertising, and you "
 "must charge for the program to support that.&rdquo;</strong>"
@@ -589,7 +621,7 @@
 "<strong>\"Reklam vermeden çok sayıda insana ulaşamazsınız ve programı "
 "desteklemek için para ödemelisiniz.\"</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;It's no use advertising a program people can get free.&rdquo;"
 "</strong>"
@@ -597,7 +629,7 @@
 "<strong>\"İnsanların özgürce sahip olabileceği bir program için reklam "
 "vermenin bir anlamı yoktur.\"</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are various forms of free or very cheap publicity that can be used to "
 "inform numbers of computer users about something like GNU.  But it may be "
@@ -615,19 +647,25 @@
 "için ödeme yapmaya yetecek kadar başarılı olmalıdır. Bu şekilde, 
yalnızca "
 "reklamdan kâr yapan kullanıcılar program için ödeme yapacaktır."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "On the other hand, if many people get GNU from their friends, and such "
+#| "companies don't succeed, this will show that advertising was not really "
+#| "necessary to spread GNU.  Why is it that free market advocates don't want "
+#| "to let the free market decide this?<a href=\"#f4\">(5)</a>"
 msgid ""
 "On the other hand, if many people get GNU from their friends, and such "
 "companies don't succeed, this will show that advertising was not really "
 "necessary to spread GNU.  Why is it that free market advocates don't want to "
-"let the free market decide this?<a href=\"#f4\">(5)</a>"
+"let the free market decide this?&#8239;<a class=\"ftn\" href=\"#f4\">[5]</a>"
 msgstr ""
 "Diğer taraftan, birçok insan GNU’yu arkadaşlarından edinirse ve bu gibi 
"
 "firmalar başarılı olamazsa, bu durum, GNU’yu yaymak için reklam 
vermenin "
 "ille de gerekli olmadığını gösterecektir. Niçin özgür piyasanın 
savunucuları "
 "buna özgür piyasanın karar vermesini istemiyor?<a href=\"#f4\">(5)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;My company needs a proprietary operating system to get a "
 "competitive edge.&rdquo;</strong>"
@@ -635,7 +673,7 @@
 "<strong>\"Firmam, rekabetçi bir durum elde etmek için özel mülk bir 
işletim "
 "sistemine ihtiyaç duymaktadır.\"</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU will remove operating system software from the realm of competition.  "
 "You will not be able to get an edge in this area, but neither will your "
@@ -653,15 +691,20 @@
 "başka bir şeyle alakalıysa, GNU işletim sistemleri satmak gibi pahalı 
bir "
 "işe atılmanızı engelleyecektir."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "I would like to see GNU development supported by gifts from many "
+#| "manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
 msgid ""
 "I would like to see GNU development supported by gifts from many "
-"manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
+"manufacturers and users, reducing the cost to each&#8239;<a class=\"ftn\" "
+"href=\"#f5\">[6]</a>."
 msgstr ""
 "Her birine ilişkin maliyeti düşürerek birçok kullanıcıdan ve 
üreticiden "
 "gelen hediyelerle GNU’nun gelişimini görmek isterdim.<a 
href=\"#f5\">(6)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't programmers deserve a reward for their creativity?"
 "&rdquo;</strong>"
@@ -669,7 +712,7 @@
 "<strong>\"Programcılar yaratıcılıkları için bir ödülü hak etmezler 
mi?\"</"
 "strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If anything deserves a reward, it is social contribution.  Creativity can be "
 "a social contribution, but only in so far as society is free to use the "
@@ -683,7 +726,7 @@
 "hak ediyorlarsa, aynı mantıkla, bu programların kullanılmasını "
 "kısıtlarlarsa, cezalandırılmayı da hak ederler."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Shouldn't a programmer be able to ask for a reward for his "
 "creativity?&rdquo;</strong>"
@@ -691,7 +734,7 @@
 "<strong>\"Bir programcı yaratıcılığı için ödül isteme hakkına sahip 
olmamalı "
 "mıdır?\"</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is nothing wrong with wanting pay for work, or seeking to maximize "
 "one's income, as long as one does not use means that are destructive.  But "
@@ -702,7 +745,7 @@
 "yoktur. Ancak günümüzde yazılım konusunda alışılageldik yollarda 
zarar "
 "verici bir durum vardır."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Extracting money from users of a program by restricting their use of it is "
 "destructive because the restrictions reduce the amount and the ways that the "
@@ -715,7 +758,7 @@
 "Bu, insanlığın programdan edinebileceği zenginliği azaltır. Kasıtlı 
bir "
 "kısıtlama durumu söz konusu olduğunda, bunun sonucu da kasıtlı 
zarardır."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The reason a good citizen does not use such destructive means to become "
 "wealthier is that, if everyone did so, we would all become poorer from the "
@@ -733,11 +776,11 @@
 "birinin yaratıcılığı için ödüllendirilmesi isteği, genel olarak bu "
 "yaratıcılığın tamamından ya da bir kısmından mahrum kalınmasını 
haklı kılmaz."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid "<strong>&ldquo;Won't programmers starve?&rdquo;</strong>"
 msgstr "<strong>\"Programlayıcılar açlıktan ölmeyecek midir?\"</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "I could answer that nobody is forced to be a programmer.  Most of us cannot "
 "manage to get any money for standing on the street and making faces.  But we "
@@ -749,7 +792,7 @@
 "olarak, caddede durup gülümseyerek açlıktan öldüğümüz için 
kınanmayız. Başka "
 "bir şeyler yaparız."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But that is the wrong answer because it accepts the questioner's implicit "
 "assumption: that without ownership of software, programmers cannot possibly "
@@ -759,7 +802,7 @@
 "etmektedir: yazılımın sahibi değilse, programcılara bir kuruş bile 
ödenemez. "
 "Bu, ya hep ya hiçtir."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The real reason programmers will not starve is that it will still be "
 "possible for them to get paid for programming; just not paid as much as now."
@@ -768,13 +811,22 @@
 "için programcılara para ödenecek olmasının hâlâ mümkün olmasıdır; 
ancak "
 "şimdiki kadar çok ödeme yapılmayacaktır."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Restricting copying is not the only basis for business in software.  It "
+#| "is the most common basis<a href=\"#f8\">(7)</a> because it brings in the "
+#| "most money.  If it were prohibited, or rejected by the customer, software "
+#| "business would move to other bases of organization which are now used "
+#| "less often.  There are always numerous ways to organize any kind of "
+#| "business."
 msgid ""
 "Restricting copying is not the only basis for business in software.  It is "
-"the most common basis<a href=\"#f8\">(7)</a> because it brings in the most "
-"money.  If it were prohibited, or rejected by the customer, software "
-"business would move to other bases of organization which are now used less "
-"often.  There are always numerous ways to organize any kind of business."
+"the most common basis&#8239;<a class=\"ftn\" href=\"#f8\">[7]</a> because it "
+"brings in the most money.  If it were prohibited, or rejected by the "
+"customer, software business would move to other bases of organization which "
+"are now used less often.  There are always numerous ways to organize any "
+"kind of business."
 msgstr ""
 "Kopyalamanın kısıtlanması, yazılım piyasasında iş yapılmasının tek 
temeli "
 "değildir. Bu en yaygın temeldir<a href=\"#f8\">(7)</a> çünkü en çok 
parayı "
@@ -783,7 +835,7 @@
 "kayardı. Herhangi bir iş tipini organize etmek için her zaman çeşitli 
yollar "
 "mevcuttur."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Probably programming will not be as lucrative on the new basis as it is "
 "now.  But that is not an argument against the change.  It is not considered "
@@ -797,7 +849,7 @@
 "aynısını yapsaydı, bu da bir haksızlık olmayacaktı. (Uygulamada, 
hâlâ bundan "
 "çok daha fazlasını gerçekleştireceklerdi.)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't people have a right to control how their creativity is "
 "used?&rdquo;</strong>"
@@ -805,7 +857,7 @@
 "<strong>\"İnsanlar yaratıcılıklarının nasıl kullanıldığını 
kontrol etme "
 "hakkına sahip değil midir?\"</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "&ldquo;Control over the use of one's ideas&rdquo; really constitutes control "
 "over other people's lives; and it is usually used to make their lives more "
@@ -815,13 +867,20 @@
 "hayatları üzerinde kontrol oluşturur ve genellikle yaşamlarını daha zor 
hale "
 "getirmek için kullanılır."
 
-#. type: Content of: <p>
-msgid ""
-"People who have studied the issue of intellectual property rights<a href="
-"\"#f6\">(8)</a> carefully (such as lawyers) say that there is no intrinsic "
-"right to intellectual property.  The kinds of supposed intellectual property "
-"rights that the government recognizes were created by specific acts of "
-"legislation for specific purposes."
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "People who have studied the issue of intellectual property rights<a href="
+#| "\"#f6\">(8)</a> carefully (such as lawyers) say that there is no "
+#| "intrinsic right to intellectual property.  The kinds of supposed "
+#| "intellectual property rights that the government recognizes were created "
+#| "by specific acts of legislation for specific purposes."
+msgid ""
+"People who have studied the issue of intellectual property rights&#8239;<a "
+"class=\"ftn\" href=\"#f6\">[8]</a> carefully (such as lawyers) say that "
+"there is no intrinsic right to intellectual property.  The kinds of supposed "
+"intellectual property rights that the government recognizes were created by "
+"specific acts of legislation for specific purposes."
 msgstr ""
 "Fikri mülkiyet [:intellectual property] <a href=\"#f6\">(8)</a> hakları "
 "üzerine dikkatli bir şekilde çalışan insanlar (avukatlar gibi) fikri "
@@ -829,7 +888,7 @@
 "fikri mülkiyet hakları, özel amaçlar için yasama organları tarafından "
 "oluşturulmuştur."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For example, the patent system was established to encourage inventors to "
 "disclose the details of their inventions.  Its purpose was to help society "
@@ -849,7 +908,7 @@
 "için, patentler, genellikle çok zarar verici değildir. Patentli ürünleri 
"
 "kullanan birçok bireyi engellemezler."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The idea of copyright did not exist in ancient times, when authors "
 "frequently copied other authors at length in works of nonfiction.  This "
@@ -868,7 +927,7 @@
 "olarak yalnızca bir baskıda kopyalanabilen kitaplar az zarar vericiydi ve "
 "kitapları okuyan bireylerin çoğunu engellemedi."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "All intellectual property rights are just licenses granted by society "
 "because it was thought, rightly or wrongly, that society as a whole would "
@@ -882,7 +941,7 @@
 "gereken soru şudur: bu gibi bir lisansın verilmesiyle daha mı iyi 
olacağız? "
 "Bir kimsenin yapması gereken bir hareketi nasıl lisanslıyoruz?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The case of programs today is very different from that of books a hundred "
 "years ago.  The fact that the easiest way to copy a program is from one "
@@ -901,14 +960,14 @@
 "olarak zarar verme durumudur; bir kimse kanunların mümkün kılıp "
 "kılmamasından bağımsız olarak bunu yapmamalıdır."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Competition makes things get done better.&rdquo;</strong>"
 msgstr ""
 "<strong>\"Rekabet bazı şeylerin daha iyi bir şekilde yapılmasını 
sağlar.\"</"
 "strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The paradigm of competition is a race: by rewarding the winner, we encourage "
 "everyone to run faster.  When capitalism really works this way, it does a "
@@ -927,7 +986,7 @@
 "örneğin, diğer koşuculara saldırabilirler. Koşucular ciddi bir kavgaya "
 "tutuşurlarsa, hepsi de yarışı geç bitireceklerdir."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Proprietary and secret software is the moral equivalent of runners in a fist "
 "fight.  Sad to say, the only referee we've got does not seem to object to "
@@ -942,7 +1001,7 @@
 "Gerçekte yapması gereken kavga edenleri ayırmak ve dövüşmeye çalışan 
"
 "koşucuları cezalandırmak olmalıdır."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Won't everyone stop programming without a monetary incentive?"
 "&rdquo;</strong>"
@@ -950,7 +1009,7 @@
 "<strong>\"Maddi bir hedefi olmayınca herkes program yapmayı durdurmayacak "
 "mıdır?\"</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually, many people will program with absolutely no monetary incentive.  "
 "Programming has an irresistible fascination for some people, usually the "
@@ -963,7 +1022,7 @@
 "şekilde para kazanamadıklarını düşünseler bile, müzik işine devam 
eden çok "
 "sayıda profesyonel müzisyen vardır."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But really this question, though commonly asked, is not appropriate to the "
 "situation.  Pay for programmers will not disappear, only become less.  So "
@@ -976,7 +1035,7 @@
 "göre mi programlama yapacaktır? Benim tecrübelerim durumun böyle 
olacağını "
 "göstermektedir."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For more than ten years, many of the world's best programmers worked at the "
 "Artificial Intelligence Lab for far less money than they could have had "
@@ -989,7 +1048,7 @@
 "kazandılar: örneğin, ün ve saygınlık gibi. Ve yaratıcılık da ayrıca 
bir "
 "eğlence, kendi içinde bir ödüldü."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Then most of them left when offered a chance to do the same interesting work "
 "for a lot of money."
@@ -997,7 +1056,7 @@
 "Daha sonra birçoğu, aynı ilginç işi çok daha fazla para kazanarak 
yapmak "
 "için işlerini bıraktı."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "What the facts show is that people will program for reasons other than "
 "riches; but if given a chance to make a lot of money as well, they will come "
@@ -1012,7 +1071,7 @@
 "daha zayıftır ancak yüksek ödeme yapan organizasyonların yasaklanması "
 "durumunda, kötü şeyler yapmaları gerekmez."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;We need the programmers desperately.  If they demand that we "
 "stop helping our neighbors, we have to obey.&rdquo;</strong>"
@@ -1020,7 +1079,7 @@
 "<strong>\"Çaresiz bir şekilde programcılara ihtiyaç duymaktayız. "
 "Komşularımıza yardım etmememizi isterlerse, buna uymamız 
gerekir.\"</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "You're never so desperate that you have to obey this sort of demand.  "
 "Remember: millions for defense, but not a cent for tribute!"
@@ -1028,14 +1087,14 @@
 "Aslında bu tip bir isteğe uyacak kadar çaresiz değilsiniz. Unutmayın: "
 "savunma için milyonlar harcanır ama vergi için bir kuruş bile verilmez!"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Programmers need to make a living somehow.&rdquo;</strong>"
 msgstr ""
 "<strong>\"Programcılar bir şekilde yaşamlarını sürdürmek 
zorundadır.\"</"
 "strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In the short run, this is true.  However, there are plenty of ways that "
 "programmers could make a living without selling the right to use a program.  "
@@ -1050,7 +1109,7 @@
 "bu değildir. Bulmak isterseniz başka yollar da bulmak kolaydır. Aşağıda 
bir "
 "kaç örnek görebilirsiniz."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A manufacturer introducing a new computer will pay for the porting of "
 "operating systems onto the new hardware."
@@ -1058,7 +1117,7 @@
 "Yeni bir bilgisayarı piyasaya süren bir üretici, işletim sistemlerinin 
yeni "
 "donanıma taşınması için bir ücret ödeyecektir."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The sale of teaching, handholding and maintenance services could also employ "
 "programmers."
@@ -1066,18 +1125,25 @@
 "Öğretme, destek ve bakım hizmetleri için de programcıların 
kullanılması "
 "gerekli olabilir."
 
-#. type: Content of: <p>
-msgid ""
-"People with new ideas could distribute programs as freeware<a href=\"#f7\">"
-"(9)</a>, asking for donations from satisfied users, or selling handholding "
-"services.  I have met people who are already working this way successfully."
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "People with new ideas could distribute programs as freeware<a href="
+#| "\"#f7\">(9)</a>, asking for donations from satisfied users, or selling "
+#| "handholding services.  I have met people who are already working this way "
+#| "successfully."
+msgid ""
+"People with new ideas could distribute programs as freeware&#8239;<a class="
+"\"ftn\" href=\"#f7\">[9]</a>, asking for donations from satisfied users, or "
+"selling handholding services.  I have met people who are already working "
+"this way successfully."
 msgstr ""
 "Yeni fikirlere sahip insanlar, freeware (ücretsiz)<a href=\"#f7\">(9)</a> "
 "olarak programları dağıtabilir, memnun kullanıcılardan bağış 
isteyebilir ya "
 "da destek hizmetlerini satabilir. Hâlihazırda bu şekilde başarılı bir "
 "biçimde çalışan insanlarla karşılaştım."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Users with related needs can form users' groups, and pay dues.  A group "
 "would contract with programming companies to write programs that the group's "
@@ -1087,12 +1153,12 @@
 "hak ödeyebilir. Bir grup, grup üyelerinin kullanmak istediği programları "
 "yazmak için, programlama firmalarıyla anlaşma yapabilir."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "All sorts of development can be funded with a Software Tax:"
 msgstr ""
 "Tüm geliştirme çeşitlerine bir Yazılım Vergisiyle finansman 
sağlanabilir:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Suppose everyone who buys a computer has to pay x percent of the price as a "
 "software tax.  The government gives this to an agency like the NSF to spend "
@@ -1102,7 +1168,7 @@
 "ödemesinin gerekli olduğunu varsayalım. Hükümet, bunu, yazılım 
geliştirme "
 "konusunda harcamak üzere NSF gibi bir birime verir."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But if the computer buyer makes a donation to software development himself, "
 "he can take a credit against the tax.  He can donate to the project of his "
@@ -1116,7 +1182,7 @@
 "Ödemesinin gerekli olduğu toplam vergiye kadar olan miktarda ödeme yapmak "
 "için kredi alabilir."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The total tax rate could be decided by a vote of the payers of the tax, "
 "weighted according to the amount they will be taxed on."
@@ -1124,19 +1190,19 @@
 "Toplam vergi oranı vergi ödeyenlerin oyuyla belirlenebilir, "
 "vergilendirilecek miktara göre ağırlıklandırılır."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "The consequences:"
 msgstr "Sonuçlar:"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "The computer-using community supports software development."
 msgstr "Bilgisayar kullanan topluluk yazılım gelişimini destekler."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "This community decides what level of support is needed."
 msgstr "Bu topluluk, hangi destek seviyesinin gerekli olduğuna karar verir."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "Users who care which projects their share is spent on can choose this for "
 "themselves."
@@ -1144,7 +1210,7 @@
 "Paylarının hangi projelere harcandığına önem veren kullanıcılar, 
kendileri "
 "için bunu seçebilir."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the long run, making programs free is a step toward the postscarcity "
 "world, where nobody will have to work very hard just to make a living.  "
@@ -1163,7 +1229,7 @@
 "sayesinde geçimini sağlamak için gerekli kazancı sağlayabilme ihtiyacı "
 "olmayacaktır."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We have already greatly reduced the amount of work that the whole society "
 "must do for its actual productivity, but only a little of this has "
@@ -1183,11 +1249,11 @@
 "üretkenlikteki teknik kazançların bizim için daha az çalışmaya 
dönüşmesi "
 "için yapmalıyız."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "Dipnotlar"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The wording here was careless.  The intention was that nobody would have to "
 "pay for <b>permission</b> to use the GNU system.  But the words don't make "
@@ -1219,7 +1285,7 @@
 "Kopyaya sahip olan herhangi biri, bu kopyanın kullanımı konusunda diğer "
 "insanlarla işbirliği yapma özgürlüğüne sahiptir."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The expression &ldquo;give away&rdquo; is another indication that I had not "
 "yet clearly separated the issue of price from that of freedom.  We now "
@@ -1234,10 +1300,16 @@
 "html#GiveAwaySoftware\">kafa karıştıran kelimeler ve ifadeler</a>&rdquo; "
 "bağlantısını ziyaret ediniz."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "This is another place I failed to distinguish carefully between the two "
+#| "different meanings of &ldquo;free&rdquo;.  The statement as it stands is "
+#| "not false&mdash;you can get copies of GNU software at no charge, from "
+#| "your friends or over the net.  But it does suggest the wrong idea."
 msgid ""
 "This is another place I failed to distinguish carefully between the two "
-"different meanings of &ldquo;free&rdquo;.  The statement as it stands is not "
+"different meanings of &ldquo;free.&rdquo; The statement as it stands is not "
 "false&mdash;you can get copies of GNU software at no charge, from your "
 "friends or over the net.  But it does suggest the wrong idea."
 msgstr ""
@@ -1247,11 +1319,11 @@
 "yazılımının kopyalarını alabilirsiniz. Ancak burada yanlış anlamı 
ifade "
 "etmektedir."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid "Several such companies now exist."
 msgstr "Buna benzer bir çok şirket günümüzde vardır."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Although it is a charity rather than a company, the Free Software Foundation "
 "for 10 years raised most of its funds from its distribution service.  You "
@@ -1263,7 +1335,7 @@
 "order/order.html\">FSF'den birşeyler satın alarak</a> çalışmasını "
 "destekleyebilirsiniz."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "A group of computer companies pooled funds around 1991 to support "
 "maintenance of the GNU C Compiler."
@@ -1271,7 +1343,7 @@
 "GNU C Derleyicisinin devamlılığının desteklenmesi için, bir grup 
bilgisayar "
 "firması 1991'de finansman sağladı."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "I think I was mistaken in saying that proprietary software was the most "
 "common basis for making money in software.  It seems that actually the most "
@@ -1291,10 +1363,21 @@
 "ücretli programcının özgür yazılım dünyasında daha az kazanmasını 
artık "
 "beklemiyorum."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "In the 1980s I had not yet realized how confusing it was to speak of "
+#| "&ldquo;the issue&rdquo; of &ldquo;intellectual property&rdquo;.  That "
+#| "term is obviously biased; more subtle is the fact that it lumps together "
+#| "various disparate laws which raise very different issues.  Nowadays I "
+#| "urge people to reject the term &ldquo;intellectual property&rdquo; "
+#| "entirely, lest it lead others to suppose that those laws form one "
+#| "coherent issue.  The way to be clear is to discuss patents, copyrights, "
+#| "and trademarks separately.  See <a href=\"/philosophy/not-ipr.html"
+#| "\">further explanation</a> of how this term spreads confusion and bias."
 msgid ""
 "In the 1980s I had not yet realized how confusing it was to speak of &ldquo;"
-"the issue&rdquo; of &ldquo;intellectual property&rdquo;.  That term is "
+"the issue&rdquo; of &ldquo;intellectual property.&rdquo; That term is "
 "obviously biased; more subtle is the fact that it lumps together various "
 "disparate laws which raise very different issues.  Nowadays I urge people to "
 "reject the term &ldquo;intellectual property&rdquo; entirely, lest it lead "
@@ -1313,10 +1396,19 @@
 "ayrı tartışmaktır. <a href=\"/philosophy/not-ipr.html\">Daha fazla "
 "açıklamayla</a> bu terimin yaydığı karışıklık ve taraflılığı 
görebilirsiniz."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "Subsequently we learned to distinguish between &ldquo;free "
+#| "software&rdquo; and &ldquo;freeware&rdquo;.  The term &ldquo;"
+#| "freeware&rdquo; means software you are free to redistribute, but usually "
+#| "you are not free to study and change the source code, so most of it is "
+#| "not free software.  See &ldquo;<a href=\"/philosophy/words-to-avoid."
+#| "html#Freeware\">Confusing Words and Phrases</a>&rdquo; for more "
+#| "explanation."
 msgid ""
 "Subsequently we learned to distinguish between &ldquo;free software&rdquo; "
-"and &ldquo;freeware&rdquo;.  The term &ldquo;freeware&rdquo; means software "
+"and &ldquo;freeware.&rdquo; The term &ldquo;freeware&rdquo; means software "
 "you are free to redistribute, but usually you are not free to study and "
 "change the source code, so most of it is not free software.  See &ldquo;<a "
 "href=\"/philosophy/words-to-avoid.html#Freeware\">Confusing Words and "
@@ -1356,14 +1448,19 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Çevirilerimizde bulmuş olabileceğiniz hataları, aklınızdaki soru ve "
@@ -1377,9 +1474,13 @@
 "\">çalışma&nbsp;sayfamızı</a> ziyaret edebilirsiniz."
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, "
+#| "2015 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 1985, 1993, 2004, 2005, 2007, 2009, 2010, 2015, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015 "
 "Free Software Foundation, Inc."
@@ -1420,10 +1521,9 @@
 msgid "Updated:"
 msgstr "Son Güncelleme:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015, "
-"2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015, "
-"2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, "
+#~ "2015, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, "
+#~ "2015, 2021 Free Software Foundation, Inc."

Index: po/manifesto.uk.po
===================================================================
RCS file: /web/www/www/gnu/po/manifesto.uk.po,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- po/manifesto.uk.po  2 Nov 2021 13:56:41 -0000       1.11
+++ po/manifesto.uk.po  2 Nov 2021 14:41:54 -0000       1.12
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manifesto.html\n"
-"POT-Creation-Date: 2015-06-02 12:55+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2016-07-09 09:39+0200\n"
 "Last-Translator: Andriy Bandura <andriykopanytsia@gmail.com>\n"
 "Language-Team: Ukrainian <>\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-11-02 14:27+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"
@@ -23,13 +24,21 @@
 msgid "The GNU Manifesto - GNU Project - Free Software Foundation"
 msgstr "Маніфест GNU - Проект GNU - Фонд вільного 
програмного забезпечення"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "The GNU Manifesto"
 msgstr "Маніфест GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "The GNU Manifesto (which appears below) was written by <a href=\"http://";
+#| "www.stallman.org/\">Richard Stallman</a> in 1985 to ask for support in "
+#| "developing the GNU operating system.  Part of the text was taken from the "
+#| "original announcement of 1983.  Through 1987, it was updated in minor "
+#| "ways to account for developments; since then, it seems best to leave it "
+#| "unchanged."
 msgid ""
-"The GNU Manifesto (which appears below) was written by <a href=\"http://www.";
+"The GNU Manifesto (which appears below) was written by <a href=\"https://www.";
 "stallman.org/\">Richard Stallman</a> in 1985 to ask for support in "
 "developing the GNU operating system.  Part of the text was taken from the "
 "original announcement of 1983.  Through 1987, it was updated in minor ways "
@@ -42,7 +51,7 @@
 "оновлювався, щоб відзначити розвиток; з 
тих пір здається найкращим залишити "
 "його незмінним."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Since that time, we have learned about certain common misunderstandings that "
 "different wording could help avoid.  Footnotes added since 1993 help clarify "
@@ -53,7 +62,7 @@
 "могло б допомогти уникнути їх. Виноски, 
додані починаючи з \n"
 "1993&nbsp;року, допомагають пояснити ці 
аспекти."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If you want to install the GNU/Linux system, we recommend you use one of the "
 "<a href=\"/distros\">100% free software GNU/Linux distributions</a>.  For "
@@ -65,7 +74,7 @@
 "Щоби дізнатися, як допомогти, відвідайте <a 
href=\"/help/help.html\">http://";
 "www.gnu.org/help</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The GNU Project is part of the Free Software Movement, a campaign for <a "
 "href=\"/philosophy/free-sw.html\">freedom for users of software</a>.  It is "
@@ -82,17 +91,24 @@
 "щоб пропагувати <a 
href=\"/philosophy/open-source-misses-the-point.html"
 "\">аморальний підхід</a> до тієї сфери."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "What's GNU? Gnu's Not Unix!"
 msgstr "Що таке GNU? GNU&nbsp;&mdash; не Unix!"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
+#| "compatible software system which I am writing so that I can give it away "
+#| "free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
+#| "volunteers are helping me.  Contributions of time, money, programs and "
+#| "equipment are greatly needed."
 msgid ""
 "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
 "compatible software system which I am writing so that I can give it away "
-"free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
-"volunteers are helping me.  Contributions of time, money, programs and "
-"equipment are greatly needed."
+"free to everyone who can use it&#8239;<a class=\"ftn\" href=\"#f1\">[1]</a>. "
+"Several other volunteers are helping me.  Contributions of time, money, "
+"programs and equipment are greatly needed."
 msgstr ""
 "GNU, що означає &ldquo;gnu's Not Unix&rdquo; \n"
 "(GNU&nbsp;&mdash; це не Unix),&mdash; \n"
@@ -103,7 +119,7 @@
 "Ми дуже потребуємо робочих рук, гроші, 
програм\n"
 "і обладнання."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So far we have an Emacs text editor with Lisp for writing editor commands, a "
 "source level debugger, a yacc-compatible parser generator, a linker, and "
@@ -137,7 +153,7 @@
 "Ми сподіваємося видати&nbsp;&nbsp; з 
часом&nbsp;&mdash; все те корисне, \n"
 "що зазвичай поставляється з системою 
сім'ї Unix, і навіть більше."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU will be able to run Unix programs, but will not be identical to Unix.  "
 "We will make all improvements that are convenient, based on our experience "
@@ -160,7 +176,7 @@
 "і Лісп. Для мережних з'єднань ми спробуємо 
підтримувати протоколи UUCP, "
 "Internet, а також Chaosnet Масачусетського тех
нологічного інституту."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is aimed initially at machines in the 68000/16000 class with virtual "
 "memory, because they are the easiest machines to make it run on.  The extra "
@@ -173,7 +189,7 @@
 "робота для запуску її на менших ЕОМ 
залишиться \n"
 "на частку того, хто захоче застосовувати 
її на них."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid horrible confusion, please pronounce the <em>g</em> in the word "
 "&ldquo;GNU&rdquo; when it is the name of this project."
@@ -181,11 +197,11 @@
 "Щоб уникнути жахливої плутанини, будь 
ласка, говоріть <em>g</em> у слові "
 "&ldquo;GNU&rdquo;, коли воно позначає цей проект."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why I Must Write GNU"
 msgstr "Чому я повинен писати GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I consider that the Golden Rule requires that if I like a program I must "
 "share it with other people who like it.  Software sellers want to divide the "
@@ -208,13 +224,20 @@
 "зайшли занадто далеко: я не зміг 
залишатися в інституті, де таке робили за "
 "мене проти моєї волі."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "So that I can continue to use computers without dishonor, I have decided "
+#| "to put together a sufficient body of free software so that I will be able "
+#| "to get along without any software that is not free.  I have resigned from "
+#| "the AI Lab to deny MIT any legal excuse to prevent me from giving GNU "
+#| "away.<a href=\"#f2a\">(2)</a>"
 msgid ""
 "So that I can continue to use computers without dishonor, I have decided to "
 "put together a sufficient body of free software so that I will be able to "
 "get along without any software that is not free.  I have resigned from the "
-"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away.<a "
-"href=\"#f2a\">(2)</a>"
+"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away&#8239;"
+"<a class=\"ftn\" href=\"#f2a\">[2]</a>."
 msgstr ""
 "Отже, щоб мати можливість продовжувати 
користуватися комп'ютерами без "
 "ганьби, я вирішив скласти разом достатнє 
число вільних програм з тим, щоб я "
@@ -222,11 +245,11 @@
 "щоб не залишити інституту жодного 
законного приводу утримати мене від "
 "роздачі<a href=\"#f2a\">(2)</a> GNU."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why GNU Will Be Compatible with Unix"
 msgstr "Чому GNU буде сумісна з Unix"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Unix is not my ideal system, but it is not too bad.  The essential features "
 "of Unix seem to be good ones, and I think I can fill in what Unix lacks "
@@ -238,11 +261,11 @@
 "Unix, не зіпсувавши цих основ. А система, 
сумісна з Unix, буде зручна в "
 "освоєнні для багатьох."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How GNU Will Be Available"
 msgstr "Як GNU буде поширюватися"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is not in the public domain.  Everyone will be permitted to modify and "
 "redistribute GNU, but no distributor will be allowed to restrict its further "
@@ -256,17 +279,17 @@
 "html#ProprietarySoftware\">невільні</a> зміни будуть 
заборонені. Я хочу "
 "гарантувати, що всі версії GNU залишаться 
вільними."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why Many Other Programmers Want to Help"
 msgstr "Чому багато програмістів хочуть 
допомогти"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found many other programmers who are excited about GNU and want to "
 "help."
 msgstr "Я знайшов багато програмістів, які 
співчувають GNU і хочуть допомогти."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Many programmers are unhappy about the commercialization of system "
 "software.  It may enable them to make more money, but it requires them to "
@@ -290,7 +313,7 @@
 "починають думати, що програмування&nbsp;&mdash; 
це тільки спосіб заробити "
 "гроші."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By working on and using GNU rather than proprietary programs, we can be "
 "hospitable to everyone and obey the law.  In addition, GNU serves as an "
@@ -306,11 +329,11 @@
 "програми, які не вільні. Приблизно для 
половини всіх програмістів, яких я "
 "питав, це важливий складник щастя, який 
гроші замінити не можуть."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How You Can Contribute"
 msgstr "Чим ви можете допомогти"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "(Nowadays, for software tasks to work on, see the <a href=\"http://fsf.org/";
 "campaigns/priority-projects\">High Priority Projects list</a> and the <a "
@@ -326,7 +349,7 @@
 "Інші способи допомогти вказані у <a 
href=\"/help/help.html\">посібнику з "
 "допомоги операційній системі GNU</a>)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am asking computer manufacturers for donations of machines and money.  I'm "
 "asking individuals for donations of programs and work."
@@ -334,7 +357,7 @@
 "Я закликаю виробників комп'ютерів 
приносити в дар машини і гроші. Я закликаю "
 "приватних осіб приносити в дар програми і 
працю."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One consequence you can expect if you donate machines is that GNU will run "
 "on them at an early date.  The machines should be complete, ready to use "
@@ -347,7 +370,7 @@
 "житлових приміщеннях і не потребувати х
итромудрих систем охолодження або "
 "живлення."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found very many programmers eager to contribute part-time work for "
 "GNU.  For most projects, such part-time distributed work would be very hard "
@@ -375,7 +398,7 @@
 "компоненти буде здійсненним завданням. 
(Ядро зажадає більш тісного "
 "спілкування. Над ним буде працювати 
невелика згуртована група.)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If I get donations of money, I may be able to hire a few people full or part "
 "time.  The salary won't be high by programmers' standards, but I'm looking "
@@ -391,19 +414,23 @@
 "дати можливість самовідданим людям 
присвятити всі свої сили роботі над GNU, "
 "позбавивши їх від потреби заробляти на 
життя іншим способом."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why All Computer Users Will Benefit"
 msgstr "Чим це буде корисно всім користувачам 
комп'ютерів"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Once GNU is written, everyone will be able to obtain good system software "
+#| "free, just like air.<a href=\"#f2\">(3)</a>"
 msgid ""
 "Once GNU is written, everyone will be able to obtain good system software "
-"free, just like air.<a href=\"#f2\">(3)</a>"
+"free, just like air&#8239;<a class=\"ftn\" href=\"#f2\">[3]</a>."
 msgstr ""
 "Як тільки GNU буде написана, кожен зможе 
отримати гарне системне програмне "
 "забезпечення так само вільно, як повітря.<a 
href=\"#f2\">(3)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This means much more than just saving everyone the price of a Unix license.  "
 "It means that much wasteful duplication of system programming effort will be "
@@ -414,7 +441,7 @@
 "праці системних програмістів. Замість 
цього їхня праця може піти на розвиток "
 "вже існуючого."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Complete system sources will be available to everyone.  As a result, a user "
 "who needs changes in the system will always be free to make them himself, or "
@@ -428,7 +455,7 @@
 "Користувачам не доведеться більше чекати 
милостей від одного програміста або "
 "компанії, що володіє початковими текстами 
іпрерогативою вносити зміни."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Schools will be able to provide a much more educational environment by "
 "encouraging all students to study and improve the system code.  Harvard's "
@@ -444,7 +471,7 @@
 "цього їм доводилося відмовлятися від 
встановлення певних програм. Я був в "
 "значній мірі натхненний цим."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Finally, the overhead of considering who owns the system software and what "
 "one is or is not entitled to do with it will be lifted."
@@ -453,7 +480,7 @@
 "програмами і що йому дозволено, а що не 
дозволено робити з ними, будуть "
 "зняті."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Arrangements to make people pay for using a program, including licensing of "
 "copies, always incur a tremendous cost to society through the cumbersome "
@@ -478,7 +505,7 @@
 "обурливі. Краще утримувати повітряний 
завод поголовним податком і скинути "
 "протигази."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copying all or parts of a program is as natural to a programmer as "
 "breathing, and as productive.  It ought to be as free."
@@ -486,11 +513,11 @@
 "Копіювання всіх частин програми так само 
природно для програміста, як "
 "дихання, і так само продуктивно. Воно 
повинно бути теж вільним."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Some Easily Rebutted Objections to GNU's Goals"
 msgstr "Деякі легко спростовувані 
заперечення проти цілей GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Nobody will use it if it is free, because that means they "
 "can't rely on any support.&rdquo;</strong>"
@@ -499,7 +526,7 @@
 "систему, тому що вони не зможуть \n"
 "розраховувати на якусь підтримку&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You have to charge for the program to pay for providing the "
 "support.&rdquo;</strong>"
@@ -507,11 +534,16 @@
 "<strong>&ldquo;Доводиться брати плату за 
програму, щоб оплатити "
 "підтримку&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "If people would rather pay for GNU plus service than get GNU free without "
+#| "service, a company to provide just service to people who have obtained "
+#| "GNU free ought to be profitable.<a href=\"#f3\">(4)</a>"
 msgid ""
 "If people would rather pay for GNU plus service than get GNU free without "
 "service, a company to provide just service to people who have obtained GNU "
-"free ought to be profitable.<a href=\"#f3\">(4)</a>"
+"free ought to be profitable&#8239;<a class=\"ftn\" href=\"#f3\">[4]</a>."
 msgstr ""
 "Якщо люди готові швидше платити за GNU \n"
 "разом з обслуговуванням, ніж взяти GNU \n"
@@ -520,7 +552,7 @@
 "що отримали GNU вільно, має бути \n"
 "прибутковим.<a href=\"#f3\">(4)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We must distinguish between support in the form of real programming work and "
 "mere handholding.  The former is something one cannot rely on from a "
@@ -532,7 +564,7 @@
 "програм. Якщо ваша проблема не стосується 
досить великого числа людей, "
 "виробник попросить вас відчепитися."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If your business needs to be able to rely on support, the only way is to "
 "have all the necessary sources and tools.  Then you can hire any available "
@@ -551,7 +583,7 @@
 "знайдеться незайнятої компетентної 
особи, але порядок поширення тут ні при "
 "чому. GNU не вирішує всіх світових проблем, 
тільки деякі з них."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Meanwhile, the users who know nothing about computers need handholding: "
 "doing things for them which they could easily do themselves but don't know "
@@ -561,7 +593,7 @@
 "допомоги: виконання за них того, що вони 
самі легко зробили б, але не знають "
 "як."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Such services could be provided by companies that sell just handholding and "
 "repair service.  If it is true that users would rather spend money and get a "
@@ -579,7 +611,7 @@
 "небудь однієї. У той же час ті з нас, кому 
не потрібні ці послуги, зможуть "
 "користуватися програмою без оплати 
послуг."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You cannot reach many people without advertising, and you "
 "must charge for the program to support that.&rdquo;</strong>"
@@ -587,7 +619,7 @@
 "<strong>&ldquo;Ви не станете популярні без 
реклами, а для цього доведеться "
 "стягувати плату за програму&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;It's no use advertising a program people can get free.&rdquo;"
 "</strong>"
@@ -595,7 +627,7 @@
 "<strong>&ldquo;Немає сенсу рекламувати програму, 
яку можна отримати "
 "вільно&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are various forms of free or very cheap publicity that can be used to "
 "inform numbers of computer users about something like GNU.  But it may be "
@@ -612,19 +644,25 @@
 "щоб оплатити рекламу та інше. Таким чином, 
за рекламу платять тільки ті, "
 "кому вона корисна."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "On the other hand, if many people get GNU from their friends, and such "
+#| "companies don't succeed, this will show that advertising was not really "
+#| "necessary to spread GNU.  Why is it that free market advocates don't want "
+#| "to let the free market decide this?<a href=\"#f4\">(5)</a>"
 msgid ""
 "On the other hand, if many people get GNU from their friends, and such "
 "companies don't succeed, this will show that advertising was not really "
 "necessary to spread GNU.  Why is it that free market advocates don't want to "
-"let the free market decide this?<a href=\"#f4\">(5)</a>"
+"let the free market decide this?&#8239;<a class=\"ftn\" href=\"#f4\">[5]</a>"
 msgstr ""
 "З іншого боку, якщо багато отримають GNU від 
своїх знайомих, і такі компанії "
 "не будуть мати успіху, це покаже, що 
насправді реклама не потрібна для "
 "поширення GNU. Чому прихильники вільного 
ринку не хочуть дозволити вирішити "
 "це вільному ринку?<a href=\"#f4\">(5)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;My company needs a proprietary operating system to get a "
 "competitive edge.&rdquo;</strong>"
@@ -632,7 +670,7 @@
 "<strong>&ldquo;Моїй компанії потрібна фірмова 
операційна система, щоб бути "
 "попереду конкурентів&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU will remove operating system software from the realm of competition.  "
 "You will not be able to get an edge in this area, but neither will your "
@@ -649,16 +687,21 @@
 "сподобається, тут вам не пощастило. Якщо 
ви займаєтеся чимось іншим, GNU не "
 "дасть втягнути вас у дорогу справу 
торгівлі операційними системами."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "I would like to see GNU development supported by gifts from many "
+#| "manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
 msgid ""
 "I would like to see GNU development supported by gifts from many "
-"manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
+"manufacturers and users, reducing the cost to each&#8239;<a class=\"ftn\" "
+"href=\"#f5\">[6]</a>."
 msgstr ""
 "Я хотів би побачити, як розробку GNU 
підтримують дари багатьох виробників "
 "і \n"
 "користувачів, знижуючи вартість для 
кожного.<a href=\"#f5\">(6)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't programmers deserve a reward for their creativity?"
 "&rdquo;</strong>"
@@ -666,7 +709,7 @@
 "<strong>&ldquo;Хіба програмісти не заслуговують 
нагороди за творчість?&rdquo;"
 "</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If anything deserves a reward, it is social contribution.  Creativity can be "
 "a social contribution, but only in so far as society is free to use the "
@@ -680,7 +723,7 @@
 "нагороди за створення передових програм, 
то з цієї ж причини вони "
 "заслуговують покарання, якщо вони 
обмежують користування цими програмами."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Shouldn't a programmer be able to ask for a reward for his "
 "creativity?&rdquo;</strong>"
@@ -688,7 +731,7 @@
 "<strong>&ldquo;Невже у програміста не повинна 
бути можливість просити "
 "винагороди за свою творчість?&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is nothing wrong with wanting pay for work, or seeking to maximize "
 "one's income, as long as one does not use means that are destructive.  But "
@@ -699,7 +742,7 @@
 "Але кошти, звичайні в галузі програмного 
забезпечення сьогодні, базуються на "
 "руйнуванні."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Extracting money from users of a program by restricting their use of it is "
 "destructive because the restrictions reduce the amount and the ways that the "
@@ -713,7 +756,7 @@
 "Коли на обмеження йдуть навмисно, 
шкідливі наслідки&nbsp;&mdash; це умисне "
 "руйнування."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The reason a good citizen does not use such destructive means to become "
 "wealthier is that, if everyone did so, we would all become poorer from the "
@@ -731,11 +774,11 @@
 "винагородженим за свою творчість не 
виправдовує позбавлення світу в цілому "
 "усієї або частини цієї творчості."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid "<strong>&ldquo;Won't programmers starve?&rdquo;</strong>"
 msgstr "<strong>&ldquo;Не будуть програмісти 
голодувати?&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "I could answer that nobody is forced to be a programmer.  Most of us cannot "
 "manage to get any money for standing on the street and making faces.  But we "
@@ -747,7 +790,7 @@
 "жалібно. Але це не означає, що ми засуджені 
проводити наше життя, просячи "
 "милостиню і голодуючи. Ми робимо щось 
інше."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But that is the wrong answer because it accepts the questioner's implicit "
 "assumption: that without ownership of software, programmers cannot possibly "
@@ -757,7 +800,7 @@
 "що без власності на програми програмісти, 
можливо, не отримають ні копійки. "
 "Передбачається, все або нічого."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The real reason programmers will not starve is that it will still be "
 "possible for them to get paid for programming; just not paid as much as now."
@@ -766,13 +809,22 @@
 "що вони все одно зможуть отримувати плату 
за програмування, тільки не так "
 "багато, як зараз."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Restricting copying is not the only basis for business in software.  It "
+#| "is the most common basis<a href=\"#f8\">(7)</a> because it brings in the "
+#| "most money.  If it were prohibited, or rejected by the customer, software "
+#| "business would move to other bases of organization which are now used "
+#| "less often.  There are always numerous ways to organize any kind of "
+#| "business."
 msgid ""
 "Restricting copying is not the only basis for business in software.  It is "
-"the most common basis<a href=\"#f8\">(7)</a> because it brings in the most "
-"money.  If it were prohibited, or rejected by the customer, software "
-"business would move to other bases of organization which are now used less "
-"often.  There are always numerous ways to organize any kind of business."
+"the most common basis&#8239;<a class=\"ftn\" href=\"#f8\">[7]</a> because it "
+"brings in the most money.  If it were prohibited, or rejected by the "
+"customer, software business would move to other bases of organization which "
+"are now used less often.  There are always numerous ways to organize any "
+"kind of business."
 msgstr ""
 "Обмеження копіювання&nbsp;&mdash; не єдине, на 
чому можуть базуватися "
 "підприємства з виробництва програм. На 
нього спираються частіше <a href="
@@ -781,7 +833,7 @@
 "інші принципи організації, які зараз 
залучаються рідше. Завжди є численні "
 "способи організації підприємств 
будь-якого роду."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Probably programming will not be as lucrative on the new basis as it is "
 "now.  But that is not an argument against the change.  It is not considered "
@@ -795,7 +847,7 @@
 "стільки ж, це теж не було б 
несправедливістю. (На практиці вони 
отримували б "
 "все-таки значно більше цього.)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't people have a right to control how their creativity is "
 "used?&rdquo;</strong>"
@@ -803,7 +855,7 @@
 "<strong>&ldquo;Хіба люди не мають права 
контролювати, як використовується "
 "їхня творчість?&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "&ldquo;Control over the use of one's ideas&rdquo; really constitutes control "
 "over other people's lives; and it is usually used to make their lives more "
@@ -813,13 +865,20 @@
 "контроль над життям людей; і зазвичай його 
використовують, щоб ускладнити їм "
 "життя."
 
-#. type: Content of: <p>
-msgid ""
-"People who have studied the issue of intellectual property rights<a href="
-"\"#f6\">(8)</a> carefully (such as lawyers) say that there is no intrinsic "
-"right to intellectual property.  The kinds of supposed intellectual property "
-"rights that the government recognizes were created by specific acts of "
-"legislation for specific purposes."
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "People who have studied the issue of intellectual property rights<a href="
+#| "\"#f6\">(8)</a> carefully (such as lawyers) say that there is no "
+#| "intrinsic right to intellectual property.  The kinds of supposed "
+#| "intellectual property rights that the government recognizes were created "
+#| "by specific acts of legislation for specific purposes."
+msgid ""
+"People who have studied the issue of intellectual property rights&#8239;<a "
+"class=\"ftn\" href=\"#f6\">[8]</a> carefully (such as lawyers) say that "
+"there is no intrinsic right to intellectual property.  The kinds of supposed "
+"intellectual property rights that the government recognizes were created by "
+"specific acts of legislation for specific purposes."
 msgstr ""
 "Ті, хто ретельно вивчив питання про права 
на інтелектуальну власність<a href="
 "\"#f6\">(8)</a> \n"
@@ -828,7 +887,7 @@
 "власність, які визнаються державою, 
створені особливими правовими актами для "
 "особливих цілей."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For example, the patent system was established to encourage inventors to "
 "disclose the details of their inventions.  Its purpose was to help society "
@@ -848,7 +907,7 @@
 "завдають багато шкоди. Вони не обтяжують 
більшість приватних осіб, які "
 "користуються патентованими продуктами."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The idea of copyright did not exist in ancient times, when authors "
 "frequently copied other authors at length in works of nonfiction.  This "
@@ -867,7 +926,7 @@
 "на друкарському верстаті, шкоди від неї 
було не багато, і вона не обтяжувала "
 "більшість осіб, які читали книги."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "All intellectual property rights are just licenses granted by society "
 "because it was thought, rightly or wrongly, that society as a whole would "
@@ -880,7 +939,7 @@
 "цілому виграє від цього. Але у кожному 
конкретному ми повинні запитати: чи "
 "справді ми виграємо, даючи такий дозвіл? 
Якого роду дії ми дозволяємо?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The case of programs today is very different from that of books a hundred "
 "years ago.  The fact that the easiest way to copy a program is from one "
@@ -900,12 +959,12 @@
 "матеріально, і морально; в якому 
особистість не \n"
 "повинна цього робити незалежно від того, 
чи дозволяє це закон."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Competition makes things get done better.&rdquo;</strong>"
 msgstr "<strong>&ldquo;Конкуренція веде до 
розвитку&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The paradigm of competition is a race: by rewarding the winner, we encourage "
 "everyone to run faster.  When capitalism really works this way, it does a "
@@ -923,7 +982,7 @@
 "наприклад, напад на інших бігунів. Якщо 
біг перейде в кулачний бій, вони всі "
 "прийдуть пізно."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Proprietary and secret software is the moral equivalent of runners in a fist "
 "fight.  Sad to say, the only referee we've got does not seem to object to "
@@ -937,7 +996,7 @@
 "він повинен розборонити їх і покарати 
бігунів за одну лише спробу затіяти "
 "бійку."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Won't everyone stop programming without a monetary incentive?"
 "&rdquo;</strong>"
@@ -945,7 +1004,7 @@
 "<strong>&ldquo;Хіба без грошового стимулу всі не 
припинять програмувати?"
 "&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually, many people will program with absolutely no monetary incentive.  "
 "Programming has an irresistible fascination for some people, usually the "
@@ -958,7 +1017,7 @@
 "продовжують займатися цим, навіть коли у 
них немає надії заробити цим на "
 "життя."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But really this question, though commonly asked, is not appropriate to the "
 "situation.  Pay for programmers will not disappear, only become less.  So "
@@ -971,7 +1030,7 @@
 "програмувати при зниженні грошового 
стимулу?&rdquo; Мій досвід каже, що "
 "будуть."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For more than ten years, many of the world's best programmers worked at the "
 "Artificial Intelligence Lab for far less money than they could have had "
@@ -984,7 +1043,7 @@
 "негрошових винагород: слава і визнання, 
наприклад. Крім того, творчість&nbsp;"
 "&mdash; це задоволення і нагорода сама по 
собі."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Then most of them left when offered a chance to do the same interesting work "
 "for a lot of money."
@@ -992,7 +1051,7 @@
 "Потім більшість з них пішли, коли 
трапилася нагоду робити ту ж цікаву роботу "
 "і отримувати багато грошей."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "What the facts show is that people will program for reasons other than "
 "riches; but if given a chance to make a lot of money as well, they will come "
@@ -1005,7 +1064,7 @@
 "Низькооплачувані організації програють 
високооплачуваним, але вони могли б "
 "бути на тому ж рівні, якби 
високооплачувані були заборонені. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;We need the programmers desperately.  If they demand that we "
 "stop helping our neighbors, we have to obey.&rdquo;</strong>"
@@ -1013,7 +1072,7 @@
 "<strong>&ldquo;Ми вкрай потребуємо програмістів; 
якщо вони вимагають, щоб ми "
 "припинили допомагати ближньому своєму, ми 
повинні коритися&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "You're never so desperate that you have to obey this sort of demand.  "
 "Remember: millions for defense, but not a cent for tribute!"
@@ -1022,12 +1081,12 @@
 "роду вимогам. Пам'ятайте: &ldquo;Краще 
мільйони витратити на оборону, ніж "
 "виплатити хоч один цент контрибуції!"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Programmers need to make a living somehow.&rdquo;</strong>"
 msgstr "<strong>&ldquo;Повинні ж програмісти чимось 
жити!&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In the short run, this is true.  However, there are plenty of ways that "
 "programmers could make a living without selling the right to use a program.  "
@@ -1041,7 +1100,7 @@
 "більше всього грошей, а не тому, що 
це&nbsp;&nbsp; єдиний спосіб заробити на "
 "життя. Якщо ви захочете, то легко знайдете 
інші шляхи. Ось кілька прикладів."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A manufacturer introducing a new computer will pay for the porting of "
 "operating systems onto the new hardware."
@@ -1049,7 +1108,7 @@
 "Виробник, що випускає новий комп'ютер, 
заплатить за перенесення операційної "
 "системи на нову апаратуру."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The sale of teaching, handholding and maintenance services could also employ "
 "programmers."
@@ -1057,17 +1116,24 @@
 "Підприємство, яке надає послуги з 
навчання, допомоги і підтримки, могло б "
 "також найняти програмістів."
 
-#. type: Content of: <p>
-msgid ""
-"People with new ideas could distribute programs as freeware<a href=\"#f7\">"
-"(9)</a>, asking for donations from satisfied users, or selling handholding "
-"services.  I have met people who are already working this way successfully."
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "People with new ideas could distribute programs as freeware<a href="
+#| "\"#f7\">(9)</a>, asking for donations from satisfied users, or selling "
+#| "handholding services.  I have met people who are already working this way "
+#| "successfully."
+msgid ""
+"People with new ideas could distribute programs as freeware&#8239;<a class="
+"\"ftn\" href=\"#f7\">[9]</a>, asking for donations from satisfied users, or "
+"selling handholding services.  I have met people who are already working "
+"this way successfully."
 msgstr ""
 "Люди з новими ідеями могли б поставляти 
безкоштовні програми<a href=\"#f7\">"
 "(9)</a>, приймаючи дари від задоволених 
користувачів або продаючи послуги із "
 "допомоги. Я зустрічав людей, які вже 
успішно працюють так."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Users with related needs can form users' groups, and pay dues.  A group "
 "would contract with programming companies to write programs that the group's "
@@ -1077,11 +1143,11 @@
 "платити внески. Спілкаукладала би з 
програмістськими компаніями договірна "
 "випуск програм, які члени спілки хотіли б 
отримати."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "All sorts of development can be funded with a Software Tax:"
 msgstr "Всі види розробок можна фінансувати 
програмними податками:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Suppose everyone who buys a computer has to pay x percent of the price as a "
 "software tax.  The government gives this to an agency like the NSF to spend "
@@ -1091,7 +1157,7 @@
 "як програмний податок. Уряд передає його 
агентству на кшталт Національного "
 "наукового фонду для вкладу в розвиток 
програм."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But if the computer buyer makes a donation to software development himself, "
 "he can take a credit against the tax.  He can donate to the project of his "
@@ -1105,7 +1171,7 @@
 "сподівається використовувати по 
завершенні. Він може зарахувати будь-яку "
 "суму пожертвувань, аж до виплати податку 
повністю."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The total tax rate could be decided by a vote of the payers of the tax, "
 "weighted according to the amount they will be taxed on."
@@ -1113,19 +1179,19 @@
 "Розмір податку міг би визначатися 
голосуванням платників податків, 
виваженим "
 "відповідно до оподатковуваної суми."
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "The consequences:"
 msgstr "Наслідки:"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "The computer-using community supports software development."
 msgstr "Товариство користувачів комп'ютерів 
підтримує розробку програм."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "This community decides what level of support is needed."
 msgstr "Це суспільство визначає необхідний 
рівень підтримки."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "Users who care which projects their share is spent on can choose this for "
 "themselves."
@@ -1133,7 +1199,7 @@
 "Користувачі, яким небайдуже, на які 
проекти витратять їх частку, можуть "
 "вибрати самі."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the long run, making programs free is a step toward the postscarcity "
 "world, where nobody will have to work very hard just to make a living.  "
@@ -1151,7 +1217,7 @@
 "роботів і протиастероїдна безпека. Там не 
потрібна буде можливість заробляти "
 "на життя програмуванням."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We have already greatly reduced the amount of work that the whole society "
 "must do for its actual productivity, but only a little of this has "
@@ -1170,11 +1236,11 @@
 "галузі виробництва програм. Ми повинні це 
зробити, щоб помножена технікою "
 "продуктивність зверталася в скорочення 
нашої роботи."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "Виноски"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The wording here was careless.  The intention was that nobody would have to "
 "pay for <b>permission</b> to use the GNU system.  But the words don't make "
@@ -1203,7 +1269,7 @@
 "програму&nbsp;&nbsp; тим краще. Важливо те, що у 
кожного, у кого є копія, є "
 "свобода співпрацювати з іншими в її 
застосуванні."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The expression &ldquo;give away&rdquo; is another indication that I had not "
 "yet clearly separated the issue of price from that of freedom.  We now "
@@ -1217,10 +1283,16 @@
 "&ldquo;<a 
href=\"/philosophy/words-to-avoid.html#GiveAwaySoftware\">Слова і "
 "фрази, що вводять в оману</a>&rdquo;."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "This is another place I failed to distinguish carefully between the two "
+#| "different meanings of &ldquo;free&rdquo;.  The statement as it stands is "
+#| "not false&mdash;you can get copies of GNU software at no charge, from "
+#| "your friends or over the net.  But it does suggest the wrong idea."
 msgid ""
 "This is another place I failed to distinguish carefully between the two "
-"different meanings of &ldquo;free&rdquo;.  The statement as it stands is not "
+"different meanings of &ldquo;free.&rdquo; The statement as it stands is not "
 "false&mdash;you can get copies of GNU software at no charge, from your "
 "friends or over the net.  But it does suggest the wrong idea."
 msgstr ""
@@ -1229,11 +1301,11 @@
 "отримати копії програм GNU 
безкоштовно&nbsp;&mdash; від знайомих або по "
 "мережі. Але воно передбачає помилкову 
думку."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid "Several such companies now exist."
 msgstr "Кілька таких компаній вже існує."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Although it is a charity rather than a company, the Free Software Foundation "
 "for 10 years raised most of its funds from its distribution service.  You "
@@ -1245,7 +1317,7 @@
 "організація. Ви можете <a 
href=\"/order/order.html\">зробити замовлення в "
 "фонді</a> для підтримки нашої роботи."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "A group of computer companies pooled funds around 1991 to support "
 "maintenance of the GNU C Compiler."
@@ -1253,7 +1325,7 @@
 "Група комп'ютерних компаній приблизно в 
1991 році зібрала фонди на підтримку "
 "компілятора GNU C."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "I think I was mistaken in saying that proprietary software was the most "
 "common basis for making money in software.  It seems that actually the most "
@@ -1274,10 +1346,21 @@
 "більшість професійних програмістів буде 
менше заробляти в світі вільних "
 "програм."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "In the 1980s I had not yet realized how confusing it was to speak of "
+#| "&ldquo;the issue&rdquo; of &ldquo;intellectual property&rdquo;.  That "
+#| "term is obviously biased; more subtle is the fact that it lumps together "
+#| "various disparate laws which raise very different issues.  Nowadays I "
+#| "urge people to reject the term &ldquo;intellectual property&rdquo; "
+#| "entirely, lest it lead others to suppose that those laws form one "
+#| "coherent issue.  The way to be clear is to discuss patents, copyrights, "
+#| "and trademarks separately.  See <a href=\"/philosophy/not-ipr.html"
+#| "\">further explanation</a> of how this term spreads confusion and bias."
 msgid ""
 "In the 1980s I had not yet realized how confusing it was to speak of &ldquo;"
-"the issue&rdquo; of &ldquo;intellectual property&rdquo;.  That term is "
+"the issue&rdquo; of &ldquo;intellectual property.&rdquo; That term is "
 "obviously biased; more subtle is the fact that it lumps together various "
 "disparate laws which raise very different issues.  Nowadays I urge people to "
 "reject the term &ldquo;intellectual property&rdquo; entirely, lest it lead "
@@ -1297,10 +1380,19 @@
 "\"/philosophy/not-ipr.html\">подальше пояснення</a> 
того, чому цей термін "
 "вносить плутанину і необ'єктивність."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "Subsequently we learned to distinguish between &ldquo;free "
+#| "software&rdquo; and &ldquo;freeware&rdquo;.  The term &ldquo;"
+#| "freeware&rdquo; means software you are free to redistribute, but usually "
+#| "you are not free to study and change the source code, so most of it is "
+#| "not free software.  See &ldquo;<a href=\"/philosophy/words-to-avoid."
+#| "html#Freeware\">Confusing Words and Phrases</a>&rdquo; for more "
+#| "explanation."
 msgid ""
 "Subsequently we learned to distinguish between &ldquo;free software&rdquo; "
-"and &ldquo;freeware&rdquo;.  The term &ldquo;freeware&rdquo; means software "
+"and &ldquo;freeware.&rdquo; The term &ldquo;freeware&rdquo; means software "
 "you are free to redistribute, but usually you are not free to study and "
 "change the source code, so most of it is not free software.  See &ldquo;<a "
 "href=\"/philosophy/words-to-avoid.html#Freeware\">Confusing Words and "
@@ -1339,14 +1431,19 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Ми намагалися зробити цей переклад точним 
та якісним, але виключити "
@@ -1357,9 +1454,13 @@
 "translations.html\">&ldquo;Посібнику з 
перекладу&rdquo;</a>."
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, "
+#| "2015 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 1985, 1993, 2004, 2005, 2007, 2009, 2010, 2015, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015 "
 "Free Software Foundation, Inc. (Фонд вільного 
програмного забезпечення, Inc.)"
@@ -1398,11 +1499,23 @@
 msgid "Updated:"
 msgstr "Оновлено:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015, "
-"2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015, "
-"2021 Free Software Foundation, Inc. (Фонд вільного 
програмного забезпечення, "
-"Inc.)"
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "Ми намагалися зробити цей переклад 
точним та якісним, але виключити "
+#~ "можливість помилки ми не можемо. 
Надсилайте, будь ласка, свої зауваження "
+#~ "і пропозиції щодо перекладу за адресою <a 
href=\"mailto:web-";
+#~ "translators@gnu.org\">&lt;web-translators@gnu.org&gt;</a>. </"
+#~ "p><p>Відомості з координації та 
пропозицій перекладів наших статей див. у "
+#~ "<a 
href=\"/server/standards/README.translations.html\">&ldquo;Посібнику 
з "
+#~ "перекладу&rdquo;</a>."
+
+#~ msgid ""
+#~ "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, "
+#~ "2015, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, "
+#~ "2015, 2021 Free Software Foundation, Inc. (Фонд вільного 
програмного "
+#~ "забезпечення, Inc.)"

Index: po/manifesto.zh-cn.po
===================================================================
RCS file: /web/www/www/gnu/po/manifesto.zh-cn.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- po/manifesto.zh-cn.po       2 Nov 2021 13:56:41 -0000       1.7
+++ po/manifesto.zh-cn.po       2 Nov 2021 14:41:54 -0000       1.8
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manifesto.html\n"
-"POT-Creation-Date: 2015-06-02 12:55+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2019-02-16 20:08+0800\n"
 "Last-Translator: Wensheng Xie <wxie@member.fsf.org>\n"
 "Language-Team: Chinese <www-zh-cn-translators@gnu.org>\n"
@@ -14,18 +14,27 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-11-02 14:27+0000\n"
 
 #. type: Content of: <title>
 msgid "The GNU Manifesto - GNU Project - Free Software Foundation"
 msgstr "GNU宣言 - GNU工程 - 自由软件基金会"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "The GNU Manifesto"
 msgstr "GNU宣言"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "The GNU Manifesto (which appears below) was written by <a href=\"http://";
+#| "www.stallman.org/\">Richard Stallman</a> in 1985 to ask for support in "
+#| "developing the GNU operating system.  Part of the text was taken from the "
+#| "original announcement of 1983.  Through 1987, it was updated in minor "
+#| "ways to account for developments; since then, it seems best to leave it "
+#| "unchanged."
 msgid ""
-"The GNU Manifesto (which appears below) was written by <a href=\"http://www.";
+"The GNU Manifesto (which appears below) was written by <a href=\"https://www.";
 "stallman.org/\">Richard Stallman</a> in 1985 to ask for support in "
 "developing the GNU operating system.  Part of the text was taken from the "
 "original announcement of 1983.  Through 1987, it was updated in minor ways "
@@ -36,7 +45,7 @@
 "初始声明。直到1987年,因为开发的原因
它时时小有更改;那时起,看起来最好是保持"
 "它不再改变。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Since that time, we have learned about certain common misunderstandings that "
 "different wording could help avoid.  Footnotes added since 1993 help clarify "
@@ -45,7 +54,7 @@
 "时过境迁,我们认识到使用不同的措辞可以避å…
ä¸€äº›å¸¸è§çš„误解。从1993年起,我们添"
 "加了脚注来澄清这些问题。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If you want to install the GNU/Linux system, we recommend you use one of the "
 "<a href=\"/distros\">100% free software GNU/Linux distributions</a>.  For "
@@ -56,7 +65,7 @@
 "Linux发行版</a>之一。如果你想做出贡献,请参看<a 
href=\"/help/help.html"
 "\">http://www.gnu.org/help</a>。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The GNU Project is part of the Free Software Movement, a campaign for <a "
 "href=\"/philosophy/free-sw.html\">freedom for users of software</a>.  It is "
@@ -71,23 +80,30 @@
 "该词汇来推动同一领域的<a 
href=\"/philosophy/open-source-misses-the-point.html"
 "\">非道德方案</a>。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "What's GNU? Gnu's Not Unix!"
 msgstr "GNU为何?GNU并非UNIX!"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
+#| "compatible software system which I am writing so that I can give it away "
+#| "free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
+#| "volunteers are helping me.  Contributions of time, money, programs and "
+#| "equipment are greatly needed."
 msgid ""
 "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
 "compatible software system which I am writing so that I can give it away "
-"free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
-"volunteers are helping me.  Contributions of time, money, programs and "
-"equipment are greatly needed."
+"free to everyone who can use it&#8239;<a class=\"ftn\" href=\"#f1\">[1]</a>. "
+"Several other volunteers are helping me.  Contributions of time, money, "
+"programs and equipment are greatly needed."
 msgstr ""
 "GNU,代表的是Gnu's Not 
Unix(GNU并非UNIX),是我正在编写的一个完全兼容Unix的"
 "软件系统,这æ 
·æˆ‘就可以把它自由地交给想要使用它的人。<a 
href=\"#f1\">(1)</a>还"
 "有几个志愿者
在帮助我。我们非常需要大家在时间、金钱、程序和设备方面的贡献。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So far we have an Emacs text editor with Lisp for writing editor commands, a "
 "source level debugger, a yacc-compatible parser generator, a linker, and "
@@ -112,7 +128,7 @@
 
"应用以及在线文档。最终,我们希望提供Unix系统常规带有的一切有用之物,以及更"
 "多。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU will be able to run Unix programs, but will not be identical to Unix.  "
 "We will make all improvements that are convenient, based on our experience "
@@ -130,7 +146,7 @@
 "Lisp的窗口系统,此时Lisp程序和普通Unix程序可以å…
±äº«ä¸€ä¸ªå±å¹•ã€‚C和Lisp都将作为系"
 "统编程语言。我们会支持UUCP、MIT 
Chaosnet和Internet等通信协议。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is aimed initially at machines in the 68000/16000 class with virtual "
 "memory, because they are the easiest machines to make it run on.  The extra "
@@ -140,18 +156,18 @@
 "GNU最初的目标是68000/16000之类的带虚拟内存的机器,因
为它们是最容易跑起来的机"
 
"器。让GNU在更小的机器上运行的额外努力就留给那些需要使用这些机器的人吧。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid horrible confusion, please pronounce the <em>g</em> in the word "
 "&ldquo;GNU&rdquo; when it is the name of this project."
 msgstr ""
 "为了避å…
å¯æ€•çš„混淆,请在指示本工程时,发出&ldquo;GNU&rdquo;中<em>g</em>的音。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why I Must Write GNU"
 msgstr "为什么我必须编写GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I consider that the Golden Rule requires that if I like a program I must "
 "share it with other people who like it.  Software sellers want to divide the "
@@ -169,23 +185,30 @@
 "几年来,我在人工智能实验室都在反抗这种趋势以及å…
¶ä»–冷漠,但是最终他们还是走得"
 "太远了:我无
法再呆在一个为我做违背我意愿之事的机构。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "So that I can continue to use computers without dishonor, I have decided "
+#| "to put together a sufficient body of free software so that I will be able "
+#| "to get along without any software that is not free.  I have resigned from "
+#| "the AI Lab to deny MIT any legal excuse to prevent me from giving GNU "
+#| "away.<a href=\"#f2a\">(2)</a>"
 msgid ""
 "So that I can continue to use computers without dishonor, I have decided to "
 "put together a sufficient body of free software so that I will be able to "
 "get along without any software that is not free.  I have resigned from the "
-"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away.<a "
-"href=\"#f2a\">(2)</a>"
+"AI Lab to deny MIT any legal excuse to prevent me from giving GNU away&#8239;"
+"<a class=\"ftn\" href=\"#f2a\">[2]</a>."
 msgstr ""
 "为了能够继续不失颜面地使用计算机,我决定把一些必
要的自由软件集合在一起,这样"
 
"我就能够继续下去而不需要任何非自由软件。我从人工智能实验室辞了职,这æ
 ·å°±å¯ä»¥"
 "在我发布GNU时避免和MIT产生法律纠葛。<a href=\"#f2a\">(2)</a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why GNU Will Be Compatible with Unix"
 msgstr "为什么GNU将会兼容Unix"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Unix is not my ideal system, but it is not too bad.  The essential features "
 "of Unix seem to be good ones, and I think I can fill in what Unix lacks "
@@ -196,11 +219,11 @@
 "为我可以在不破坏这些好功能的情
况下填补Unix缺少的东西。而且和Unix兼容可以让许"
 "多人能够方便地接纳它。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How GNU Will Be Available"
 msgstr "如何获取GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "GNU is not in the public domain.  Everyone will be permitted to modify and "
 "redistribute GNU, but no distributor will be allowed to restrict its further "
@@ -212,17 +235,17 @@
 "续发布。就是说,它不允许<a href=\"/philosophy/categories."
 
"html#ProprietarySoftware\">专有性</a>的修改。我想让GNU的所有版本都保持自由。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why Many Other Programmers Want to Help"
 msgstr "为什么许多程序员想要提供帮助"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found many other programmers who are excited about GNU and want to "
 "help."
 msgstr "我发现许多程序员看到GNU很兴奋并想要提供帮助。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Many programmers are unhappy about the commercialization of system "
 "software.  It may enable them to make more money, but it requires them to "
@@ -241,7 +264,7 @@
 
"在友谊和守法之间抉择。自然地,许多人认为友谊更重要。但是许多守法的人通常会感"
 
"到选哪个都不自在。他们变得愤世嫉俗并且认为编程只是一个挣钱的手段。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By working on and using GNU rather than proprietary programs, we can be "
 "hospitable to everyone and obey the law.  In addition, GNU serves as an "
@@ -255,11 +278,11 @@
 
"自由软件不可能有的。就和我讨论过的程序员来说,大约一半人认为这是一个重要的幸"
 "福感,而它是金钱无法替代的。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "How You Can Contribute"
 msgstr "你该如何做出贡献"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "(Nowadays, for software tasks to work on, see the <a href=\"http://fsf.org/";
 "campaigns/priority-projects\">High Priority Projects list</a> and the <a "
@@ -273,13 +296,13 @@
 "type_id=1\">GNU帮助需求列表</a>,这是GNU软件包
的一般任务列表。其他帮助,请看"
 "<a href=\"/help/help.html\">帮助GNU操作系统的指南</a>。)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I am asking computer manufacturers for donations of machines and money.  I'm "
 "asking individuals for donations of programs and work."
 msgstr "我请求计算机制造
商捐助机器和金钱。我请求个人捐助程序和作品。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One consequence you can expect if you donate machines is that GNU will run "
 "on them at an early date.  The machines should be complete, ready to use "
@@ -289,7 +312,7 @@
 "如果你捐助机器,你可以期待
的结果就是GNU将会早一天在该机器上运行。捐助的机器应"
 "该是完备的、可用的系统,它应该适用于居家的环境,并无
需复杂的冷却或供电系统。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I have found very many programmers eager to contribute part-time work for "
 "GNU.  For most projects, such part-time distributed work would be very hard "
@@ -313,7 +336,7 @@
 "sup>,联合这些部件也是可以完成的任务。(内æ 
¸å°†éœ€è¦æ›´å¯†åˆ‡çš„沟通,它将会由一个"
 "小的、紧凑的小组来进行。)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If I get donations of money, I may be able to hire a few people full or part "
 "time.  The salary won't be high by programmers' standards, but I'm looking "
@@ -326,19 +349,23 @@
 "准来看的话不高,但是我要找的人要和看重金钱一æ 
·çœ‹ä¸­ç¤¾åŒºç²¾ç¥žçš„建设。我把这当作"
 "一种方法,它让一些人能够全身心地为GNU工作而不用寻求å…
¶ä»–谋生的手段。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Why All Computer Users Will Benefit"
 msgstr "为什么所有计算机用户都会受益"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Once GNU is written, everyone will be able to obtain good system software "
+#| "free, just like air.<a href=\"#f2\">(3)</a>"
 msgid ""
 "Once GNU is written, everyone will be able to obtain good system software "
-"free, just like air.<a href=\"#f2\">(3)</a>"
+"free, just like air&#8239;<a class=\"ftn\" href=\"#f2\">[3]</a>."
 msgstr ""
 
"一旦GNU完成,任何人都能够自由地得到一个好用的系统,正如得到空气一æ
 ·ã€‚<a href="
 "\"#f2\">(3)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This means much more than just saving everyone the price of a Unix license.  "
 "It means that much wasteful duplication of system programming effort will be "
@@ -347,7 +374,7 @@
 "其意义远远超
出了只是为每个人省去一份Unix许可证费用。这意味着避å…
äº†å¤§é‡é‡å¤çš„"
 "系统编程工作造
成的浪费。这些努力就可以用于推进技术的进步。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Complete system sources will be available to everyone.  As a result, a user "
 "who needs changes in the system will always be free to make them himself, or "
@@ -359,7 +386,7 @@
 "地自己修改或雇用其他程序员或å…
¬å¸æ¥æ”¹ã€‚用户就用不再祈求拥有源代码的那一家公司"
 "或那一个程序员来帮他修改,没有人再处于独断的地位。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Schools will be able to provide a much more educational environment by "
 "encouraging all students to study and improve the system code.  Harvard's "
@@ -372,13 +399,13 @@
 "机实验室曾有一个政策:如果程序的源代码不能å…
¬å¼€æ˜¾ç¤ºåœ¨å±å¹•ä¸Šï¼Œé‚£ä¹ˆå°±ä¸èƒ½å®‰è£…该"
 "程序,这就是坚持拒绝安装某些程序。我受此启发良多。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Finally, the overhead of considering who owns the system software and what "
 "one is or is not entitled to do with it will be lifted."
 msgstr "最后,考虑谁是系统软件的所有者
以及谁应该做或不做什么的开销也被化解了。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Arrangements to make people pay for using a program, including licensing of "
 "copies, always incur a tremendous cost to society through the cumbersome "
@@ -398,7 +425,7 @@
 "忍受的事。加之随处可见的、监控人们是否脱掉面å…
·çš„摄像头也令人无法容忍。所以,"
 "支持空气工厂的最好办法还是只收人头税并摆脱掉面具。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copying all or parts of a program is as natural to a programmer as "
 "breathing, and as productive.  It ought to be as free."
@@ -406,11 +433,11 @@
 "复制全部或部分程序对程序员来说和呼吸一样自然,一æ 
·æœ‰ç”Ÿäº§åŠ›ã€‚它也应该一样自"
 "由。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Some Easily Rebutted Objections to GNU's Goals"
 msgstr "一些容易驳斥的、反对GNU目标的观点"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Nobody will use it if it is free, because that means they "
 "can't rely on any support.&rdquo;</strong>"
@@ -418,22 +445,27 @@
 "<strong>&ldquo;如果免费,就没有人会用了,因为用户没有可靠
的技术支持。&rdquo;"
 "</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You have to charge for the program to pay for providing the "
 "support.&rdquo;</strong>"
 msgstr "<strong>&ldquo;你必
须对程序收钱才能提供技术支持。&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "If people would rather pay for GNU plus service than get GNU free without "
+#| "service, a company to provide just service to people who have obtained "
+#| "GNU free ought to be profitable.<a href=\"#f3\">(4)</a>"
 msgid ""
 "If people would rather pay for GNU plus service than get GNU free without "
 "service, a company to provide just service to people who have obtained GNU "
-"free ought to be profitable.<a href=\"#f3\">(4)</a>"
+"free ought to be profitable&#8239;<a class=\"ftn\" href=\"#f3\">[4]</a>."
 msgstr ""
 "如果人们宁愿å…
è´¹èŽ·å¾—没有服务的GNU,而不是付费给GNU获得服务,那么为å…
è´¹GNU提供"
 "技术服务的公司应该是有利可图的。<a href=\"#f3\">(4)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We must distinguish between support in the form of real programming work and "
 "mere handholding.  The former is something one cannot rely on from a "
@@ -444,7 +476,7 @@
 "能依赖一个软件供应商来解决的。如果你
的问题没有被足够多的人共同体会,那么供应"
 "商会告诉你:快走开。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If your business needs to be able to rely on support, the only way is to "
 "have all the necessary sources and tools.  Then you can hire any available "
@@ -461,7 +493,7 @@
 
"时候,但这个问题不是发行策划的问题。GNU并没有解决世界上所有的问题,只是å
…¶ä¸­ä¸€"
 "些问题。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Meanwhile, the users who know nothing about computers need handholding: "
 "doing things for them which they could easily do themselves but don't know "
@@ -470,7 +502,7 @@
 
"同时,对计算机知之甚少的用户需要手把手服务:为他们做些很容易但他们真的不知道"
 "怎么做的事。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Such services could be provided by companies that sell just handholding and "
 "repair service.  If it is true that users would rather spend money and get a "
@@ -485,7 +517,7 @@
 "格;用户不会绑定在某个服务商上。同时,像我们这æ 
·çš„不需要服务的人可以不用购买"
 "服务来使用程序。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;You cannot reach many people without advertising, and you "
 "must charge for the program to support that.&rdquo;</strong>"
@@ -493,13 +525,13 @@
 "<strong>&ldquo;不打广告,不可能有很多人知道,所以你必
须对程序收费才能够支付广"
 "告费。&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;It's no use advertising a program people can get free.&rdquo;"
 "</strong>"
 msgstr "<strong>&ldquo;对免费可得的程序打广告是做无
用功。&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are various forms of free or very cheap publicity that can be used to "
 "inform numbers of computer users about something like GNU.  But it may be "
@@ -512,24 +544,30 @@
 "告可能会通知到更多的计算机用户。如果真是这æ 
·ï¼Œé‚£ä¹ˆé€šè¿‡å¹¿å‘Šæ”¶è´¹å¯„送GNU拷贝的业"
 "务应该可以赚回广告费及更多。这æ 
·çš„话,只有从该广告获利的用户才付费。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "On the other hand, if many people get GNU from their friends, and such "
+#| "companies don't succeed, this will show that advertising was not really "
+#| "necessary to spread GNU.  Why is it that free market advocates don't want "
+#| "to let the free market decide this?<a href=\"#f4\">(5)</a>"
 msgid ""
 "On the other hand, if many people get GNU from their friends, and such "
 "companies don't succeed, this will show that advertising was not really "
 "necessary to spread GNU.  Why is it that free market advocates don't want to "
-"let the free market decide this?<a href=\"#f4\">(5)</a>"
+"let the free market decide this?&#8239;<a class=\"ftn\" href=\"#f4\">[5]</a>"
 msgstr ""
 
"另一方面,如果许多人从朋友处获得GNU,而此类业务并不成功,那么说明é
 å¹¿å‘Šä¼ æ’­"
 "GNU并无实际必要。为什么自由市场的倡导者
不能让自由市场决定这件事呢?<a href="
 "\"#f4\">(5)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;My company needs a proprietary operating system to get a "
 "competitive edge.&rdquo;</strong>"
 msgstr "<strong>&ldquo;我å…
¬å¸éœ€è¦ä¸“有操作系统来在竞争中取胜。&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU will remove operating system software from the realm of competition.  "
 "You will not be able to get an edge in this area, but neither will your "
@@ -544,22 +582,27 @@
 "不会喜欢GNU,但这对你来说是困难的事。如果你的业务是å…
¶ä»–,GNU能够把你从昂贵的"
 "操作系统售价中解救出来。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "I would like to see GNU development supported by gifts from many "
+#| "manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
 msgid ""
 "I would like to see GNU development supported by gifts from many "
-"manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
+"manufacturers and users, reducing the cost to each&#8239;<a class=\"ftn\" "
+"href=\"#f5\">[6]</a>."
 msgstr ""
 "我很想看到许多制造商和用户会捐助GNU的开发,这æ 
·ä¼šé™ä½Žä»–们的花费。<a href="
 "\"#f5\">(6)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't programmers deserve a reward for their creativity?"
 "&rdquo;</strong>"
 msgstr ""
 "<strong>&ldquo;难道程序员不该因为他们的创造
力得到回报吗?&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If anything deserves a reward, it is social contribution.  Creativity can be "
 "a social contribution, but only in so far as society is free to use the "
@@ -571,14 +614,14 @@
 "自由使用å…
¶ç»“果时才是。如果程序员应该由于创新程序而得到回报,同理,他们也应该"
 "由于限制程序的使用而得到惩罚。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Shouldn't a programmer be able to ask for a reward for his "
 "creativity?&rdquo;</strong>"
 msgstr ""
 "<strong>&ldquo;难道程序员不能为自己的创造
力要求回报吗?&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is nothing wrong with wanting pay for work, or seeking to maximize "
 "one's income, as long as one does not use means that are destructive.  But "
@@ -587,7 +630,7 @@
 "工作获得报酬或追求更高的薪é…
¬å¹¶æ²¡æœ‰ä»€ä¹ˆä¸å¯¹ï¼Œåªè¦æˆ‘们不使用破坏性的手段。但是"
 "今天,软件领域的常规手段就是建立在破坏之上的。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Extracting money from users of a program by restricting their use of it is "
 "destructive because the restrictions reduce the amount and the ways that the "
@@ -599,7 +642,7 @@
 "财是ç 
´åæ€§çš„。它限制了人类可以从该程序中获得财富的总量。当限制是æ•
…意为之,伤"
 "害的结果就是故意破坏。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The reason a good citizen does not use such destructive means to become "
 "wealthier is that, if everyone did so, we would all become poorer from the "
@@ -615,11 +658,11 @@
 "是不对的。特别地,希望个人的创造
力有回报并不能证明剥夺其他人的这种创造力就是"
 "对的。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid "<strong>&ldquo;Won't programmers starve?&rdquo;</strong>"
 msgstr "<strong>&ldquo;程序员不就饿死了吗?&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "I could answer that nobody is forced to be a programmer.  Most of us cannot "
 "manage to get any money for standing on the street and making faces.  But we "
@@ -629,7 +672,7 @@
 "我可能会回答没人被迫成为程序员。我们大多数人无法靠
沿街乞讨过活。但结果是,我"
 "们并没有被迫沿街乞讨并挨饿。我们会去做其他事情。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But that is the wrong answer because it accepts the questioner's implicit "
 "assumption: that without ownership of software, programmers cannot possibly "
@@ -638,7 +681,7 @@
 "然而,这个回答是错的,因为它承认了提问者
隐含的假设:没有软件的所有权,程序员"
 "就可能不会收到任何报酬。据此,报酬不是å…
¨éƒ¨ã€å°±æ˜¯æ²¡æœ‰ã€‚"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The real reason programmers will not starve is that it will still be "
 "possible for them to get paid for programming; just not paid as much as now."
@@ -646,19 +689,28 @@
 "程序员不被饿死的真正原因
是他们还有能从编程谋生的方法;只是不如现在赚得多罢"
 "了。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Restricting copying is not the only basis for business in software.  It "
+#| "is the most common basis<a href=\"#f8\">(7)</a> because it brings in the "
+#| "most money.  If it were prohibited, or rejected by the customer, software "
+#| "business would move to other bases of organization which are now used "
+#| "less often.  There are always numerous ways to organize any kind of "
+#| "business."
 msgid ""
 "Restricting copying is not the only basis for business in software.  It is "
-"the most common basis<a href=\"#f8\">(7)</a> because it brings in the most "
-"money.  If it were prohibited, or rejected by the customer, software "
-"business would move to other bases of organization which are now used less "
-"often.  There are always numerous ways to organize any kind of business."
+"the most common basis&#8239;<a class=\"ftn\" href=\"#f8\">[7]</a> because it "
+"brings in the most money.  If it were prohibited, or rejected by the "
+"customer, software business would move to other bases of organization which "
+"are now used less often.  There are always numerous ways to organize any "
+"kind of business."
 msgstr ""
 "限制拷贝不是软件行业唯一的基础。它是最常见的基础<a 
href=\"#f8\">(7)</a>因为它"
 
"收获了最多的金钱。如果它被禁止或被客户拒绝,软件行业会迁移到那些现在不常用的"
 "基础结构之上。总是有多种方式来组织经营活动的。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Probably programming will not be as lucrative on the new basis as it is "
 "now.  But that is not an argument against the change.  It is not considered "
@@ -670,14 +722,14 @@
 "论据。现在销售人员按劳取酬并无不妥。如果程序员这æ 
·ï¼Œé‚£ä¹ˆä¹Ÿæ˜¯æ­£å½“的。(实际"
 "上,他们也许还能赚更多。)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Don't people have a right to control how their creativity is "
 "used?&rdquo;</strong>"
 msgstr ""
 "<strong>&ldquo;难道人们没有权利控制自己的创造
力如何被使用?&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "&ldquo;Control over the use of one's ideas&rdquo; really constitutes control "
 "over other people's lives; and it is usually used to make their lives more "
@@ -686,18 +738,25 @@
 "&ldquo;控制自己想法的应用&rdquo;真的构成对å…
¶ä»–人生活的控制;而且通常是使他人"
 "的生活更困难。"
 
-#. type: Content of: <p>
-msgid ""
-"People who have studied the issue of intellectual property rights<a href="
-"\"#f6\">(8)</a> carefully (such as lawyers) say that there is no intrinsic "
-"right to intellectual property.  The kinds of supposed intellectual property "
-"rights that the government recognizes were created by specific acts of "
-"legislation for specific purposes."
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "People who have studied the issue of intellectual property rights<a href="
+#| "\"#f6\">(8)</a> carefully (such as lawyers) say that there is no "
+#| "intrinsic right to intellectual property.  The kinds of supposed "
+#| "intellectual property rights that the government recognizes were created "
+#| "by specific acts of legislation for specific purposes."
+msgid ""
+"People who have studied the issue of intellectual property rights&#8239;<a "
+"class=\"ftn\" href=\"#f6\">[8]</a> carefully (such as lawyers) say that "
+"there is no intrinsic right to intellectual property.  The kinds of supposed "
+"intellectual property rights that the government recognizes were created by "
+"specific acts of legislation for specific purposes."
 msgstr ""
 "认真研究过知识产权问题<a 
href=\"#f6\">(8)</a>的人(比如律师)会说知识产权并非"
 "天生的权利。政府确认的那些知识产权种类是有å…
·ä½“目的的特定法律活动的产物。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For example, the patent system was established to encourage inventors to "
 "disclose the details of their inventions.  Its purpose was to help society "
@@ -713,7 +772,7 @@
 
"之间的问题,对他们来说,专利协议的花费比生产建设要小,所以专利通常没有太大的"
 "害处。专利没有限制使用它们的大多数用户。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The idea of copyright did not exist in ancient times, when authors "
 "frequently copied other authors at length in works of nonfiction.  This "
@@ -729,7 +788,7 @@
 "励作者权益而特意创建。在å…
¶åˆ›å»ºçš„发明领域&mdash;书籍,只有用印刷机才能有效拷贝"
 "&mdash;版权没什么害处,也没有限制大多数读者。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "All intellectual property rights are just licenses granted by society "
 "because it was thought, rightly or wrongly, that society as a whole would "
@@ -741,7 +800,7 @@
 "样的许可证可以使整个社会受益。但是就任何具体情
况来说,我们都要问:发放该许可"
 
"证真的让我们受益了吗?获得授权的人能够从事什么活动呢?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The case of programs today is very different from that of books a hundred "
 "years ago.  The fact that the easiest way to copy a program is from one "
@@ -757,12 +816,12 @@
 "就构成了一种情形。在此情形下,加
强版权对整个社会在物质和精神上都是伤害;无论"
 "法律是否允许,我们此时都不应该再维护版权。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Competition makes things get done better.&rdquo;</strong>"
 msgstr "<strong>&ldquo;竞争使东西变得更好。&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The paradigm of competition is a race: by rewarding the winner, we encourage "
 "everyone to run faster.  When capitalism really works this way, it does a "
@@ -777,7 +836,7 @@
 "的原因而只想着胜利,不计方法,那么他们就可能使用å…
¶ä»–çš„ç­–ç•¥&mdash;比如攻击别的"
 "竞争者。如果竞争者在互相打架,大家就都跑不快。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Proprietary and secret software is the moral equivalent of runners in a fist "
 "fight.  Sad to say, the only referee we've got does not seem to object to "
@@ -789,13 +848,13 @@
 "判看来并不反对打架;他只是规范打架者
(&ldquo;每跑10米,你们可以打一下"
 
"&rdquo;)。他真的应该把他们分开,并严惩试图打架的竞争者
。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Won't everyone stop programming without a monetary incentive?"
 "&rdquo;</strong>"
 msgstr 
"<strong>&ldquo;没有金钱刺激,人们不就不再编程了吗?&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually, many people will program with absolutely no monetary incentive.  "
 "Programming has an irresistible fascination for some people, usually the "
@@ -806,7 +865,7 @@
 "力,这些人往往是最擅
长编程的那些人。从来也不缺少坚持音乐的职业音乐家,即使他"
 "们毫无希望靠音乐谋生。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But really this question, though commonly asked, is not appropriate to the "
 "situation.  Pay for programmers will not disappear, only become less.  So "
@@ -816,7 +875,7 @@
 "但是这个问题,虽然经常被问到,并不是指这种情
况。程序员会得到报酬,只是变少。"
 
"所以问题应该是,金钱减少时,还有人编程吗?我的经验是:有。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "For more than ten years, many of the world's best programmers worked at the "
 "Artificial Intelligence Lab for far less money than they could have had "
@@ -827,13 +886,13 @@
 
"他地方工作少得太多。他们获得了许多非金钱的回报:比如,名望和感谢。而创é€
 åŠ›æœ¬"
 "身也是快乐,也是回报。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Then most of them left when offered a chance to do the same interesting work "
 "for a lot of money."
 msgstr "然后,当有机会做同æ 
·æœ‰è¶£çš„工作并赚大钱时,大多数人离开了。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "What the facts show is that people will program for reasons other than "
 "riches; but if given a chance to make a lot of money as well, they will come "
@@ -845,7 +904,7 @@
 
"它。薪水低的企业在和薪水高的企业竞争时表现不佳,但是如果薪水高的企业被禁止,"
 "低薪水的企业不应该再表现差劲吧。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;We need the programmers desperately.  If they demand that we "
 "stop helping our neighbors, we have to obey.&rdquo;</strong>"
@@ -853,7 +912,7 @@
 
"<strong>&ldquo;我们迫切需要程序员。如果他们要求我们不要帮助友邻,我们不得不那"
 "样做。&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "You're never so desperate that you have to obey this sort of demand.  "
 "Remember: millions for defense, but not a cent for tribute!"
@@ -861,12 +920,12 @@
 "你永远也不会绝望到去遵守这æ 
·çš„命令。请记住:宁为玉碎,不为瓦全!<sup><a href="
 "\"#TransNote3\">3</a></sup>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "<strong>&ldquo;Programmers need to make a living somehow.&rdquo;</strong>"
 msgstr "<strong>&ldquo;程序员也需要谋生啊。&rdquo;</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In the short run, this is true.  However, there are plenty of ways that "
 "programmers could make a living without selling the right to use a program.  "
@@ -878,28 +937,35 @@
 "法。出卖权利现在成了惯例,是因
为它带给程序员和生意人最多的钱财,而不是因为它"
 "是谋生的唯一手段。如果想要,我们能够轻易找到å…
¶ä»–的方法。这里举几个例子。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A manufacturer introducing a new computer will pay for the porting of "
 "operating systems onto the new hardware."
 msgstr "制造
商新引进新计算机需要雇人来把操作系统移植到新硬件上。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The sale of teaching, handholding and maintenance services could also employ "
 "programmers."
 msgstr 
"教育培训、手把手服务和维护服务也可能雇佣程序员。"
 
-#. type: Content of: <p>
-msgid ""
-"People with new ideas could distribute programs as freeware<a href=\"#f7\">"
-"(9)</a>, asking for donations from satisfied users, or selling handholding "
-"services.  I have met people who are already working this way successfully."
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "People with new ideas could distribute programs as freeware<a href="
+#| "\"#f7\">(9)</a>, asking for donations from satisfied users, or selling "
+#| "handholding services.  I have met people who are already working this way "
+#| "successfully."
+msgid ""
+"People with new ideas could distribute programs as freeware&#8239;<a class="
+"\"ftn\" href=\"#f7\">[9]</a>, asking for donations from satisfied users, or "
+"selling handholding services.  I have met people who are already working "
+"this way successfully."
 msgstr ""
 "有新想法的人可以发布免费软件<a 
href=\"#f7\">(9)</a>,并向对此满意的用户寻求捐"
 "助,或者是销售手把手服务。我就碰到一些成功这æ 
·åšçš„人。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Users with related needs can form users' groups, and pay dues.  A group "
 "would contract with programming companies to write programs that the group's "
@@ -908,11 +974,11 @@
 "需求相å…
³çš„用户可以组建用户组,并支付会费。用户组就可以和程序å
…¬å¸ç­¾çº¦è®©å…¬å¸å®š"
 "制组内成员需要的程序。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "All sorts of development can be funded with a Software Tax:"
 msgstr "所有开发费用都可以由软件税来支付:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Suppose everyone who buys a computer has to pay x percent of the price as a "
 "software tax.  The government gives this to an agency like the NSF to spend "
@@ -921,7 +987,7 @@
 "假设每个购买计算机的用户都要按价æ 
¼æ”¯ä»˜ä¸€å®šæ¯”例的软件税。政府可以让诸如"
 "NSF<sup><a 
href=\"#TransNote4\">4</a></sup>之类的代理使用该税收支持软件开发。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "But if the computer buyer makes a donation to software development himself, "
 "he can take a credit against the tax.  He can donate to the project of his "
@@ -932,31 +998,31 @@
 "但是如果购买者
自己向软件开发做了捐助,那么他可以减税。他可以自己选择捐助项目"
 
"&mdash;通常,他会选择他希望能够用到的项目。减税额度最高是å
…ç¨Žã€‚"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The total tax rate could be decided by a vote of the payers of the tax, "
 "weighted according to the amount they will be taxed on."
 msgstr 
"税率可以由交税的人投票决定,票的权重可以按大家的应税额来算。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><dl><dd><p>
 msgid "The consequences:"
 msgstr "结果:"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "The computer-using community supports software development."
 msgstr "计算机使用社群支持软件开发。"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid "This community decides what level of support is needed."
 msgstr "该社群决定应该支持到什么程度。"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "Users who care which projects their share is spent on can choose this for "
 "themselves."
 msgstr "用户可以根据自己的需要来选择要支持的项目。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the long run, making programs free is a step toward the postscarcity "
 "world, where nobody will have to work very hard just to make a living.  "
@@ -971,7 +1037,7 @@
 "外,能够自由投入到象编程这æ 
·çš„有趣活动中。那时,就没有必要再以编程为谋生手段"
 "了。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We have already greatly reduced the amount of work that the whole society "
 "must do for its actual productivity, but only a little of this has "
@@ -987,11 +1053,11 @@
 
"的抗拒。自由软件会大大减少在软件生产领域的生产力流失。我们å¿
…须做这件事,为了"
 
"使技术进步带来的生产力提高能够转化为人们工作的减少。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "脚注"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The wording here was careless.  The intention was that nobody would have to "
 "pay for <b>permission</b> to use the GNU system.  But the words don't make "
@@ -1015,7 +1081,7 @@
 
"拷贝&mdash;如果这些资金帮助到软件的改善,善莫大焉。重要的一点是拥有拷贝的用户"
 "有自由和其他人一起使用自由软件。"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The expression &ldquo;give away&rdquo; is another indication that I had not "
 "yet clearly separated the issue of price from that of freedom.  We now "
@@ -1028,10 +1094,16 @@
 "\"/philosophy/words-to-avoid.html#GiveAwaySoftware\">不清
楚的词汇和短语</"
 "a>&rdquo;了解更多解释。"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "This is another place I failed to distinguish carefully between the two "
+#| "different meanings of &ldquo;free&rdquo;.  The statement as it stands is "
+#| "not false&mdash;you can get copies of GNU software at no charge, from "
+#| "your friends or over the net.  But it does suggest the wrong idea."
 msgid ""
 "This is another place I failed to distinguish carefully between the two "
-"different meanings of &ldquo;free&rdquo;.  The statement as it stands is not "
+"different meanings of &ldquo;free.&rdquo; The statement as it stands is not "
 "false&mdash;you can get copies of GNU software at no charge, from your "
 "friends or over the net.  But it does suggest the wrong idea."
 msgstr ""
@@ -1039,11 +1111,11 @@
 "错&mdash;你是可以å…
è´¹èŽ·å¾—GNU软件,从朋友那里或从网上下载。但是它在提倡错误的"
 "理念。"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid "Several such companies now exist."
 msgstr "现在就有几个这样的公司。"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Although it is a charity rather than a company, the Free Software Foundation "
 "for 10 years raised most of its funds from its distribution service.  You "
@@ -1053,13 +1125,13 @@
 "虽然它不是公司而只是æ…
ˆå–„机构,自由软件基金会有10年是靠发行服务来获得å…
¶å¤§éƒ¨åˆ†"
 "资金的。你可以通过<a 
href=\"/order/order.html\">在FSF购物</a>来支持它的工作。"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "A group of computer companies pooled funds around 1991 to support "
 "maintenance of the GNU C Compiler."
 msgstr "一组公司在1991年左右集资来支持GNU C编译器的维护。"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "I think I was mistaken in saying that proprietary software was the most "
 "common basis for making money in software.  It seems that actually the most "
@@ -1075,10 +1147,21 @@
 "它必须不断地做事来维持收å…
¥ã€‚在自由软件的世界,软件定制行业还会继续存在,基本"
 "没什么变化。因
此,我不再预期程序员在自由软件的世界里收入会变少。"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "In the 1980s I had not yet realized how confusing it was to speak of "
+#| "&ldquo;the issue&rdquo; of &ldquo;intellectual property&rdquo;.  That "
+#| "term is obviously biased; more subtle is the fact that it lumps together "
+#| "various disparate laws which raise very different issues.  Nowadays I "
+#| "urge people to reject the term &ldquo;intellectual property&rdquo; "
+#| "entirely, lest it lead others to suppose that those laws form one "
+#| "coherent issue.  The way to be clear is to discuss patents, copyrights, "
+#| "and trademarks separately.  See <a href=\"/philosophy/not-ipr.html"
+#| "\">further explanation</a> of how this term spreads confusion and bias."
 msgid ""
 "In the 1980s I had not yet realized how confusing it was to speak of &ldquo;"
-"the issue&rdquo; of &ldquo;intellectual property&rdquo;.  That term is "
+"the issue&rdquo; of &ldquo;intellectual property.&rdquo; That term is "
 "obviously biased; more subtle is the fact that it lumps together various "
 "disparate laws which raise very different issues.  Nowadays I urge people to "
 "reject the term &ldquo;intellectual property&rdquo; entirely, lest it lead "
@@ -1094,10 +1177,19 @@
 "立讨论专利、版权和商标。请参看å…
³äºŽè¯¥æœ¯è¯­å¦‚何散布混乱和偏见的<a href=\"/"
 "philosophy/not-ipr.html\">进一步解释</a>。"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "Subsequently we learned to distinguish between &ldquo;free "
+#| "software&rdquo; and &ldquo;freeware&rdquo;.  The term &ldquo;"
+#| "freeware&rdquo; means software you are free to redistribute, but usually "
+#| "you are not free to study and change the source code, so most of it is "
+#| "not free software.  See &ldquo;<a href=\"/philosophy/words-to-avoid."
+#| "html#Freeware\">Confusing Words and Phrases</a>&rdquo; for more "
+#| "explanation."
 msgid ""
 "Subsequently we learned to distinguish between &ldquo;free software&rdquo; "
-"and &ldquo;freeware&rdquo;.  The term &ldquo;freeware&rdquo; means software "
+"and &ldquo;freeware.&rdquo; The term &ldquo;freeware&rdquo; means software "
 "you are free to redistribute, but usually you are not free to study and "
 "change the source code, so most of it is not free software.  See &ldquo;<a "
 "href=\"/philosophy/words-to-avoid.html#Freeware\">Confusing Words and "
@@ -1138,9 +1230,7 @@
 "系方法</a>联系自由软件基金会(FSF)。请将无效链接,å…
¶ä»–错误或建议发送给<a href="
 "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>。"
 
-#
-#
-#
+# TODO: submitting -> contributing.
 #.  TRANSLATORS: Ignore the original text in this paragraph,
 #.         replace it with the translation of these two:
 #.         We work hard and do our best to provide accurate, good quality
@@ -1148,23 +1238,32 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
-"若您想翻译本文,请参看<a 
href=\"/server/standards/README.translations.html\">"
-"翻译须知</a>。"
+"请参考 <a 
href=\"/server/standards/README.translations.html\">翻译说明</a> 了"
+"解有关协调和提交文章翻译的信息。"
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, "
+#| "2015 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 1985, 1993, 2004, 2005, 2007, 2009, 2010, 2015, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015 "
 "Free Software Foundation, Inc."
@@ -1197,10 +1296,20 @@
 msgid "Updated:"
 msgstr "最后更新:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015, "
-"2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015, "
-"2021 Free Software Foundation, Inc."
+#
+#
+#
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "若您想翻译本文,请参看<a 
href=\"/server/standards/README.translations.html"
+#~ "\">翻译须知</a>。"
+
+#~ msgid ""
+#~ "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, "
+#~ "2015, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, "
+#~ "2015, 2021 Free Software Foundation, Inc."

Index: po/pronunciation.de.po
===================================================================
RCS file: /web/www/www/gnu/po/pronunciation.de.po,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- po/pronunciation.de.po      2 Nov 2021 14:27:04 -0000       1.11
+++ po/pronunciation.de.po      2 Nov 2021 14:41:54 -0000       1.12
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: pronunciation.html\n"
 "Report-Msgid-Bugs-To: Webmasters <webmasters@gnu.org>\n"
-"POT-Creation-Date: 2014-05-16 17:25+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2014-06-25 22:00+0200\n"
 "Last-Translator: Joerg Kohne <joeko (AT) online [PUNKT] de>\n"
 "Language-Team: German <www-de-translators@gnu.org>\n"
@@ -15,20 +15,32 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-11-02 14:27+0000\n"
 
 #. type: Content of: <title>
 msgid "How To Pronounce GNU - GNU Project - Free Software Foundation"
 msgstr "Wie man GNU ausspricht - GNU-Projekt - Free Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "How To Pronounce GNU"
 msgstr "Wie man <em>GNU</em> ausspricht"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The name &ldquo;GNU&rdquo; is a recursive acronym for &ldquo;GNU's Not
+# | Unix!&rdquo;; it is pronounced as one syllable with a hard [-g,-]
+# | {+<i>g</i>,+} like &ldquo;grew&rdquo; but with the letter
+# | [-&ldquo;n&rdquo;-] {+<i>n</i>+} instead of [-&ldquo;r&rdquo;.-]
+# | {+<i>r</i>.+}
+#, fuzzy
+#| msgid ""
+#| "The name &ldquo;GNU&rdquo; is a recursive acronym for &ldquo;GNU's Not "
+#| "Unix!&rdquo;; it is pronounced as one syllable with a hard g, like &ldquo;"
+#| "grew&rdquo; but with the letter &ldquo;n&rdquo; instead of &ldquo;"
+#| "r&rdquo;."
 msgid ""
 "The name &ldquo;GNU&rdquo; is a recursive acronym for &ldquo;GNU's Not Unix!"
-"&rdquo;; it is pronounced as one syllable with a hard g, like &ldquo;"
-"grew&rdquo; but with the letter &ldquo;n&rdquo; instead of &ldquo;r&rdquo;."
+"&rdquo;; it is pronounced as one syllable with a hard <i>g</i>, like &ldquo;"
+"grew&rdquo; but with the letter <i>n</i> instead of <i>r</i>."
 msgstr ""
 "Der Name <em>GNU</em> ist ein rekursives Akronym von <em><span xml:lang=\"en"
 "\" lang=\"en\">GNU’s Not Unix</span></em> (‚GNU ist Nicht Unix‘) und 
wird "
@@ -36,9 +48,17 @@
 "ausgesprochen."
 
 # Translation deviating 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | This is a recording of <a href=\"http{+s+}://www.stallman.org/\">Richard
+# | Stallman</a> saying &ldquo;GNU&rdquo; and another with a short explanation
+# | about how GNU was named:
+#, fuzzy
+#| msgid ""
+#| "This is a recording of <a href=\"http://www.stallman.org/\";>Richard "
+#| "Stallman</a> saying &ldquo;GNU&rdquo; and another with a short "
+#| "explanation about how GNU was named:"
 msgid ""
-"This is a recording of <a href=\"http://www.stallman.org/\";>Richard "
+"This is a recording of <a href=\"https://www.stallman.org/\";>Richard "
 "Stallman</a> saying &ldquo;GNU&rdquo; and another with a short explanation "
 "about how GNU was named:"
 msgstr ""
@@ -46,54 +66,73 @@
 "Stallman</a>, <em>‚GNU‘</em> sagend, sowie einer kurzen Erläuterung, wie 
es "
 "zu dem Namen kam:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "<strong>How to say &ldquo;GNU&rdquo;:</strong>"
 msgstr "<strong>Wie wird <em>GNU</em> ausgesprochen:</strong>"
 
-#. type: Content of: <audio>
+#. type: Content of: <div><audio>
 msgid "<a href=\"/audio/gnu-pronunciation.ogg\">How To Say GNU</a>"
 msgstr ""
 "<a href=\"/audio/gnu-pronunciation.ogg\" title=\"Aussprache\" type=\"audio/"
 "ogg\">Wie wird <em>GNU</em> ausgesprochen</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "<strong>How GNU Was Named:</strong>"
 msgstr "<strong>Wie kam es zu dem Namen <em>GNU</em>:</strong>"
 
-#. type: Content of: <audio>
+#. type: Content of: <div><audio>
 msgid "<a href=\"/audio/how-gnu-was-named.ogg\">How GNU Was Named</a>"
 msgstr ""
 "<a href=\"/audio/how-gnu-was-named.ogg\" type=\"audio/ogg\">Wie kam es zu "
 "dem Namen <em>GNU</em></a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The combination of <a href=\"/gnu/linux-and-gnu.html\">GNU and Linux</a>
+# | is the <strong>GNU/Linux operating system</strong>, now used by millions
+# | and sometimes incorrectly called simply [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "The combination of <a href=\"/gnu/linux-and-gnu.html\">GNU and Linux</a> "
+#| "is the <strong>GNU/Linux operating system</strong>, now used by millions "
+#| "and sometimes incorrectly called simply &ldquo;Linux&rdquo;."
 msgid ""
 "The combination of <a href=\"/gnu/linux-and-gnu.html\">GNU and Linux</a> is "
 "the <strong>GNU/Linux operating system</strong>, now used by millions and "
-"sometimes incorrectly called simply &ldquo;Linux&rdquo;."
+"sometimes incorrectly called simply &ldquo;Linux.&rdquo;"
 msgstr ""
 "Die Kombination von <a href=\"/gnu/linux-and-gnu\">GNU und Linux</a> ist das "
 "<strong>GNU/Linux-Betriebssystem</strong>, heute von Millionen genutzt und "
 "manchmal fälschlicherweise einfach nur „Linux“ genannt."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | For more detailed information and history of the GNU Operating System
+# | visit <a [-href=\"/gnu/\">http://www.gnu.org/gnu/</a>-]
+# | {+href=\"/gnu/\">gnu.org/gnu/</a>+}
+#, fuzzy
+#| msgid ""
+#| "For more detailed information and history of the GNU Operating System "
+#| "visit <a href=\"/gnu/\">http://www.gnu.org/gnu/</a>"
 msgid ""
 "For more detailed information and history of the GNU Operating System visit "
-"<a href=\"/gnu/\">http://www.gnu.org/gnu/</a>"
+"<a href=\"/gnu/\">gnu.org/gnu/</a>"
 msgstr ""
 "Weitere Informationen und die Historie des Betriebssystems GNU finden Sie "
 "unter <a href=\"/gnu/\" title=\"GNU-Betriebssystem\">http://www.gnu.org/gnu/";
 "</a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "License Of The Recordings"
 msgstr "Lizenz der Aufnahmen"
 
-#. type: Content of: <p>
-msgid "Copyright (C) 2001 Richard M. Stallman"
-msgstr "Copyright &copy; 2001 Richard M. Stallman."
+#. type: Content of: <div><div><p>
+# | Copyright &copy; [-2015-] {+2001+} Richard Stallman
+#, fuzzy
+#| msgid "Copyright &copy; 2015 Richard Stallman"
+msgid "Copyright &copy; 2001 Richard Stallman"
+msgstr "Copyright &copy; 2015 Richard Stallman."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "These recordings are licensed under a <a rel=\"license\" href=\"http://";
 "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
@@ -131,14 +170,20 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Bei der Übersetzung dieses Werkes wurde mit größter Sorgfalt vorgegangen. "
@@ -152,19 +197,28 @@
 "standards/README.translations\">LIESMICH für Übersetzungen</a>."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2010, 2013, 2014 Free Software Foundation, Inc."
+# | Copyright &copy; 2010, [-2013, 2014-] {+2011, 2021+} Free Software
+# | Foundation, Inc.
+#, fuzzy
+#| msgid "Copyright &copy; 2010, 2013, 2014 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2010, 2011, 2021 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2010, 2013, 2014 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+#| "NoDerivatives 4.0 International License</a>."
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
 "Dieses Werk ist lizenziert unter einer <a rel=\"license\" href=\"//"
-"creativecommons.org/licenses/by-nd/3.0/us/deed.de\">Creative Commons "
-"Namensnennung-Keine Bearbeitung 3.0 Vereinigte Staaten von Amerika</a>-"
-"Lizenz."
+"creativecommons.org/licenses/by-nd/4.0/deed.de\">Creative Commons "
+"Namensnennung-Keine Bearbeitungen 4.0 International</a>-Lizenz."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>
@@ -178,9 +232,23 @@
 msgid "Updated:"
 msgstr "Letzte Änderung:"
 
-#. type: Content of: <div><p>
-msgid "Copyright &copy; 2010, 2013, 2014, 2021 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2010, 2013, 2014, 2021 Free Software Foundation, Inc."
+#~ msgid "Copyright (C) 2001 Richard M. Stallman"
+#~ msgstr "Copyright &copy; 2001 Richard M. Stallman."
+
+#~ msgid ""
+#~ "This page is licensed under a <a rel=\"license\" href=\"http://";
+#~ "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#~ "NoDerivs 3.0 United States License</a>."
+#~ msgstr ""
+#~ "Dieses Werk ist lizenziert unter einer <a rel=\"license\" href=\"//"
+#~ "creativecommons.org/licenses/by-nd/3.0/us/deed.de\">Creative Commons "
+#~ "Namensnennung-Keine Bearbeitung 3.0 Vereinigte Staaten von Amerika</a>-"
+#~ "Lizenz."
+
+#~ msgid ""
+#~ "Copyright &copy; 2010, 2013, 2014, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2010, 2013, 2014, 2021 Free Software Foundation, Inc."
 
 #~ msgid "Copyright &copy; 2010, 2013 Free Software Foundation, Inc."
 #~ msgstr "Copyright &copy; 2010, 2013 Free Software Foundation, Inc."

Index: po/pronunciation.fr.po
===================================================================
RCS file: /web/www/www/gnu/po/pronunciation.fr.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- po/pronunciation.fr.po      2 Nov 2021 14:27:04 -0000       1.7
+++ po/pronunciation.fr.po      2 Nov 2021 14:41:54 -0000       1.8
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: pronunciation.html\n"
 "Report-Msgid-Bugs-To: trad-gnu@april.org\n"
-"POT-Creation-Date: 2014-05-16 17:25+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2020-12-06 11:59+0100\n"
 "Last-Translator: Sogal <sogal@member.fsf.org>\n"
 "Language-Team: French <trad-gnu@april.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-11-02 14:27+0000\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Gtranslator 2.91.6\n"
 
@@ -22,23 +23,42 @@
 msgid "How To Pronounce GNU - GNU Project - Free Software Foundation"
 msgstr "Comment prononcer GNU - Projet GNU - Free Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "How To Pronounce GNU"
 msgstr "Prononciation de « GNU »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The name &ldquo;GNU&rdquo; is a recursive acronym for &ldquo;GNU's Not
+# | Unix!&rdquo;; it is pronounced as one syllable with a hard [-g,-]
+# | {+<i>g</i>,+} like &ldquo;grew&rdquo; but with the letter
+# | [-&ldquo;n&rdquo;-] {+<i>n</i>+} instead of [-&ldquo;r&rdquo;.-]
+# | {+<i>r</i>.+}
+#, fuzzy
+#| msgid ""
+#| "The name &ldquo;GNU&rdquo; is a recursive acronym for &ldquo;GNU's Not "
+#| "Unix!&rdquo;; it is pronounced as one syllable with a hard g, like &ldquo;"
+#| "grew&rdquo; but with the letter &ldquo;n&rdquo; instead of &ldquo;"
+#| "r&rdquo;."
 msgid ""
 "The name &ldquo;GNU&rdquo; is a recursive acronym for &ldquo;GNU's Not Unix!"
-"&rdquo;; it is pronounced as one syllable with a hard g, like &ldquo;"
-"grew&rdquo; but with the letter &ldquo;n&rdquo; instead of &ldquo;r&rdquo;."
+"&rdquo;; it is pronounced as one syllable with a hard <i>g</i>, like &ldquo;"
+"grew&rdquo; but with the letter <i>n</i> instead of <i>r</i>."
 msgstr ""
 "Le nom « GNU » est l'acronyme récursif de <i>GNU's Not Unix!</i> 
(« GNU "
 "n'est pas Unix ! ») ; en français, il se prononce « gnou » 
(comme l'animal), "
 "avec un « g » dur."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | This is a recording of <a href=\"http{+s+}://www.stallman.org/\">Richard
+# | Stallman</a> saying &ldquo;GNU&rdquo; and another with a short explanation
+# | about how GNU was named:
+#, fuzzy
+#| msgid ""
+#| "This is a recording of <a href=\"http://www.stallman.org/\";>Richard "
+#| "Stallman</a> saying &ldquo;GNU&rdquo; and another with a short "
+#| "explanation about how GNU was named:"
 msgid ""
-"This is a recording of <a href=\"http://www.stallman.org/\";>Richard "
+"This is a recording of <a href=\"https://www.stallman.org/\";>Richard "
 "Stallman</a> saying &ldquo;GNU&rdquo; and another with a short explanation "
 "about how GNU was named:"
 msgstr ""
@@ -46,50 +66,69 @@
 "Stallman</a> prononçant « GNU » ainsi qu'un autre avec une courte "
 "explication sur l'origine du nom GNU :"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "<strong>How to say &ldquo;GNU&rdquo;:</strong>"
 msgstr "<strong>Comment prononcer « GNU » :</strong>"
 
-#. type: Content of: <audio>
+#. type: Content of: <div><audio>
 msgid "<a href=\"/audio/gnu-pronunciation.ogg\">How To Say GNU</a>"
 msgstr "<a href=\"/audio/gnu-pronunciation.ogg\">Comment prononcer GNU</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "<strong>How GNU Was Named:</strong>"
 msgstr "<strong>Origine du nom GNU :</strong>"
 
-#. type: Content of: <audio>
+#. type: Content of: <div><audio>
 msgid "<a href=\"/audio/how-gnu-was-named.ogg\">How GNU Was Named</a>"
 msgstr "<a href=\"/audio/how-gnu-was-named.ogg\">Origine du nom GNU</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The combination of <a href=\"/gnu/linux-and-gnu.html\">GNU and Linux</a>
+# | is the <strong>GNU/Linux operating system</strong>, now used by millions
+# | and sometimes incorrectly called simply [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "The combination of <a href=\"/gnu/linux-and-gnu.html\">GNU and Linux</a> "
+#| "is the <strong>GNU/Linux operating system</strong>, now used by millions "
+#| "and sometimes incorrectly called simply &ldquo;Linux&rdquo;."
 msgid ""
 "The combination of <a href=\"/gnu/linux-and-gnu.html\">GNU and Linux</a> is "
 "the <strong>GNU/Linux operating system</strong>, now used by millions and "
-"sometimes incorrectly called simply &ldquo;Linux&rdquo;."
+"sometimes incorrectly called simply &ldquo;Linux.&rdquo;"
 msgstr ""
 "La combinaison du système <a href=\"/gnu/linux-and-gnu.html\">GNU et de "
 "Linux</a> est le <strong>système d'exploitation GNU/Linux</strong>, "
 "désormais utilisé par des millions de personnes et parfois abusivement "
 "appelé simplement « Linux »."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | For more detailed information and history of the GNU Operating System
+# | visit <a [-href=\"/gnu/\">http://www.gnu.org/gnu/</a>-]
+# | {+href=\"/gnu/\">gnu.org/gnu/</a>+}
+#, fuzzy
+#| msgid ""
+#| "For more detailed information and history of the GNU Operating System "
+#| "visit <a href=\"/gnu/\">http://www.gnu.org/gnu/</a>"
 msgid ""
 "For more detailed information and history of the GNU Operating System visit "
-"<a href=\"/gnu/\">http://www.gnu.org/gnu/</a>"
+"<a href=\"/gnu/\">gnu.org/gnu/</a>"
 msgstr ""
 "Pour en savoir plus sur le système d'exploitation GNU et son histoire, "
 "rendez vous sur <a href=\"/gnu/\">www.gnu.org/gnu/</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "License Of The Recordings"
 msgstr "Licence des enregistrements"
 
-#. type: Content of: <p>
-msgid "Copyright (C) 2001 Richard M. Stallman"
+#. type: Content of: <div><div><p>
+# | Copyright [-(C)-] {+&copy;+} 2001 Richard [-M.-] Stallman
+#, fuzzy
+#| msgid "Copyright (C) 2001 Richard M. Stallman"
+msgid "Copyright &copy; 2001 Richard Stallman"
 msgstr "Copyright (C) 2001 Richard M. Stallman"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "These recordings are licensed under a <a rel=\"license\" href=\"http://";
 "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
@@ -125,14 +164,14 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Merci d'adresser vos commentaires sur les pages en français à &lt;<a href="
@@ -143,19 +182,23 @@
 "traduction</a> les infos nécessaires."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2010, 2013, 2014 Free Software Foundation, Inc."
+# | Copyright &copy; 2010, [-2013, 2014-] {+2011, 2021+} Free Software
+# | Foundation, Inc.
+#, fuzzy
+#| msgid "Copyright &copy; 2010, 2013, 2014 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2010, 2011, 2021 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2010, 2013, 2014 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
 "Cette page peut être utilisée suivant les conditions de la licence <a rel="
-"\"license\" href=\"http://creativecommons.org/licenses/by-nd/3.0/us/deed.fr";
-"\">Creative Commons attribution, pas de modification, 3.0 États-Unis (CC 
BY-"
-"ND 3.0 US)</a>."
+"\"license\" href=\"http://creativecommons.org/licenses/by-nd/4.0/deed.fr";
+"\">Creative Commons attribution, pas de modification, 4.0 internationale "
+"(CC BY-ND 4.0)</a>."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>
@@ -169,6 +212,7 @@
 msgid "Updated:"
 msgstr "Dernière mise à jour :"
 
-#. type: Content of: <div><p>
-msgid "Copyright &copy; 2010, 2013, 2014, 2021 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2010, 2013, 2014, 2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 2010, 2013, 2014, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2010, 2013, 2014, 2021 Free Software Foundation, Inc."

Index: po/pronunciation.hr.po
===================================================================
RCS file: /web/www/www/gnu/po/pronunciation.hr.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- po/pronunciation.hr.po      2 Nov 2021 14:27:04 -0000       1.3
+++ po/pronunciation.hr.po      2 Nov 2021 14:41:54 -0000       1.4
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: pronunciation.html\n"
-"POT-Creation-Date: 2014-05-16 17:25+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2014-04-13 23:30+0100\n"
 "Last-Translator: Martina Bebek <martinaporec@gmail.com>\n"
 "Language-Team: GNU Croatian Translation Team <www-hr-lista@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-11-02 14:27+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"
@@ -22,23 +23,42 @@
 msgid "How To Pronounce GNU - GNU Project - Free Software Foundation"
 msgstr "Kako se izgovara naziv GNU - Projekt GNU - Zaklada za slobodni softver"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "How To Pronounce GNU"
 msgstr "Kako se izgovara naziv GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The name &ldquo;GNU&rdquo; is a recursive acronym for &ldquo;GNU's Not
+# | Unix!&rdquo;; it is pronounced as one syllable with a hard [-g,-]
+# | {+<i>g</i>,+} like &ldquo;grew&rdquo; but with the letter
+# | [-&ldquo;n&rdquo;-] {+<i>n</i>+} instead of [-&ldquo;r&rdquo;.-]
+# | {+<i>r</i>.+}
+#, fuzzy
+#| msgid ""
+#| "The name &ldquo;GNU&rdquo; is a recursive acronym for &ldquo;GNU's Not "
+#| "Unix!&rdquo;; it is pronounced as one syllable with a hard g, like &ldquo;"
+#| "grew&rdquo; but with the letter &ldquo;n&rdquo; instead of &ldquo;"
+#| "r&rdquo;."
 msgid ""
 "The name &ldquo;GNU&rdquo; is a recursive acronym for &ldquo;GNU's Not Unix!"
-"&rdquo;; it is pronounced as one syllable with a hard g, like &ldquo;"
-"grew&rdquo; but with the letter &ldquo;n&rdquo; instead of &ldquo;r&rdquo;."
+"&rdquo;; it is pronounced as one syllable with a hard <i>g</i>, like &ldquo;"
+"grew&rdquo; but with the letter <i>n</i> instead of <i>r</i>."
 msgstr ""
 "Naziv &ldquo;GNU&rdquo; je rekurzivni akronim sa značenjem &ldquo;GNU's Not "
 "Unix!&rdquo; (GNU nije Unix!); a izgovara se kako se i piše - kao gnu "
 "(nikako ne đnu i sl)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | This is a recording of <a href=\"http{+s+}://www.stallman.org/\">Richard
+# | Stallman</a> saying &ldquo;GNU&rdquo; and another with a short explanation
+# | about how GNU was named:
+#, fuzzy
+#| msgid ""
+#| "This is a recording of <a href=\"http://www.stallman.org/\";>Richard "
+#| "Stallman</a> saying &ldquo;GNU&rdquo; and another with a short "
+#| "explanation about how GNU was named:"
 msgid ""
-"This is a recording of <a href=\"http://www.stallman.org/\";>Richard "
+"This is a recording of <a href=\"https://www.stallman.org/\";>Richard "
 "Stallman</a> saying &ldquo;GNU&rdquo; and another with a short explanation "
 "about how GNU was named:"
 msgstr ""
@@ -46,49 +66,68 @@
 "kako izgovara &ldquo;GNU&rdquo; i zatim snimak gdje objašnjava kako je GNU "
 "dobio ime:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "<strong>How to say &ldquo;GNU&rdquo;:</strong>"
 msgstr "<strong>Kako izgovoriti naziv &ldquo;GNU&rdquo;:</strong>"
 
-#. type: Content of: <audio>
+#. type: Content of: <div><audio>
 msgid "<a href=\"/audio/gnu-pronunciation.ogg\">How To Say GNU</a>"
 msgstr "<a href=\"/audio/gnu-pronunciation.ogg\">Kako izgovoriti naziv GNU</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "<strong>How GNU Was Named:</strong>"
 msgstr "<strong>Kako je GNU dobio ime:</strong>"
 
-#. type: Content of: <audio>
+#. type: Content of: <div><audio>
 msgid "<a href=\"/audio/how-gnu-was-named.ogg\">How GNU Was Named</a>"
 msgstr "<a href=\"/audio/how-gnu-was-named.ogg\">Kako je GNU dobio ime</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The combination of <a href=\"/gnu/linux-and-gnu.html\">GNU and Linux</a>
+# | is the <strong>GNU/Linux operating system</strong>, now used by millions
+# | and sometimes incorrectly called simply [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "The combination of <a href=\"/gnu/linux-and-gnu.html\">GNU and Linux</a> "
+#| "is the <strong>GNU/Linux operating system</strong>, now used by millions "
+#| "and sometimes incorrectly called simply &ldquo;Linux&rdquo;."
 msgid ""
 "The combination of <a href=\"/gnu/linux-and-gnu.html\">GNU and Linux</a> is "
 "the <strong>GNU/Linux operating system</strong>, now used by millions and "
-"sometimes incorrectly called simply &ldquo;Linux&rdquo;."
+"sometimes incorrectly called simply &ldquo;Linux.&rdquo;"
 msgstr ""
 "Kombinacija  <a href=\"/gnu/linux-and-gnu.html\">GNU-a i Linuxa</a> tvori "
 "<strong>operacijski sustav GNU/Linux</strong>, kojeg danas koriste milijuni "
 "ljudi, a ponekad ga se krivo naziva samo &ldquo;Linux&rdquo;."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | For more detailed information and history of the GNU Operating System
+# | visit <a [-href=\"/gnu/\">http://www.gnu.org/gnu/</a>-]
+# | {+href=\"/gnu/\">gnu.org/gnu/</a>+}
+#, fuzzy
+#| msgid ""
+#| "For more detailed information and history of the GNU Operating System "
+#| "visit <a href=\"/gnu/\">http://www.gnu.org/gnu/</a>"
 msgid ""
 "For more detailed information and history of the GNU Operating System visit "
-"<a href=\"/gnu/\">http://www.gnu.org/gnu/</a>"
+"<a href=\"/gnu/\">gnu.org/gnu/</a>"
 msgstr ""
 "Za detaljnije informacije i povijest operacijskog sustava GNU, posjetite <a "
 "href=\"/gnu/\">http://www.gnu.org/gnu/</a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "License Of The Recordings"
 msgstr "Licenca snimaka"
 
-#. type: Content of: <p>
-msgid "Copyright (C) 2001 Richard M. Stallman"
+#. type: Content of: <div><div><p>
+# | Copyright [-(C)-] {+&copy;+} 2001 Richard [-M.-] Stallman
+#, fuzzy
+#| msgid "Copyright (C) 2001 Richard M. Stallman"
+msgid "Copyright &copy; 2001 Richard Stallman"
 msgstr "Copyright (C) 2001 Richard M. Stallman"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "These recordings are licensed under a <a rel=\"license\" href=\"http://";
 "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
@@ -124,14 +163,20 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Radimo naporno i dajemo sve od sebe da bi pružili točne, visoko kvalitetne "
@@ -143,17 +188,31 @@
 "prijevode</a>."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2010, 2013, 2014 Free Software Foundation, Inc."
+# | Copyright &copy; 2010, [-2013, 2014-] {+2011, 2021+} Free Software
+# | Foundation, Inc.
+#, fuzzy
+#| msgid "Copyright &copy; 2010, 2013, 2014 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2010, 2011, 2021 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2010, 2013, 2014 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
+# | This page is licensed under a <a rel=\"license\"
+# | [-href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative-]
+# | {+href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Creative+}
+# | Commons [-Attribution-NoDerivs 3.0 United States-]
+# | {+Attribution-NoDerivatives 4.0 International+} License</a>.
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#| "NoDerivs 3.0 United States License</a>."
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
 "Ovo djelo je dano na korištenje pod licencom <a rel=\"license\" href="
-"\"http://creativecommons.org/licenses/by-nd/3.0/us/deed.hr\";>Creative "
+"\"http://creativecommons.org/licenses/by-nd/3.0/us/deed.hr\";> Creative "
 "Commons Imenovanje-Bez prerada 3.0 SAD</a>."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
@@ -166,6 +225,29 @@
 msgid "Updated:"
 msgstr "Zadnji put promijenjeno:"
 
-#. type: Content of: <div><p>
-msgid "Copyright &copy; 2010, 2013, 2014, 2021 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2010, 2013, 2014, 2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "Radimo naporno i dajemo sve od sebe da bi pružili točne, visoko "
+#~ "kvalitetne prijevode. Međutim, nismo oslobođeni od nesavršenosti. Molim 
"
+#~ "vas šaljite vaše komentare i općenite prijedloge u tom smislu na <a 
href="
+#~ "\"mailto:web-translators@gnu.org\";>&lt;web-translators@gnu.org&gt;</a>.</"
+#~ "p> <p>Za informacije o koordiniranju i slanju prijevoda naših mrežnih "
+#~ "stranica, pogledajte <a href=\"/server/standards/README.translations.html"
+#~ "\">README za prijevode</a>."
+
+#~ msgid ""
+#~ "This page is licensed under a <a rel=\"license\" href=\"http://";
+#~ "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#~ "NoDerivs 3.0 United States License</a>."
+#~ msgstr ""
+#~ "Ovo djelo je dano na korištenje pod licencom <a rel=\"license\" href="
+#~ "\"http://creativecommons.org/licenses/by-nd/3.0/us/deed.hr\";>Creative "
+#~ "Commons Imenovanje-Bez prerada 3.0 SAD</a>."
+
+#~ msgid ""
+#~ "Copyright &copy; 2010, 2013, 2014, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2010, 2013, 2014, 2021 Free Software Foundation, Inc."

Index: po/pronunciation.it.po
===================================================================
RCS file: /web/www/www/gnu/po/pronunciation.it.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- po/pronunciation.it.po      2 Nov 2021 14:27:04 -0000       1.6
+++ po/pronunciation.it.po      2 Nov 2021 14:41:54 -0000       1.7
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: pronunciation.html\n"
-"POT-Creation-Date: 2014-05-16 17:25+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2015-01-18 21:36+0100\n"
 "Last-Translator: Andrea Pescetti <pescetti@gnu.org>\n"
 "Language-Team: Italian <www-it-traduzioni@gnu.org>\n"
@@ -15,30 +15,50 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-11-02 14:27+0000\n"
 "X-Generator: Poedit 1.5.4\n"
 
 #. type: Content of: <title>
 msgid "How To Pronounce GNU - GNU Project - Free Software Foundation"
 msgstr "Come pronunciare GNU - Progetto GNU - Free Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "How To Pronounce GNU"
 msgstr "Come pronunciare GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The name &ldquo;GNU&rdquo; is a recursive acronym for &ldquo;GNU's Not
+# | Unix!&rdquo;; it is pronounced as one syllable with a hard [-g,-]
+# | {+<i>g</i>,+} like &ldquo;grew&rdquo; but with the letter
+# | [-&ldquo;n&rdquo;-] {+<i>n</i>+} instead of [-&ldquo;r&rdquo;.-]
+# | {+<i>r</i>.+}
+#, fuzzy
+#| msgid ""
+#| "The name &ldquo;GNU&rdquo; is a recursive acronym for &ldquo;GNU's Not "
+#| "Unix!&rdquo;; it is pronounced as one syllable with a hard g, like &ldquo;"
+#| "grew&rdquo; but with the letter &ldquo;n&rdquo; instead of &ldquo;"
+#| "r&rdquo;."
 msgid ""
 "The name &ldquo;GNU&rdquo; is a recursive acronym for &ldquo;GNU's Not Unix!"
-"&rdquo;; it is pronounced as one syllable with a hard g, like &ldquo;"
-"grew&rdquo; but with the letter &ldquo;n&rdquo; instead of &ldquo;r&rdquo;."
+"&rdquo;; it is pronounced as one syllable with a hard <i>g</i>, like &ldquo;"
+"grew&rdquo; but with the letter <i>n</i> instead of <i>r</i>."
 msgstr ""
 "Il nome &ldquo;GNU&rdquo; è un acronimo ricorsivo per &ldquo;GNU's Not Unix!"
 "&rdquo; (GNU non è Unix!); si pronuncia come una sola sillaba con la g dura, 
"
 "come &ldquo;gru&rdquo; ma con la lettera &ldquo;n&rdquo; al posto della "
 "&ldquo;r&rdquo;."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | This is a recording of <a href=\"http{+s+}://www.stallman.org/\">Richard
+# | Stallman</a> saying &ldquo;GNU&rdquo; and another with a short explanation
+# | about how GNU was named:
+#, fuzzy
+#| msgid ""
+#| "This is a recording of <a href=\"http://www.stallman.org/\";>Richard "
+#| "Stallman</a> saying &ldquo;GNU&rdquo; and another with a short "
+#| "explanation about how GNU was named:"
 msgid ""
-"This is a recording of <a href=\"http://www.stallman.org/\";>Richard "
+"This is a recording of <a href=\"https://www.stallman.org/\";>Richard "
 "Stallman</a> saying &ldquo;GNU&rdquo; and another with a short explanation "
 "about how GNU was named:"
 msgstr ""
@@ -46,49 +66,68 @@
 "Stallman</a> che dice &ldquo;GNU&rdquo; seguita da un'altra, in lingua "
 "inglese, con una breve spiegazione sulle origini del nome GNU:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "<strong>How to say &ldquo;GNU&rdquo;:</strong>"
 msgstr "<strong>Come pronunciare &ldquo;GNU&rdquo;:</strong>"
 
-#. type: Content of: <audio>
+#. type: Content of: <div><audio>
 msgid "<a href=\"/audio/gnu-pronunciation.ogg\">How To Say GNU</a>"
 msgstr "<a href=\"/audio/gnu-pronunciation.ogg\">Come pronunciare GNU</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "<strong>How GNU Was Named:</strong>"
 msgstr "<strong>Le origini del nome GNU:</strong>"
 
-#. type: Content of: <audio>
+#. type: Content of: <div><audio>
 msgid "<a href=\"/audio/how-gnu-was-named.ogg\">How GNU Was Named</a>"
 msgstr "<a href=\"/audio/how-gnu-was-named.ogg\">Le origini del nome GNU</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The combination of <a href=\"/gnu/linux-and-gnu.html\">GNU and Linux</a>
+# | is the <strong>GNU/Linux operating system</strong>, now used by millions
+# | and sometimes incorrectly called simply [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "The combination of <a href=\"/gnu/linux-and-gnu.html\">GNU and Linux</a> "
+#| "is the <strong>GNU/Linux operating system</strong>, now used by millions "
+#| "and sometimes incorrectly called simply &ldquo;Linux&rdquo;."
 msgid ""
 "The combination of <a href=\"/gnu/linux-and-gnu.html\">GNU and Linux</a> is "
 "the <strong>GNU/Linux operating system</strong>, now used by millions and "
-"sometimes incorrectly called simply &ldquo;Linux&rdquo;."
+"sometimes incorrectly called simply &ldquo;Linux.&rdquo;"
 msgstr ""
 "La combinazione di <a href=\"/gnu/linux-and-gnu.html\">GNU e Linux</a> è il "
 "<strong>sistema operativo GNU/Linux</strong>, ora usato da milioni di "
 "persone ed a volte erroneamente chiamato &ldquo;Linux&rdquo;."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | For more detailed information and history of the GNU Operating System
+# | visit <a [-href=\"/gnu/\">http://www.gnu.org/gnu/</a>-]
+# | {+href=\"/gnu/\">gnu.org/gnu/</a>+}
+#, fuzzy
+#| msgid ""
+#| "For more detailed information and history of the GNU Operating System "
+#| "visit <a href=\"/gnu/\">http://www.gnu.org/gnu/</a>"
 msgid ""
 "For more detailed information and history of the GNU Operating System visit "
-"<a href=\"/gnu/\">http://www.gnu.org/gnu/</a>"
+"<a href=\"/gnu/\">gnu.org/gnu/</a>"
 msgstr ""
 "Per informazioni più dettagliate e cenni storici sul sistema operativo GNU "
 "si prega di visitare <a href=\"/gnu/\">http://www.gnu.org/gnu/</a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "License Of The Recordings"
 msgstr "Licenza delle registrazioni"
 
-#. type: Content of: <p>
-msgid "Copyright (C) 2001 Richard M. Stallman"
+#. type: Content of: <div><div><p>
+# | Copyright [-(C)-] {+&copy;+} 2001 Richard [-M.-] Stallman
+#, fuzzy
+#| msgid "Copyright (C) 2001 Richard M. Stallman"
+msgid "Copyright &copy; 2001 Richard Stallman"
 msgstr "Copyright (C) 2001 Richard M. Stallman"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "These recordings are licensed under a <a rel=\"license\" href=\"http://";
 "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
@@ -125,14 +164,14 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Le traduzioni italiane sono effettuate ponendo la massima attenzione ai "
@@ -146,19 +185,23 @@
 "traduzioni</a>."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2010, 2013, 2014 Free Software Foundation, Inc."
+# | Copyright &copy; 2010, [-2013, 2014-] {+2011, 2021+} Free Software
+# | Foundation, Inc.
+#, fuzzy
+#| msgid "Copyright &copy; 2010, 2013, 2014 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2010, 2011, 2021 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2010, 2013, 2014 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
 "Questa pagina è distribuita secondo i termini della licenza <a rel=\"license"
-"\" href=\"http://creativecommons.org/licenses/by-nd/3.0/us/deed.it";
-"\">Creative Commons Attribuzione - Non opere derivate 3.0 Stati Uniti</a> "
-"(CC BY-ND 3.0)."
+"\" href=\"http://creativecommons.org/licenses/by-nd/4.0/deed.it\";>Creative "
+"Commons Attribuzione - Non opere derivate 4.0 Internazionale</a> (CC BY-ND "
+"4.0)."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>
@@ -172,6 +215,7 @@
 msgid "Updated:"
 msgstr "Ultimo aggiornamento:"
 
-#. type: Content of: <div><p>
-msgid "Copyright &copy; 2010, 2013, 2014, 2021 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2010, 2013, 2014, 2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 2010, 2013, 2014, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2010, 2013, 2014, 2021 Free Software Foundation, Inc."

Index: po/pronunciation.ja.po
===================================================================
RCS file: /web/www/www/gnu/po/pronunciation.ja.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- po/pronunciation.ja.po      2 Nov 2021 14:27:04 -0000       1.4
+++ po/pronunciation.ja.po      2 Nov 2021 14:41:54 -0000       1.5
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: pronunciation.html\n"
-"POT-Creation-Date: 2014-05-16 17:25+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2014-04-28 13:35+0900\n"
 "Last-Translator: NIIBE Yutaka <gniibe@fsij.org>\n"
 "Language-Team: Japanese <web-translators-ja@gnu.org>\n"
@@ -14,28 +14,40 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-11-02 14:27+0000\n"
 
 #. type: Content of: <title>
 msgid "How To Pronounce GNU - GNU Project - Free Software Foundation"
 msgstr ""
 "GNUの発音の仕方 - GNUプロジェクト - 
フリーソフトウェアファウンデーション"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "How To Pronounce GNU"
 msgstr "GNUの発音の仕方"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The name &ldquo;GNU&rdquo; is a recursive acronym for &ldquo;GNU's Not "
+#| "Unix!&rdquo;; it is pronounced as one syllable with a hard g, like &ldquo;"
+#| "grew&rdquo; but with the letter &ldquo;n&rdquo; instead of &ldquo;"
+#| "r&rdquo;."
 msgid ""
 "The name &ldquo;GNU&rdquo; is a recursive acronym for &ldquo;GNU's Not Unix!"
-"&rdquo;; it is pronounced as one syllable with a hard g, like &ldquo;"
-"grew&rdquo; but with the letter &ldquo;n&rdquo; instead of &ldquo;r&rdquo;."
+"&rdquo;; it is pronounced as one syllable with a hard <i>g</i>, like &ldquo;"
+"grew&rdquo; but with the letter <i>n</i> instead of <i>r</i>."
 msgstr ""
 "&ldquo;GNU&rdquo;は、&ldquo;GNU's Not 
Unix&rdquo;(GNUはUnixではない)の再帰頭"
 
"字語です。/g/で始まる一音節で、<em>グヌー</em>[ˈgnuː]と発音します。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "This is a recording of <a href=\"http://www.stallman.org/\";>Richard "
+#| "Stallman</a> saying &ldquo;GNU&rdquo; and another with a short "
+#| "explanation about how GNU was named:"
 msgid ""
-"This is a recording of <a href=\"http://www.stallman.org/\";>Richard "
+"This is a recording of <a href=\"https://www.stallman.org/\";>Richard "
 "Stallman</a> saying &ldquo;GNU&rdquo; and another with a short explanation "
 "about how GNU was named:"
 msgstr ""
@@ -43,50 +55,61 @@
 
"&ldquo;GNU&rdquo;と言っている録音と、どのようにしてGNUが名づけられたかについ"
 "て説明している録音です:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "<strong>How to say &ldquo;GNU&rdquo;:</strong>"
 msgstr "<strong>&ldquo;GNU&rdquo;の言い方:</strong>"
 
-#. type: Content of: <audio>
+#. type: Content of: <div><audio>
 msgid "<a href=\"/audio/gnu-pronunciation.ogg\">How To Say GNU</a>"
 msgstr "<a href=\"/audio/gnu-pronunciation.ogg\">GNUの言い方</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "<strong>How GNU Was Named:</strong>"
 msgstr "<strong>どのようにGNUは名づけられたか:</strong>"
 
-#. type: Content of: <audio>
+#. type: Content of: <div><audio>
 msgid "<a href=\"/audio/how-gnu-was-named.ogg\">How GNU Was Named</a>"
 msgstr ""
 "<a 
href=\"/audio/how-gnu-was-named.ogg\">どのようにGNUは名づけられたか</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The combination of <a href=\"/gnu/linux-and-gnu.html\">GNU and Linux</a> "
+#| "is the <strong>GNU/Linux operating system</strong>, now used by millions "
+#| "and sometimes incorrectly called simply &ldquo;Linux&rdquo;."
 msgid ""
 "The combination of <a href=\"/gnu/linux-and-gnu.html\">GNU and Linux</a> is "
 "the <strong>GNU/Linux operating system</strong>, now used by millions and "
-"sometimes incorrectly called simply &ldquo;Linux&rdquo;."
+"sometimes incorrectly called simply &ldquo;Linux.&rdquo;"
 msgstr ""
 "<a 
href=\"/gnu/linux-and-gnu.html\">GNUとLinux</a>の組み合わせが<strong>GNU/"
 "Linuxオペレーティング・システム
</strong>です。いまや何百万人に使われてます"
 "が、時に間違って、単に&ldquo;Linux&rdquo;と呼ばれます。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "For more detailed information and history of the GNU Operating System "
+#| "visit <a href=\"/gnu/\">http://www.gnu.org/gnu/</a>"
 msgid ""
 "For more detailed information and history of the GNU Operating System visit "
-"<a href=\"/gnu/\">http://www.gnu.org/gnu/</a>"
+"<a href=\"/gnu/\">gnu.org/gnu/</a>"
 msgstr ""
 "GNUオペレーティング・システムのより詳細な情å 
±ã¨æ­´å²ã«ã¤ã„ては、こちら<a href="
 "\"/gnu/\">http://www.gnu.org/gnu/</a>をご覧ください"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "License Of The Recordings"
 msgstr "録音のライセンス"
 
-#. type: Content of: <p>
-msgid "Copyright (C) 2001 Richard M. Stallman"
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid "Copyright (C) 2001 Richard M. Stallman"
+msgid "Copyright &copy; 2001 Richard Stallman"
 msgstr "Copyright (C) 2001 Richard M. Stallman"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "These recordings are licensed under a <a rel=\"license\" href=\"http://";
 "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
@@ -121,35 +144,37 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 
"正確で良い品質の翻訳を提供するよう努力していますが、不完å
…¨ãªå ´åˆã‚‚あるかと思"
 "います。翻訳に関するコメントと提案は、<a 
href=\"mailto:web-translators@gnu.";
 
"org\">&lt;web-translators@gnu.org&gt;</a>におねがいします。</p><p>わたしたち"
-"のウェブページの翻訳の調整と提出については、<a 
href=\"/server/standards/"
+"のウェブページの翻訳の調整と貢献については、<a 
href=\"/server/standards/"
 "README.translations.html\">翻訳 README</a>をご覧ください。"
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2010, 2013, 2014 Free Software Foundation, Inc."
+#, fuzzy
+#| msgid "Copyright &copy; 2010, 2013, 2014 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2010, 2011, 2021 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2010, 2013, 2014 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
 "このページは<a rel=\"license\" 
href=\"http://creativecommons.org/licenses/by-";
-"nd/3.0/us/deed.ja\">Creative Commons Attribution-NoDerivs 3.0 United States "
-"License</a>の条件で許諾されます。"
+"nd/4.0/deed.ja\">Creative Commons Attribution-NoDerivatives 4.0 "
+"International License</a>の条件で許諾されます。"
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>
@@ -161,6 +186,7 @@
 msgid "Updated:"
 msgstr "最終更新:"
 
-#. type: Content of: <div><p>
-msgid "Copyright &copy; 2010, 2013, 2014, 2021 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2010, 2013, 2014, 2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 2010, 2013, 2014, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2010, 2013, 2014, 2021 Free Software Foundation, Inc."

Index: po/pronunciation.ko.po
===================================================================
RCS file: /web/www/www/gnu/po/pronunciation.ko.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- po/pronunciation.ko.po      2 Nov 2021 14:27:04 -0000       1.3
+++ po/pronunciation.ko.po      2 Nov 2021 14:41:54 -0000       1.4
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2014-04-05 00:03+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2012-04-27 15:42+0900\n"
 "Last-Translator: Chang-hun Song <chsong@gnu.org>\n"
 "Language-Team: Korean <www-ko-translators@gnu.org>\n"
@@ -17,29 +17,49 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-11-02 14:27+0000\n"
 
 #. type: Content of: <title>
 msgid "How To Pronounce GNU - GNU Project - Free Software Foundation"
 msgstr "GNU를 발음하는 방법 - GNU 프로젝트 - 자유 소프트웨어 
재단"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "How To Pronounce GNU"
 msgstr "GNU를 발음하는 방법"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The name &ldquo;GNU&rdquo; is a recursive acronym for &ldquo;GNU's Not
+# | Unix!&rdquo;; it is pronounced as one syllable with a hard [-g,-]
+# | {+<i>g</i>,+} like &ldquo;grew&rdquo; but with the letter
+# | [-&ldquo;n&rdquo;-] {+<i>n</i>+} instead of [-&ldquo;r&rdquo;.-]
+# | {+<i>r</i>.+}
+#, fuzzy
+#| msgid ""
+#| "The name &ldquo;GNU&rdquo; is a recursive acronym for &ldquo;GNU's Not "
+#| "Unix!&rdquo;; it is pronounced as one syllable with a hard g, like &ldquo;"
+#| "grew&rdquo; but with the letter &ldquo;n&rdquo; instead of &ldquo;"
+#| "r&rdquo;."
 msgid ""
 "The name &ldquo;GNU&rdquo; is a recursive acronym for &ldquo;GNU's Not Unix!"
-"&rdquo;; it is pronounced as one syllable with a hard g, like &ldquo;"
-"grew&rdquo; but with the letter &ldquo;n&rdquo; instead of &ldquo;r&rdquo;."
+"&rdquo;; it is pronounced as one syllable with a hard <i>g</i>, like &ldquo;"
+"grew&rdquo; but with the letter <i>n</i> instead of <i>r</i>."
 msgstr ""
 "&ldquo;GNU&rdquo;는 &ldquo;GNU's Not Unix!&rdquo;라는 표현을 
구성하는 단어들"
 "의 첫번째 문자들만 뽑아서 만든 재귀적 약어입니다. 이 
단어는 &ldquo;"
 "grew&rdquo;라는 단어의 스펠링 중 &ldquo;r&rdquo;을 
&ldquo;n&rdquo;으로 바꾼 "
 "뒤에 첫 문자 g에 강세를 주어 &ldquo;그누&rdquo;라고 한 음ì 
ˆë¡œ 발음합니다."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | This is a recording of <a href=\"http{+s+}://www.stallman.org/\">Richard
+# | Stallman</a> saying &ldquo;GNU&rdquo; and another with a short explanation
+# | about how GNU was named:
+#, fuzzy
+#| msgid ""
+#| "This is a recording of <a href=\"http://www.stallman.org/\";>Richard "
+#| "Stallman</a> saying &ldquo;GNU&rdquo; and another with a short "
+#| "explanation about how GNU was named:"
 msgid ""
-"This is a recording of <a href=\"http://www.stallman.org/\";>Richard "
+"This is a recording of <a href=\"https://www.stallman.org/\";>Richard "
 "Stallman</a> saying &ldquo;GNU&rdquo; and another with a short explanation "
 "about how GNU was named:"
 msgstr ""
@@ -47,50 +67,69 @@
 "GNU&rdquo;를 발음한 것을 녹음한 것입니다. 또다른 파일에는 
GNU라는 이름을 만든"
 "데 대한 짧은 설명이 포함되어 있습니다."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "<strong>How to say &ldquo;GNU&rdquo;:</strong>"
 msgstr "<strong>&ldquo;GNU&rdquo;를 발음하는 방법:</strong>"
 
-#. type: Content of: <audio>
+#. type: Content of: <div><audio>
 msgid "<a href=\"/audio/gnu-pronunciation.ogg\">How To Say GNU</a>"
 msgstr "<a href=\"/audio/gnu-pronunciation.ogg\">GNU를 발음하는 
방법</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "<strong>How GNU Was Named:</strong>"
 msgstr "<strong>GNU라고 이름 붙인 이유:</strong>"
 
-#. type: Content of: <audio>
+#. type: Content of: <div><audio>
 msgid "<a href=\"/audio/how-gnu-was-named.ogg\">How GNU Was Named</a>"
 msgstr "<a href=\"/audio/how-gnu-was-named.ogg\">GNU라고 이름붙인 이유
</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The combination of <a href=\"/gnu/linux-and-gnu.html\">GNU and Linux</a>
+# | is the <strong>GNU/Linux operating system</strong>, now used by millions
+# | and sometimes incorrectly called simply [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "The combination of <a href=\"/gnu/linux-and-gnu.html\">GNU and Linux</a> "
+#| "is the <strong>GNU/Linux operating system</strong>, now used by millions "
+#| "and sometimes incorrectly called simply &ldquo;Linux&rdquo;."
 msgid ""
 "The combination of <a href=\"/gnu/linux-and-gnu.html\">GNU and Linux</a> is "
 "the <strong>GNU/Linux operating system</strong>, now used by millions and "
-"sometimes incorrectly called simply &ldquo;Linux&rdquo;."
+"sometimes incorrectly called simply &ldquo;Linux.&rdquo;"
 msgstr ""
 "<a href=\"/gnu/linux-and-gnu.html\">GNU와 리눅스</a>가 결합된 것이 "
 "<strong>GNU/리눅스 운영체제</strong>입니다. 많은 사람들이 ì 
•í™•í•œ 이름인 GNU/"
 "리눅스가 아닌 &ldquo;리눅스&rdquo;로 잘못 부르고 있지만, 
현재 이 운영체제는 "
 "수백만의 사람들이 사용하고 있습니다."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | For more detailed information and history of the GNU Operating System
+# | visit <a [-href=\"/gnu/\">http://www.gnu.org/gnu/</a>-]
+# | {+href=\"/gnu/\">gnu.org/gnu/</a>+}
+#, fuzzy
+#| msgid ""
+#| "For more detailed information and history of the GNU Operating System "
+#| "visit <a href=\"/gnu/\">http://www.gnu.org/gnu/</a>"
 msgid ""
 "For more detailed information and history of the GNU Operating System visit "
-"<a href=\"/gnu/\">http://www.gnu.org/gnu/</a>"
+"<a href=\"/gnu/\">gnu.org/gnu/</a>"
 msgstr ""
 "GNU 운영체제에 대한 보다 자세한 역사와 정보에 대해서는 
<a href=\"/gnu/"
 "\">http://www.gnu.org/gnu/</a> 페이지를 참고하시기 바랍니다."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "License Of The Recordings"
 msgstr "녹음 파일의 이용허락 안내"
 
-#. type: Content of: <p>
-msgid "Copyright (C) 2001 Richard M. Stallman"
+#. type: Content of: <div><div><p>
+# | Copyright [-(C)-] {+&copy;+} 2001 Richard [-M.-] Stallman
+#, fuzzy
+#| msgid "Copyright (C) 2001 Richard M. Stallman"
+msgid "Copyright &copy; 2001 Richard Stallman"
 msgstr "Copyright (C) 2001 Richard M. Stallman"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "These recordings are licensed under a <a rel=\"license\" href=\"http://";
 "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
@@ -118,6 +157,7 @@
 "있습니다. 끊어진 링크나 다른 수정 사항 또는 제안은 <a 
href=\"mailto:";
 "webmasters@gnu.org\">&lt;webmasters@gnu.org&gt;</a> 앞으로 보내 
주세요."
 
+# TODO: submitting -> contributing.
 #.  TRANSLATORS: Ignore the original text in this paragraph,
 #.         replace it with the translation of these two:
 #.         We work hard and do our best to provide accurate, good quality
@@ -125,28 +165,48 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "이 글의 다른 언어 번역문 작성이나 제출에 대한 정보는 <a 
href=\"/server/"
 "standards/README.translations.html\">번역 안내</a>를 참고해 
주세요."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2010, 2013, 2014 Free Software Foundation, Inc."
+# | Copyright &copy; 2010, [-2013, 2014-] {+2011, 2021+} Free Software
+# | Foundation, Inc.
+#, fuzzy
+#| msgid "Copyright &copy; 2010, 2013, 2014 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2010, 2011, 2021 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2010, 2013, 2014 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
+# | This page is licensed under a <a rel=\"license\"
+# | [-href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative-]
+# | {+href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Creative+}
+# | Commons [-Attribution-NoDerivs 3.0 United States-]
+# | {+Attribution-NoDerivatives 4.0 International+} License</a>.
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#| "NoDerivs 3.0 United States License</a>."
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
 "이 페이지는 <a rel=\"license\" 
href=\"http://creativecommons.org/licenses/by-";
 "nd/3.0/us/deed.ko\">크리에이티브 커먼스 저작자표시-변경금지 
3.0 미국 이용허락"
@@ -162,6 +222,7 @@
 msgid "Updated:"
 msgstr "최종 수정일:"
 
-#. type: Content of: <div><p>
-msgid "Copyright &copy; 2010, 2013, 2014, 2021 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2010, 2013, 2014, 2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 2010, 2013, 2014, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2010, 2013, 2014, 2021 Free Software Foundation, Inc."

Index: po/pronunciation.pot
===================================================================
RCS file: /web/www/www/gnu/po/pronunciation.pot,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- po/pronunciation.pot        16 May 2014 17:28:45 -0000      1.2
+++ po/pronunciation.pot        2 Nov 2021 14:41:54 -0000       1.3
@@ -1,4 +1,4 @@
-# LANGUAGE translation of http://www.gnu.org/gnu/pronunciation.html
+# LANGUAGE translation of https://www.gnu.org/gnu/pronunciation.html
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # This file is distributed under the same license as the original article.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -7,75 +7,75 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: pronunciation.html\n"
-"POT-Creation-Date: 2014-05-16 17:25+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <title>
 msgid "How To Pronounce GNU - GNU Project - Free Software Foundation"
 msgstr ""
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "How To Pronounce GNU"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The name &ldquo;GNU&rdquo; is a recursive acronym for &ldquo;GNU's Not "
-"Unix!&rdquo;; it is pronounced as one syllable with a hard g, like "
-"&ldquo;grew&rdquo; but with the letter &ldquo;n&rdquo; instead of "
-"&ldquo;r&rdquo;."
+"Unix!&rdquo;; it is pronounced as one syllable with a hard <i>g</i>, like "
+"&ldquo;grew&rdquo; but with the letter <i>n</i> instead of <i>r</i>."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"This is a recording of <a href=\"http://www.stallman.org/\";>Richard "
+"This is a recording of <a href=\"https://www.stallman.org/\";>Richard "
 "Stallman</a> saying &ldquo;GNU&rdquo; and another with a short explanation "
 "about how GNU was named:"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "<strong>How to say &ldquo;GNU&rdquo;:</strong>"
 msgstr ""
 
-#. type: Content of: <audio>
+#. type: Content of: <div><audio>
 msgid "<a href=\"/audio/gnu-pronunciation.ogg\">How To Say GNU</a>"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "<strong>How GNU Was Named:</strong>"
 msgstr ""
 
-#. type: Content of: <audio>
+#. type: Content of: <div><audio>
 msgid "<a href=\"/audio/how-gnu-was-named.ogg\">How GNU Was Named</a>"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The combination of <a href=\"/gnu/linux-and-gnu.html\">GNU and Linux</a> is "
 "the <strong>GNU/Linux operating system</strong>, now used by millions and "
-"sometimes incorrectly called simply &ldquo;Linux&rdquo;."
+"sometimes incorrectly called simply &ldquo;Linux.&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For more detailed information and history of the GNU Operating System visit "
-"<a href=\"/gnu/\">http://www.gnu.org/gnu/</a>"
+"<a href=\"/gnu/\">gnu.org/gnu/</a>"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "License Of The Recordings"
 msgstr ""
 
-#. type: Content of: <p>
-msgid "Copyright (C) 2001 Richard M. Stallman"
+#. type: Content of: <div><div><p>
+msgid "Copyright &copy; 2001 Richard Stallman"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "These recordings are licensed under a <a rel=\"license\" "
 "href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative Commons "
@@ -106,7 +106,7 @@
 #
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
 #
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
@@ -114,18 +114,19 @@
 msgid ""
 "Please see the <a "
 "href=\"/server/standards/README.translations.html\">Translations README</a> "
-"for information on coordinating and submitting translations of this article."
+"for information on coordinating and contributing translations of this "
+"article."
 msgstr ""
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2010, 2013, 2014 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2010, 2011, 2021 Free Software Foundation, Inc."
 msgstr ""
 
 #. type: Content of: <div><p>
 msgid ""
 "This page is licensed under a <a rel=\"license\" "
-"href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative Commons "
-"Attribution-NoDerivs 3.0 United States License</a>."
+"href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Creative Commons "
+"Attribution-NoDerivatives 4.0 International License</a>."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.

Index: po/pronunciation.pt-br.po
===================================================================
RCS file: /web/www/www/gnu/po/pronunciation.pt-br.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- po/pronunciation.pt-br.po   2 Nov 2021 14:27:04 -0000       1.5
+++ po/pronunciation.pt-br.po   2 Nov 2021 14:41:54 -0000       1.6
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: pronunciation.html\n"
-"POT-Creation-Date: 2014-05-16 17:25+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2017-10-03 15:48-0300\n"
 "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
 "Language-Team: Brazilian Portuguese <www-pt-br-general@gnu.org>\n"
@@ -13,6 +13,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-11-02 14:27+0000\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Virtaal 1.0.0-beta1\n"
 
@@ -20,23 +21,34 @@
 msgid "How To Pronounce GNU - GNU Project - Free Software Foundation"
 msgstr "Como pronunciar GNU - Projeto GNU - Free Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "How To Pronounce GNU"
 msgstr "Como pronunciar GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The name &ldquo;GNU&rdquo; is a recursive acronym for &ldquo;GNU's Not "
+#| "Unix!&rdquo;; it is pronounced as one syllable with a hard g, like &ldquo;"
+#| "grew&rdquo; but with the letter &ldquo;n&rdquo; instead of &ldquo;"
+#| "r&rdquo;."
 msgid ""
 "The name &ldquo;GNU&rdquo; is a recursive acronym for &ldquo;GNU's Not Unix!"
-"&rdquo;; it is pronounced as one syllable with a hard g, like &ldquo;"
-"grew&rdquo; but with the letter &ldquo;n&rdquo; instead of &ldquo;r&rdquo;."
+"&rdquo;; it is pronounced as one syllable with a hard <i>g</i>, like &ldquo;"
+"grew&rdquo; but with the letter <i>n</i> instead of <i>r</i>."
 msgstr ""
 "O nome “GNU” é um acrônimo recursivo para “GNU's Not Unix!”, que, 
em "
 "português, é traduzido como “GNU Não é Unix!”; ele é pronunciado 
como "
 "“menu”, com “g” em vez de “me”, e como o herbívoro africano 
“gnu”."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "This is a recording of <a href=\"http://www.stallman.org/\";>Richard "
+#| "Stallman</a> saying &ldquo;GNU&rdquo; and another with a short "
+#| "explanation about how GNU was named:"
 msgid ""
-"This is a recording of <a href=\"http://www.stallman.org/\";>Richard "
+"This is a recording of <a href=\"https://www.stallman.org/\";>Richard "
 "Stallman</a> saying &ldquo;GNU&rdquo; and another with a short explanation "
 "about how GNU was named:"
 msgstr ""
@@ -44,49 +56,60 @@
 "Stallman</a> dizendo “GNU” e outra com uma explicação curta sobre como 
GNU "
 "recebeu o nome:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "<strong>How to say &ldquo;GNU&rdquo;:</strong>"
 msgstr "<strong>Como dizer “GNU”:</strong>"
 
-#. type: Content of: <audio>
+#. type: Content of: <div><audio>
 msgid "<a href=\"/audio/gnu-pronunciation.ogg\">How To Say GNU</a>"
 msgstr "<a href=\"/audio/gnu-pronunciation.ogg\">Como dizer GNU</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "<strong>How GNU Was Named:</strong>"
 msgstr "<strong>Como GNU recebeu o nome:</strong>"
 
-#. type: Content of: <audio>
+#. type: Content of: <div><audio>
 msgid "<a href=\"/audio/how-gnu-was-named.ogg\">How GNU Was Named</a>"
 msgstr "<a href=\"/audio/how-gnu-was-named.ogg\">Como GNU recebeu o nome</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The combination of <a href=\"/gnu/linux-and-gnu.html\">GNU and Linux</a> "
+#| "is the <strong>GNU/Linux operating system</strong>, now used by millions "
+#| "and sometimes incorrectly called simply &ldquo;Linux&rdquo;."
 msgid ""
 "The combination of <a href=\"/gnu/linux-and-gnu.html\">GNU and Linux</a> is "
 "the <strong>GNU/Linux operating system</strong>, now used by millions and "
-"sometimes incorrectly called simply &ldquo;Linux&rdquo;."
+"sometimes incorrectly called simply &ldquo;Linux.&rdquo;"
 msgstr ""
 "A combinação de <a href=\"/gnu/linux-and-gnu.html\">GNU e Linux</a> é o "
 "<strong>sistema operacional GNU/Linux</strong>, agora usado por milhões e, "
 "por vezes, incorretamente chamado apenas de “Linux”."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "For more detailed information and history of the GNU Operating System "
+#| "visit <a href=\"/gnu/\">http://www.gnu.org/gnu/</a>"
 msgid ""
 "For more detailed information and history of the GNU Operating System visit "
-"<a href=\"/gnu/\">http://www.gnu.org/gnu/</a>"
+"<a href=\"/gnu/\">gnu.org/gnu/</a>"
 msgstr ""
 "Para mais informações detalhadas e histórico do Sistema Operacional GNU, "
 "visite <a href=\"/gnu/\">http://www.gnu.org/gnu/</a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "License Of The Recordings"
 msgstr "Licença das gravações"
 
-#. type: Content of: <p>
-msgid "Copyright (C) 2001 Richard M. Stallman"
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid "Copyright (C) 2001 Richard M. Stallman"
+msgid "Copyright &copy; 2001 Richard Stallman"
 msgstr "Copyright (C) 2001 Richard M. Stallman"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "These recordings are licensed under a <a rel=\"license\" href=\"http://";
 "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
@@ -122,14 +145,14 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "A equipe de traduções para o português brasileiro se esforça para 
oferecer "
@@ -137,22 +160,24 @@
 "favor, envie seus comentários e sugestões em geral sobre as traduções 
para "
 "<a href=\"mailto:web-translators@gnu.org\";>&lt;web-translators@gnu.org&gt;</"
 "a>. </p><p>Consulte o <a href=\"/server/standards/README.translations.html"
-"\">Guia para as traduções</a> para mais informações sobre a coordenação 
e o "
-"envio de traduções das páginas deste site."
+"\">Guia para as traduções</a> para mais informações sobre a coordenação 
e a "
+"contribuição com traduções das páginas deste site."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2010, 2013, 2014 Free Software Foundation, Inc."
+#, fuzzy
+#| msgid "Copyright &copy; 2010, 2013, 2014 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2010, 2011, 2021 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2010, 2013, 2014 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
 "Esta página está licenciada sob uma licença <a rel=\"license\" 
href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/deed.pt_BR\">Creative Commons "
-"Atribuição-SemDerivações 3.0 Estados Unidos</a>."
+"creativecommons.org/licenses/by-nd/4.0/deed.pt_BR\">Creative Commons "
+"Atribuição-SemDerivações 4.0 Internacional</a>."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>
@@ -166,6 +191,7 @@
 msgid "Updated:"
 msgstr "Última atualização:"
 
-#. type: Content of: <div><p>
-msgid "Copyright &copy; 2010, 2013, 2014, 2021 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2010, 2013, 2014, 2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 2010, 2013, 2014, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2010, 2013, 2014, 2021 Free Software Foundation, Inc."

Index: po/pronunciation.ru.po
===================================================================
RCS file: /web/www/www/gnu/po/pronunciation.ru.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- po/pronunciation.ru.po      2 Nov 2021 14:27:04 -0000       1.2
+++ po/pronunciation.ru.po      2 Nov 2021 14:41:54 -0000       1.3
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: pronunciation.html\n"
-"POT-Creation-Date: 2014-05-16 17:25+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2014-05-17 06:14+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-11-02 14:27+0000\n"
 
 #. type: Content of: <title>
 msgid "How To Pronounce GNU - GNU Project - Free Software Foundation"
@@ -22,15 +23,26 @@
 "Как произносить &ldquo;GNU&rdquo; - Проект GNU - Фонд 
свободного "
 "программного обеспечения"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "How To Pronounce GNU"
 msgstr "Как произносить &ldquo;GNU&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The name &ldquo;GNU&rdquo; is a recursive acronym for &ldquo;GNU's Not
+# | Unix!&rdquo;; it is pronounced as one syllable with a hard [-g,-]
+# | {+<i>g</i>,+} like &ldquo;grew&rdquo; but with the letter
+# | [-&ldquo;n&rdquo;-] {+<i>n</i>+} instead of [-&ldquo;r&rdquo;.-]
+# | {+<i>r</i>.+}
+#, fuzzy
+#| msgid ""
+#| "The name &ldquo;GNU&rdquo; is a recursive acronym for &ldquo;GNU's Not "
+#| "Unix!&rdquo;; it is pronounced as one syllable with a hard g, like &ldquo;"
+#| "grew&rdquo; but with the letter &ldquo;n&rdquo; instead of &ldquo;"
+#| "r&rdquo;."
 msgid ""
 "The name &ldquo;GNU&rdquo; is a recursive acronym for &ldquo;GNU's Not Unix!"
-"&rdquo;; it is pronounced as one syllable with a hard g, like &ldquo;"
-"grew&rdquo; but with the letter &ldquo;n&rdquo; instead of &ldquo;r&rdquo;."
+"&rdquo;; it is pronounced as one syllable with a hard <i>g</i>, like &ldquo;"
+"grew&rdquo; but with the letter <i>n</i> instead of <i>r</i>."
 msgstr ""
 "Название &ldquo;GNU&rdquo; представляет 
рекурсивное сокращение &ldquo;<span "
 "lang=\"en\" xml:lang=\"en\">GNU's Not Unix!</span>&rdquo; (&ldquo;GNU&nbsp;"
@@ -38,9 +50,17 @@
 "глагол &ldquo;гнуть&rdquo; в первом лице, 
единственном числе настоящего "
 "времени изъявительного наклонения."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | This is a recording of <a href=\"http{+s+}://www.stallman.org/\">Richard
+# | Stallman</a> saying &ldquo;GNU&rdquo; and another with a short explanation
+# | about how GNU was named:
+#, fuzzy
+#| msgid ""
+#| "This is a recording of <a href=\"http://www.stallman.org/\";>Richard "
+#| "Stallman</a> saying &ldquo;GNU&rdquo; and another with a short "
+#| "explanation about how GNU was named:"
 msgid ""
-"This is a recording of <a href=\"http://www.stallman.org/\";>Richard "
+"This is a recording of <a href=\"https://www.stallman.org/\";>Richard "
 "Stallman</a> saying &ldquo;GNU&rdquo; and another with a short explanation "
 "about how GNU was named:"
 msgstr ""
@@ -48,52 +68,71 @@
 "произносящего &ldquo;GNU&rdquo;, и другая, с 
кратким объяснением того, как "
 "появилось это название:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "<strong>How to say &ldquo;GNU&rdquo;:</strong>"
 msgstr "<strong>Как говорить &ldquo;GNU&rdquo;:</strong>"
 
-#. type: Content of: <audio>
+#. type: Content of: <div><audio>
 msgid "<a href=\"/audio/gnu-pronunciation.ogg\">How To Say GNU</a>"
 msgstr ""
 "<a href=\"/audio/gnu-pronunciation.ogg\">Как говорить 
&ldquo;GNU&rdquo;</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "<strong>How GNU Was Named:</strong>"
 msgstr "<strong>Как появилось это название:</strong>"
 
-#. type: Content of: <audio>
+#. type: Content of: <div><audio>
 msgid "<a href=\"/audio/how-gnu-was-named.ogg\">How GNU Was Named</a>"
 msgstr ""
 "<a href=\"/audio/how-gnu-was-named.ogg\">Как появилось это 
название</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The combination of <a href=\"/gnu/linux-and-gnu.html\">GNU and Linux</a>
+# | is the <strong>GNU/Linux operating system</strong>, now used by millions
+# | and sometimes incorrectly called simply [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "The combination of <a href=\"/gnu/linux-and-gnu.html\">GNU and Linux</a> "
+#| "is the <strong>GNU/Linux operating system</strong>, now used by millions "
+#| "and sometimes incorrectly called simply &ldquo;Linux&rdquo;."
 msgid ""
 "The combination of <a href=\"/gnu/linux-and-gnu.html\">GNU and Linux</a> is "
 "the <strong>GNU/Linux operating system</strong>, now used by millions and "
-"sometimes incorrectly called simply &ldquo;Linux&rdquo;."
+"sometimes incorrectly called simply &ldquo;Linux.&rdquo;"
 msgstr ""
 "Сочетание <a href=\"/gnu/linux-and-gnu.html\">GNU и Linux</a> 
представляет "
 "<strong>операционную систему GNU/Linux</strong>, 
которую сейчас применяют "
 "миллионы и которую иногда неверно 
называют просто &ldquo;Linux&rdquo;."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | For more detailed information and history of the GNU Operating System
+# | visit <a [-href=\"/gnu/\">http://www.gnu.org/gnu/</a>-]
+# | {+href=\"/gnu/\">gnu.org/gnu/</a>+}
+#, fuzzy
+#| msgid ""
+#| "For more detailed information and history of the GNU Operating System "
+#| "visit <a href=\"/gnu/\">http://www.gnu.org/gnu/</a>"
 msgid ""
 "For more detailed information and history of the GNU Operating System visit "
-"<a href=\"/gnu/\">http://www.gnu.org/gnu/</a>"
+"<a href=\"/gnu/\">gnu.org/gnu/</a>"
 msgstr ""
 "Подробнее об истории операционной 
системы GNU см. на <a href=\"/gnu/"
 "\">http://www.gnu.org/gnu/</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "License Of The Recordings"
 msgstr "Лицензия звукозаписей"
 
 # type: Content of: <div><p>
-#. type: Content of: <p>
-msgid "Copyright (C) 2001 Richard M. Stallman"
+#. type: Content of: <div><div><p>
+# | Copyright [-(C)-] {+&copy;+} 2001 Richard [-M.-] Stallman
+#, fuzzy
+#| msgid "Copyright (C) 2001 Richard M. Stallman"
+msgid "Copyright &copy; 2001 Richard Stallman"
 msgstr "Copyright &copy; 2001 Richard Stallman"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "These recordings are licensed under a <a rel=\"license\" href=\"http://";
 "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
@@ -131,14 +170,20 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Мы старались сделать этот перевод точным 
и качественным, но исключить "
@@ -150,19 +195,29 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2010, 2013, 2014 Free Software Foundation, Inc."
+# | Copyright &copy; 2010, [-2013, 2014-] {+2011, 2021+} Free Software
+# | Foundation, Inc.
+#, fuzzy
+#| msgid "Copyright &copy; 2010, 2013, 2014 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2010, 2011, 2021 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2010, 2013, 2014 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+#| "NoDerivatives 4.0 International License</a>."
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
 "Это произведение доступно по <a rel=\"license\" 
href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/deed.ru\">лицензии Creative 
"
-"Commons Attribution-NoDerivs (<em>Атрибуция&nbsp;&mdash; Без 
производных "
-"произведений</em>) 3.0 США</a>."
+"creativecommons.org/licenses/by-nd/4.0/deed.ru\">лицензии Creative 
Commons "
+"Attribution-NoDerivs (<em>Атрибуция&nbsp;&mdash; Без 
производных "
+"произведений</em>) 4.0 Всемирная</a>."
 
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
@@ -180,6 +235,7 @@
 msgstr "Обновлено:"
 
 # type: Content of: <div><p>
-#. type: Content of: <div><p>
-msgid "Copyright &copy; 2010, 2013, 2014, 2021 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2010, 2013, 2014, 2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 2010, 2013, 2014, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2010, 2013, 2014, 2021 Free Software Foundation, Inc."

Index: po/pronunciation.tr.po
===================================================================
RCS file: /web/www/www/gnu/po/pronunciation.tr.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- po/pronunciation.tr.po      2 Nov 2021 14:27:04 -0000       1.3
+++ po/pronunciation.tr.po      2 Nov 2021 14:41:54 -0000       1.4
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: pronunciation.html\n"
-"POT-Creation-Date: 2014-05-16 17:25+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2021-02-01 21:35+0100\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-11-02 14:27+0000\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Poedit 2.2.4\n"
 
@@ -21,24 +22,35 @@
 msgid "How To Pronounce GNU - GNU Project - Free Software Foundation"
 msgstr "GNU Nasıl Telaffuz Ediliyor - GNU Projesi - Özgür Yazılım Vakfı"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "How To Pronounce GNU"
 msgstr "GNU Nasıl Telaffuz Ediliyor"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The name &ldquo;GNU&rdquo; is a recursive acronym for &ldquo;GNU's Not "
+#| "Unix!&rdquo;; it is pronounced as one syllable with a hard g, like &ldquo;"
+#| "grew&rdquo; but with the letter &ldquo;n&rdquo; instead of &ldquo;"
+#| "r&rdquo;."
 msgid ""
 "The name &ldquo;GNU&rdquo; is a recursive acronym for &ldquo;GNU's Not Unix!"
-"&rdquo;; it is pronounced as one syllable with a hard g, like &ldquo;"
-"grew&rdquo; but with the letter &ldquo;n&rdquo; instead of &ldquo;r&rdquo;."
+"&rdquo;; it is pronounced as one syllable with a hard <i>g</i>, like &ldquo;"
+"grew&rdquo; but with the letter <i>n</i> instead of <i>r</i>."
 msgstr ""
 "&ldquo;GNU&rdquo; &ldquo;GNU's Not Unix!&rdquo; [GNU Unix Değildir!] "
 "ifadesinin kısaltmasıdır; sert bir g ile tek bir hece olarak telaffuz "
 "edilmektedir, Ä°ngilizcedeki &ldquo;grew&rdquo; gibi ama &ldquo;r&rdquo; "
 "harfi yerine &ldquo;n&rdquo; harfiyle."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "This is a recording of <a href=\"http://www.stallman.org/\";>Richard "
+#| "Stallman</a> saying &ldquo;GNU&rdquo; and another with a short "
+#| "explanation about how GNU was named:"
 msgid ""
-"This is a recording of <a href=\"http://www.stallman.org/\";>Richard "
+"This is a recording of <a href=\"https://www.stallman.org/\";>Richard "
 "Stallman</a> saying &ldquo;GNU&rdquo; and another with a short explanation "
 "about how GNU was named:"
 msgstr ""
@@ -46,50 +58,61 @@
 "GNU&rdquo;'yu nasıl telaffuz ettiğini duyabileceğiniz bir ses kaydıyla, 
GNU "
 "isminin nasıl verildiğini kısaca anlattığı bir diğer ses kaydı var:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "<strong>How to say &ldquo;GNU&rdquo;:</strong>"
 msgstr "<strong>&ldquo;GNU&rdquo; nasıl söyleniyor:</strong>"
 
-#. type: Content of: <audio>
+#. type: Content of: <div><audio>
 msgid "<a href=\"/audio/gnu-pronunciation.ogg\">How To Say GNU</a>"
 msgstr "<a href=\"/audio/gnu-pronunciation.ogg\">GNU Nasıl Söylenmeli</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "<strong>How GNU Was Named:</strong>"
 msgstr "<strong>GNU Adı Nasıl Verildi:</strong>"
 
-#. type: Content of: <audio>
+#. type: Content of: <div><audio>
 msgid "<a href=\"/audio/how-gnu-was-named.ogg\">How GNU Was Named</a>"
 msgstr "<a href=\"/audio/how-gnu-was-named.ogg\">GNU Adı Nasıl Verildi</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The combination of <a href=\"/gnu/linux-and-gnu.html\">GNU and Linux</a> "
+#| "is the <strong>GNU/Linux operating system</strong>, now used by millions "
+#| "and sometimes incorrectly called simply &ldquo;Linux&rdquo;."
 msgid ""
 "The combination of <a href=\"/gnu/linux-and-gnu.html\">GNU and Linux</a> is "
 "the <strong>GNU/Linux operating system</strong>, now used by millions and "
-"sometimes incorrectly called simply &ldquo;Linux&rdquo;."
+"sometimes incorrectly called simply &ldquo;Linux.&rdquo;"
 msgstr ""
 "<a href=\"/gnu/linux-and-gnu.html\">GNU ve Linux</a> birleşimi <strong>GNU/"
 "Linux işletim sistemi</strong>dir, şimdi milyonlarca kişi tarafından "
 "kullanılıyor ve kimi zaman yanlış bir şekilde basitçe 
&ldquo;Linux&rdquo; "
 "olarak adlandırılıyor."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "For more detailed information and history of the GNU Operating System "
+#| "visit <a href=\"/gnu/\">http://www.gnu.org/gnu/</a>"
 msgid ""
 "For more detailed information and history of the GNU Operating System visit "
-"<a href=\"/gnu/\">http://www.gnu.org/gnu/</a>"
+"<a href=\"/gnu/\">gnu.org/gnu/</a>"
 msgstr ""
 "GNU İşletim Sistemi hakkında daha ayrıntılı bilgi ve tarihi için <a 
href=\"/"
 "gnu/\">http://www.gnu.org/gnu/</a> adresini ziyaret edin"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "License Of The Recordings"
 msgstr "Kayıtların Lisansları"
 
-#. type: Content of: <p>
-msgid "Copyright (C) 2001 Richard M. Stallman"
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid "Copyright (C) 2001 Richard M. Stallman"
+msgid "Copyright &copy; 2001 Richard Stallman"
 msgstr "Copyright (C) 2001 Richard M. Stallman"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "These recordings are licensed under a <a rel=\"license\" href=\"http://";
 "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
@@ -125,14 +148,19 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Çevirilerimizde bulmuş olabileceğiniz hataları, aklınızdaki soru ve "
@@ -146,17 +174,19 @@
 "\">çalışma&nbsp;sayfamızı</a> ziyaret edebilirsiniz."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2010, 2013, 2014 Free Software Foundation, Inc."
+#, fuzzy
+#| msgid "Copyright &copy; 2010, 2013, 2014 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2010, 2011, 2021 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2010, 2013, 2014 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
 "Bu sayfa <a rel=\"license\" href=\"http://creativecommons.org/licenses/by-";
-"nd/3.0/us/deed.tr\">Creative Commons Atıf-Türetilemez 3.0 Birleşik 
Devletler "
+"nd/4.0/deed.tr\">Creative Commons Alıntı-Türetilemez 4.0 Uluslararası "
 "Lisansı</a> altında lisanslanmıştır."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
@@ -173,6 +203,7 @@
 msgid "Updated:"
 msgstr "Son Güncelleme:"
 
-#. type: Content of: <div><p>
-msgid "Copyright &copy; 2010, 2013, 2014, 2021 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2010, 2013, 2014, 2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 2010, 2013, 2014, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2010, 2013, 2014, 2021 Free Software Foundation, Inc."

Index: po/pronunciation.uk.po
===================================================================
RCS file: /web/www/www/gnu/po/pronunciation.uk.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- po/pronunciation.uk.po      2 Nov 2021 14:27:04 -0000       1.7
+++ po/pronunciation.uk.po      2 Nov 2021 14:41:54 -0000       1.8
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: pronunciation.html\n"
-"POT-Creation-Date: 2014-05-16 17:25+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2016-07-09 09:40+0200\n"
 "Last-Translator: Andriy Bandura <andriykopanytsia@gmail.com>\n"
 "Language-Team: Ukrainian <>\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-11-02 14:27+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"
@@ -23,15 +24,21 @@
 msgid "How To Pronounce GNU - GNU Project - Free Software Foundation"
 msgstr "Як вимовляти GNU - Проект GNU - Фонд 
вільного програмного забезпечення"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "How To Pronounce GNU"
 msgstr "Як вимовляти &ldquo;GNU&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The name &ldquo;GNU&rdquo; is a recursive acronym for &ldquo;GNU's Not "
+#| "Unix!&rdquo;; it is pronounced as one syllable with a hard g, like &ldquo;"
+#| "grew&rdquo; but with the letter &ldquo;n&rdquo; instead of &ldquo;"
+#| "r&rdquo;."
 msgid ""
 "The name &ldquo;GNU&rdquo; is a recursive acronym for &ldquo;GNU's Not Unix!"
-"&rdquo;; it is pronounced as one syllable with a hard g, like &ldquo;"
-"grew&rdquo; but with the letter &ldquo;n&rdquo; instead of &ldquo;r&rdquo;."
+"&rdquo;; it is pronounced as one syllable with a hard <i>g</i>, like &ldquo;"
+"grew&rdquo; but with the letter <i>n</i> instead of <i>r</i>."
 msgstr ""
 "Назва &ldquo;GNU&rdquo;&nbsp;&mdash; це рекурсивне 
скорочення фрази &ldquo;"
 "GNU's Not Unix!&rdquo; (&ldquo;GNU&nbsp;&mdash; не Unix!&rdquo;). &ldquo;"
@@ -39,9 +46,14 @@
 "<em>ґну</em></a>, одним складом, як іменник у 
першій особі однини "
 "(вимовляємо український звук ґ, а не г)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "This is a recording of <a href=\"http://www.stallman.org/\";>Richard "
+#| "Stallman</a> saying &ldquo;GNU&rdquo; and another with a short "
+#| "explanation about how GNU was named:"
 msgid ""
-"This is a recording of <a href=\"http://www.stallman.org/\";>Richard "
+"This is a recording of <a href=\"https://www.stallman.org/\";>Richard "
 "Stallman</a> saying &ldquo;GNU&rdquo; and another with a short explanation "
 "about how GNU was named:"
 msgstr ""
@@ -49,51 +61,62 @@
 "говорить &ldquo;GNU&rdquo; а також коротке 
пояснення про те, як було названо "
 "GNU:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "<strong>How to say &ldquo;GNU&rdquo;:</strong>"
 msgstr "<strong>Як сказати &ldquo;GNU&rdquo;:</strong>"
 
-#. type: Content of: <audio>
+#. type: Content of: <div><audio>
 msgid "<a href=\"/audio/gnu-pronunciation.ogg\">How To Say GNU</a>"
 msgstr ""
 "<a href=\"/audio/gnu-pronunciation.ogg\">Як вимовляти 
&ldquo;GNU&rdquo;</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "<strong>How GNU Was Named:</strong>"
 msgstr "<strong>Як було названо GNU:</strong>"
 
-#. type: Content of: <audio>
+#. type: Content of: <div><audio>
 msgid "<a href=\"/audio/how-gnu-was-named.ogg\">How GNU Was Named</a>"
 msgstr "<a href=\"/audio/how-gnu-was-named.ogg\">Як було названо 
GNU</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The combination of <a href=\"/gnu/linux-and-gnu.html\">GNU and Linux</a> "
+#| "is the <strong>GNU/Linux operating system</strong>, now used by millions "
+#| "and sometimes incorrectly called simply &ldquo;Linux&rdquo;."
 msgid ""
 "The combination of <a href=\"/gnu/linux-and-gnu.html\">GNU and Linux</a> is "
 "the <strong>GNU/Linux operating system</strong>, now used by millions and "
-"sometimes incorrectly called simply &ldquo;Linux&rdquo;."
+"sometimes incorrectly called simply &ldquo;Linux.&rdquo;"
 msgstr ""
 "Це поєднання, по суті, є <a 
href=\"/gnu/linux-and-gnu.html\"> "
 "<strong>операційною системою GNU/Linux</strong></a>. 
Мільйони людей "
 "користуються GNU/Linux, хоча більшість з них <a 
href=\"/gnu/gnu-linux-faq."
 "html\">невірно називають її &ldquo;Linux&rdquo;</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "For more detailed information and history of the GNU Operating System "
+#| "visit <a href=\"/gnu/\">http://www.gnu.org/gnu/</a>"
 msgid ""
 "For more detailed information and history of the GNU Operating System visit "
-"<a href=\"/gnu/\">http://www.gnu.org/gnu/</a>"
+"<a href=\"/gnu/\">gnu.org/gnu/</a>"
 msgstr ""
 "За детальнішою інформацією та історією 
операційної системи GNU відвідайте <a "
 "href=\"/gnu/\">http://www.gnu.org/gnu/</a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "License Of The Recordings"
 msgstr "Ліцензія записів"
 
-#. type: Content of: <p>
-msgid "Copyright (C) 2001 Richard M. Stallman"
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid "Copyright (C) 2001 Richard M. Stallman"
+msgid "Copyright &copy; 2001 Richard Stallman"
 msgstr "Copyright (C) 2001 Річард Столмен"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "These recordings are licensed under a <a rel=\"license\" href=\"http://";
 "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
@@ -130,14 +153,19 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Ми намагалися зробити цей переклад точним 
та якісним, але виключити "
@@ -148,16 +176,23 @@
 "translations.html\">&ldquo;Посібнику з 
перекладу&rdquo;</a>."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2010, 2013, 2014 Free Software Foundation, Inc."
+#, fuzzy
+#| msgid "Copyright &copy; 2010, 2013, 2014 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2010, 2011, 2021 Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 2010, 2013, 2014 Free Software Foundation, Inc. (Фонд "
 "вільного програмного забезпечення, Inc.)"
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#| "NoDerivs 3.0 United States License</a>."
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
 "Ця сторінка доступна на умовах <a rel=\"license\" 
href=\"http://";
 "creativecommons.org/licenses/by-nd/3.0/us/deed.uk\"> ліцензії 
Creative "
@@ -175,8 +210,21 @@
 msgid "Updated:"
 msgstr "Оновлено:"
 
-#. type: Content of: <div><p>
-msgid "Copyright &copy; 2010, 2013, 2014, 2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 2010, 2013, 2014, 2021 Free Software Foundation, Inc. 
(Фонд "
-"вільного програмного забезпечення, Inc.)"
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "Ми намагалися зробити цей переклад 
точним та якісним, але виключити "
+#~ "можливість помилки ми не можемо. 
Надсилайте, будь ласка, свої зауваження "
+#~ "і пропозиції щодо перекладу за адресою <a 
href=\"mailto:web-";
+#~ "translators@gnu.org\">&lt;web-translators@gnu.org&gt;</a>. </"
+#~ "p><p>Відомості з координації та 
пропозицій перекладів наших статей див. у "
+#~ "<a 
href=\"/server/standards/README.translations.html\">&ldquo;Посібнику 
з "
+#~ "перекладу&rdquo;</a>."
+
+#~ msgid ""
+#~ "Copyright &copy; 2010, 2013, 2014, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2010, 2013, 2014, 2021 Free Software Foundation, Inc. "
+#~ "(Фонд вільного програмного 
забезпечення, Inc.)"

Index: po/pronunciation.zh-cn.po
===================================================================
RCS file: /web/www/www/gnu/po/pronunciation.zh-cn.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- po/pronunciation.zh-cn.po   2 Nov 2021 14:27:04 -0000       1.3
+++ po/pronunciation.zh-cn.po   2 Nov 2021 14:41:54 -0000       1.4
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: pronunciation.html\n"
-"POT-Creation-Date: 2014-05-16 17:25+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2018-10-14 09:37+0800\n"
 "Last-Translator: Wensheng Xie <wxie@member.fsf.org>\n"
 "Language-Team: Chinese <www-zh-cn-translators@gnu.org>\n"
@@ -14,77 +14,100 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-11-02 14:27+0000\n"
 
 #. type: Content of: <title>
 msgid "How To Pronounce GNU - GNU Project - Free Software Foundation"
 msgstr "GNU怎么发音 - GNU工程 - 自由软件基金会"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "How To Pronounce GNU"
 msgstr "GNU怎么发音"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The name &ldquo;GNU&rdquo; is a recursive acronym for &ldquo;GNU's Not "
+#| "Unix!&rdquo;; it is pronounced as one syllable with a hard g, like &ldquo;"
+#| "grew&rdquo; but with the letter &ldquo;n&rdquo; instead of &ldquo;"
+#| "r&rdquo;."
 msgid ""
 "The name &ldquo;GNU&rdquo; is a recursive acronym for &ldquo;GNU's Not Unix!"
-"&rdquo;; it is pronounced as one syllable with a hard g, like &ldquo;"
-"grew&rdquo; but with the letter &ldquo;n&rdquo; instead of &ldquo;r&rdquo;."
+"&rdquo;; it is pronounced as one syllable with a hard <i>g</i>, like &ldquo;"
+"grew&rdquo; but with the letter <i>n</i> instead of <i>r</i>."
 msgstr ""
 "&ldquo;GNU&rdquo;是&ldquo;GNU's Not 
Unix!&rdquo;(GNU并非Unix!)的首字母递归"
 
"缩写;它是g发音的单音节字,就像&ldquo;grew&rdquo;,但要用字母&ldquo;n&rdquo;"
 "替换掉&ldquo;r&rdquo;。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "This is a recording of <a href=\"http://www.stallman.org/\";>Richard "
+#| "Stallman</a> saying &ldquo;GNU&rdquo; and another with a short "
+#| "explanation about how GNU was named:"
 msgid ""
-"This is a recording of <a href=\"http://www.stallman.org/\";>Richard "
+"This is a recording of <a href=\"https://www.stallman.org/\";>Richard "
 "Stallman</a> saying &ldquo;GNU&rdquo; and another with a short explanation "
 "about how GNU was named:"
 msgstr ""
 "这是<a href=\"http://www.stallman.org/\";>Richard Stallman</a>读&ldquo;"
 "GNU&rdquo;的录音,另一个录音是关于GNU之名起源的简介:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "<strong>How to say &ldquo;GNU&rdquo;:</strong>"
 msgstr "<strong>&ldquo;GNU&rdquo;怎么发音:</strong>"
 
-#. type: Content of: <audio>
+#. type: Content of: <div><audio>
 msgid "<a href=\"/audio/gnu-pronunciation.ogg\">How To Say GNU</a>"
 msgstr "<a href=\"/audio/gnu-pronunciation.ogg\">GNU怎么发音</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "<strong>How GNU Was Named:</strong>"
 msgstr "<strong>为什么起GNU这个名字:</strong>"
 
-#. type: Content of: <audio>
+#. type: Content of: <div><audio>
 msgid "<a href=\"/audio/how-gnu-was-named.ogg\">How GNU Was Named</a>"
 msgstr "<a 
href=\"/audio/how-gnu-was-named.ogg\">为什么起GNU这个名字</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The combination of <a href=\"/gnu/linux-and-gnu.html\">GNU and Linux</a> "
+#| "is the <strong>GNU/Linux operating system</strong>, now used by millions "
+#| "and sometimes incorrectly called simply &ldquo;Linux&rdquo;."
 msgid ""
 "The combination of <a href=\"/gnu/linux-and-gnu.html\">GNU and Linux</a> is "
 "the <strong>GNU/Linux operating system</strong>, now used by millions and "
-"sometimes incorrectly called simply &ldquo;Linux&rdquo;."
+"sometimes incorrectly called simply &ldquo;Linux.&rdquo;"
 msgstr ""
 "<a 
href=\"/gnu/linux-and-gnu.html\">GNU和Linux</a>的组合是<strong>GNU/Linux操"
 
"作系统</strong>,它现在被数百万用户所使用,它有时被错误地简称为&ldquo;"
 "Linux&rdquo;。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "For more detailed information and history of the GNU Operating System "
+#| "visit <a href=\"/gnu/\">http://www.gnu.org/gnu/</a>"
 msgid ""
 "For more detailed information and history of the GNU Operating System visit "
-"<a href=\"/gnu/\">http://www.gnu.org/gnu/</a>"
+"<a href=\"/gnu/\">gnu.org/gnu/</a>"
 msgstr ""
 "更多关于GNU操作系统的历史和知识,请到<a 
href=\"/gnu/\">http://www.gnu.org/";
 "gnu/</a>了解。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "License Of The Recordings"
 msgstr "这些录音的许可证"
 
-#. type: Content of: <p>
-msgid "Copyright (C) 2001 Richard M. Stallman"
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid "Copyright (C) 2001 Richard M. Stallman"
+msgid "Copyright &copy; 2001 Richard Stallman"
 msgstr "Copyright (C) 2001 Richard M. Stallman"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "These recordings are licensed under a <a rel=\"license\" href=\"http://";
 "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
@@ -112,9 +135,7 @@
 "系方法</a>联系自由软件基金会(FSF)。请将无效链接,å…
¶ä»–错误或建议发送给<a href="
 "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>。"
 
-#
-#
-#
+# TODO: submitting -> contributing.
 #.  TRANSLATORS: Ignore the original text in this paragraph,
 #.         replace it with the translation of these two:
 #.         We work hard and do our best to provide accurate, good quality
@@ -122,32 +143,44 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
-"若您想翻译本文,请参看<a 
href=\"/server/standards/README.translations.html\">"
-"翻译须知</a>。"
+"请参考 <a 
href=\"/server/standards/README.translations.html\">翻译说明</a> 了"
+"解有关协调和提交文章翻译的信息。"
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2010, 2013, 2014 Free Software Foundation, Inc."
+#, fuzzy
+#| msgid "Copyright &copy; 2010, 2013, 2014 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2010, 2011, 2021 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2010, 2013, 2014 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#| "NoDerivs 3.0 United States License</a>."
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
-"本页面使用<a rel=\"license\" 
href=\"http://creativecommons.org/licenses/by-";
+"本页面采用 <a rel=\"license\" 
href=\"http://creativecommons.org/licenses/by-";
 "nd/3.0/us/\">Creative Commons Attribution-NoDerivs 3.0 United States "
-"License</a>授权。"
+"License</a> 许可证授权。"
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>
@@ -161,6 +194,27 @@
 msgid "Updated:"
 msgstr "最后更新:"
 
-#. type: Content of: <div><p>
-msgid "Copyright &copy; 2010, 2013, 2014, 2021 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2010, 2013, 2014, 2021 Free Software Foundation, Inc."
+#
+#
+#
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "若您想翻译本文,请参看<a 
href=\"/server/standards/README.translations.html"
+#~ "\">翻译须知</a>。"
+
+#~ msgid ""
+#~ "This page is licensed under a <a rel=\"license\" href=\"http://";
+#~ "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#~ "NoDerivs 3.0 United States License</a>."
+#~ msgstr ""
+#~ "本页面使用<a rel=\"license\" 
href=\"http://creativecommons.org/licenses/";
+#~ "by-nd/3.0/us/\">Creative Commons Attribution-NoDerivs 3.0 United States "
+#~ "License</a>授权。"
+
+#~ msgid ""
+#~ "Copyright &copy; 2010, 2013, 2014, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2010, 2013, 2014, 2021 Free Software Foundation, Inc."

Index: po/rms-lisp.es.po
===================================================================
RCS file: /web/www/www/gnu/po/rms-lisp.es.po,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- po/rms-lisp.es.po   2 Nov 2021 13:56:42 -0000       1.54
+++ po/rms-lisp.es.po   2 Nov 2021 14:41:54 -0000       1.55
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rms-list.html\n"
-"POT-Creation-Date: 2020-09-21 18:55+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2020-09-23 11:57+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-11-02 14:27+0000\n"
 "X-Generator: Poedit 2.2.1\n"
 
 # type: Content of: <title>
@@ -30,22 +31,28 @@
 "Free Software Foundation "
 
 # type: Content of: <h2>
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "My Lisp Experiences and the Development of GNU Emacs"
 msgstr "Mis experiencias con Lisp y el desarrollo de Emacs de GNU"
 
 # type: Content of: <h3>
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><p>
+# | [-(-]Transcript of Richard Stallman's [-Speech, 28 Oct 2002,-] {+speech+}
+# | at the International Lisp [-Conference).-] {+Conference, 28 Oct 2002.+}
+#, fuzzy
+#| msgid ""
+#| "(Transcript of Richard Stallman's Speech, 28 Oct 2002, at the "
+#| "International Lisp Conference)."
 msgid ""
-"(Transcript of Richard Stallman's Speech, 28 Oct 2002, at the International "
-"Lisp Conference)."
+"Transcript of Richard Stallman's speech at the International Lisp "
+"Conference, 28 Oct 2002."
 msgstr ""
 "(Transcripción de la conferencia pronunciada por Richard Stallman el 28 de "
 "octubre de 2002 en el Congreso Internacional de Lisp [<span style=\"font-"
 "style:italic;\">International Lisp Conference</span>])."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Since none of my usual speeches have anything to do with Lisp, none of them "
 "were appropriate for today. So I'm going to have to wing it.  Since I've "
@@ -59,17 +66,39 @@
 "interesante al respecto."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | My first experience with Lisp was when I read the Lisp 1.5 manual in high
+# | school. That's when I had my mind blown by the idea that there could be a
+# | computer language like that. The first time I had a chance to do anything
+# | with Lisp was when I was a freshman at Harvard and I wrote a Lisp
+# | interpreter for the <abbr title=\"Programmed Data
+# | Processor\">PDP</abbr>-11. It was a very small [-machine &mdash; it-]
+# | {+machine&mdash;it+} had something like 8k of [-memory &mdash; and-]
+# | {+memory&mdash;and+} I managed to write the interpreter in a thousand
+# | instructions. This gave me some room for a little bit of data. That was
+# | before I got to see what real software was like, that did real system jobs.
+#, fuzzy
+#| msgid ""
+#| "My first experience with Lisp was when I read the Lisp 1.5 manual in high "
+#| "school. That's when I had my mind blown by the idea that there could be a "
+#| "computer language like that. The first time I had a chance to do anything "
+#| "with Lisp was when I was a freshman at Harvard and I wrote a Lisp "
+#| "interpreter for the <abbr title=\"Programmed Data Processor\">PDP</"
+#| "abbr>-11. It was a very small machine &mdash; it had something like 8k of "
+#| "memory &mdash; and I managed to write the interpreter in a thousand "
+#| "instructions. This gave me some room for a little bit of data. That was "
+#| "before I got to see what real software was like, that did real system "
+#| "jobs."
 msgid ""
 "My first experience with Lisp was when I read the Lisp 1.5 manual in high "
 "school. That's when I had my mind blown by the idea that there could be a "
 "computer language like that. The first time I had a chance to do anything "
 "with Lisp was when I was a freshman at Harvard and I wrote a Lisp "
 "interpreter for the <abbr title=\"Programmed Data Processor\">PDP</abbr>-11. "
-"It was a very small machine &mdash; it had something like 8k of memory "
-"&mdash; and I managed to write the interpreter in a thousand instructions. "
-"This gave me some room for a little bit of data. That was before I got to "
-"see what real software was like, that did real system jobs."
+"It was a very small machine&mdash;it had something like 8k of memory&mdash;"
+"and I managed to write the interpreter in a thousand instructions. This gave "
+"me some room for a little bit of data. That was before I got to see what "
+"real software was like, that did real system jobs."
 msgstr ""
 "Mi primera experiencia con Lisp tuvo lugar en la escuela secundaria, cuando "
 "leí el manual de Lisp 1.5. Entonces quedé maravillado con la idea de que "
@@ -83,13 +112,26 @@
 "los sistemas reales."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | I began doing work on a real Lisp implementation with JonL White once I
+# | started working at <abbr title=\"Massachusetts Institute of
+# | Technology\">MIT</abbr>. I got hired at the Artificial Intelligence Lab
+# | not by JonL, but by Russ Noftsker, which was most ironic considering what
+# | was to [-come &mdash; he-] {+come&mdash;he+} must have really regretted
+# | that day.
+#, fuzzy
+#| msgid ""
+#| "I began doing work on a real Lisp implementation with JonL White once I "
+#| "started working at <abbr title=\"Massachusetts Institute of Technology"
+#| "\">MIT</abbr>. I got hired at the Artificial Intelligence Lab not by "
+#| "JonL, but by Russ Noftsker, which was most ironic considering what was to "
+#| "come &mdash; he must have really regretted that day."
 msgid ""
 "I began doing work on a real Lisp implementation with JonL White once I "
 "started working at <abbr title=\"Massachusetts Institute of Technology"
 "\">MIT</abbr>. I got hired at the Artificial Intelligence Lab not by JonL, "
-"but by Russ Noftsker, which was most ironic considering what was to come "
-"&mdash; he must have really regretted that day."
+"but by Russ Noftsker, which was most ironic considering what was to "
+"come&mdash;he must have really regretted that day."
 msgstr ""
 "Fue tras comenzar mi trabajo en el <abbr title=\"Instituto de Tecnología de "
 "Massachusetts\">MIT</abbr> cuando empecé a trabajar en una implementación "
@@ -99,7 +141,7 @@
 "lamentado realmente lo ocurrido aquel día."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "During the 1970s, before my life became politicized by horrible events, I "
 "was just going along making one extension after another for various "
@@ -129,7 +171,7 @@
 "tales prestaciones."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This spirit of building up gigantic, complicated programs to use in your own "
 "editing, and then exchanging them with other people, fueled the spirit of "
@@ -155,19 +197,46 @@
 "Inteligencia Artificial lo que condujo a Emacs e hizo de él lo que fue."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The original Emacs did not have Lisp in it. The lower level language, the
+# | non-interpreted [-language &mdash; was-] {+language&mdash;was+} PDP-10
+# | Assembler. The interpreter we wrote in that actually wasn't written for
+# | Emacs, it was written for <abbr title=\"Text Editor and
+# | COrrector\">TECO</abbr>. It was our text editor, and was an extremely ugly
+# | programming language, as ugly as could possibly be. The reason was that it
+# | wasn't designed to be a programming language, it was designed to be an
+# | editor and command language. There were commands like
+# | [-&lsquo;5l&rsquo;,-] {+<code>5l</code>,+} meaning [-&lsquo;move-]
+# | {+<code>move+} five [-lines&rsquo;,-] {+lines</code>,+} or
+# | [-&lsquo;i&rsquo;-] {+<code>i</code>+} and then a string and then an ESC
+# | to insert that string. You would type a string that was a series of
+# | commands, which was called a command string. You would end it with ESC
+# | ESC, and it would get executed.
+#, fuzzy
+#| msgid ""
+#| "The original Emacs did not have Lisp in it. The lower level language, the "
+#| "non-interpreted language &mdash; was PDP-10 Assembler. The interpreter we "
+#| "wrote in that actually wasn't written for Emacs, it was written for <abbr "
+#| "title=\"Text Editor and COrrector\">TECO</abbr>. It was our text editor, "
+#| "and was an extremely ugly programming language, as ugly as could possibly "
+#| "be. The reason was that it wasn't designed to be a programming language, "
+#| "it was designed to be an editor and command language. There were commands "
+#| "like &lsquo;5l&rsquo;, meaning &lsquo;move five lines&rsquo;, or &lsquo;"
+#| "i&rsquo; and then a string and then an ESC to insert that string. You "
+#| "would type a string that was a series of commands, which was called a "
+#| "command string. You would end it with ESC ESC, and it would get executed."
 msgid ""
 "The original Emacs did not have Lisp in it. The lower level language, the "
-"non-interpreted language &mdash; was PDP-10 Assembler. The interpreter we "
+"non-interpreted language&mdash;was PDP-10 Assembler. The interpreter we "
 "wrote in that actually wasn't written for Emacs, it was written for <abbr "
 "title=\"Text Editor and COrrector\">TECO</abbr>. It was our text editor, and "
 "was an extremely ugly programming language, as ugly as could possibly be. "
 "The reason was that it wasn't designed to be a programming language, it was "
 "designed to be an editor and command language. There were commands like "
-"&lsquo;5l&rsquo;, meaning &lsquo;move five lines&rsquo;, or &lsquo;i&rsquo; "
-"and then a string and then an ESC to insert that string. You would type a "
-"string that was a series of commands, which was called a command string. You "
-"would end it with ESC ESC, and it would get executed."
+"<code>5l</code>, meaning <code>move five lines</code>, or <code>i</code> and "
+"then a string and then an ESC to insert that string. You would type a string "
+"that was a series of commands, which was called a command string. You would "
+"end it with ESC ESC, and it would get executed."
 msgstr ""
 "El Emacs original no incluía Lisp. Su lenguaje, de más bajo nivel y no "
 "interpretado, era Ensamblador del PDP-10. El intérprete que escribimos "
@@ -183,18 +252,43 @@
 "ESC ESC, y sería ejecutada."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Well, people wanted to extend this language with programming facilities,
+# | so they added some. For instance, one of the first was a looping
+# | construct, which was [-&lt; &gt;.-] {+<code>&lt;&nbsp;&gt;</code>.+} You
+# | would put those around things and it would loop. There were other cryptic
+# | commands that could be used to conditionally exit the loop.  To make
+# | Emacs, [-we <a href=\"#foot-1\">(1)</a>-] {+we&#8239;<a
+# | href=\"#foot-1\">[1]</a>+} added facilities to have subroutines with
+# | names. Before that, it was sort of like Basic, and the subroutines could
+# | only have single letters as their names. That was hard to program big
+# | programs with, so we added code so they could have longer names. Actually,
+# | there were some rather sophisticated facilities; I think that Lisp got its
+# | unwind-protect facility from TECO.
+#, fuzzy
+#| msgid ""
+#| "Well, people wanted to extend this language with programming facilities, "
+#| "so they added some. For instance, one of the first was a looping "
+#| "construct, which was &lt; &gt;. You would put those around things and it "
+#| "would loop. There were other cryptic commands that could be used to "
+#| "conditionally exit the loop.  To make Emacs, we <a href=\"#foot-1\">(1)</"
+#| "a> added facilities to have subroutines with names. Before that, it was "
+#| "sort of like Basic, and the subroutines could only have single letters as "
+#| "their names. That was hard to program big programs with, so we added code "
+#| "so they could have longer names. Actually, there were some rather "
+#| "sophisticated facilities; I think that Lisp got its unwind-protect "
+#| "facility from TECO."
 msgid ""
 "Well, people wanted to extend this language with programming facilities, so "
 "they added some. For instance, one of the first was a looping construct, "
-"which was &lt; &gt;. You would put those around things and it would loop. "
-"There were other cryptic commands that could be used to conditionally exit "
-"the loop.  To make Emacs, we <a href=\"#foot-1\">(1)</a> added facilities to "
-"have subroutines with names. Before that, it was sort of like Basic, and the "
-"subroutines could only have single letters as their names. That was hard to "
-"program big programs with, so we added code so they could have longer names. "
-"Actually, there were some rather sophisticated facilities; I think that Lisp "
-"got its unwind-protect facility from TECO."
+"which was <code>&lt;&nbsp;&gt;</code>. You would put those around things and "
+"it would loop. There were other cryptic commands that could be used to "
+"conditionally exit the loop.  To make Emacs, we&#8239;<a href=\"#foot-1\">[1]"
+"</a> added facilities to have subroutines with names. Before that, it was "
+"sort of like Basic, and the subroutines could only have single letters as "
+"their names. That was hard to program big programs with, so we added code so "
+"they could have longer names. Actually, there were some rather sophisticated "
+"facilities; I think that Lisp got its unwind-protect facility from TECO."
 msgstr ""
 "Bien. La gente quería extender este lenguaje con elementos útiles para la "
 "programación, así que añadió algunos. Por ejemplo, uno de los primeros 
fue "
@@ -211,10 +305,28 @@
 "aplicación-abierta», de TECO."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | We started putting in rather sophisticated facilities, all with the
+# | ugliest syntax you could ever think of, and it [-worked &mdash; people-]
+# | {+worked&mdash;people+} were able to write large programs in it anyway.
+# | The obvious lesson was that a language like TECO, which wasn't designed to
+# | be a programming language, was the wrong way to go. The language that you
+# | build your extensions on shouldn't be thought of as a programming language
+# | in afterthought; it should be designed as a programming language. In fact,
+# | we discovered that the best programming language for that purpose was Lisp.
+#, fuzzy
+#| msgid ""
+#| "We started putting in rather sophisticated facilities, all with the "
+#| "ugliest syntax you could ever think of, and it worked &mdash; people were "
+#| "able to write large programs in it anyway. The obvious lesson was that a "
+#| "language like TECO, which wasn't designed to be a programming language, "
+#| "was the wrong way to go. The language that you build your extensions on "
+#| "shouldn't be thought of as a programming language in afterthought; it "
+#| "should be designed as a programming language. In fact, we discovered that "
+#| "the best programming language for that purpose was Lisp."
 msgid ""
 "We started putting in rather sophisticated facilities, all with the ugliest "
-"syntax you could ever think of, and it worked &mdash; people were able to "
+"syntax you could ever think of, and it worked&mdash;people were able to "
 "write large programs in it anyway. The obvious lesson was that a language "
 "like TECO, which wasn't designed to be a programming language, was the wrong "
 "way to go. The language that you build your extensions on shouldn't be "
@@ -233,18 +345,41 @@
 "programación para ese propósito era Lisp."
 
 # type: Content of: <p>
-#. type: Content of: <p>
-msgid ""
-"It was Bernie Greenberg, who discovered that it was <a href=\"#foot-2\">(2)</"
-"a>.  He wrote a version of Emacs in Multics MacLisp, and he wrote his "
-"commands in MacLisp in a straightforward fashion. The editor itself was "
-"written entirely in Lisp. Multics Emacs proved to be a great success &mdash; "
-"programming new editing commands was so convenient that even the secretaries "
-"in his office started learning how to use it. They used a manual someone had "
-"written which showed how to extend Emacs, but didn't say it was a "
-"programming. So the secretaries, who believed they couldn't do programming, "
-"weren't scared off. They read the manual, discovered they could do useful "
-"things and they learned to program."
+#. type: Content of: <div><p>
+# | It was Bernie Greenberg, who discovered that it [-was <a
+# | href=\"#foot-2\">(2)</a>.-] {+was&#8239;<a href=\"#foot-2\">[2]</a>.+}  He
+# | wrote a version of Emacs in Multics MacLisp, and he wrote his commands in
+# | MacLisp in a straightforward fashion. The editor itself was written
+# | entirely in Lisp. Multics Emacs proved to be a great [-success &mdash;
+# | programming-] {+success&mdash;programming+} new editing commands was so
+# | convenient that even the secretaries in his office started learning how to
+# | use it. They used a manual someone had written which showed how to extend
+# | Emacs, but didn't say it was a programming. So the secretaries, who
+# | believed they couldn't do programming, weren't scared off. They read the
+# | manual, discovered they could do useful things and they learned to program.
+#, fuzzy
+#| msgid ""
+#| "It was Bernie Greenberg, who discovered that it was <a href=\"#foot-2\">"
+#| "(2)</a>.  He wrote a version of Emacs in Multics MacLisp, and he wrote "
+#| "his commands in MacLisp in a straightforward fashion. The editor itself "
+#| "was written entirely in Lisp. Multics Emacs proved to be a great success "
+#| "&mdash; programming new editing commands was so convenient that even the "
+#| "secretaries in his office started learning how to use it. They used a "
+#| "manual someone had written which showed how to extend Emacs, but didn't "
+#| "say it was a programming. So the secretaries, who believed they couldn't "
+#| "do programming, weren't scared off. They read the manual, discovered they "
+#| "could do useful things and they learned to program."
+msgid ""
+"It was Bernie Greenberg, who discovered that it was&#8239;<a href="
+"\"#foot-2\">[2]</a>.  He wrote a version of Emacs in Multics MacLisp, and he "
+"wrote his commands in MacLisp in a straightforward fashion. The editor "
+"itself was written entirely in Lisp. Multics Emacs proved to be a great "
+"success&mdash;programming new editing commands was so convenient that even "
+"the secretaries in his office started learning how to use it. They used a "
+"manual someone had written which showed how to extend Emacs, but didn't say "
+"it was a programming. So the secretaries, who believed they couldn't do "
+"programming, weren't scared off. They read the manual, discovered they could "
+"do useful things and they learned to program."
 msgstr ""
 "Fue Bernie Greenberg quien descubrió que lo era <a href=\"#foot-2\">(2)</"
 "a> . Escribió una versión de Emacs en Multics MacLisp, y programó sus "
@@ -258,16 +393,37 @@
 "aprendieron a programar."
 
 # type: Content of: <p>
-#. type: Content of: <p>
-msgid ""
-"So Bernie saw that an application &mdash; a program that does something "
-"useful for you &mdash; which has Lisp inside it and which you could extend "
-"by rewriting the Lisp programs, is actually a very good way for people to "
-"learn programming. It gives them a chance to write small programs that are "
-"useful for them, which in most arenas you can't possibly do. They can get "
-"encouragement for their own practical use &mdash; at the stage where it's "
-"the hardest &mdash; where they don't believe they can program, until they "
-"get to the point where they are programmers."
+#. type: Content of: <div><p>
+# | So Bernie saw that an [-application &mdash; a-] {+application&mdash;a+}
+# | program that does something useful for [-you &mdash; which-]
+# | {+you&mdash;which+} has Lisp inside it and which you could extend by
+# | rewriting the Lisp programs, is actually a very good way for people to
+# | learn programming. It gives them a chance to write small programs that are
+# | useful for them, which in most arenas you can't possibly do. They can get
+# | encouragement for their own practical [-use &mdash; at-] {+use&mdash;at+}
+# | the stage where it's the [-hardest &mdash; where-] {+hardest&mdash;where+}
+# | they don't believe they can program, until they get to the point where
+# | they are programmers.
+#, fuzzy
+#| msgid ""
+#| "So Bernie saw that an application &mdash; a program that does something "
+#| "useful for you &mdash; which has Lisp inside it and which you could "
+#| "extend by rewriting the Lisp programs, is actually a very good way for "
+#| "people to learn programming. It gives them a chance to write small "
+#| "programs that are useful for them, which in most arenas you can't "
+#| "possibly do. They can get encouragement for their own practical use "
+#| "&mdash; at the stage where it's the hardest &mdash; where they don't "
+#| "believe they can program, until they get to the point where they are "
+#| "programmers."
+msgid ""
+"So Bernie saw that an application&mdash;a program that does something useful "
+"for you&mdash;which has Lisp inside it and which you could extend by "
+"rewriting the Lisp programs, is actually a very good way for people to learn "
+"programming. It gives them a chance to write small programs that are useful "
+"for them, which in most arenas you can't possibly do. They can get "
+"encouragement for their own practical use&mdash;at the stage where it's the "
+"hardest&mdash;where they don't believe they can program, until they get to "
+"the point where they are programmers."
 msgstr ""
 "Así que Bernie vio que una aplicación, un programa creado para solucionar "
 "problemas prácticos, que llevara incorporado LISP, de forma que pudiera "
@@ -280,30 +436,79 @@
 "no es capaz de programar, hasta aquel en que está, de hecho, programando."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | At that point, people began to wonder how they could get something like
+# | this on a platform where they didn't have full service Lisp
+# | implementation. Multics MacLisp had a compiler as well as an [-interpreter
+# | &mdash; it-] {+interpreter&mdash;it+} was a full-fledged Lisp [-system
+# | &mdash; but-] {+system&mdash;but+} people wanted to implement something
+# | like that on other systems where they had not already written a Lisp
+# | compiler. Well, if you didn't have the Lisp compiler you couldn't write
+# | the whole editor in [-Lisp &mdash; it-] {+Lisp&mdash;it+} would be too
+# | slow, especially redisplay, if it had to run interpreted Lisp.  So we
+# | developed a hybrid technique. The idea was to write a Lisp interpreter and
+# | the lower level parts of the editor together, so that parts of the editor
+# | were built-in Lisp facilities. Those would be whatever parts we felt we
+# | had to optimize. This was a technique that we had already consciously
+# | practiced in the original Emacs, because there were certain fairly high
+# | level features which we re-implemented in machine language, making them
+# | into TECO primitives. For instance, there was a TECO primitive to fill a
+# | paragraph (actually, to do most of the work of filling a paragraph,
+# | because some of the less time-consuming parts of the job would be done at
+# | the higher level by a TECO program). You could do the whole job by writing
+# | a TECO program, but that was too slow, so we optimized it by putting part
+# | of it in machine language. We used the same idea here (in the hybrid
+# | technique), that most of the editor would be written in Lisp, but certain
+# | parts of it that had to run particularly fast would be written at a lower
+# | level.
+#, fuzzy
+#| msgid ""
+#| "At that point, people began to wonder how they could get something like "
+#| "this on a platform where they didn't have full service Lisp "
+#| "implementation. Multics MacLisp had a compiler as well as an interpreter "
+#| "&mdash; it was a full-fledged Lisp system &mdash; but people wanted to "
+#| "implement something like that on other systems where they had not already "
+#| "written a Lisp compiler. Well, if you didn't have the Lisp compiler you "
+#| "couldn't write the whole editor in Lisp &mdash; it would be too slow, "
+#| "especially redisplay, if it had to run interpreted Lisp.  So we developed "
+#| "a hybrid technique. The idea was to write a Lisp interpreter and the "
+#| "lower level parts of the editor together, so that parts of the editor "
+#| "were built-in Lisp facilities. Those would be whatever parts we felt we "
+#| "had to optimize. This was a technique that we had already consciously "
+#| "practiced in the original Emacs, because there were certain fairly high "
+#| "level features which we re-implemented in machine language, making them "
+#| "into TECO primitives. For instance, there was a TECO primitive to fill a "
+#| "paragraph (actually, to do most of the work of filling a paragraph, "
+#| "because some of the less time-consuming parts of the job would be done at "
+#| "the higher level by a TECO program). You could do the whole job by "
+#| "writing a TECO program, but that was too slow, so we optimized it by "
+#| "putting part of it in machine language. We used the same idea here (in "
+#| "the hybrid technique), that most of the editor would be written in Lisp, "
+#| "but certain parts of it that had to run particularly fast would be "
+#| "written at a lower level."
 msgid ""
 "At that point, people began to wonder how they could get something like this "
 "on a platform where they didn't have full service Lisp implementation. "
-"Multics MacLisp had a compiler as well as an interpreter &mdash; it was a "
-"full-fledged Lisp system &mdash; but people wanted to implement something "
-"like that on other systems where they had not already written a Lisp "
-"compiler. Well, if you didn't have the Lisp compiler you couldn't write the "
-"whole editor in Lisp &mdash; it would be too slow, especially redisplay, if "
-"it had to run interpreted Lisp.  So we developed a hybrid technique. The "
-"idea was to write a Lisp interpreter and the lower level parts of the editor "
-"together, so that parts of the editor were built-in Lisp facilities. Those "
-"would be whatever parts we felt we had to optimize. This was a technique "
-"that we had already consciously practiced in the original Emacs, because "
-"there were certain fairly high level features which we re-implemented in "
-"machine language, making them into TECO primitives. For instance, there was "
-"a TECO primitive to fill a paragraph (actually, to do most of the work of "
-"filling a paragraph, because some of the less time-consuming parts of the "
-"job would be done at the higher level by a TECO program). You could do the "
-"whole job by writing a TECO program, but that was too slow, so we optimized "
-"it by putting part of it in machine language. We used the same idea here (in "
-"the hybrid technique), that most of the editor would be written in Lisp, but "
-"certain parts of it that had to run particularly fast would be written at a "
-"lower level."
+"Multics MacLisp had a compiler as well as an interpreter&mdash;it was a full-"
+"fledged Lisp system&mdash;but people wanted to implement something like that "
+"on other systems where they had not already written a Lisp compiler. Well, "
+"if you didn't have the Lisp compiler you couldn't write the whole editor in "
+"Lisp&mdash;it would be too slow, especially redisplay, if it had to run "
+"interpreted Lisp.  So we developed a hybrid technique. The idea was to write "
+"a Lisp interpreter and the lower level parts of the editor together, so that "
+"parts of the editor were built-in Lisp facilities. Those would be whatever "
+"parts we felt we had to optimize. This was a technique that we had already "
+"consciously practiced in the original Emacs, because there were certain "
+"fairly high level features which we re-implemented in machine language, "
+"making them into TECO primitives. For instance, there was a TECO primitive "
+"to fill a paragraph (actually, to do most of the work of filling a "
+"paragraph, because some of the less time-consuming parts of the job would be "
+"done at the higher level by a TECO program). You could do the whole job by "
+"writing a TECO program, but that was too slow, so we optimized it by putting "
+"part of it in machine language. We used the same idea here (in the hybrid "
+"technique), that most of the editor would be written in Lisp, but certain "
+"parts of it that had to run particularly fast would be written at a lower "
+"level."
 msgstr ""
 "Llegado este punto, la gente se empezó a preguntar cómo podría conseguir "
 "algo así en una plataforma que no poseyera una implementación de Lisp "
@@ -331,16 +536,33 @@
 "partes que tenían que ejecutarse particularmente rápido."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Therefore, when I wrote my second implementation of Emacs, I followed the
+# | same kind of design. The low level language was not machine language
+# | anymore, it was C. C was a good, efficient language for portable programs
+# | to run in a Unix-like operating system. There was a Lisp interpreter, but
+# | I implemented facilities for special purpose editing jobs directly in [-C
+# | &mdash; manipulating-] {+C&mdash;manipulating+} editor buffers, inserting
+# | leading text, reading and writing files, redisplaying the buffer on the
+# | screen, managing editor windows.
+#, fuzzy
+#| msgid ""
+#| "Therefore, when I wrote my second implementation of Emacs, I followed the "
+#| "same kind of design. The low level language was not machine language "
+#| "anymore, it was C. C was a good, efficient language for portable programs "
+#| "to run in a Unix-like operating system. There was a Lisp interpreter, but "
+#| "I implemented facilities for special purpose editing jobs directly in C "
+#| "&mdash; manipulating editor buffers, inserting leading text, reading and "
+#| "writing files, redisplaying the buffer on the screen, managing editor "
+#| "windows."
 msgid ""
 "Therefore, when I wrote my second implementation of Emacs, I followed the "
 "same kind of design. The low level language was not machine language "
 "anymore, it was C. C was a good, efficient language for portable programs to "
 "run in a Unix-like operating system. There was a Lisp interpreter, but I "
-"implemented facilities for special purpose editing jobs directly in C "
-"&mdash; manipulating editor buffers, inserting leading text, reading and "
-"writing files, redisplaying the buffer on the screen, managing editor "
-"windows."
+"implemented facilities for special purpose editing jobs directly in C&mdash;"
+"manipulating editor buffers, inserting leading text, reading and writing "
+"files, redisplaying the buffer on the screen, managing editor windows."
 msgstr ""
 "Por lo tanto, cuando escribí mi segunda implementación de Emacs seguí el "
 "mismo esquema. El lenguaje de bajo nivel ya no era lenguaje máquina, sino C. 
"
@@ -353,20 +575,46 @@
 "ventanas del editor."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Now, this was not the first Emacs that was written in C and ran on Unix.
+# | The first was written by James Gosling, and was referred to as GosMacs. A
+# | strange thing happened with him. In the beginning, he seemed to be
+# | influenced by the same spirit of sharing and cooperation of the original
+# | Emacs. I first released the original Emacs to people at MIT. Someone
+# | wanted to port it to run on [-Twenex &mdash; it-] {+Twenex&mdash;it+}
+# | originally only ran on the Incompatible Timesharing System we used at MIT.
+# | They ported it to Twenex, which meant that there were a few hundred
+# | installations around the world that could potentially use it. We started
+# | distributing it to them, with the rule that &ldquo;you had to send back
+# | all of your improvements&rdquo; so we could all benefit. No one ever tried
+# | to enforce that, but as far as I know people did cooperate.
+#, fuzzy
+#| msgid ""
+#| "Now, this was not the first Emacs that was written in C and ran on Unix. "
+#| "The first was written by James Gosling, and was referred to as GosMacs. A "
+#| "strange thing happened with him. In the beginning, he seemed to be "
+#| "influenced by the same spirit of sharing and cooperation of the original "
+#| "Emacs. I first released the original Emacs to people at MIT. Someone "
+#| "wanted to port it to run on Twenex &mdash; it originally only ran on the "
+#| "Incompatible Timesharing System we used at MIT. They ported it to Twenex, "
+#| "which meant that there were a few hundred installations around the world "
+#| "that could potentially use it. We started distributing it to them, with "
+#| "the rule that &ldquo;you had to send back all of your improvements&rdquo; "
+#| "so we could all benefit. No one ever tried to enforce that, but as far as "
+#| "I know people did cooperate."
 msgid ""
 "Now, this was not the first Emacs that was written in C and ran on Unix. The "
 "first was written by James Gosling, and was referred to as GosMacs. A "
 "strange thing happened with him. In the beginning, he seemed to be "
 "influenced by the same spirit of sharing and cooperation of the original "
 "Emacs. I first released the original Emacs to people at MIT. Someone wanted "
-"to port it to run on Twenex &mdash; it originally only ran on the "
-"Incompatible Timesharing System we used at MIT. They ported it to Twenex, "
-"which meant that there were a few hundred installations around the world "
-"that could potentially use it. We started distributing it to them, with the "
-"rule that &ldquo;you had to send back all of your improvements&rdquo; so we "
-"could all benefit. No one ever tried to enforce that, but as far as I know "
-"people did cooperate."
+"to port it to run on Twenex&mdash;it originally only ran on the Incompatible "
+"Timesharing System we used at MIT. They ported it to Twenex, which meant "
+"that there were a few hundred installations around the world that could "
+"potentially use it. We started distributing it to them, with the rule that "
+"&ldquo;you had to send back all of your improvements&rdquo; so we could all "
+"benefit. No one ever tried to enforce that, but as far as I know people did "
+"cooperate."
 msgstr ""
 "Ahora bien, este no fue el primer Emacs escrito en C y que se ejecutaba en "
 "Unix. El primero lo escribió James Gosling, y era conocido como GosMacs. Con 
"
@@ -384,12 +632,26 @@
 "cooperaba."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Gosling did, at first, seem to participate in this spirit. He wrote in a
+# | manual that he called the program Emacs hoping that others in the
+# | community would improve it until it was worthy of that name. That's the
+# | right approach to take towards a [-community &mdash; to-]
+# | {+community&mdash;to+} ask them to join in and make the program better.
+# | But after that he seemed to change the spirit, and sold it to a company.
+#, fuzzy
+#| msgid ""
+#| "Gosling did, at first, seem to participate in this spirit. He wrote in a "
+#| "manual that he called the program Emacs hoping that others in the "
+#| "community would improve it until it was worthy of that name. That's the "
+#| "right approach to take towards a community &mdash; to ask them to join in "
+#| "and make the program better. But after that he seemed to change the "
+#| "spirit, and sold it to a company."
 msgid ""
 "Gosling did, at first, seem to participate in this spirit. He wrote in a "
 "manual that he called the program Emacs hoping that others in the community "
 "would improve it until it was worthy of that name. That's the right approach "
-"to take towards a community &mdash; to ask them to join in and make the "
+"to take towards a community&mdash;to ask them to join in and make the "
 "program better. But after that he seemed to change the spirit, and sold it "
 "to a company."
 msgstr ""
@@ -401,7 +663,32 @@
 "cambiar el espíritu, y lo vendió a una empresa."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | At that time I was working on the GNU system (a free software Unix-like
+# | operating system that many people erroneously call &ldquo;Linux&rdquo;). 
+# | There was no free software Emacs editor that ran on Unix. I did, however,
+# | have a friend who had participated in developing Gosling's Emacs. Gosling
+# | had given him, by email, permission to distribute his own version. He
+# | proposed to me that I use that version. Then I discovered that Gosling's
+# | Emacs did not have a real Lisp. It had a programming language that was
+# | known as [-&lsquo;mocklisp&rsquo;,-] {+&ldquo;mocklisp,&rdquo;+} which
+# | looks syntactically like Lisp, but didn't have the data structures of
+# | Lisp.  So programs were not data, and vital elements of Lisp were missing.
+# |  Its data structures were strings, numbers and a few other specialized
+# | things.
+#, fuzzy
+#| msgid ""
+#| "At that time I was working on the GNU system (a free software Unix-like "
+#| "operating system that many people erroneously call &ldquo;Linux&rdquo;).  "
+#| "There was no free software Emacs editor that ran on Unix. I did, however, "
+#| "have a friend who had participated in developing Gosling's Emacs. Gosling "
+#| "had given him, by email, permission to distribute his own version. He "
+#| "proposed to me that I use that version. Then I discovered that Gosling's "
+#| "Emacs did not have a real Lisp. It had a programming language that was "
+#| "known as &lsquo;mocklisp&rsquo;, which looks syntactically like Lisp, but "
+#| "didn't have the data structures of Lisp.  So programs were not data, and "
+#| "vital elements of Lisp were missing.  Its data structures were strings, "
+#| "numbers and a few other specialized things."
 msgid ""
 "At that time I was working on the GNU system (a free software Unix-like "
 "operating system that many people erroneously call &ldquo;Linux&rdquo;).  "
@@ -410,7 +697,7 @@
 "had given him, by email, permission to distribute his own version. He "
 "proposed to me that I use that version. Then I discovered that Gosling's "
 "Emacs did not have a real Lisp. It had a programming language that was known "
-"as &lsquo;mocklisp&rsquo;, which looks syntactically like Lisp, but didn't "
+"as &ldquo;mocklisp,&rdquo; which looks syntactically like Lisp, but didn't "
 "have the data structures of Lisp.  So programs were not data, and vital "
 "elements of Lisp were missing.  Its data structures were strings, numbers "
 "and a few other specialized things."
@@ -429,7 +716,7 @@
 "elementos especializados más."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I concluded I couldn't use it and had to replace it all, the first step of "
 "which was to write an actual Lisp interpreter. I gradually adapted every "
@@ -445,13 +732,28 @@
 "manipulables por los programas Lisp del usuario."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The one exception was redisplay. For a long time, redisplay was sort of an
+# | alternate world. The editor would enter the world of redisplay and things
+# | would go on with very special data structures that were not safe for
+# | garbage collection, not safe for interruption, and you couldn't run any
+# | Lisp programs during that. We've changed that [-since &mdash; it's-]
+# | {+since&mdash;it's+} now possible to run Lisp code during redisplay. It's
+# | quite a convenient thing.
+#, fuzzy
+#| msgid ""
+#| "The one exception was redisplay. For a long time, redisplay was sort of "
+#| "an alternate world. The editor would enter the world of redisplay and "
+#| "things would go on with very special data structures that were not safe "
+#| "for garbage collection, not safe for interruption, and you couldn't run "
+#| "any Lisp programs during that. We've changed that since &mdash; it's now "
+#| "possible to run Lisp code during redisplay. It's quite a convenient thing."
 msgid ""
 "The one exception was redisplay. For a long time, redisplay was sort of an "
 "alternate world. The editor would enter the world of redisplay and things "
 "would go on with very special data structures that were not safe for garbage "
 "collection, not safe for interruption, and you couldn't run any Lisp "
-"programs during that. We've changed that since &mdash; it's now possible to "
+"programs during that. We've changed that since&mdash;it's now possible to "
 "run Lisp code during redisplay. It's quite a convenient thing."
 msgstr ""
 "La excepción fue <span style=\"font-style:italic;\">redisplay</span>. "
@@ -466,15 +768,37 @@
 "\">redisplay</span>. Es algo muy práctico."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | This second Emacs program was [-&lsquo;free software&rsquo;-]
+# | {+&ldquo;free software&rdquo;+} in the modern sense of the [-term &mdash;
+# | it-] {+term&mdash;it+} was part of an explicit political campaign to make
+# | software free. The essence of this campaign was that everybody should be
+# | free to do the things we did in the old days at MIT, working together on
+# | software and working with whomever wanted to work with us.  That is the
+# | basis for the free software [-movement &mdash; the-]
+# | {+movement&mdash;the+} experience I had, the life that I've lived at the
+# | MIT AI [-lab &mdash; to-] {+lab&mdash;to+} be working on human knowledge,
+# | and not be standing in the way of anybody's further using and further
+# | disseminating human knowledge.
+#, fuzzy
+#| msgid ""
+#| "This second Emacs program was &lsquo;free software&rsquo; in the modern "
+#| "sense of the term &mdash; it was part of an explicit political campaign "
+#| "to make software free. The essence of this campaign was that everybody "
+#| "should be free to do the things we did in the old days at MIT, working "
+#| "together on software and working with whomever wanted to work with us.  "
+#| "That is the basis for the free software movement &mdash; the experience I "
+#| "had, the life that I've lived at the MIT AI lab &mdash; to be working on "
+#| "human knowledge, and not be standing in the way of anybody's further "
+#| "using and further disseminating human knowledge."
 msgid ""
-"This second Emacs program was &lsquo;free software&rsquo; in the modern "
-"sense of the term &mdash; it was part of an explicit political campaign to "
+"This second Emacs program was &ldquo;free software&rdquo; in the modern "
+"sense of the term&mdash;it was part of an explicit political campaign to "
 "make software free. The essence of this campaign was that everybody should "
 "be free to do the things we did in the old days at MIT, working together on "
 "software and working with whomever wanted to work with us.  That is the "
-"basis for the free software movement &mdash; the experience I had, the life "
-"that I've lived at the MIT AI lab &mdash; to be working on human knowledge, "
+"basis for the free software movement&mdash;the experience I had, the life "
+"that I've lived at the MIT AI lab&mdash;to be working on human knowledge, "
 "and not be standing in the way of anybody's further using and further "
 "disseminating human knowledge."
 msgstr ""
@@ -489,7 +813,7 @@
 "obstaculizar su uso ni su expansión."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "At the time, you could make a computer that was about the same price range "
 "as other computers that weren't meant for Lisp, except that it would run "
@@ -510,11 +834,30 @@
 "obtenían resultados absurdos y terminaban por fallar o bloquearse."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The Lisp machine was able to execute instructions about as fast as those
+# | other machines, but each [-instruction &mdash; a-] {+instruction&mdash;a+}
+# | <code>car</code> instruction would do data [-typechecking &mdash; so-]
+# | {+typechecking&mdash;so+} when you tried to get the <code>car</code> of a
+# | number in a compiled program, it would give you an immediate error. We
+# | built the machine and had a Lisp operating system for it. It was written
+# | almost entirely in Lisp, the only exceptions being parts written in the
+# | microcode. People became interested in manufacturing them, which meant
+# | they should start a company.
+#, fuzzy
+#| msgid ""
+#| "The Lisp machine was able to execute instructions about as fast as those "
+#| "other machines, but each instruction &mdash; a <code>car</code> "
+#| "instruction would do data typechecking &mdash; so when you tried to get "
+#| "the <code>car</code> of a number in a compiled program, it would give you "
+#| "an immediate error. We built the machine and had a Lisp operating system "
+#| "for it. It was written almost entirely in Lisp, the only exceptions being "
+#| "parts written in the microcode. People became interested in manufacturing "
+#| "them, which meant they should start a company."
 msgid ""
 "The Lisp machine was able to execute instructions about as fast as those "
-"other machines, but each instruction &mdash; a <code>car</code> instruction "
-"would do data typechecking &mdash; so when you tried to get the <code>car</"
+"other machines, but each instruction&mdash;a <code>car</code> instruction "
+"would do data typechecking&mdash;so when you tried to get the <code>car</"
 "code> of a number in a compiled program, it would give you an immediate "
 "error. We built the machine and had a Lisp operating system for it. It was "
 "written almost entirely in Lisp, the only exceptions being parts written in "
@@ -532,15 +875,34 @@
 "una empresa."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | There were two different ideas about what this company should be like. 
+# | Greenblatt wanted to start what he called a &ldquo;hacker&rdquo; company.
+# | This meant it would be a company run by hackers and would operate in a way
+# | conducive to hackers. Another goal was to maintain the AI Lab [-culture <a
+# | href=\"#foot-3\">(3)</a>.-] {+culture&#8239;<a class=\"ftn\"
+# | href=\"#foot-3\">[3]</a>.+}  Unfortunately, Greenblatt didn't have any
+# | business experience, so other people in the Lisp machine group said they
+# | doubted whether he could succeed. They thought that his plan to avoid
+# | outside investment wouldn't work.
+#, fuzzy
+#| msgid ""
+#| "There were two different ideas about what this company should be like.  "
+#| "Greenblatt wanted to start what he called a &ldquo;hacker&rdquo; company. "
+#| "This meant it would be a company run by hackers and would operate in a "
+#| "way conducive to hackers. Another goal was to maintain the AI Lab culture "
+#| "<a href=\"#foot-3\">(3)</a>.  Unfortunately, Greenblatt didn't have any "
+#| "business experience, so other people in the Lisp machine group said they "
+#| "doubted whether he could succeed. They thought that his plan to avoid "
+#| "outside investment wouldn't work."
 msgid ""
 "There were two different ideas about what this company should be like.  "
 "Greenblatt wanted to start what he called a &ldquo;hacker&rdquo; company. "
 "This meant it would be a company run by hackers and would operate in a way "
-"conducive to hackers. Another goal was to maintain the AI Lab culture <a "
-"href=\"#foot-3\">(3)</a>.  Unfortunately, Greenblatt didn't have any "
-"business experience, so other people in the Lisp machine group said they "
-"doubted whether he could succeed. They thought that his plan to avoid "
+"conducive to hackers. Another goal was to maintain the AI Lab culture&#8239;"
+"<a class=\"ftn\" href=\"#foot-3\">[3]</a>.  Unfortunately, Greenblatt didn't "
+"have any business experience, so other people in the Lisp machine group said "
+"they doubted whether he could succeed. They thought that his plan to avoid "
 "outside investment wouldn't work."
 msgstr ""
 "Había dos visiones diferentes sobre cómo debería ser esa empresa. 
Greenblatt "
@@ -553,7 +915,7 @@
 "Pensaban que su plan para evitar inversiones externas no funcionaría."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Why did he want to avoid outside investment? Because when a company has "
 "outside investors, they take control and they don't let you have any "
@@ -566,7 +928,7 @@
 "funciones directivas."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So Greenblatt had the idea that he would find a customer who would pay in "
 "advance to buy the parts. They would build machines and deliver them; with "
@@ -583,7 +945,7 @@
 "pensaban que lo más probable era que el plan no saliera bien."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Greenblatt then recruited Russell Noftsker, the man who had hired me, who "
 "had subsequently left the AI Lab and created a successful company.  Russell "
@@ -605,7 +967,7 @@
 "ganar."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "But Greenblatt didn't give up. He and the few people loyal to him decided to "
 "start Lisp Machines Inc. anyway and go ahead with their plans. And what do "
@@ -628,7 +990,7 @@
 "destruirla."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Thus, the abandonment of our lab was followed by &ldquo;war&rdquo; in our "
 "lab.  The abandonment happened when Symbolics hired away all the hackers, "
@@ -658,13 +1020,26 @@
 "sería aniquilado, pero lo fue."
 
 # type: Content of: <p>
-#. type: Content of: <p>
-msgid ""
-"So Symbolics came up with a plan <a href=\"#foot-4\">(4)</a>.  They said to "
-"the lab, &ldquo;We will continue making our changes to the system available "
-"for you to use, but you can't put it into the MIT Lisp machine system. "
-"Instead, we'll give you access to Symbolics' Lisp machine system, and you "
-"can run it, but that's all you can do.&rdquo;"
+#. type: Content of: <div><p>
+# | So Symbolics came up with a [-plan <a href=\"#foot-4\">(4)</a>.-]
+# | {+plan&#8239;<a href=\"#foot-4\">[4]</a>.+}  They said to the lab,
+# | &ldquo;We will continue making our changes to the system available for you
+# | to use, but you can't put it into the MIT Lisp machine system. Instead,
+# | we'll give you access to Symbolics' Lisp machine system, and you can run
+# | it, but that's all you can do.&rdquo;
+#, fuzzy
+#| msgid ""
+#| "So Symbolics came up with a plan <a href=\"#foot-4\">(4)</a>.  They said "
+#| "to the lab, &ldquo;We will continue making our changes to the system "
+#| "available for you to use, but you can't put it into the MIT Lisp machine "
+#| "system. Instead, we'll give you access to Symbolics' Lisp machine system, "
+#| "and you can run it, but that's all you can do.&rdquo;"
+msgid ""
+"So Symbolics came up with a plan&#8239;<a href=\"#foot-4\">[4]</a>.  They "
+"said to the lab, &ldquo;We will continue making our changes to the system "
+"available for you to use, but you can't put it into the MIT Lisp machine "
+"system. Instead, we'll give you access to Symbolics' Lisp machine system, "
+"and you can run it, but that's all you can do.&rdquo;"
 msgstr ""
 "A Symbolics se le ocurrió un plan <a href=\"#foot-4\">(4)</a>. Dijeron al "
 "laboratorio: «seguiremos permitiéndoles que usen nuestras modificaciones al 
"
@@ -673,7 +1048,7 @@
 "ejecutarlo, pero eso será todo lo que podrán hacer»."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This, in effect, meant that they demanded that we had to choose a side, and "
 "use either the MIT version of the system or the Symbolics version.  "
@@ -694,12 +1069,28 @@
 "que siguiera existiendo. Así, no se nos permitió seguir siendo neutrales."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Up until that point, I hadn't taken the side of either company, although
+# | it made me miserable to see what had happened to our community and the
+# | software.  But now, Symbolics had forced the issue.  So, in an effort to
+# | help keep Lisp Machines Inc. [-going <a href=\"#foot-5\">(5)</a> &mdash;
+# | I-] {+going&#8239;<a href=\"#foot-5\">[5]</a>&mdash;I+} began duplicating
+# | all of the improvements Symbolics had made to the Lisp machine system.  I
+# | wrote the equivalent improvements again myself (i.e., the code was my own).
+#, fuzzy
+#| msgid ""
+#| "Up until that point, I hadn't taken the side of either company, although "
+#| "it made me miserable to see what had happened to our community and the "
+#| "software.  But now, Symbolics had forced the issue.  So, in an effort to "
+#| "help keep Lisp Machines Inc. going <a href=\"#foot-5\">(5)</a> &mdash; I "
+#| "began duplicating all of the improvements Symbolics had made to the Lisp "
+#| "machine system.  I wrote the equivalent improvements again myself (i.e., "
+#| "the code was my own)."
 msgid ""
 "Up until that point, I hadn't taken the side of either company, although it "
 "made me miserable to see what had happened to our community and the "
 "software.  But now, Symbolics had forced the issue.  So, in an effort to "
-"help keep Lisp Machines Inc. going <a href=\"#foot-5\">(5)</a> &mdash; I "
+"help keep Lisp Machines Inc. going&#8239;<a href=\"#foot-5\">[5]</a>&mdash;I "
 "began duplicating all of the improvements Symbolics had made to the Lisp "
 "machine system.  I wrote the equivalent improvements again myself (i.e., the "
 "code was my own)."
@@ -713,12 +1104,24 @@
 "mejoras equivalentes de nuevo (es decir, el código era mío)."
 
 # type: Content of: <p>
-#. type: Content of: <p>
-msgid ""
-"After a while <a href=\"#foot-6\">(6)</a>, I came to the conclusion that it "
-"would be best if I didn't even look at their code. When they made a beta "
-"announcement that gave the release notes, I would see what the features were "
-"and then implement them. By the time they had a real release, I did too."
+#. type: Content of: <div><p>
+# | After a [-while <a href=\"#foot-6\">(6)</a>,-] {+while&#8239;<a
+# | href=\"#foot-6\">[6]</a>,+} I came to the conclusion that it would be best
+# | if I didn't even look at their code. When they made a beta announcement
+# | that gave the release notes, I would see what the features were and then
+# | implement them. By the time they had a real release, I did too.
+#, fuzzy
+#| msgid ""
+#| "After a while <a href=\"#foot-6\">(6)</a>, I came to the conclusion that "
+#| "it would be best if I didn't even look at their code. When they made a "
+#| "beta announcement that gave the release notes, I would see what the "
+#| "features were and then implement them. By the time they had a real "
+#| "release, I did too."
+msgid ""
+"After a while&#8239;<a href=\"#foot-6\">[6]</a>, I came to the conclusion "
+"that it would be best if I didn't even look at their code. When they made a "
+"beta announcement that gave the release notes, I would see what the features "
+"were and then implement them. By the time they had a real release, I did too."
 msgstr ""
 "Después de un tiempo <a href=\"#foot-6\">(6)</a>, llegué a la conclusión 
de "
 "que sería mejor ni siquiera mirar su código. Cuando anunciaban la 
liberación "
@@ -728,15 +1131,33 @@
 "modificaciones, yo también liberaba las mías."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | In this way, for two years, I prevented them from wiping out Lisp Machines
+# | Incorporated, and the two companies went on. But, I didn't want to spend
+# | years and years punishing someone, just thwarting an evil deed. I figured
+# | they had been punished pretty thoroughly because they were stuck with
+# | competition that was not leaving or going to [-disappear <a
+# | href=\"#foot-7\">(7)</a>.-] {+disappear&#8239;<a
+# | href=\"#foot-7\">[7]</a>.+}  Meanwhile, it was time to start building a
+# | new community to replace the one that their actions and others had wiped
+# | out.
+#, fuzzy
+#| msgid ""
+#| "In this way, for two years, I prevented them from wiping out Lisp "
+#| "Machines Incorporated, and the two companies went on. But, I didn't want "
+#| "to spend years and years punishing someone, just thwarting an evil deed. "
+#| "I figured they had been punished pretty thoroughly because they were "
+#| "stuck with competition that was not leaving or going to disappear <a href="
+#| "\"#foot-7\">(7)</a>. Meanwhile, it was time to start building a new "
+#| "community to replace the one that their actions and others had wiped out."
 msgid ""
 "In this way, for two years, I prevented them from wiping out Lisp Machines "
 "Incorporated, and the two companies went on. But, I didn't want to spend "
 "years and years punishing someone, just thwarting an evil deed. I figured "
 "they had been punished pretty thoroughly because they were stuck with "
-"competition that was not leaving or going to disappear <a href=\"#foot-7\">"
-"(7)</a>. Meanwhile, it was time to start building a new community to replace "
-"the one that their actions and others had wiped out."
+"competition that was not leaving or going to disappear&#8239;<a href="
+"\"#foot-7\">[7]</a>.  Meanwhile, it was time to start building a new "
+"community to replace the one that their actions and others had wiped out."
 msgstr ""
 "De esta manera, durante dos años evité que acabaran con Lisp Machines "
 "Incorporated, y las dos empresas siguieron adelante. Pero no quería pasarme "
@@ -747,7 +1168,7 @@
 "a la que las acciones suyas y de otros exterminaron."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The Lisp community in the 70s was not limited to the MIT AI Lab, and the "
 "hackers were not all at MIT. The war that Symbolics started was what wiped "
@@ -762,11 +1183,21 @@
 "también contribuyó a extinguir la comunidad."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Once I stopped punishing Symbolics, I had to figure out what to do next. I
+# | had to make a free operating system, that was [-clear &mdash; the-]
+# | {+clear&mdash;the+} only way that people could work together and share was
+# | with a free operating system.
+#, fuzzy
+#| msgid ""
+#| "Once I stopped punishing Symbolics, I had to figure out what to do next. "
+#| "I had to make a free operating system, that was clear &mdash; the only "
+#| "way that people could work together and share was with a free operating "
+#| "system."
 msgid ""
 "Once I stopped punishing Symbolics, I had to figure out what to do next. I "
-"had to make a free operating system, that was clear &mdash; the only way "
-"that people could work together and share was with a free operating system."
+"had to make a free operating system, that was clear&mdash;the only way that "
+"people could work together and share was with a free operating system."
 msgstr ""
 "Una vez que dejé de castigar a Symbolics, tuve que pensar qué hacer a "
 "continuación. Tenía que hacer un sistema operativo libre, eso estaba claro. 
"
@@ -774,7 +1205,33 @@
 "era con un sistema operativo libre."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | At first, I thought of making a Lisp-based system, but I realized that
+# | wouldn't be a good idea technically. To have something like the Lisp
+# | machine system, you needed special purpose microcode. That's what made it
+# | possible to run programs as fast as other computers would run their
+# | programs and still get the benefit of typechecking. Without that, you
+# | would be reduced to something like the Lisp compilers for other machines.
+# | The programs would be faster, but unstable. Now that's okay if you're
+# | running one program on a timesharing [-system &mdash; if-]
+# | {+system&mdash;if+} one program crashes, that's not a disaster, that's
+# | something your program occasionally does. But that didn't make it good for
+# | writing the operating system in, so I rejected the idea of making a system
+# | like the Lisp machine.
+#, fuzzy
+#| msgid ""
+#| "At first, I thought of making a Lisp-based system, but I realized that "
+#| "wouldn't be a good idea technically. To have something like the Lisp "
+#| "machine system, you needed special purpose microcode. That's what made it "
+#| "possible to run programs as fast as other computers would run their "
+#| "programs and still get the benefit of typechecking. Without that, you "
+#| "would be reduced to something like the Lisp compilers for other machines. "
+#| "The programs would be faster, but unstable. Now that's okay if you're "
+#| "running one program on a timesharing system &mdash; if one program "
+#| "crashes, that's not a disaster, that's something your program "
+#| "occasionally does. But that didn't make it good for writing the operating "
+#| "system in, so I rejected the idea of making a system like the Lisp "
+#| "machine."
 msgid ""
 "At first, I thought of making a Lisp-based system, but I realized that "
 "wouldn't be a good idea technically. To have something like the Lisp machine "
@@ -783,7 +1240,7 @@
 "still get the benefit of typechecking. Without that, you would be reduced to "
 "something like the Lisp compilers for other machines. The programs would be "
 "faster, but unstable. Now that's okay if you're running one program on a "
-"timesharing system &mdash; if one program crashes, that's not a disaster, "
+"timesharing system&mdash;if one program crashes, that's not a disaster, "
 "that's something your program occasionally does. But that didn't make it "
 "good for writing the operating system in, so I rejected the idea of making a "
 "system like the Lisp machine."
@@ -803,7 +1260,7 @@
 "máquina Lisp."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I decided instead to make a Unix-like operating system that would have Lisp "
 "implementations to run as user programs. The kernel wouldn't be written in "
@@ -821,7 +1278,7 @@
 "tener muy en cuenta."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There were people in those days, in 1985, who had one-megabyte machines "
 "without virtual memory. They wanted to be able to use GNU Emacs. This meant "
@@ -832,15 +1289,34 @@
 "significaba que tenía que hacer que el programa fuera lo más pequeño 
posible."
 
 # type: Content of: <p>
-#. type: Content of: <p>
-msgid ""
-"For instance, at the time the only looping construct was &lsquo;"
-"while&rsquo;, which was extremely simple. There was no way to break out of "
-"the &lsquo;while&rsquo; statement, you just had to do a catch and a throw, "
-"or test a variable that ran the loop. That shows how far I was pushing to "
-"keep things small. We didn't have &lsquo;caar&rsquo; and &lsquo;cadr&rsquo; "
-"and so on; &ldquo;squeeze out everything possible&rdquo; was the spirit of "
-"GNU Emacs, the spirit of Emacs Lisp, from the beginning."
+#. type: Content of: <div><p>
+# | For instance, at the time the only looping construct was
+# | [-&lsquo;while&rsquo;,-] {+<code>while</code>,+} which was extremely
+# | simple. There was no way to break out of the [-&lsquo;while&rsquo;-]
+# | {+<code>while</code>+} statement, you just had to do a catch and a throw,
+# | or test a variable that ran the loop. That shows how far I was pushing to
+# | keep things small. We didn't have [-&lsquo;caar&rsquo;-]
+# | {+<code>caar</code>+} and [-&lsquo;cadr&rsquo;-] {+<code>cadr</code>+} and
+# | so on; &ldquo;squeeze out everything possible&rdquo; was the spirit of GNU
+# | Emacs, the spirit of Emacs Lisp, from the beginning.
+#, fuzzy
+#| msgid ""
+#| "For instance, at the time the only looping construct was &lsquo;"
+#| "while&rsquo;, which was extremely simple. There was no way to break out "
+#| "of the &lsquo;while&rsquo; statement, you just had to do a catch and a "
+#| "throw, or test a variable that ran the loop. That shows how far I was "
+#| "pushing to keep things small. We didn't have &lsquo;caar&rsquo; and "
+#| "&lsquo;cadr&rsquo; and so on; &ldquo;squeeze out everything "
+#| "possible&rdquo; was the spirit of GNU Emacs, the spirit of Emacs Lisp, "
+#| "from the beginning."
+msgid ""
+"For instance, at the time the only looping construct was <code>while</code>, "
+"which was extremely simple. There was no way to break out of the "
+"<code>while</code> statement, you just had to do a catch and a throw, or "
+"test a variable that ran the loop. That shows how far I was pushing to keep "
+"things small. We didn't have <code>caar</code> and <code>cadr</code> and so "
+"on; &ldquo;squeeze out everything possible&rdquo; was the spirit of GNU "
+"Emacs, the spirit of Emacs Lisp, from the beginning."
 msgstr ""
 "Por ejemplo, en aquel entonces la única estructura iterativa era «while», "
 "implementada de forma extremadamente simple. No había ningún mecanismo para 
"
@@ -853,15 +1329,35 @@
 "espíritu de Emacs Lisp desde el principio."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Obviously, machines are bigger now, and we don't do it that way any more.
+# | We put in [-&lsquo;caar&rsquo;-] {+<code>caar</code>+} and
+# | [-&lsquo;cadr&rsquo;-] {+<code>cadr</code>+} and so on, and we might put
+# | in another looping construct one of these days. We're willing to extend it
+# | some now, but we don't want to extend it to the level of common Lisp. I
+# | implemented Common Lisp once on the Lisp machine, and I'm not all that
+# | happy with it. One thing I don't like terribly much is keyword [-arguments
+# | <a href=\"#foot-8\">(8)</a>.-] {+arguments&#8239;<a
+# | href=\"#foot-8\">[8]</a>.+}  They don't seem quite Lispy to me; I'll do it
+# | sometimes but I minimize the times when I do that.
+#, fuzzy
+#| msgid ""
+#| "Obviously, machines are bigger now, and we don't do it that way any more. "
+#| "We put in &lsquo;caar&rsquo; and &lsquo;cadr&rsquo; and so on, and we "
+#| "might put in another looping construct one of these days. We're willing "
+#| "to extend it some now, but we don't want to extend it to the level of "
+#| "common Lisp. I implemented Common Lisp once on the Lisp machine, and I'm "
+#| "not all that happy with it. One thing I don't like terribly much is "
+#| "keyword arguments <a href=\"#foot-8\">(8)</a>.  They don't seem quite "
+#| "Lispy to me; I'll do it sometimes but I minimize the times when I do that."
 msgid ""
 "Obviously, machines are bigger now, and we don't do it that way any more. We "
-"put in &lsquo;caar&rsquo; and &lsquo;cadr&rsquo; and so on, and we might put "
+"put in <code>caar</code> and <code>cadr</code> and so on, and we might put "
 "in another looping construct one of these days. We're willing to extend it "
 "some now, but we don't want to extend it to the level of common Lisp. I "
 "implemented Common Lisp once on the Lisp machine, and I'm not all that happy "
-"with it. One thing I don't like terribly much is keyword arguments <a href="
-"\"#foot-8\">(8)</a>.  They don't seem quite Lispy to me; I'll do it "
+"with it. One thing I don't like terribly much is keyword arguments&#8239;<a "
+"href=\"#foot-8\">[8]</a>.  They don't seem quite Lispy to me; I'll do it "
 "sometimes but I minimize the times when I do that."
 msgstr ""
 "Evidentemente, las máquinas actuales tienen mayor capacidad, y ya no hacemos 
"
@@ -874,7 +1370,7 @@
 "menos posible."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "That was not the end of the GNU projects involved with Lisp. Later on around "
 "1995, we were looking into starting a graphical desktop project. It was "
@@ -889,7 +1385,7 @@
 "desde el escritorio. La cuestión era cuál."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "At the time, <abbr title=\"Tool Command Language\">TCL</abbr> was being "
 "pushed heavily for this purpose. I had a very low opinion of TCL, basically "
@@ -919,7 +1415,7 @@
 "para todos los programas GNU."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There's an interesting benefit you can get from using such a powerful "
 "language as a version of Lisp as your primary extensibility language.  You "
@@ -945,18 +1441,50 @@
 "cualquier aplicación y extender dicha aplicación usando su lenguaje 
favorito."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | As long as the extensibility languages are weak, the users have to use
+# | only the language you provided them. Which means that people who love any
+# | given language have to compete for the choice of the developers of
+# | [-applications &mdash; saying-] {+applications&mdash;saying+}
+# | &ldquo;Please, application developer, put my language into your
+# | application, not his language.&rdquo; Then the users get no choices at
+# | [-all &mdash; whichever-] {+all&mdash;whichever+} application they're
+# | using comes with one language and they're stuck with [that language]. But
+# | when you have a powerful language that can implement others by translating
+# | into it, then you give the user a choice of language and we don't have to
+# | have a language war anymore. That's what we're hoping
+# | [-&lsquo;Guile&rsquo;,-] {+Guile,+} our scheme interpreter, will do. We
+# | had a person working last summer finishing up a translator from Python to
+# | Scheme. I don't know if it's entirely finished yet, but for anyone
+# | interested in this project, please get in touch. So that's the plan we
+# | have for the future.
+#, fuzzy
+#| msgid ""
+#| "As long as the extensibility languages are weak, the users have to use "
+#| "only the language you provided them. Which means that people who love any "
+#| "given language have to compete for the choice of the developers of "
+#| "applications &mdash; saying &ldquo;Please, application developer, put my "
+#| "language into your application, not his language.&rdquo; Then the users "
+#| "get no choices at all &mdash; whichever application they're using comes "
+#| "with one language and they're stuck with [that language]. But when you "
+#| "have a powerful language that can implement others by translating into "
+#| "it, then you give the user a choice of language and we don't have to have "
+#| "a language war anymore. That's what we're hoping &lsquo;Guile&rsquo;, our "
+#| "scheme interpreter, will do. We had a person working last summer "
+#| "finishing up a translator from Python to Scheme. I don't know if it's "
+#| "entirely finished yet, but for anyone interested in this project, please "
+#| "get in touch. So that's the plan we have for the future."
 msgid ""
 "As long as the extensibility languages are weak, the users have to use only "
 "the language you provided them. Which means that people who love any given "
-"language have to compete for the choice of the developers of applications "
-"&mdash; saying &ldquo;Please, application developer, put my language into "
-"your application, not his language.&rdquo; Then the users get no choices at "
-"all &mdash; whichever application they're using comes with one language and "
-"they're stuck with [that language]. But when you have a powerful language "
-"that can implement others by translating into it, then you give the user a "
-"choice of language and we don't have to have a language war anymore. That's "
-"what we're hoping &lsquo;Guile&rsquo;, our scheme interpreter, will do. We "
+"language have to compete for the choice of the developers of "
+"applications&mdash;saying &ldquo;Please, application developer, put my "
+"language into your application, not his language.&rdquo; Then the users get "
+"no choices at all&mdash;whichever application they're using comes with one "
+"language and they're stuck with [that language]. But when you have a "
+"powerful language that can implement others by translating into it, then you "
+"give the user a choice of language and we don't have to have a language war "
+"anymore. That's what we're hoping Guile, our scheme interpreter, will do. We "
 "had a person working last summer finishing up a translator from Python to "
 "Scheme. I don't know if it's entirely finished yet, but for anyone "
 "interested in this project, please get in touch. So that's the plan we have "
@@ -978,7 +1506,27 @@
 "proyecto, por favor póngase en contacto. Este es nuestro plan para el 
futuro."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | I haven't been speaking about free software, but let me briefly tell you a
+# | little bit about what that means. Free software does not refer to price;
+# | it doesn't mean that you get it for free. (You may have paid for a copy,
+# | or gotten a copy gratis.) It means that you have freedom as a user. The
+# | crucial thing is that you are free to run the program, free to study what
+# | it does, free to change it to suit your needs, free to redistribute the
+# | copies of others and free to publish improved, extended versions. This is
+# | what free software means. If you are using a non[---]free program, you
+# | have lost crucial freedom, so don't ever do that.
+#, fuzzy
+#| msgid ""
+#| "I haven't been speaking about free software, but let me briefly tell you "
+#| "a little bit about what that means. Free software does not refer to "
+#| "price; it doesn't mean that you get it for free. (You may have paid for a "
+#| "copy, or gotten a copy gratis.) It means that you have freedom as a user. "
+#| "The crucial thing is that you are free to run the program, free to study "
+#| "what it does, free to change it to suit your needs, free to redistribute "
+#| "the copies of others and free to publish improved, extended versions. "
+#| "This is what free software means. If you are using a non-free program, "
+#| "you have lost crucial freedom, so don't ever do that."
 msgid ""
 "I haven't been speaking about free software, but let me briefly tell you a "
 "little bit about what that means. Free software does not refer to price; it "
@@ -987,7 +1535,7 @@
 "thing is that you are free to run the program, free to study what it does, "
 "free to change it to suit your needs, free to redistribute the copies of "
 "others and free to publish improved, extended versions. This is what free "
-"software means. If you are using a non-free program, you have lost crucial "
+"software means. If you are using a nonfree program, you have lost crucial "
 "freedom, so don't ever do that."
 msgstr ""
 "Esta charla no es sobre software libre, pero déjenme comentarles brevemente "
@@ -1002,12 +1550,30 @@
 "que no es libre, pierde una libertad crucial, así que no lo haga nunca."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The purpose of the GNU project is to make it easier for people to reject
+# | freedom-trampling, user-dominating, non[---]free software by providing
+# | free software to replace it. For those who don't have the moral courage to
+# | reject the non[---]free software, when that means some practical
+# | inconvenience, what we try to do is give a free alternative so that you
+# | can move to freedom with less of a mess and less of a sacrifice in
+# | practical terms. The less sacrifice the better. We want to make it easier
+# | for you to live in freedom, to cooperate.
+#, fuzzy
+#| msgid ""
+#| "The purpose of the GNU project is to make it easier for people to reject "
+#| "freedom-trampling, user-dominating, non-free software by providing free "
+#| "software to replace it. For those who don't have the moral courage to "
+#| "reject the non-free software, when that means some practical "
+#| "inconvenience, what we try to do is give a free alternative so that you "
+#| "can move to freedom with less of a mess and less of a sacrifice in "
+#| "practical terms. The less sacrifice the better. We want to make it easier "
+#| "for you to live in freedom, to cooperate."
 msgid ""
 "The purpose of the GNU project is to make it easier for people to reject "
-"freedom-trampling, user-dominating, non-free software by providing free "
+"freedom-trampling, user-dominating, nonfree software by providing free "
 "software to replace it. For those who don't have the moral courage to reject "
-"the non-free software, when that means some practical inconvenience, what we "
+"the nonfree software, when that means some practical inconvenience, what we "
 "try to do is give a free alternative so that you can move to freedom with "
 "less of a mess and less of a sacrifice in practical terms. The less "
 "sacrifice the better. We want to make it easier for you to live in freedom, "
@@ -1023,16 +1589,34 @@
 "sacrificio, mejor. Queremos hacer más fácil vivir en libertad, cooperar."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | This is a matter of the freedom to cooperate. We're used to thinking of
+# | freedom and cooperation with society as if they are opposites. But here
+# | they're on the same side. With free software you are free to cooperate
+# | with other people as well as free to help yourself. With non[---]free
+# | software, somebody is dominating you and keeping people divided. You're
+# | not allowed to share with them, you're not free to cooperate or help
+# | society, anymore than you're free to help yourself.  Divided and helpless
+# | is the state of users using non[---]free software.
+#, fuzzy
+#| msgid ""
+#| "This is a matter of the freedom to cooperate. We're used to thinking of "
+#| "freedom and cooperation with society as if they are opposites. But here "
+#| "they're on the same side. With free software you are free to cooperate "
+#| "with other people as well as free to help yourself. With non-free "
+#| "software, somebody is dominating you and keeping people divided. You're "
+#| "not allowed to share with them, you're not free to cooperate or help "
+#| "society, anymore than you're free to help yourself.  Divided and helpless "
+#| "is the state of users using non-free software."
 msgid ""
 "This is a matter of the freedom to cooperate. We're used to thinking of "
 "freedom and cooperation with society as if they are opposites. But here "
 "they're on the same side. With free software you are free to cooperate with "
-"other people as well as free to help yourself. With non-free software, "
+"other people as well as free to help yourself. With nonfree software, "
 "somebody is dominating you and keeping people divided. You're not allowed to "
 "share with them, you're not free to cooperate or help society, anymore than "
 "you're free to help yourself.  Divided and helpless is the state of users "
-"using non-free software."
+"using nonfree software."
 msgstr ""
 "Es una cuestión de libertad para cooperar. Solemos pensar en la libertad y "
 "en la cooperación con la sociedad como si fueran opuestos. Pero aquí están 
"
@@ -1044,21 +1628,53 @@
 "como se encuentran los usuarios de software que no es libre."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | We've produced a tremendous range of free software. We've done what people
+# | said we could never do; we have two operating systems of free software. We
+# | have many applications and we obviously have a lot farther to go. So we
+# | need your help. I would like to ask you to volunteer for the GNU project;
+# | help us develop free software for more jobs. Take a look at <a
+# | [-href=\"/help/\">http://www.gnu.org/help</a>-]
+# | {+href=\"/help/help.html\">gnu.org/help</a>+} to find suggestions for how
+# | to help. If you want to order things, there's a link to that from the home
+# | page. If you want to read about philosophical issues, look in /philosophy.
+# | If you're looking for free software to use, look in /directory, which
+# | lists about 1900 packages now (which is a fraction of all the free
+# | software out there). Please write more and contribute to us. My book of
+# | essays, &ldquo;Free Software and Free [-Society&rdquo;,-]
+# | {+Society,&rdquo;+} is on sale and can be purchased at [-<a
+# | href=\"http://www.gnu.org/\";>www.gnu.org</a>.-] {+www.gnu.org&#8239;<a
+# | href=\"#foot-9\">[9]</a>.+}  Happy hacking!
+#, fuzzy
+#| msgid ""
+#| "We've produced a tremendous range of free software. We've done what "
+#| "people said we could never do; we have two operating systems of free "
+#| "software. We have many applications and we obviously have a lot farther "
+#| "to go. So we need your help. I would like to ask you to volunteer for the "
+#| "GNU project; help us develop free software for more jobs. Take a look at "
+#| "<a href=\"/help/\">http://www.gnu.org/help</a> to find suggestions for "
+#| "how to help. If you want to order things, there's a link to that from the "
+#| "home page. If you want to read about philosophical issues, look in /"
+#| "philosophy. If you're looking for free software to use, look in /"
+#| "directory, which lists about 1900 packages now (which is a fraction of "
+#| "all the free software out there). Please write more and contribute to us. "
+#| "My book of essays, &ldquo;Free Software and Free Society&rdquo;, is on "
+#| "sale and can be purchased at <a href=\"http://www.gnu.org/\";>www.gnu.org</"
+#| "a>. Happy hacking!"
 msgid ""
 "We've produced a tremendous range of free software. We've done what people "
 "said we could never do; we have two operating systems of free software. We "
 "have many applications and we obviously have a lot farther to go. So we need "
 "your help. I would like to ask you to volunteer for the GNU project; help us "
-"develop free software for more jobs. Take a look at <a href=\"/help/"
-"\">http://www.gnu.org/help</a> to find suggestions for how to help. If you "
-"want to order things, there's a link to that from the home page. If you want "
-"to read about philosophical issues, look in /philosophy. If you're looking "
-"for free software to use, look in /directory, which lists about 1900 "
-"packages now (which is a fraction of all the free software out there). "
-"Please write more and contribute to us. My book of essays, &ldquo;Free "
-"Software and Free Society&rdquo;, is on sale and can be purchased at <a href="
-"\"http://www.gnu.org/\";>www.gnu.org</a>. Happy hacking!"
+"develop free software for more jobs. Take a look at <a href=\"/help/help.html"
+"\">gnu.org/help</a> to find suggestions for how to help. If you want to "
+"order things, there's a link to that from the home page. If you want to read "
+"about philosophical issues, look in /philosophy. If you're looking for free "
+"software to use, look in /directory, which lists about 1900 packages now "
+"(which is a fraction of all the free software out there). Please write more "
+"and contribute to us. My book of essays, &ldquo;Free Software and Free "
+"Society,&rdquo; is on sale and can be purchased at www.gnu.org&#8239;<a href="
+"\"#foot-9\">[9]</a>.  Happy hacking!"
 msgstr ""
 "Hemos producido una enorme variedad de software libre. Hemos hecho lo que la "
 "gente decía que nunca lograríamos hacer; tenemos dos sistemas operativos de 
"
@@ -1078,8 +1694,13 @@
 "\">www.gnu.org</a><sup><a href=\"#TransNote2\" id=\"IniTransNote2\">2</a></"
 "sup>. ¡Feliz hacking!"
 
+# type: Content of: <h4>
+#. type: Content of: <div><h3>
+msgid "Footnotes"
+msgstr "Notas"
+
 # type: Content of: <p>
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Guy Steele designed the original symmetrical Emacs command set; then he and "
 "I began implementing Emacs (on top of TECO), but after one long joint "
@@ -1094,7 +1715,7 @@
 "McMahon, contribuyeron más tarde de forma sustancial."
 
 # type: Content of: <p>
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Bernie Greenberg says that Dan Weinreb's implementation of Emacs for the "
 "Lisp Machine came before Greenberg's implementation for Multics.  I "
@@ -1105,7 +1726,7 @@
 "error. "
 
 # type: Content of: <p>
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Greenblatt's plan, as I understood it, was to hire lab people part time, so "
 "that they could continue working at the AI Lab.  Symbolics hired them full "
@@ -1117,13 +1738,26 @@
 "jornada completa, así que dejaron de trabajar en el MIT."
 
 # type: Content of: <p>
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+# | The background of this plan, which I did not state explicitly in the talk,
+# | is that during an initial period the ex-AI-Lab hackers, whether at
+# | Symbolics or LMI, continued contributing their changes to the MIT Lisp
+# | Machine [-system &mdash; even-] {+system&mdash;even+} though the contract
+# | did not require this.  Symbolics' plan was to rupture this cooperation
+# | unilaterally.
+#, fuzzy
+#| msgid ""
+#| "The background of this plan, which I did not state explicitly in the "
+#| "talk, is that during an initial period the ex-AI-Lab hackers, whether at "
+#| "Symbolics or LMI, continued contributing their changes to the MIT Lisp "
+#| "Machine system &mdash; even though the contract did not require this.  "
+#| "Symbolics' plan was to rupture this cooperation unilaterally."
 msgid ""
 "The background of this plan, which I did not state explicitly in the talk, "
 "is that during an initial period the ex-AI-Lab hackers, whether at Symbolics "
-"or LMI, continued contributing their changes to the MIT Lisp Machine system "
-"&mdash; even though the contract did not require this.  Symbolics' plan was "
-"to rupture this cooperation unilaterally."
+"or LMI, continued contributing their changes to the MIT Lisp Machine "
+"system&mdash;even though the contract did not require this.  Symbolics' plan "
+"was to rupture this cooperation unilaterally."
 msgstr ""
 "Las circunstancias de este plan, que no expuse explícitamente en la charla, "
 "fueron las siguientes: durante un periodo inicial los hackers que habían "
@@ -1134,7 +1768,7 @@
 "ruptura de esta cooperación."
 
 # type: Content of: <p>
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "It was not that I cared particularly about the fate of LMI, but rather I did "
 "not want to let Symbolics gain through its aggression against the AI Lab."
@@ -1144,7 +1778,7 @@
 "hizo al Laboratorio de Inteligencia Artificial."
 
 # type: Content of: <p>
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "This statement has been misconstrued as saying that I never, ever looked at "
 "Symbolics' code.  Actually it says I did look, at first.  The Symbolics "
@@ -1158,7 +1792,7 @@
 "modificaciones."
 
 # type: Content of: <p>
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
 msgid ""
 "But that meant I had to make a special effort to solve each problem "
 "differently, in order to avoid copying Symbolics code.  After a while, I "
@@ -1172,7 +1806,7 @@
 "considerara mejor sin preocuparme de lo que contenía el código de 
Symbolics."
 
 # type: Content of: <p>
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Symbolics at one point protested to MIT that my work, by thwarting their "
 "plan, had cost Symbolics a million dollars."
@@ -1180,7 +1814,7 @@
 "En una ocasión Symbolics se quejó al MIT de que mi trabajo, al frustrar sus 
"
 "planes, le había costado un millón de dólares."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "I don't mind if a very complex and heavyweight function takes keyword "
 "arguments.  What bothers me is making simple basic functions such as &ldquo;"
@@ -1190,6 +1824,28 @@
 "palabras clave. Lo que me molesta es ponerlas en funciones simples y básicas 
"
 "como «member»."
 
+#. type: Content of: <div><ol><li>
+# | [-This essay is published in-]{+In 2021, this book can be purchased from+}
+# | <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>.-]
+# | 
{+href=\"https://shop.fsf.org/books-docs/free-software-free-society-selected-essays-richard-m-stallman-3rd-edition\";>
+# | GNU Press</a>.+}
+#, 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 ""
+"In 2021, this book can be purchased from <a href=\"https://shop.fsf.org/";
+"books-docs/free-software-free-society-selected-essays-richard-m-stallman-3rd-"
+"edition\"> GNU Press</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>
@@ -1221,7 +1877,6 @@
 "proponer otras correcciones o sugerencias, diríjase a <a href=\"mailto:";
 "webmasters@gnu.org\">&lt;webmasters@gnu.org&gt;</a>."
 
-#
 #.  TRANSLATORS: Ignore the original text in this paragraph,
 #.         replace it with the translation of these two:
 #.         We work hard and do our best to provide accurate, good quality
@@ -1229,14 +1884,14 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "El equipo de traductores al español se esfuerza por ofrecer traducciones "
@@ -1249,8 +1904,13 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2003, 2007, 2013, 2014, 2020 Free Software Foundation, Inc."
+# | Copyright &copy; 2003, 2007, 2013, [-2014, 2020-] {+2021+} Free Software
+# | Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2003, 2007, 2013, 2014, 2020 Free Software Foundation, "
+#| "Inc."
+msgid "Copyright &copy; 2003, 2007, 2013, 2021 Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 2003, 2007, 2013, 2014, 2020 Free Software Foundation, Inc."
 
@@ -1279,10 +1939,9 @@
 msgstr "Última actualización:"
 
 # type: Content of: <div><p>
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2003, 2007, 2013, 2014, 2020, 2021 Free Software "
-"Foundation, Inc."
-msgstr ""
-"Copyright &copy; 2003, 2007, 2013, 2014, 2020, 2021 Free Software "
-"Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 2003, 2007, 2013, 2014, 2020, 2021 Free Software "
+#~ "Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2003, 2007, 2013, 2014, 2020, 2021 Free Software "
+#~ "Foundation, Inc."

Index: po/rms-lisp.fr.po
===================================================================
RCS file: /web/www/www/gnu/po/rms-lisp.fr.po,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- po/rms-lisp.fr.po   2 Nov 2021 13:56:42 -0000       1.58
+++ po/rms-lisp.fr.po   2 Nov 2021 14:41:54 -0000       1.59
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rms-lisp.html\n"
-"POT-Creation-Date: 2020-09-21 18:55+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2021-09-12 19:21+0200\n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <trad-gnu@april.org>\n"
@@ -16,6 +16,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-11-02 14:27+0000\n"
 "Plural-Forms: \n"
 "X-Generator: Gtranslator 2.91.5\n"
 
@@ -27,19 +28,25 @@
 "Mes expériences avec Lisp et le développement de GNU Emacs - Projet GNU - "
 "Free Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "My Lisp Experiences and the Development of GNU Emacs"
 msgstr "Mes expériences avec Lisp et le développement de GNU Emacs"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><p>
+# | [-(-]Transcript of Richard Stallman's [-Speech, 28 Oct 2002,-] {+speech+}
+# | at the International Lisp [-Conference).-] {+Conference, 28 Oct 2002.+}
+#, fuzzy
+#| msgid ""
+#| "(Transcript of Richard Stallman's Speech, 28 Oct 2002, at the "
+#| "International Lisp Conference)."
 msgid ""
-"(Transcript of Richard Stallman's Speech, 28 Oct 2002, at the International "
-"Lisp Conference)."
+"Transcript of Richard Stallman's speech at the International Lisp "
+"Conference, 28 Oct 2002."
 msgstr ""
 "(Transcription du discours de Richard Stallman à la conférence "
 "internationale Lisp, le 28 octobre 2002)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Since none of my usual speeches have anything to do with Lisp, none of them "
 "were appropriate for today. So I'm going to have to wing it.  Since I've "
@@ -51,17 +58,39 @@
 "suffisamment de choses dans ma carrière en relation avec Lisp, je devrais "
 "être capable de raconter quelque chose d'intéressant."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | My first experience with Lisp was when I read the Lisp 1.5 manual in high
+# | school. That's when I had my mind blown by the idea that there could be a
+# | computer language like that. The first time I had a chance to do anything
+# | with Lisp was when I was a freshman at Harvard and I wrote a Lisp
+# | interpreter for the <abbr title=\"Programmed Data
+# | Processor\">PDP</abbr>-11. It was a very small [-machine &mdash; it-]
+# | {+machine&mdash;it+} had something like 8k of [-memory &mdash; and-]
+# | {+memory&mdash;and+} I managed to write the interpreter in a thousand
+# | instructions. This gave me some room for a little bit of data. That was
+# | before I got to see what real software was like, that did real system jobs.
+#, fuzzy
+#| msgid ""
+#| "My first experience with Lisp was when I read the Lisp 1.5 manual in high "
+#| "school. That's when I had my mind blown by the idea that there could be a "
+#| "computer language like that. The first time I had a chance to do anything "
+#| "with Lisp was when I was a freshman at Harvard and I wrote a Lisp "
+#| "interpreter for the <abbr title=\"Programmed Data Processor\">PDP</"
+#| "abbr>-11. It was a very small machine &mdash; it had something like 8k of "
+#| "memory &mdash; and I managed to write the interpreter in a thousand "
+#| "instructions. This gave me some room for a little bit of data. That was "
+#| "before I got to see what real software was like, that did real system "
+#| "jobs."
 msgid ""
 "My first experience with Lisp was when I read the Lisp 1.5 manual in high "
 "school. That's when I had my mind blown by the idea that there could be a "
 "computer language like that. The first time I had a chance to do anything "
 "with Lisp was when I was a freshman at Harvard and I wrote a Lisp "
 "interpreter for the <abbr title=\"Programmed Data Processor\">PDP</abbr>-11. "
-"It was a very small machine &mdash; it had something like 8k of memory "
-"&mdash; and I managed to write the interpreter in a thousand instructions. "
-"This gave me some room for a little bit of data. That was before I got to "
-"see what real software was like, that did real system jobs."
+"It was a very small machine&mdash;it had something like 8k of memory&mdash;"
+"and I managed to write the interpreter in a thousand instructions. This gave "
+"me some room for a little bit of data. That was before I got to see what "
+"real software was like, that did real system jobs."
 msgstr ""
 "Ma première expérience avec Lisp a été de lire le manuel Lisp 1.5 au 
lycée. "
 "C'est à ce moment-là que l'idée m'a frappé de plein fouet : qu'il puisse 
y "
@@ -74,13 +103,26 @@
 "données. Tout cela, c'était avant que je ne voie ce qu'est un vrai 
logiciel, "
 "qui fait de vraies tâches sur un système."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | I began doing work on a real Lisp implementation with JonL White once I
+# | started working at <abbr title=\"Massachusetts Institute of
+# | Technology\">MIT</abbr>. I got hired at the Artificial Intelligence Lab
+# | not by JonL, but by Russ Noftsker, which was most ironic considering what
+# | was to [-come &mdash; he-] {+come&mdash;he+} must have really regretted
+# | that day.
+#, fuzzy
+#| msgid ""
+#| "I began doing work on a real Lisp implementation with JonL White once I "
+#| "started working at <abbr title=\"Massachusetts Institute of Technology"
+#| "\">MIT</abbr>. I got hired at the Artificial Intelligence Lab not by "
+#| "JonL, but by Russ Noftsker, which was most ironic considering what was to "
+#| "come &mdash; he must have really regretted that day."
 msgid ""
 "I began doing work on a real Lisp implementation with JonL White once I "
 "started working at <abbr title=\"Massachusetts Institute of Technology"
 "\">MIT</abbr>. I got hired at the Artificial Intelligence Lab not by JonL, "
-"but by Russ Noftsker, which was most ironic considering what was to come "
-"&mdash; he must have really regretted that day."
+"but by Russ Noftsker, which was most ironic considering what was to "
+"come&mdash;he must have really regretted that day."
 msgstr ""
 "J'ai commencé à travailler sur une vraie implémentation de Lisp avec "
 "JonL White après avoir débuté au <abbr title=\"Massachusetts Institute of 
"
@@ -89,7 +131,7 @@
 "plutôt ironique vu ce qui s'est passé par la suite ; il a vraiment dû "
 "regretter ce jour‑là."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "During the 1970s, before my life became politicized by horrible events, I "
 "was just going along making one extension after another for various "
@@ -117,7 +159,7 @@
 "Je ne sais pas si c'était le premier programme à le faire, mais c'était "
 "certainement le premier éditeur comme ça."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This spirit of building up gigantic, complicated programs to use in your own "
 "editing, and then exchanging them with other people, fueled the spirit of "
@@ -143,19 +185,46 @@
 "une connexion inconsciente. Je pense que c'est la nature de notre façon de "
 "vivre au labo d'IA qui a mené à Emacs et l'a fait devenir ce qu'il était."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The original Emacs did not have Lisp in it. The lower level language, the
+# | non-interpreted [-language &mdash; was-] {+language&mdash;was+} PDP-10
+# | Assembler. The interpreter we wrote in that actually wasn't written for
+# | Emacs, it was written for <abbr title=\"Text Editor and
+# | COrrector\">TECO</abbr>. It was our text editor, and was an extremely ugly
+# | programming language, as ugly as could possibly be. The reason was that it
+# | wasn't designed to be a programming language, it was designed to be an
+# | editor and command language. There were commands like
+# | [-&lsquo;5l&rsquo;,-] {+<code>5l</code>,+} meaning [-&lsquo;move-]
+# | {+<code>move+} five [-lines&rsquo;,-] {+lines</code>,+} or
+# | [-&lsquo;i&rsquo;-] {+<code>i</code>+} and then a string and then an ESC
+# | to insert that string. You would type a string that was a series of
+# | commands, which was called a command string. You would end it with ESC
+# | ESC, and it would get executed.
+#, fuzzy
+#| msgid ""
+#| "The original Emacs did not have Lisp in it. The lower level language, the "
+#| "non-interpreted language &mdash; was PDP-10 Assembler. The interpreter we "
+#| "wrote in that actually wasn't written for Emacs, it was written for <abbr "
+#| "title=\"Text Editor and COrrector\">TECO</abbr>. It was our text editor, "
+#| "and was an extremely ugly programming language, as ugly as could possibly "
+#| "be. The reason was that it wasn't designed to be a programming language, "
+#| "it was designed to be an editor and command language. There were commands "
+#| "like &lsquo;5l&rsquo;, meaning &lsquo;move five lines&rsquo;, or &lsquo;"
+#| "i&rsquo; and then a string and then an ESC to insert that string. You "
+#| "would type a string that was a series of commands, which was called a "
+#| "command string. You would end it with ESC ESC, and it would get executed."
 msgid ""
 "The original Emacs did not have Lisp in it. The lower level language, the "
-"non-interpreted language &mdash; was PDP-10 Assembler. The interpreter we "
+"non-interpreted language&mdash;was PDP-10 Assembler. The interpreter we "
 "wrote in that actually wasn't written for Emacs, it was written for <abbr "
 "title=\"Text Editor and COrrector\">TECO</abbr>. It was our text editor, and "
 "was an extremely ugly programming language, as ugly as could possibly be. "
 "The reason was that it wasn't designed to be a programming language, it was "
 "designed to be an editor and command language. There were commands like "
-"&lsquo;5l&rsquo;, meaning &lsquo;move five lines&rsquo;, or &lsquo;i&rsquo; "
-"and then a string and then an ESC to insert that string. You would type a "
-"string that was a series of commands, which was called a command string. You "
-"would end it with ESC ESC, and it would get executed."
+"<code>5l</code>, meaning <code>move five lines</code>, or <code>i</code> and "
+"then a string and then an ESC to insert that string. You would type a string "
+"that was a series of commands, which was called a command string. You would "
+"end it with ESC ESC, and it would get executed."
 msgstr ""
 "L'Emacs original ne contenait pas de Lisp. Le langage de bas niveau, le "
 "langage non interprété, était de l'assembleur PDP-10. L'interpréteur dans 
"
@@ -170,18 +239,43 @@
 "une série de commandes, ce qui s'appelait une chaîne de commande. Vous la "
 "terminiez par Échap Échap, et elle était exécutée."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Well, people wanted to extend this language with programming facilities,
+# | so they added some. For instance, one of the first was a looping
+# | construct, which was [-&lt; &gt;.-] {+<code>&lt;&nbsp;&gt;</code>.+} You
+# | would put those around things and it would loop. There were other cryptic
+# | commands that could be used to conditionally exit the loop.  To make
+# | Emacs, [-we <a href=\"#foot-1\">(1)</a>-] {+we&#8239;<a
+# | href=\"#foot-1\">[1]</a>+} added facilities to have subroutines with
+# | names. Before that, it was sort of like Basic, and the subroutines could
+# | only have single letters as their names. That was hard to program big
+# | programs with, so we added code so they could have longer names. Actually,
+# | there were some rather sophisticated facilities; I think that Lisp got its
+# | unwind-protect facility from TECO.
+#, fuzzy
+#| msgid ""
+#| "Well, people wanted to extend this language with programming facilities, "
+#| "so they added some. For instance, one of the first was a looping "
+#| "construct, which was &lt; &gt;. You would put those around things and it "
+#| "would loop. There were other cryptic commands that could be used to "
+#| "conditionally exit the loop.  To make Emacs, we <a href=\"#foot-1\">(1)</"
+#| "a> added facilities to have subroutines with names. Before that, it was "
+#| "sort of like Basic, and the subroutines could only have single letters as "
+#| "their names. That was hard to program big programs with, so we added code "
+#| "so they could have longer names. Actually, there were some rather "
+#| "sophisticated facilities; I think that Lisp got its unwind-protect "
+#| "facility from TECO."
 msgid ""
 "Well, people wanted to extend this language with programming facilities, so "
 "they added some. For instance, one of the first was a looping construct, "
-"which was &lt; &gt;. You would put those around things and it would loop. "
-"There were other cryptic commands that could be used to conditionally exit "
-"the loop.  To make Emacs, we <a href=\"#foot-1\">(1)</a> added facilities to "
-"have subroutines with names. Before that, it was sort of like Basic, and the "
-"subroutines could only have single letters as their names. That was hard to "
-"program big programs with, so we added code so they could have longer names. "
-"Actually, there were some rather sophisticated facilities; I think that Lisp "
-"got its unwind-protect facility from TECO."
+"which was <code>&lt;&nbsp;&gt;</code>. You would put those around things and "
+"it would loop. There were other cryptic commands that could be used to "
+"conditionally exit the loop.  To make Emacs, we&#8239;<a href=\"#foot-1\">[1]"
+"</a> added facilities to have subroutines with names. Before that, it was "
+"sort of like Basic, and the subroutines could only have single letters as "
+"their names. That was hard to program big programs with, so we added code so "
+"they could have longer names. Actually, there were some rather sophisticated "
+"facilities; I think that Lisp got its unwind-protect facility from TECO."
 msgstr ""
 "Certaines personnes voulaient étendre ce langage avec des méthodes de "
 "programmation. Elles en ont donc ajouté quelques-unes. Par exemple, l'une "
@@ -197,10 +291,28 @@
 "avait des méthodes plutôt sophistiquées : je pense que Lisp a hérité sa 
"
 "méthode <i>unwind-protect</i> de TECO."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | We started putting in rather sophisticated facilities, all with the
+# | ugliest syntax you could ever think of, and it [-worked &mdash; people-]
+# | {+worked&mdash;people+} were able to write large programs in it anyway.
+# | The obvious lesson was that a language like TECO, which wasn't designed to
+# | be a programming language, was the wrong way to go. The language that you
+# | build your extensions on shouldn't be thought of as a programming language
+# | in afterthought; it should be designed as a programming language. In fact,
+# | we discovered that the best programming language for that purpose was Lisp.
+#, fuzzy
+#| msgid ""
+#| "We started putting in rather sophisticated facilities, all with the "
+#| "ugliest syntax you could ever think of, and it worked &mdash; people were "
+#| "able to write large programs in it anyway. The obvious lesson was that a "
+#| "language like TECO, which wasn't designed to be a programming language, "
+#| "was the wrong way to go. The language that you build your extensions on "
+#| "shouldn't be thought of as a programming language in afterthought; it "
+#| "should be designed as a programming language. In fact, we discovered that "
+#| "the best programming language for that purpose was Lisp."
 msgid ""
 "We started putting in rather sophisticated facilities, all with the ugliest "
-"syntax you could ever think of, and it worked &mdash; people were able to "
+"syntax you could ever think of, and it worked&mdash;people were able to "
 "write large programs in it anyway. The obvious lesson was that a language "
 "like TECO, which wasn't designed to be a programming language, was the wrong "
 "way to go. The language that you build your extensions on shouldn't be "
@@ -217,18 +329,41 @@
 "après coup, il doit être <em>conçu</em> comme langage de programmation. En 
"
 "fait, nous avons découvert que le mieux adapté à cet usage était Lisp."
 
-#. type: Content of: <p>
-msgid ""
-"It was Bernie Greenberg, who discovered that it was <a href=\"#foot-2\">(2)</"
-"a>.  He wrote a version of Emacs in Multics MacLisp, and he wrote his "
-"commands in MacLisp in a straightforward fashion. The editor itself was "
-"written entirely in Lisp. Multics Emacs proved to be a great success &mdash; "
-"programming new editing commands was so convenient that even the secretaries "
-"in his office started learning how to use it. They used a manual someone had "
-"written which showed how to extend Emacs, but didn't say it was a "
-"programming. So the secretaries, who believed they couldn't do programming, "
-"weren't scared off. They read the manual, discovered they could do useful "
-"things and they learned to program."
+#. type: Content of: <div><p>
+# | It was Bernie Greenberg, who discovered that it [-was <a
+# | href=\"#foot-2\">(2)</a>.-] {+was&#8239;<a href=\"#foot-2\">[2]</a>.+}  He
+# | wrote a version of Emacs in Multics MacLisp, and he wrote his commands in
+# | MacLisp in a straightforward fashion. The editor itself was written
+# | entirely in Lisp. Multics Emacs proved to be a great [-success &mdash;
+# | programming-] {+success&mdash;programming+} new editing commands was so
+# | convenient that even the secretaries in his office started learning how to
+# | use it. They used a manual someone had written which showed how to extend
+# | Emacs, but didn't say it was a programming. So the secretaries, who
+# | believed they couldn't do programming, weren't scared off. They read the
+# | manual, discovered they could do useful things and they learned to program.
+#, fuzzy
+#| msgid ""
+#| "It was Bernie Greenberg, who discovered that it was <a href=\"#foot-2\">"
+#| "(2)</a>.  He wrote a version of Emacs in Multics MacLisp, and he wrote "
+#| "his commands in MacLisp in a straightforward fashion. The editor itself "
+#| "was written entirely in Lisp. Multics Emacs proved to be a great success "
+#| "&mdash; programming new editing commands was so convenient that even the "
+#| "secretaries in his office started learning how to use it. They used a "
+#| "manual someone had written which showed how to extend Emacs, but didn't "
+#| "say it was a programming. So the secretaries, who believed they couldn't "
+#| "do programming, weren't scared off. They read the manual, discovered they "
+#| "could do useful things and they learned to program."
+msgid ""
+"It was Bernie Greenberg, who discovered that it was&#8239;<a href="
+"\"#foot-2\">[2]</a>.  He wrote a version of Emacs in Multics MacLisp, and he "
+"wrote his commands in MacLisp in a straightforward fashion. The editor "
+"itself was written entirely in Lisp. Multics Emacs proved to be a great "
+"success&mdash;programming new editing commands was so convenient that even "
+"the secretaries in his office started learning how to use it. They used a "
+"manual someone had written which showed how to extend Emacs, but didn't say "
+"it was a programming. So the secretaries, who believed they couldn't do "
+"programming, weren't scared off. They read the manual, discovered they could "
+"do useful things and they learned to program."
 msgstr ""
 "C'est Bernie Greenberg qui l'a découvert <a id=\"foot-2-rev\" href="
 "\"#foot-2\">(2)</a>. Il a écrit une version d'Emacs avec le MacLisp de "
@@ -242,16 +377,37 @@
 "Elles ont lu le manuel, découvert qu'elles pouvaient faire des choses "
 "utiles, et ont appris à programmer."
 
-#. type: Content of: <p>
-msgid ""
-"So Bernie saw that an application &mdash; a program that does something "
-"useful for you &mdash; which has Lisp inside it and which you could extend "
-"by rewriting the Lisp programs, is actually a very good way for people to "
-"learn programming. It gives them a chance to write small programs that are "
-"useful for them, which in most arenas you can't possibly do. They can get "
-"encouragement for their own practical use &mdash; at the stage where it's "
-"the hardest &mdash; where they don't believe they can program, until they "
-"get to the point where they are programmers."
+#. type: Content of: <div><p>
+# | So Bernie saw that an [-application &mdash; a-] {+application&mdash;a+}
+# | program that does something useful for [-you &mdash; which-]
+# | {+you&mdash;which+} has Lisp inside it and which you could extend by
+# | rewriting the Lisp programs, is actually a very good way for people to
+# | learn programming. It gives them a chance to write small programs that are
+# | useful for them, which in most arenas you can't possibly do. They can get
+# | encouragement for their own practical [-use &mdash; at-] {+use&mdash;at+}
+# | the stage where it's the [-hardest &mdash; where-] {+hardest&mdash;where+}
+# | they don't believe they can program, until they get to the point where
+# | they are programmers.
+#, fuzzy
+#| msgid ""
+#| "So Bernie saw that an application &mdash; a program that does something "
+#| "useful for you &mdash; which has Lisp inside it and which you could "
+#| "extend by rewriting the Lisp programs, is actually a very good way for "
+#| "people to learn programming. It gives them a chance to write small "
+#| "programs that are useful for them, which in most arenas you can't "
+#| "possibly do. They can get encouragement for their own practical use "
+#| "&mdash; at the stage where it's the hardest &mdash; where they don't "
+#| "believe they can program, until they get to the point where they are "
+#| "programmers."
+msgid ""
+"So Bernie saw that an application&mdash;a program that does something useful "
+"for you&mdash;which has Lisp inside it and which you could extend by "
+"rewriting the Lisp programs, is actually a very good way for people to learn "
+"programming. It gives them a chance to write small programs that are useful "
+"for them, which in most arenas you can't possibly do. They can get "
+"encouragement for their own practical use&mdash;at the stage where it's the "
+"hardest&mdash;where they don't believe they can program, until they get to "
+"the point where they are programmers."
 msgstr ""
 "Bernie a vu ainsi qu'une application (un programme qui fait quelque chose "
 "d'utile pour vous) contenant Lisp, qu'on pouvait étendre en réécrivant les 
"
@@ -263,30 +419,79 @@
 "pouvoir programmer, jusqu'à ce qu'ils en arrivent au point où ils étaient "
 "devenus programmeurs."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | At that point, people began to wonder how they could get something like
+# | this on a platform where they didn't have full service Lisp
+# | implementation. Multics MacLisp had a compiler as well as an [-interpreter
+# | &mdash; it-] {+interpreter&mdash;it+} was a full-fledged Lisp [-system
+# | &mdash; but-] {+system&mdash;but+} people wanted to implement something
+# | like that on other systems where they had not already written a Lisp
+# | compiler. Well, if you didn't have the Lisp compiler you couldn't write
+# | the whole editor in [-Lisp &mdash; it-] {+Lisp&mdash;it+} would be too
+# | slow, especially redisplay, if it had to run interpreted Lisp.  So we
+# | developed a hybrid technique. The idea was to write a Lisp interpreter and
+# | the lower level parts of the editor together, so that parts of the editor
+# | were built-in Lisp facilities. Those would be whatever parts we felt we
+# | had to optimize. This was a technique that we had already consciously
+# | practiced in the original Emacs, because there were certain fairly high
+# | level features which we re-implemented in machine language, making them
+# | into TECO primitives. For instance, there was a TECO primitive to fill a
+# | paragraph (actually, to do most of the work of filling a paragraph,
+# | because some of the less time-consuming parts of the job would be done at
+# | the higher level by a TECO program). You could do the whole job by writing
+# | a TECO program, but that was too slow, so we optimized it by putting part
+# | of it in machine language. We used the same idea here (in the hybrid
+# | technique), that most of the editor would be written in Lisp, but certain
+# | parts of it that had to run particularly fast would be written at a lower
+# | level.
+#, fuzzy
+#| msgid ""
+#| "At that point, people began to wonder how they could get something like "
+#| "this on a platform where they didn't have full service Lisp "
+#| "implementation. Multics MacLisp had a compiler as well as an interpreter "
+#| "&mdash; it was a full-fledged Lisp system &mdash; but people wanted to "
+#| "implement something like that on other systems where they had not already "
+#| "written a Lisp compiler. Well, if you didn't have the Lisp compiler you "
+#| "couldn't write the whole editor in Lisp &mdash; it would be too slow, "
+#| "especially redisplay, if it had to run interpreted Lisp.  So we developed "
+#| "a hybrid technique. The idea was to write a Lisp interpreter and the "
+#| "lower level parts of the editor together, so that parts of the editor "
+#| "were built-in Lisp facilities. Those would be whatever parts we felt we "
+#| "had to optimize. This was a technique that we had already consciously "
+#| "practiced in the original Emacs, because there were certain fairly high "
+#| "level features which we re-implemented in machine language, making them "
+#| "into TECO primitives. For instance, there was a TECO primitive to fill a "
+#| "paragraph (actually, to do most of the work of filling a paragraph, "
+#| "because some of the less time-consuming parts of the job would be done at "
+#| "the higher level by a TECO program). You could do the whole job by "
+#| "writing a TECO program, but that was too slow, so we optimized it by "
+#| "putting part of it in machine language. We used the same idea here (in "
+#| "the hybrid technique), that most of the editor would be written in Lisp, "
+#| "but certain parts of it that had to run particularly fast would be "
+#| "written at a lower level."
 msgid ""
 "At that point, people began to wonder how they could get something like this "
 "on a platform where they didn't have full service Lisp implementation. "
-"Multics MacLisp had a compiler as well as an interpreter &mdash; it was a "
-"full-fledged Lisp system &mdash; but people wanted to implement something "
-"like that on other systems where they had not already written a Lisp "
-"compiler. Well, if you didn't have the Lisp compiler you couldn't write the "
-"whole editor in Lisp &mdash; it would be too slow, especially redisplay, if "
-"it had to run interpreted Lisp.  So we developed a hybrid technique. The "
-"idea was to write a Lisp interpreter and the lower level parts of the editor "
-"together, so that parts of the editor were built-in Lisp facilities. Those "
-"would be whatever parts we felt we had to optimize. This was a technique "
-"that we had already consciously practiced in the original Emacs, because "
-"there were certain fairly high level features which we re-implemented in "
-"machine language, making them into TECO primitives. For instance, there was "
-"a TECO primitive to fill a paragraph (actually, to do most of the work of "
-"filling a paragraph, because some of the less time-consuming parts of the "
-"job would be done at the higher level by a TECO program). You could do the "
-"whole job by writing a TECO program, but that was too slow, so we optimized "
-"it by putting part of it in machine language. We used the same idea here (in "
-"the hybrid technique), that most of the editor would be written in Lisp, but "
-"certain parts of it that had to run particularly fast would be written at a "
-"lower level."
+"Multics MacLisp had a compiler as well as an interpreter&mdash;it was a full-"
+"fledged Lisp system&mdash;but people wanted to implement something like that "
+"on other systems where they had not already written a Lisp compiler. Well, "
+"if you didn't have the Lisp compiler you couldn't write the whole editor in "
+"Lisp&mdash;it would be too slow, especially redisplay, if it had to run "
+"interpreted Lisp.  So we developed a hybrid technique. The idea was to write "
+"a Lisp interpreter and the lower level parts of the editor together, so that "
+"parts of the editor were built-in Lisp facilities. Those would be whatever "
+"parts we felt we had to optimize. This was a technique that we had already "
+"consciously practiced in the original Emacs, because there were certain "
+"fairly high level features which we re-implemented in machine language, "
+"making them into TECO primitives. For instance, there was a TECO primitive "
+"to fill a paragraph (actually, to do most of the work of filling a "
+"paragraph, because some of the less time-consuming parts of the job would be "
+"done at the higher level by a TECO program). You could do the whole job by "
+"writing a TECO program, but that was too slow, so we optimized it by putting "
+"part of it in machine language. We used the same idea here (in the hybrid "
+"technique), that most of the editor would be written in Lisp, but certain "
+"parts of it that had to run particularly fast would be written at a lower "
+"level."
 msgstr ""
 "À ce moment-là, les gens ont commencé à se demander comment ils pouvaient 
"
 "obtenir quelque chose de ce genre sur une plateforme sur laquelle ils ne "
@@ -315,16 +520,33 @@
 "besoin d'une vitesse d'exécution particulièrement rapide seraient écrites 
à "
 "un niveau inférieur."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Therefore, when I wrote my second implementation of Emacs, I followed the
+# | same kind of design. The low level language was not machine language
+# | anymore, it was C. C was a good, efficient language for portable programs
+# | to run in a Unix-like operating system. There was a Lisp interpreter, but
+# | I implemented facilities for special purpose editing jobs directly in [-C
+# | &mdash; manipulating-] {+C&mdash;manipulating+} editor buffers, inserting
+# | leading text, reading and writing files, redisplaying the buffer on the
+# | screen, managing editor windows.
+#, fuzzy
+#| msgid ""
+#| "Therefore, when I wrote my second implementation of Emacs, I followed the "
+#| "same kind of design. The low level language was not machine language "
+#| "anymore, it was C. C was a good, efficient language for portable programs "
+#| "to run in a Unix-like operating system. There was a Lisp interpreter, but "
+#| "I implemented facilities for special purpose editing jobs directly in C "
+#| "&mdash; manipulating editor buffers, inserting leading text, reading and "
+#| "writing files, redisplaying the buffer on the screen, managing editor "
+#| "windows."
 msgid ""
 "Therefore, when I wrote my second implementation of Emacs, I followed the "
 "same kind of design. The low level language was not machine language "
 "anymore, it was C. C was a good, efficient language for portable programs to "
 "run in a Unix-like operating system. There was a Lisp interpreter, but I "
-"implemented facilities for special purpose editing jobs directly in C "
-"&mdash; manipulating editor buffers, inserting leading text, reading and "
-"writing files, redisplaying the buffer on the screen, managing editor "
-"windows."
+"implemented facilities for special purpose editing jobs directly in C&mdash;"
+"manipulating editor buffers, inserting leading text, reading and writing "
+"files, redisplaying the buffer on the screen, managing editor windows."
 msgstr ""
 "Par conséquent, j'ai suivi le même concept pour écrire ma deuxième "
 "implémentation d'Emacs. Le langage de bas niveau n'était plus du langage "
@@ -335,20 +557,46 @@
 "l'éditeur, insérer des interlignes, lire et écrire des fichiers, 
réafficher "
 "la pile à l'écran, gérer les fenêtres de l'éditeur."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Now, this was not the first Emacs that was written in C and ran on Unix.
+# | The first was written by James Gosling, and was referred to as GosMacs. A
+# | strange thing happened with him. In the beginning, he seemed to be
+# | influenced by the same spirit of sharing and cooperation of the original
+# | Emacs. I first released the original Emacs to people at MIT. Someone
+# | wanted to port it to run on [-Twenex &mdash; it-] {+Twenex&mdash;it+}
+# | originally only ran on the Incompatible Timesharing System we used at MIT.
+# | They ported it to Twenex, which meant that there were a few hundred
+# | installations around the world that could potentially use it. We started
+# | distributing it to them, with the rule that &ldquo;you had to send back
+# | all of your improvements&rdquo; so we could all benefit. No one ever tried
+# | to enforce that, but as far as I know people did cooperate.
+#, fuzzy
+#| msgid ""
+#| "Now, this was not the first Emacs that was written in C and ran on Unix. "
+#| "The first was written by James Gosling, and was referred to as GosMacs. A "
+#| "strange thing happened with him. In the beginning, he seemed to be "
+#| "influenced by the same spirit of sharing and cooperation of the original "
+#| "Emacs. I first released the original Emacs to people at MIT. Someone "
+#| "wanted to port it to run on Twenex &mdash; it originally only ran on the "
+#| "Incompatible Timesharing System we used at MIT. They ported it to Twenex, "
+#| "which meant that there were a few hundred installations around the world "
+#| "that could potentially use it. We started distributing it to them, with "
+#| "the rule that &ldquo;you had to send back all of your improvements&rdquo; "
+#| "so we could all benefit. No one ever tried to enforce that, but as far as "
+#| "I know people did cooperate."
 msgid ""
 "Now, this was not the first Emacs that was written in C and ran on Unix. The "
 "first was written by James Gosling, and was referred to as GosMacs. A "
 "strange thing happened with him. In the beginning, he seemed to be "
 "influenced by the same spirit of sharing and cooperation of the original "
 "Emacs. I first released the original Emacs to people at MIT. Someone wanted "
-"to port it to run on Twenex &mdash; it originally only ran on the "
-"Incompatible Timesharing System we used at MIT. They ported it to Twenex, "
-"which meant that there were a few hundred installations around the world "
-"that could potentially use it. We started distributing it to them, with the "
-"rule that &ldquo;you had to send back all of your improvements&rdquo; so we "
-"could all benefit. No one ever tried to enforce that, but as far as I know "
-"people did cooperate."
+"to port it to run on Twenex&mdash;it originally only ran on the Incompatible "
+"Timesharing System we used at MIT. They ported it to Twenex, which meant "
+"that there were a few hundred installations around the world that could "
+"potentially use it. We started distributing it to them, with the rule that "
+"&ldquo;you had to send back all of your improvements&rdquo; so we could all "
+"benefit. No one ever tried to enforce that, but as far as I know people did "
+"cooperate."
 msgstr ""
 "Cela dit, ce n'était pas le premier Emacs écrit en C et fonctionnant sous "
 "Unix. Le premier a été écrit par James Gosling et s'appelait GosMac. Une "
@@ -365,12 +613,26 @@
 "Personne n'a jamais essayé de faire appliquer cette règle, mais autant que "
 "je sache les gens coopéraient effectivement."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Gosling did, at first, seem to participate in this spirit. He wrote in a
+# | manual that he called the program Emacs hoping that others in the
+# | community would improve it until it was worthy of that name. That's the
+# | right approach to take towards a [-community &mdash; to-]
+# | {+community&mdash;to+} ask them to join in and make the program better.
+# | But after that he seemed to change the spirit, and sold it to a company.
+#, fuzzy
+#| msgid ""
+#| "Gosling did, at first, seem to participate in this spirit. He wrote in a "
+#| "manual that he called the program Emacs hoping that others in the "
+#| "community would improve it until it was worthy of that name. That's the "
+#| "right approach to take towards a community &mdash; to ask them to join in "
+#| "and make the program better. But after that he seemed to change the "
+#| "spirit, and sold it to a company."
 msgid ""
 "Gosling did, at first, seem to participate in this spirit. He wrote in a "
 "manual that he called the program Emacs hoping that others in the community "
 "would improve it until it was worthy of that name. That's the right approach "
-"to take towards a community &mdash; to ask them to join in and make the "
+"to take towards a community&mdash;to ask them to join in and make the "
 "program better. But after that he seemed to change the spirit, and sold it "
 "to a company."
 msgstr ""
@@ -382,7 +644,32 @@
 "Mais après cela il a apparemment changé d'état d'esprit et vendu le "
 "programme à une entreprise."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | At that time I was working on the GNU system (a free software Unix-like
+# | operating system that many people erroneously call &ldquo;Linux&rdquo;). 
+# | There was no free software Emacs editor that ran on Unix. I did, however,
+# | have a friend who had participated in developing Gosling's Emacs. Gosling
+# | had given him, by email, permission to distribute his own version. He
+# | proposed to me that I use that version. Then I discovered that Gosling's
+# | Emacs did not have a real Lisp. It had a programming language that was
+# | known as [-&lsquo;mocklisp&rsquo;,-] {+&ldquo;mocklisp,&rdquo;+} which
+# | looks syntactically like Lisp, but didn't have the data structures of
+# | Lisp.  So programs were not data, and vital elements of Lisp were missing.
+# |  Its data structures were strings, numbers and a few other specialized
+# | things.
+#, fuzzy
+#| msgid ""
+#| "At that time I was working on the GNU system (a free software Unix-like "
+#| "operating system that many people erroneously call &ldquo;Linux&rdquo;).  "
+#| "There was no free software Emacs editor that ran on Unix. I did, however, "
+#| "have a friend who had participated in developing Gosling's Emacs. Gosling "
+#| "had given him, by email, permission to distribute his own version. He "
+#| "proposed to me that I use that version. Then I discovered that Gosling's "
+#| "Emacs did not have a real Lisp. It had a programming language that was "
+#| "known as &lsquo;mocklisp&rsquo;, which looks syntactically like Lisp, but "
+#| "didn't have the data structures of Lisp.  So programs were not data, and "
+#| "vital elements of Lisp were missing.  Its data structures were strings, "
+#| "numbers and a few other specialized things."
 msgid ""
 "At that time I was working on the GNU system (a free software Unix-like "
 "operating system that many people erroneously call &ldquo;Linux&rdquo;).  "
@@ -391,7 +678,7 @@
 "had given him, by email, permission to distribute his own version. He "
 "proposed to me that I use that version. Then I discovered that Gosling's "
 "Emacs did not have a real Lisp. It had a programming language that was known "
-"as &lsquo;mocklisp&rsquo;, which looks syntactically like Lisp, but didn't "
+"as &ldquo;mocklisp,&rdquo; which looks syntactically like Lisp, but didn't "
 "have the data structures of Lisp.  So programs were not data, and vital "
 "elements of Lisp were missing.  Its data structures were strings, numbers "
 "and a few other specialized things."
@@ -409,7 +696,7 @@
 "manquaient. Ses structures de données étaient les chaînes de caractères, 
les "
 "nombres et quelques autres choses spécialisées."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I concluded I couldn't use it and had to replace it all, the first step of "
 "which was to write an actual Lisp interpreter. I gradually adapted every "
@@ -425,13 +712,28 @@
 "aux structures de données des parties internes de l'éditeur pour les "
 "manipuler."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The one exception was redisplay. For a long time, redisplay was sort of an
+# | alternate world. The editor would enter the world of redisplay and things
+# | would go on with very special data structures that were not safe for
+# | garbage collection, not safe for interruption, and you couldn't run any
+# | Lisp programs during that. We've changed that [-since &mdash; it's-]
+# | {+since&mdash;it's+} now possible to run Lisp code during redisplay. It's
+# | quite a convenient thing.
+#, fuzzy
+#| msgid ""
+#| "The one exception was redisplay. For a long time, redisplay was sort of "
+#| "an alternate world. The editor would enter the world of redisplay and "
+#| "things would go on with very special data structures that were not safe "
+#| "for garbage collection, not safe for interruption, and you couldn't run "
+#| "any Lisp programs during that. We've changed that since &mdash; it's now "
+#| "possible to run Lisp code during redisplay. It's quite a convenient thing."
 msgid ""
 "The one exception was redisplay. For a long time, redisplay was sort of an "
 "alternate world. The editor would enter the world of redisplay and things "
 "would go on with very special data structures that were not safe for garbage "
 "collection, not safe for interruption, and you couldn't run any Lisp "
-"programs during that. We've changed that since &mdash; it's now possible to "
+"programs during that. We've changed that since&mdash;it's now possible to "
 "run Lisp code during redisplay. It's quite a convenient thing."
 msgstr ""
 "L'unique exception était le réaffichage. Pendant longtemps, le réaffichage 
a "
@@ -443,15 +745,37 @@
 "ça depuis ; il est maintenant possible d'exécuter du code Lisp pendant le "
 "réaffichage. C'est quelque chose de très pratique."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | This second Emacs program was [-&lsquo;free software&rsquo;-]
+# | {+&ldquo;free software&rdquo;+} in the modern sense of the [-term &mdash;
+# | it-] {+term&mdash;it+} was part of an explicit political campaign to make
+# | software free. The essence of this campaign was that everybody should be
+# | free to do the things we did in the old days at MIT, working together on
+# | software and working with whomever wanted to work with us.  That is the
+# | basis for the free software [-movement &mdash; the-]
+# | {+movement&mdash;the+} experience I had, the life that I've lived at the
+# | MIT AI [-lab &mdash; to-] {+lab&mdash;to+} be working on human knowledge,
+# | and not be standing in the way of anybody's further using and further
+# | disseminating human knowledge.
+#, fuzzy
+#| msgid ""
+#| "This second Emacs program was &lsquo;free software&rsquo; in the modern "
+#| "sense of the term &mdash; it was part of an explicit political campaign "
+#| "to make software free. The essence of this campaign was that everybody "
+#| "should be free to do the things we did in the old days at MIT, working "
+#| "together on software and working with whomever wanted to work with us.  "
+#| "That is the basis for the free software movement &mdash; the experience I "
+#| "had, the life that I've lived at the MIT AI lab &mdash; to be working on "
+#| "human knowledge, and not be standing in the way of anybody's further "
+#| "using and further disseminating human knowledge."
 msgid ""
-"This second Emacs program was &lsquo;free software&rsquo; in the modern "
-"sense of the term &mdash; it was part of an explicit political campaign to "
+"This second Emacs program was &ldquo;free software&rdquo; in the modern "
+"sense of the term&mdash;it was part of an explicit political campaign to "
 "make software free. The essence of this campaign was that everybody should "
 "be free to do the things we did in the old days at MIT, working together on "
 "software and working with whomever wanted to work with us.  That is the "
-"basis for the free software movement &mdash; the experience I had, the life "
-"that I've lived at the MIT AI lab &mdash; to be working on human knowledge, "
+"basis for the free software movement&mdash;the experience I had, the life "
+"that I've lived at the MIT AI lab&mdash;to be working on human knowledge, "
 "and not be standing in the way of anybody's further using and further "
 "disseminating human knowledge."
 msgstr ""
@@ -464,7 +788,7 @@
 "que j'ai vécue au labo d'IA du MIT : travailler sur le savoir de 
l'humanité, "
 "sans empêcher qui que ce soit de le réutiliser et de le disséminer."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "At the time, you could make a computer that was about the same price range "
 "as other computers that weren't meant for Lisp, except that it would run "
@@ -485,11 +809,30 @@
 "code> sur un nombre, ils sortaient des résultats insensés et finissaient 
par "
 "planter au bout d'un moment."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The Lisp machine was able to execute instructions about as fast as those
+# | other machines, but each [-instruction &mdash; a-] {+instruction&mdash;a+}
+# | <code>car</code> instruction would do data [-typechecking &mdash; so-]
+# | {+typechecking&mdash;so+} when you tried to get the <code>car</code> of a
+# | number in a compiled program, it would give you an immediate error. We
+# | built the machine and had a Lisp operating system for it. It was written
+# | almost entirely in Lisp, the only exceptions being parts written in the
+# | microcode. People became interested in manufacturing them, which meant
+# | they should start a company.
+#, fuzzy
+#| msgid ""
+#| "The Lisp machine was able to execute instructions about as fast as those "
+#| "other machines, but each instruction &mdash; a <code>car</code> "
+#| "instruction would do data typechecking &mdash; so when you tried to get "
+#| "the <code>car</code> of a number in a compiled program, it would give you "
+#| "an immediate error. We built the machine and had a Lisp operating system "
+#| "for it. It was written almost entirely in Lisp, the only exceptions being "
+#| "parts written in the microcode. People became interested in manufacturing "
+#| "them, which meant they should start a company."
 msgid ""
 "The Lisp machine was able to execute instructions about as fast as those "
-"other machines, but each instruction &mdash; a <code>car</code> instruction "
-"would do data typechecking &mdash; so when you tried to get the <code>car</"
+"other machines, but each instruction&mdash;a <code>car</code> instruction "
+"would do data typechecking&mdash;so when you tried to get the <code>car</"
 "code> of a number in a compiled program, it would give you an immediate "
 "error. We built the machine and had a Lisp operating system for it. It was "
 "written almost entirely in Lisp, the only exceptions being parts written in "
@@ -506,15 +849,34 @@
 "microcode. Certaines personnes ont porté de l'intérêt à la fabrication de 
la "
 "machine Lisp, ce qui voulait dire qu'elles allaient lancer une entreprise."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | There were two different ideas about what this company should be like. 
+# | Greenblatt wanted to start what he called a &ldquo;hacker&rdquo; company.
+# | This meant it would be a company run by hackers and would operate in a way
+# | conducive to hackers. Another goal was to maintain the AI Lab [-culture <a
+# | href=\"#foot-3\">(3)</a>.-] {+culture&#8239;<a class=\"ftn\"
+# | href=\"#foot-3\">[3]</a>.+}  Unfortunately, Greenblatt didn't have any
+# | business experience, so other people in the Lisp machine group said they
+# | doubted whether he could succeed. They thought that his plan to avoid
+# | outside investment wouldn't work.
+#, fuzzy
+#| msgid ""
+#| "There were two different ideas about what this company should be like.  "
+#| "Greenblatt wanted to start what he called a &ldquo;hacker&rdquo; company. "
+#| "This meant it would be a company run by hackers and would operate in a "
+#| "way conducive to hackers. Another goal was to maintain the AI Lab culture "
+#| "<a href=\"#foot-3\">(3)</a>.  Unfortunately, Greenblatt didn't have any "
+#| "business experience, so other people in the Lisp machine group said they "
+#| "doubted whether he could succeed. They thought that his plan to avoid "
+#| "outside investment wouldn't work."
 msgid ""
 "There were two different ideas about what this company should be like.  "
 "Greenblatt wanted to start what he called a &ldquo;hacker&rdquo; company. "
 "This meant it would be a company run by hackers and would operate in a way "
-"conducive to hackers. Another goal was to maintain the AI Lab culture <a "
-"href=\"#foot-3\">(3)</a>.  Unfortunately, Greenblatt didn't have any "
-"business experience, so other people in the Lisp machine group said they "
-"doubted whether he could succeed. They thought that his plan to avoid "
+"conducive to hackers. Another goal was to maintain the AI Lab culture&#8239;"
+"<a class=\"ftn\" href=\"#foot-3\">[3]</a>.  Unfortunately, Greenblatt didn't "
+"have any business experience, so other people in the Lisp machine group said "
+"they doubted whether he could succeed. They thought that his plan to avoid "
 "outside investment wouldn't work."
 msgstr ""
 "Il y avait deux conceptions différentes du type de société que ça devait "
@@ -527,7 +889,7 @@
 "émis des doutes sur ses chances de réussite. Elles pensaient que son plan "
 "pour éviter les investissements extérieurs ne marcherait pas."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Why did he want to avoid outside investment? Because when a company has "
 "outside investors, they take control and they don't let you have any "
@@ -540,7 +902,7 @@
 "finissez par avoir des scrupules, ils vous remplacent également à la "
 "direction."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So Greenblatt had the idea that he would find a customer who would pay in "
 "advance to buy the parts. They would build machines and deliver them; with "
@@ -556,7 +918,7 @@
 "plus de machines, etc., etc. Les autres personnes du groupe ne pensaient pas "
 "que cela puisse fonctionner."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Greenblatt then recruited Russell Noftsker, the man who had hired me, who "
 "had subsequently left the AI Lab and created a successful company.  Russell "
@@ -577,7 +939,7 @@
 "investissements extérieurs, n'auraient aucun scrupule et feraient tout leur "
 "possible pour gagner."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "But Greenblatt didn't give up. He and the few people loyal to him decided to "
 "start Lisp Machines Inc. anyway and go ahead with their plans. And what do "
@@ -601,7 +963,7 @@
 "n'allait pas s'écrouler, ils ont commencé à chercher des moyens de la "
 "détruire."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Thus, the abandonment of our lab was followed by &ldquo;war&rdquo; in our "
 "lab.  The abandonment happened when Symbolics hired away all the hackers, "
@@ -631,13 +993,26 @@
 "n'avait imaginé que le groupe de hackers du labo d'IA disparaîtrait, mais 
ce "
 "fut le cas."
 
-#. type: Content of: <p>
-msgid ""
-"So Symbolics came up with a plan <a href=\"#foot-4\">(4)</a>.  They said to "
-"the lab, &ldquo;We will continue making our changes to the system available "
-"for you to use, but you can't put it into the MIT Lisp machine system. "
-"Instead, we'll give you access to Symbolics' Lisp machine system, and you "
-"can run it, but that's all you can do.&rdquo;"
+#. type: Content of: <div><p>
+# | So Symbolics came up with a [-plan <a href=\"#foot-4\">(4)</a>.-]
+# | {+plan&#8239;<a href=\"#foot-4\">[4]</a>.+}  They said to the lab,
+# | &ldquo;We will continue making our changes to the system available for you
+# | to use, but you can't put it into the MIT Lisp machine system. Instead,
+# | we'll give you access to Symbolics' Lisp machine system, and you can run
+# | it, but that's all you can do.&rdquo;
+#, fuzzy
+#| msgid ""
+#| "So Symbolics came up with a plan <a href=\"#foot-4\">(4)</a>.  They said "
+#| "to the lab, &ldquo;We will continue making our changes to the system "
+#| "available for you to use, but you can't put it into the MIT Lisp machine "
+#| "system. Instead, we'll give you access to Symbolics' Lisp machine system, "
+#| "and you can run it, but that's all you can do.&rdquo;"
+msgid ""
+"So Symbolics came up with a plan&#8239;<a href=\"#foot-4\">[4]</a>.  They "
+"said to the lab, &ldquo;We will continue making our changes to the system "
+"available for you to use, but you can't put it into the MIT Lisp machine "
+"system. Instead, we'll give you access to Symbolics' Lisp machine system, "
+"and you can run it, but that's all you can do.&rdquo;"
 msgstr ""
 "Les gens de Symbolics ont trouvé une combine <a id=\"foot-4-rev\" href="
 "\"#foot-4\">(4)</a>. Ils ont dit au labo : « Nous continuerons à mettre à
 "
@@ -646,7 +1021,7 @@
 "place, nous vous donnerons accès à celui de Symbolics et vous pourrez le "
 "faire fonctionner, mais c'est tout ce que vous pourrez faire. »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This, in effect, meant that they demanded that we had to choose a side, and "
 "use either the MIT version of the system or the Symbolics version.  "
@@ -666,12 +1041,28 @@
 "mais Symbolics verrait que nous soutenions LMI puisque nous les aidions à "
 "exister. Donc nous ne pouvions plus rester neutres."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Up until that point, I hadn't taken the side of either company, although
+# | it made me miserable to see what had happened to our community and the
+# | software.  But now, Symbolics had forced the issue.  So, in an effort to
+# | help keep Lisp Machines Inc. [-going <a href=\"#foot-5\">(5)</a> &mdash;
+# | I-] {+going&#8239;<a href=\"#foot-5\">[5]</a>&mdash;I+} began duplicating
+# | all of the improvements Symbolics had made to the Lisp machine system.  I
+# | wrote the equivalent improvements again myself (i.e., the code was my own).
+#, fuzzy
+#| msgid ""
+#| "Up until that point, I hadn't taken the side of either company, although "
+#| "it made me miserable to see what had happened to our community and the "
+#| "software.  But now, Symbolics had forced the issue.  So, in an effort to "
+#| "help keep Lisp Machines Inc. going <a href=\"#foot-5\">(5)</a> &mdash; I "
+#| "began duplicating all of the improvements Symbolics had made to the Lisp "
+#| "machine system.  I wrote the equivalent improvements again myself (i.e., "
+#| "the code was my own)."
 msgid ""
 "Up until that point, I hadn't taken the side of either company, although it "
 "made me miserable to see what had happened to our community and the "
 "software.  But now, Symbolics had forced the issue.  So, in an effort to "
-"help keep Lisp Machines Inc. going <a href=\"#foot-5\">(5)</a> &mdash; I "
+"help keep Lisp Machines Inc. going&#8239;<a href=\"#foot-5\">[5]</a>&mdash;I "
 "began duplicating all of the improvements Symbolics had made to the Lisp "
 "machine system.  I wrote the equivalent improvements again myself (i.e., the "
 "code was my own)."
@@ -684,12 +1075,24 @@
 "Symbolics avait faites au système de machine Lisp. Je réécrivais des "
 "améliorations équivalentes moi-même (c'est-à-dire avec mon propre code)."
 
-#. type: Content of: <p>
-msgid ""
-"After a while <a href=\"#foot-6\">(6)</a>, I came to the conclusion that it "
-"would be best if I didn't even look at their code. When they made a beta "
-"announcement that gave the release notes, I would see what the features were "
-"and then implement them. By the time they had a real release, I did too."
+#. type: Content of: <div><p>
+# | After a [-while <a href=\"#foot-6\">(6)</a>,-] {+while&#8239;<a
+# | href=\"#foot-6\">[6]</a>,+} I came to the conclusion that it would be best
+# | if I didn't even look at their code. When they made a beta announcement
+# | that gave the release notes, I would see what the features were and then
+# | implement them. By the time they had a real release, I did too.
+#, fuzzy
+#| msgid ""
+#| "After a while <a href=\"#foot-6\">(6)</a>, I came to the conclusion that "
+#| "it would be best if I didn't even look at their code. When they made a "
+#| "beta announcement that gave the release notes, I would see what the "
+#| "features were and then implement them. By the time they had a real "
+#| "release, I did too."
+msgid ""
+"After a while&#8239;<a href=\"#foot-6\">[6]</a>, I came to the conclusion "
+"that it would be best if I didn't even look at their code. When they made a "
+"beta announcement that gave the release notes, I would see what the features "
+"were and then implement them. By the time they had a real release, I did too."
 msgstr ""
 "Au bout d'un moment <a id=\"foot-6-rev\" href=\"#foot-6\">(6)</a>, je suis "
 "arrivé à la conclusion que cela irait mieux si je ne regardais même pas 
leur "
@@ -698,15 +1101,33 @@
 "moi-même. Au moment où ils avaient une version publiable, j'avais la mienne 
"
 "également."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | In this way, for two years, I prevented them from wiping out Lisp Machines
+# | Incorporated, and the two companies went on. But, I didn't want to spend
+# | years and years punishing someone, just thwarting an evil deed. I figured
+# | they had been punished pretty thoroughly because they were stuck with
+# | competition that was not leaving or going to [-disappear <a
+# | href=\"#foot-7\">(7)</a>.-] {+disappear&#8239;<a
+# | href=\"#foot-7\">[7]</a>.+}  Meanwhile, it was time to start building a
+# | new community to replace the one that their actions and others had wiped
+# | out.
+#, fuzzy
+#| msgid ""
+#| "In this way, for two years, I prevented them from wiping out Lisp "
+#| "Machines Incorporated, and the two companies went on. But, I didn't want "
+#| "to spend years and years punishing someone, just thwarting an evil deed. "
+#| "I figured they had been punished pretty thoroughly because they were "
+#| "stuck with competition that was not leaving or going to disappear <a href="
+#| "\"#foot-7\">(7)</a>. Meanwhile, it was time to start building a new "
+#| "community to replace the one that their actions and others had wiped out."
 msgid ""
 "In this way, for two years, I prevented them from wiping out Lisp Machines "
 "Incorporated, and the two companies went on. But, I didn't want to spend "
 "years and years punishing someone, just thwarting an evil deed. I figured "
 "they had been punished pretty thoroughly because they were stuck with "
-"competition that was not leaving or going to disappear <a href=\"#foot-7\">"
-"(7)</a>. Meanwhile, it was time to start building a new community to replace "
-"the one that their actions and others had wiped out."
+"competition that was not leaving or going to disappear&#8239;<a href="
+"\"#foot-7\">[7]</a>.  Meanwhile, it was time to start building a new "
+"community to replace the one that their actions and others had wiped out."
 msgstr ""
 "De cette façon, et pendant deux ans, je les ai empêchés d'écraser LMI et 
les "
 "deux entreprises ont continué d'exister. Mais je ne voulais pas passer des "
@@ -717,7 +1138,7 @@
 "il était temps de commencer à bâtir une nouvelle communauté pour 
remplacer "
 "celle que leurs actions, ainsi que d'autres, avaient rayée de la carte."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The Lisp community in the 70s was not limited to the MIT AI Lab, and the "
 "hackers were not all at MIT. The war that Symbolics started was what wiped "
@@ -732,18 +1153,54 @@
 "coopération ; tout cela a détruit la communauté et il n'en est pas resté 
"
 "grand-chose."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Once I stopped punishing Symbolics, I had to figure out what to do next. I
+# | had to make a free operating system, that was [-clear &mdash; the-]
+# | {+clear&mdash;the+} only way that people could work together and share was
+# | with a free operating system.
+#, fuzzy
+#| msgid ""
+#| "Once I stopped punishing Symbolics, I had to figure out what to do next. "
+#| "I had to make a free operating system, that was clear &mdash; the only "
+#| "way that people could work together and share was with a free operating "
+#| "system."
 msgid ""
 "Once I stopped punishing Symbolics, I had to figure out what to do next. I "
-"had to make a free operating system, that was clear &mdash; the only way "
-"that people could work together and share was with a free operating system."
+"had to make a free operating system, that was clear&mdash;the only way that "
+"people could work together and share was with a free operating system."
 msgstr ""
 "Après avoir arrêté de punir Symbolics, il m'a fallu réfléchir à la 
suite. Il "
 "fallait que je fasse un système d'exploitation libre, c'était clair ; la "
 "seule façon de faire travailler des gens ensemble et de les faire partager "
 "était d'avoir un système d'exploitation libre."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | At first, I thought of making a Lisp-based system, but I realized that
+# | wouldn't be a good idea technically. To have something like the Lisp
+# | machine system, you needed special purpose microcode. That's what made it
+# | possible to run programs as fast as other computers would run their
+# | programs and still get the benefit of typechecking. Without that, you
+# | would be reduced to something like the Lisp compilers for other machines.
+# | The programs would be faster, but unstable. Now that's okay if you're
+# | running one program on a timesharing [-system &mdash; if-]
+# | {+system&mdash;if+} one program crashes, that's not a disaster, that's
+# | something your program occasionally does. But that didn't make it good for
+# | writing the operating system in, so I rejected the idea of making a system
+# | like the Lisp machine.
+#, fuzzy
+#| msgid ""
+#| "At first, I thought of making a Lisp-based system, but I realized that "
+#| "wouldn't be a good idea technically. To have something like the Lisp "
+#| "machine system, you needed special purpose microcode. That's what made it "
+#| "possible to run programs as fast as other computers would run their "
+#| "programs and still get the benefit of typechecking. Without that, you "
+#| "would be reduced to something like the Lisp compilers for other machines. "
+#| "The programs would be faster, but unstable. Now that's okay if you're "
+#| "running one program on a timesharing system &mdash; if one program "
+#| "crashes, that's not a disaster, that's something your program "
+#| "occasionally does. But that didn't make it good for writing the operating "
+#| "system in, so I rejected the idea of making a system like the Lisp "
+#| "machine."
 msgid ""
 "At first, I thought of making a Lisp-based system, but I realized that "
 "wouldn't be a good idea technically. To have something like the Lisp machine "
@@ -752,7 +1209,7 @@
 "still get the benefit of typechecking. Without that, you would be reduced to "
 "something like the Lisp compilers for other machines. The programs would be "
 "faster, but unstable. Now that's okay if you're running one program on a "
-"timesharing system &mdash; if one program crashes, that's not a disaster, "
+"timesharing system&mdash;if one program crashes, that's not a disaster, "
 "that's something your program occasionally does. But that didn't make it "
 "good for writing the operating system in, so I rejected the idea of making a "
 "system like the Lisp machine."
@@ -771,7 +1228,7 @@
 "système d'exploitation ; j'ai donc rejeté l'idée de prendre comme modèle 
le "
 "système comme la machine Lisp."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I decided instead to make a Unix-like operating system that would have Lisp "
 "implementations to run as user programs. The kernel wouldn't be written in "
@@ -788,7 +1245,7 @@
 "faire le strict minimum d'implémentation Lisp. La taille des programmes "
 "était un souci énorme."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There were people in those days, in 1985, who had one-megabyte machines "
 "without virtual memory. They wanted to be able to use GNU Emacs. This meant "
@@ -799,15 +1256,34 @@
 "Cela voulait dire que je devais garder le programme aussi réduit que "
 "possible."
 
-#. type: Content of: <p>
-msgid ""
-"For instance, at the time the only looping construct was &lsquo;"
-"while&rsquo;, which was extremely simple. There was no way to break out of "
-"the &lsquo;while&rsquo; statement, you just had to do a catch and a throw, "
-"or test a variable that ran the loop. That shows how far I was pushing to "
-"keep things small. We didn't have &lsquo;caar&rsquo; and &lsquo;cadr&rsquo; "
-"and so on; &ldquo;squeeze out everything possible&rdquo; was the spirit of "
-"GNU Emacs, the spirit of Emacs Lisp, from the beginning."
+#. type: Content of: <div><p>
+# | For instance, at the time the only looping construct was
+# | [-&lsquo;while&rsquo;,-] {+<code>while</code>,+} which was extremely
+# | simple. There was no way to break out of the [-&lsquo;while&rsquo;-]
+# | {+<code>while</code>+} statement, you just had to do a catch and a throw,
+# | or test a variable that ran the loop. That shows how far I was pushing to
+# | keep things small. We didn't have [-&lsquo;caar&rsquo;-]
+# | {+<code>caar</code>+} and [-&lsquo;cadr&rsquo;-] {+<code>cadr</code>+} and
+# | so on; &ldquo;squeeze out everything possible&rdquo; was the spirit of GNU
+# | Emacs, the spirit of Emacs Lisp, from the beginning.
+#, fuzzy
+#| msgid ""
+#| "For instance, at the time the only looping construct was &lsquo;"
+#| "while&rsquo;, which was extremely simple. There was no way to break out "
+#| "of the &lsquo;while&rsquo; statement, you just had to do a catch and a "
+#| "throw, or test a variable that ran the loop. That shows how far I was "
+#| "pushing to keep things small. We didn't have &lsquo;caar&rsquo; and "
+#| "&lsquo;cadr&rsquo; and so on; &ldquo;squeeze out everything "
+#| "possible&rdquo; was the spirit of GNU Emacs, the spirit of Emacs Lisp, "
+#| "from the beginning."
+msgid ""
+"For instance, at the time the only looping construct was <code>while</code>, "
+"which was extremely simple. There was no way to break out of the "
+"<code>while</code> statement, you just had to do a catch and a throw, or "
+"test a variable that ran the loop. That shows how far I was pushing to keep "
+"things small. We didn't have <code>caar</code> and <code>cadr</code> and so "
+"on; &ldquo;squeeze out everything possible&rdquo; was the spirit of GNU "
+"Emacs, the spirit of Emacs Lisp, from the beginning."
 msgstr ""
 "Par exemple, à ce moment-là, la seule construction de boucle était "
 "<code>while</code>, et elle était extrêmement simple. Il n'existait aucun "
@@ -818,15 +1294,35 @@
 "simplifier au maximum était l'esprit de GNU Emacs, l'esprit du Lisp d'Emacs, 
"
 "depuis l'origine."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Obviously, machines are bigger now, and we don't do it that way any more.
+# | We put in [-&lsquo;caar&rsquo;-] {+<code>caar</code>+} and
+# | [-&lsquo;cadr&rsquo;-] {+<code>cadr</code>+} and so on, and we might put
+# | in another looping construct one of these days. We're willing to extend it
+# | some now, but we don't want to extend it to the level of common Lisp. I
+# | implemented Common Lisp once on the Lisp machine, and I'm not all that
+# | happy with it. One thing I don't like terribly much is keyword [-arguments
+# | <a href=\"#foot-8\">(8)</a>.-] {+arguments&#8239;<a
+# | href=\"#foot-8\">[8]</a>.+}  They don't seem quite Lispy to me; I'll do it
+# | sometimes but I minimize the times when I do that.
+#, fuzzy
+#| msgid ""
+#| "Obviously, machines are bigger now, and we don't do it that way any more. "
+#| "We put in &lsquo;caar&rsquo; and &lsquo;cadr&rsquo; and so on, and we "
+#| "might put in another looping construct one of these days. We're willing "
+#| "to extend it some now, but we don't want to extend it to the level of "
+#| "common Lisp. I implemented Common Lisp once on the Lisp machine, and I'm "
+#| "not all that happy with it. One thing I don't like terribly much is "
+#| "keyword arguments <a href=\"#foot-8\">(8)</a>.  They don't seem quite "
+#| "Lispy to me; I'll do it sometimes but I minimize the times when I do that."
 msgid ""
 "Obviously, machines are bigger now, and we don't do it that way any more. We "
-"put in &lsquo;caar&rsquo; and &lsquo;cadr&rsquo; and so on, and we might put "
+"put in <code>caar</code> and <code>cadr</code> and so on, and we might put "
 "in another looping construct one of these days. We're willing to extend it "
 "some now, but we don't want to extend it to the level of common Lisp. I "
 "implemented Common Lisp once on the Lisp machine, and I'm not all that happy "
-"with it. One thing I don't like terribly much is keyword arguments <a href="
-"\"#foot-8\">(8)</a>.  They don't seem quite Lispy to me; I'll do it "
+"with it. One thing I don't like terribly much is keyword arguments&#8239;<a "
+"href=\"#foot-8\">[8]</a>.  They don't seem quite Lispy to me; I'll do it "
 "sometimes but I minimize the times when I do that."
 msgstr ""
 "Évidemment les machines sont plus grosses maintenant et nous ne travaillons "
@@ -839,7 +1335,7 @@
 "clefs <a id=\"foot-8-rev\" href=\"#foot-8\">(8)</a>. Ils ne me semblent pas "
 "très « Lisp » ; je le fais de temps à autre, mais le moins possible."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "That was not the end of the GNU projects involved with Lisp. Later on around "
 "1995, we were looking into starting a graphical desktop project. It was "
@@ -853,7 +1349,7 @@
 "programmation qui permette d'en écrire une grande partie et de le rendre "
 "facilement extensible, comme l'éditeur. La question était lequel choisir."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "At the time, <abbr title=\"Tool Command Language\">TCL</abbr> was being "
 "pushed heavily for this purpose. I had a very low opinion of TCL, basically "
@@ -882,7 +1378,7 @@
 "ensuite de donner la préférence à Scheme pour les extensions à tous les "
 "programmes GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There's an interesting benefit you can get from using such a powerful "
 "language as a version of Lisp as your primary extensibility language.  You "
@@ -908,18 +1404,50 @@
 "dans n'importe quelle application et la configurer dans votre langage "
 "favori, et cela marcherait également avec d'autres configurations."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | As long as the extensibility languages are weak, the users have to use
+# | only the language you provided them. Which means that people who love any
+# | given language have to compete for the choice of the developers of
+# | [-applications &mdash; saying-] {+applications&mdash;saying+}
+# | &ldquo;Please, application developer, put my language into your
+# | application, not his language.&rdquo; Then the users get no choices at
+# | [-all &mdash; whichever-] {+all&mdash;whichever+} application they're
+# | using comes with one language and they're stuck with [that language]. But
+# | when you have a powerful language that can implement others by translating
+# | into it, then you give the user a choice of language and we don't have to
+# | have a language war anymore. That's what we're hoping
+# | [-&lsquo;Guile&rsquo;,-] {+Guile,+} our scheme interpreter, will do. We
+# | had a person working last summer finishing up a translator from Python to
+# | Scheme. I don't know if it's entirely finished yet, but for anyone
+# | interested in this project, please get in touch. So that's the plan we
+# | have for the future.
+#, fuzzy
+#| msgid ""
+#| "As long as the extensibility languages are weak, the users have to use "
+#| "only the language you provided them. Which means that people who love any "
+#| "given language have to compete for the choice of the developers of "
+#| "applications &mdash; saying &ldquo;Please, application developer, put my "
+#| "language into your application, not his language.&rdquo; Then the users "
+#| "get no choices at all &mdash; whichever application they're using comes "
+#| "with one language and they're stuck with [that language]. But when you "
+#| "have a powerful language that can implement others by translating into "
+#| "it, then you give the user a choice of language and we don't have to have "
+#| "a language war anymore. That's what we're hoping &lsquo;Guile&rsquo;, our "
+#| "scheme interpreter, will do. We had a person working last summer "
+#| "finishing up a translator from Python to Scheme. I don't know if it's "
+#| "entirely finished yet, but for anyone interested in this project, please "
+#| "get in touch. So that's the plan we have for the future."
 msgid ""
 "As long as the extensibility languages are weak, the users have to use only "
 "the language you provided them. Which means that people who love any given "
-"language have to compete for the choice of the developers of applications "
-"&mdash; saying &ldquo;Please, application developer, put my language into "
-"your application, not his language.&rdquo; Then the users get no choices at "
-"all &mdash; whichever application they're using comes with one language and "
-"they're stuck with [that language]. But when you have a powerful language "
-"that can implement others by translating into it, then you give the user a "
-"choice of language and we don't have to have a language war anymore. That's "
-"what we're hoping &lsquo;Guile&rsquo;, our scheme interpreter, will do. We "
+"language have to compete for the choice of the developers of "
+"applications&mdash;saying &ldquo;Please, application developer, put my "
+"language into your application, not his language.&rdquo; Then the users get "
+"no choices at all&mdash;whichever application they're using comes with one "
+"language and they're stuck with [that language]. But when you have a "
+"powerful language that can implement others by translating into it, then you "
+"give the user a choice of language and we don't have to have a language war "
+"anymore. That's what we're hoping Guile, our scheme interpreter, will do. We "
 "had a person working last summer finishing up a translator from Python to "
 "Scheme. I don't know if it's entirely finished yet, but for anyone "
 "interested in this project, please get in touch. So that's the plan we have "
@@ -941,7 +1469,27 @@
 "quelqu'un est intéressé par ce projet, contactez-moi. Voilà donc notre "
 "projet pour l'avenir."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | I haven't been speaking about free software, but let me briefly tell you a
+# | little bit about what that means. Free software does not refer to price;
+# | it doesn't mean that you get it for free. (You may have paid for a copy,
+# | or gotten a copy gratis.) It means that you have freedom as a user. The
+# | crucial thing is that you are free to run the program, free to study what
+# | it does, free to change it to suit your needs, free to redistribute the
+# | copies of others and free to publish improved, extended versions. This is
+# | what free software means. If you are using a non[---]free program, you
+# | have lost crucial freedom, so don't ever do that.
+#, fuzzy
+#| msgid ""
+#| "I haven't been speaking about free software, but let me briefly tell you "
+#| "a little bit about what that means. Free software does not refer to "
+#| "price; it doesn't mean that you get it for free. (You may have paid for a "
+#| "copy, or gotten a copy gratis.) It means that you have freedom as a user. "
+#| "The crucial thing is that you are free to run the program, free to study "
+#| "what it does, free to change it to suit your needs, free to redistribute "
+#| "the copies of others and free to publish improved, extended versions. "
+#| "This is what free software means. If you are using a non-free program, "
+#| "you have lost crucial freedom, so don't ever do that."
 msgid ""
 "I haven't been speaking about free software, but let me briefly tell you a "
 "little bit about what that means. Free software does not refer to price; it "
@@ -950,7 +1498,7 @@
 "thing is that you are free to run the program, free to study what it does, "
 "free to change it to suit your needs, free to redistribute the copies of "
 "others and free to publish improved, extended versions. This is what free "
-"software means. If you are using a non-free program, you have lost crucial "
+"software means. If you are using a nonfree program, you have lost crucial "
 "freedom, so don't ever do that."
 msgstr ""
 "Je n'ai pas parlé de logiciel libre, mais laissez-moi vous dire rapidement "
@@ -965,12 +1513,30 @@
 "signifie « logiciel libre ». Si vous utilisez des logiciels non libres, 
vous "
 "perdez cette liberté capitale, donc ne le faites jamais."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The purpose of the GNU project is to make it easier for people to reject
+# | freedom-trampling, user-dominating, non[---]free software by providing
+# | free software to replace it. For those who don't have the moral courage to
+# | reject the non[---]free software, when that means some practical
+# | inconvenience, what we try to do is give a free alternative so that you
+# | can move to freedom with less of a mess and less of a sacrifice in
+# | practical terms. The less sacrifice the better. We want to make it easier
+# | for you to live in freedom, to cooperate.
+#, fuzzy
+#| msgid ""
+#| "The purpose of the GNU project is to make it easier for people to reject "
+#| "freedom-trampling, user-dominating, non-free software by providing free "
+#| "software to replace it. For those who don't have the moral courage to "
+#| "reject the non-free software, when that means some practical "
+#| "inconvenience, what we try to do is give a free alternative so that you "
+#| "can move to freedom with less of a mess and less of a sacrifice in "
+#| "practical terms. The less sacrifice the better. We want to make it easier "
+#| "for you to live in freedom, to cooperate."
 msgid ""
 "The purpose of the GNU project is to make it easier for people to reject "
-"freedom-trampling, user-dominating, non-free software by providing free "
+"freedom-trampling, user-dominating, nonfree software by providing free "
 "software to replace it. For those who don't have the moral courage to reject "
-"the non-free software, when that means some practical inconvenience, what we "
+"the nonfree software, when that means some practical inconvenience, what we "
 "try to do is give a free alternative so that you can move to freedom with "
 "less of a mess and less of a sacrifice in practical terms. The less "
 "sacrifice the better. We want to make it easier for you to live in freedom, "
@@ -985,16 +1551,34 @@
 "moindre en termes pratiques. Plus le sacrifice est petit, mieux c'est. Nous "
 "voulons leur faciliter la vie libre, la coopération."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | This is a matter of the freedom to cooperate. We're used to thinking of
+# | freedom and cooperation with society as if they are opposites. But here
+# | they're on the same side. With free software you are free to cooperate
+# | with other people as well as free to help yourself. With non[---]free
+# | software, somebody is dominating you and keeping people divided. You're
+# | not allowed to share with them, you're not free to cooperate or help
+# | society, anymore than you're free to help yourself.  Divided and helpless
+# | is the state of users using non[---]free software.
+#, fuzzy
+#| msgid ""
+#| "This is a matter of the freedom to cooperate. We're used to thinking of "
+#| "freedom and cooperation with society as if they are opposites. But here "
+#| "they're on the same side. With free software you are free to cooperate "
+#| "with other people as well as free to help yourself. With non-free "
+#| "software, somebody is dominating you and keeping people divided. You're "
+#| "not allowed to share with them, you're not free to cooperate or help "
+#| "society, anymore than you're free to help yourself.  Divided and helpless "
+#| "is the state of users using non-free software."
 msgid ""
 "This is a matter of the freedom to cooperate. We're used to thinking of "
 "freedom and cooperation with society as if they are opposites. But here "
 "they're on the same side. With free software you are free to cooperate with "
-"other people as well as free to help yourself. With non-free software, "
+"other people as well as free to help yourself. With nonfree software, "
 "somebody is dominating you and keeping people divided. You're not allowed to "
 "share with them, you're not free to cooperate or help society, anymore than "
 "you're free to help yourself.  Divided and helpless is the state of users "
-"using non-free software."
+"using nonfree software."
 msgstr ""
 "Il s'agit de la liberté de coopérer. Nous avons l'habitude de penser à la "
 "liberté et à la coopération avec la société comme si ces notions "
@@ -1006,21 +1590,53 @@
 "vous n'êtes autorisé à vous aider vous-même. Divisés et impuissants, 
voilà "
 "l'état des utilisateurs de logiciel non libre."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | We've produced a tremendous range of free software. We've done what people
+# | said we could never do; we have two operating systems of free software. We
+# | have many applications and we obviously have a lot farther to go. So we
+# | need your help. I would like to ask you to volunteer for the GNU project;
+# | help us develop free software for more jobs. Take a look at <a
+# | [-href=\"/help/\">http://www.gnu.org/help</a>-]
+# | {+href=\"/help/help.html\">gnu.org/help</a>+} to find suggestions for how
+# | to help. If you want to order things, there's a link to that from the home
+# | page. If you want to read about philosophical issues, look in /philosophy.
+# | If you're looking for free software to use, look in /directory, which
+# | lists about 1900 packages now (which is a fraction of all the free
+# | software out there). Please write more and contribute to us. My book of
+# | essays, &ldquo;Free Software and Free [-Society&rdquo;,-]
+# | {+Society,&rdquo;+} is on sale and can be purchased at [-<a
+# | href=\"http://www.gnu.org/\";>www.gnu.org</a>.-] {+www.gnu.org&#8239;<a
+# | href=\"#foot-9\">[9]</a>.+}  Happy hacking!
+#, fuzzy
+#| msgid ""
+#| "We've produced a tremendous range of free software. We've done what "
+#| "people said we could never do; we have two operating systems of free "
+#| "software. We have many applications and we obviously have a lot farther "
+#| "to go. So we need your help. I would like to ask you to volunteer for the "
+#| "GNU project; help us develop free software for more jobs. Take a look at "
+#| "<a href=\"/help/\">http://www.gnu.org/help</a> to find suggestions for "
+#| "how to help. If you want to order things, there's a link to that from the "
+#| "home page. If you want to read about philosophical issues, look in /"
+#| "philosophy. If you're looking for free software to use, look in /"
+#| "directory, which lists about 1900 packages now (which is a fraction of "
+#| "all the free software out there). Please write more and contribute to us. "
+#| "My book of essays, &ldquo;Free Software and Free Society&rdquo;, is on "
+#| "sale and can be purchased at <a href=\"http://www.gnu.org/\";>www.gnu.org</"
+#| "a>. Happy hacking!"
 msgid ""
 "We've produced a tremendous range of free software. We've done what people "
 "said we could never do; we have two operating systems of free software. We "
 "have many applications and we obviously have a lot farther to go. So we need "
 "your help. I would like to ask you to volunteer for the GNU project; help us "
-"develop free software for more jobs. Take a look at <a href=\"/help/"
-"\">http://www.gnu.org/help</a> to find suggestions for how to help. If you "
-"want to order things, there's a link to that from the home page. If you want "
-"to read about philosophical issues, look in /philosophy. If you're looking "
-"for free software to use, look in /directory, which lists about 1900 "
-"packages now (which is a fraction of all the free software out there). "
-"Please write more and contribute to us. My book of essays, &ldquo;Free "
-"Software and Free Society&rdquo;, is on sale and can be purchased at <a href="
-"\"http://www.gnu.org/\";>www.gnu.org</a>. Happy hacking!"
+"develop free software for more jobs. Take a look at <a href=\"/help/help.html"
+"\">gnu.org/help</a> to find suggestions for how to help. If you want to "
+"order things, there's a link to that from the home page. If you want to read "
+"about philosophical issues, look in /philosophy. If you're looking for free "
+"software to use, look in /directory, which lists about 1900 packages now "
+"(which is a fraction of all the free software out there). Please write more "
+"and contribute to us. My book of essays, &ldquo;Free Software and Free "
+"Society,&rdquo; is on sale and can be purchased at www.gnu.org&#8239;<a href="
+"\"#foot-9\">[9]</a>.  Happy hacking!"
 msgstr ""
 "Nous avons produit une variété énorme de logiciels libres. Nous avons fait 
"
 "ce que les gens disaient que nous n'arriverions jamais à faire ; nous avons 
"
@@ -1040,7 +1656,14 @@
 "libre), est en vente et peut être acheté sur <a href=\"/\">www.gnu.org</a>. 
"
 "<i>Happy hacking!</i> (Codez joyeusement !)"
 
-#. type: Content of: <ol><li>
+#. 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>
 msgid ""
 "Guy Steele designed the original symmetrical Emacs command set; then he and "
 "I began implementing Emacs (on top of TECO), but after one long joint "
@@ -1055,7 +1678,7 @@
 "Eugene C. Cicciarelli et Mike McMahon, ont par la suite contribué de 
manière "
 "substantielle. <a href=\"#foot-1-rev\" class=\"nounderline\">&#8593;</a>"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Bernie Greenberg says that Dan Weinreb's implementation of Emacs for the "
 "Lisp Machine came before Greenberg's implementation for Multics.  I "
@@ -1066,7 +1689,7 @@
 "présente mes excuses pour cette erreur. <a href=\"#foot-2-rev\" class="
 "\"nounderline\">&#8593;</a>"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Greenblatt's plan, as I understood it, was to hire lab people part time, so "
 "that they could continue working at the AI Lab.  Symbolics hired them full "
@@ -1078,13 +1701,26 @@
 "donc ils ont arrêté de travailler au MIT. <a href=\"#foot-3-rev\" class="
 "\"nounderline\">&#8593;</a>"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+# | The background of this plan, which I did not state explicitly in the talk,
+# | is that during an initial period the ex-AI-Lab hackers, whether at
+# | Symbolics or LMI, continued contributing their changes to the MIT Lisp
+# | Machine [-system &mdash; even-] {+system&mdash;even+} though the contract
+# | did not require this.  Symbolics' plan was to rupture this cooperation
+# | unilaterally.
+#, fuzzy
+#| msgid ""
+#| "The background of this plan, which I did not state explicitly in the "
+#| "talk, is that during an initial period the ex-AI-Lab hackers, whether at "
+#| "Symbolics or LMI, continued contributing their changes to the MIT Lisp "
+#| "Machine system &mdash; even though the contract did not require this.  "
+#| "Symbolics' plan was to rupture this cooperation unilaterally."
 msgid ""
 "The background of this plan, which I did not state explicitly in the talk, "
 "is that during an initial period the ex-AI-Lab hackers, whether at Symbolics "
-"or LMI, continued contributing their changes to the MIT Lisp Machine system "
-"&mdash; even though the contract did not require this.  Symbolics' plan was "
-"to rupture this cooperation unilaterally."
+"or LMI, continued contributing their changes to the MIT Lisp Machine "
+"system&mdash;even though the contract did not require this.  Symbolics' plan "
+"was to rupture this cooperation unilaterally."
 msgstr ""
 "L'arrière-pensée de ce plan, que je n'ai pas explicitée dans le discours, "
 "était que durant cette période initiale les ex-hackers du labo d'IA, que ce 
"
@@ -1093,7 +1729,7 @@
 "plan de Symbolics était de briser cette coopération unilatéralement. <a 
href="
 "\"#foot-4-rev\" class=\"nounderline\">&#8593;</a>"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "It was not that I cared particularly about the fate of LMI, but rather I did "
 "not want to let Symbolics gain through its aggression against the AI Lab."
@@ -1102,7 +1738,7 @@
 "que je ne voulais pas laisser Symbolics gagner grâce à son agression contre 
"
 "le labo d'IA. <a href=\"#foot-5-rev\" class=\"nounderline\">&#8593;</a>"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "This statement has been misconstrued as saying that I never, ever looked at "
 "Symbolics' code.  Actually it says I did look, at first.  The Symbolics "
@@ -1115,7 +1751,7 @@
 "disponible au MIT où j'étais en droit de le lire, et au début c'est ainsi "
 "que je me suis rendu compte de leurs modifications."
 
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
 msgid ""
 "But that meant I had to make a special effort to solve each problem "
 "differently, in order to avoid copying Symbolics code.  After a while, I "
@@ -1129,7 +1765,7 @@
 "façon, sans me soucier de ce qui était dans le code de Symbolics. <a href="
 "\"#foot-6-rev\" class=\"nounderline\">&#8593;</a>"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Symbolics at one point protested to MIT that my work, by thwarting their "
 "plan, had cost Symbolics a million dollars."
@@ -1138,7 +1774,7 @@
 "coûté à Symbolics un million de dollars. <a href=\"#foot-7-rev\" class="
 "\"nounderline\">&#8593;</a>"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "I don't mind if a very complex and heavyweight function takes keyword "
 "arguments.  What bothers me is making simple basic functions such as &ldquo;"
@@ -1149,6 +1785,28 @@
 "et basiques comme « member ». <a href=\"#foot-8-rev\" 
class=\"nounderline"
 "\">&#8593;</a>"
 
+#. type: Content of: <div><ol><li>
+# | [-This essay is published in-]{+In 2021, this book can be purchased from+}
+# | <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>.-]
+# | 
{+href=\"https://shop.fsf.org/books-docs/free-software-free-society-selected-essays-richard-m-stallman-3rd-edition\";>
+# | GNU Press</a>.+}
+#, 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 ""
+"In 2021, this book can be purchased from <a href=\"https://shop.fsf.org/";
+"books-docs/free-software-free-society-selected-essays-richard-m-stallman-3rd-"
+"edition\"> GNU Press</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*"
@@ -1191,14 +1849,14 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Merci d'adresser vos commentaires sur les pages en français à &lt;<a href="
@@ -1209,8 +1867,13 @@
 "traduction</a> les infos nécessaires."
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2003, 2007, 2013, 2014, 2020 Free Software Foundation, Inc."
+# | Copyright &copy; 2003, 2007, 2013, [-2014, 2020-] {+2021+} Free Software
+# | Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2003, 2007, 2013, 2014, 2020 Free Software Foundation, "
+#| "Inc."
+msgid "Copyright &copy; 2003, 2007, 2013, 2021 Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 2003, 2007, 2013, 2014, 2020 Free Software Foundation, Inc."
 
@@ -1237,10 +1900,9 @@
 msgid "Updated:"
 msgstr "Dernière mise à jour :"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2003, 2007, 2013, 2014, 2020, 2021 Free Software "
-"Foundation, Inc."
-msgstr ""
-"Copyright &copy; 2003, 2007, 2013, 2014, 2020, 2021 Free Software "
-"Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 2003, 2007, 2013, 2014, 2020, 2021 Free Software "
+#~ "Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2003, 2007, 2013, 2014, 2020, 2021 Free Software "
+#~ "Foundation, Inc."

Index: po/rms-lisp.ja.po
===================================================================
RCS file: /web/www/www/gnu/po/rms-lisp.ja.po,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- po/rms-lisp.ja.po   2 Nov 2021 13:56:43 -0000       1.23
+++ po/rms-lisp.ja.po   2 Nov 2021 14:41:54 -0000       1.24
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rms-lisp.html\n"
-"POT-Creation-Date: 2020-09-21 18:55+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2014-04-28 15:37+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-11-02 14:27+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -24,19 +25,23 @@
 "わたしのLispの経験とGNU Emacsの開発 - GNUプロジェクト - 
フリーソフトウェア"
 "ファウンデーション"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "My Lisp Experiences and the Development of GNU Emacs"
 msgstr "わたしのLispの経験とGNU Emacsの開発"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "(Transcript of Richard Stallman's Speech, 28 Oct 2002, at the "
+#| "International Lisp Conference)."
 msgid ""
-"(Transcript of Richard Stallman's Speech, 28 Oct 2002, at the International "
-"Lisp Conference)."
+"Transcript of Richard Stallman's speech at the International Lisp "
+"Conference, 28 Oct 2002."
 msgstr ""
 
"(2002年10月28日、国際Lispカンファレンスでのリチャード・ストールマンの講演の記"
 "録)。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Since none of my usual speeches have anything to do with Lisp, none of them "
 "were appropriate for today. So I'm going to have to wing it.  Since I've "
@@ -48,17 +53,29 @@
 
"において、わたしはLispと関連したことをたくさんやってきたので、なにか興味深い"
 "ことを話せるべきでしょう。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "My first experience with Lisp was when I read the Lisp 1.5 manual in high "
+#| "school. That's when I had my mind blown by the idea that there could be a "
+#| "computer language like that. The first time I had a chance to do anything "
+#| "with Lisp was when I was a freshman at Harvard and I wrote a Lisp "
+#| "interpreter for the <abbr title=\"Programmed Data Processor\">PDP</"
+#| "abbr>-11. It was a very small machine &mdash; it had something like 8k of "
+#| "memory &mdash; and I managed to write the interpreter in a thousand "
+#| "instructions. This gave me some room for a little bit of data. That was "
+#| "before I got to see what real software was like, that did real system "
+#| "jobs."
 msgid ""
 "My first experience with Lisp was when I read the Lisp 1.5 manual in high "
 "school. That's when I had my mind blown by the idea that there could be a "
 "computer language like that. The first time I had a chance to do anything "
 "with Lisp was when I was a freshman at Harvard and I wrote a Lisp "
 "interpreter for the <abbr title=\"Programmed Data Processor\">PDP</abbr>-11. "
-"It was a very small machine &mdash; it had something like 8k of memory "
-"&mdash; and I managed to write the interpreter in a thousand instructions. "
-"This gave me some room for a little bit of data. That was before I got to "
-"see what real software was like, that did real system jobs."
+"It was a very small machine&mdash;it had something like 8k of memory&mdash;"
+"and I managed to write the interpreter in a thousand instructions. This gave "
+"me some room for a little bit of data. That was before I got to see what "
+"real software was like, that did real system jobs."
 msgstr ""
 "わたしの最初のLispの経験は、高校でLisp 
1.5マニュアルを読んだときです。その"
 
"時、わたしの心に、そのようなコンピュータ言語がありうるという考えが吹きつけら"
@@ -69,13 +86,20 @@
 "得ることができました。本当のシステム
の仕事をする本当のソフトウェアがどういっ"
 "たものであるかを知る前のことです。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "I began doing work on a real Lisp implementation with JonL White once I "
+#| "started working at <abbr title=\"Massachusetts Institute of Technology"
+#| "\">MIT</abbr>. I got hired at the Artificial Intelligence Lab not by "
+#| "JonL, but by Russ Noftsker, which was most ironic considering what was to "
+#| "come &mdash; he must have really regretted that day."
 msgid ""
 "I began doing work on a real Lisp implementation with JonL White once I "
 "started working at <abbr title=\"Massachusetts Institute of Technology"
 "\">MIT</abbr>. I got hired at the Artificial Intelligence Lab not by JonL, "
-"but by Russ Noftsker, which was most ironic considering what was to come "
-"&mdash; he must have really regretted that day."
+"but by Russ Noftsker, which was most ironic considering what was to "
+"come&mdash;he must have really regretted that day."
 msgstr ""
 "<abbr title=\"Massachusetts Institute of 
Technology\">MIT</abbr>で働きはじめ"
 "たら、ジョンL・ホワイトと本当のLispの実装
の仕事をはじめました。AIラボ(人工知"
@@ -83,7 +107,7 @@
 
"れは、引き続いて起こることを考えると、もっとも皮肉なことで、かれはこの日を実"
 "に後悔したに違いありません。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "During the 1970s, before my life became politicized by horrible events, I "
 "was just going along making one extension after another for various "
@@ -108,7 +132,7 @@
 "つつプログラム
できる、のでした。それが、そういったものの最初であるかどうかは"
 
"知りませんが、それがそのような最初のエディタであったのは確かです。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This spirit of building up gigantic, complicated programs to use in your own "
 "editing, and then exchanging them with other people, fueled the spirit of "
@@ -130,19 +154,32 @@
 
"く、無意識のつながりがあった、ということには同意します。Emacsを導き、それがそ"
 
"うであるようにしたのは、わたしたちが暮らしたAIラボの方法の性質ã
 ã¨æ€ã„ます。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The original Emacs did not have Lisp in it. The lower level language, the "
+#| "non-interpreted language &mdash; was PDP-10 Assembler. The interpreter we "
+#| "wrote in that actually wasn't written for Emacs, it was written for <abbr "
+#| "title=\"Text Editor and COrrector\">TECO</abbr>. It was our text editor, "
+#| "and was an extremely ugly programming language, as ugly as could possibly "
+#| "be. The reason was that it wasn't designed to be a programming language, "
+#| "it was designed to be an editor and command language. There were commands "
+#| "like &lsquo;5l&rsquo;, meaning &lsquo;move five lines&rsquo;, or &lsquo;"
+#| "i&rsquo; and then a string and then an ESC to insert that string. You "
+#| "would type a string that was a series of commands, which was called a "
+#| "command string. You would end it with ESC ESC, and it would get executed."
 msgid ""
 "The original Emacs did not have Lisp in it. The lower level language, the "
-"non-interpreted language &mdash; was PDP-10 Assembler. The interpreter we "
+"non-interpreted language&mdash;was PDP-10 Assembler. The interpreter we "
 "wrote in that actually wasn't written for Emacs, it was written for <abbr "
 "title=\"Text Editor and COrrector\">TECO</abbr>. It was our text editor, and "
 "was an extremely ugly programming language, as ugly as could possibly be. "
 "The reason was that it wasn't designed to be a programming language, it was "
 "designed to be an editor and command language. There were commands like "
-"&lsquo;5l&rsquo;, meaning &lsquo;move five lines&rsquo;, or &lsquo;i&rsquo; "
-"and then a string and then an ESC to insert that string. You would type a "
-"string that was a series of commands, which was called a command string. You "
-"would end it with ESC ESC, and it would get executed."
+"<code>5l</code>, meaning <code>move five lines</code>, or <code>i</code> and "
+"then a string and then an ESC to insert that string. You would type a string "
+"that was a series of commands, which was called a command string. You would "
+"end it with ESC ESC, and it would get executed."
 msgstr ""
 
"オリジナルのEmacsにはLispはありませんでした。低レベルの言語、インタプリタ言語"
 
"ではない、のは、PDP-10のアセンブラでした。わたしたちが、そこで使ったインタプ"
@@ -155,18 +192,31 @@
 "で、その文字列を挿å…
¥ã€ãªã©ã§ã™ã€‚コマンド文字列、と呼ばれたコマンドの列である"
 "文字列をタイプするのでした。それをESC 
ESCで終了すると、実行されるのです。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Well, people wanted to extend this language with programming facilities, "
+#| "so they added some. For instance, one of the first was a looping "
+#| "construct, which was &lt; &gt;. You would put those around things and it "
+#| "would loop. There were other cryptic commands that could be used to "
+#| "conditionally exit the loop.  To make Emacs, we <a href=\"#foot-1\">(1)</"
+#| "a> added facilities to have subroutines with names. Before that, it was "
+#| "sort of like Basic, and the subroutines could only have single letters as "
+#| "their names. That was hard to program big programs with, so we added code "
+#| "so they could have longer names. Actually, there were some rather "
+#| "sophisticated facilities; I think that Lisp got its unwind-protect "
+#| "facility from TECO."
 msgid ""
 "Well, people wanted to extend this language with programming facilities, so "
 "they added some. For instance, one of the first was a looping construct, "
-"which was &lt; &gt;. You would put those around things and it would loop. "
-"There were other cryptic commands that could be used to conditionally exit "
-"the loop.  To make Emacs, we <a href=\"#foot-1\">(1)</a> added facilities to "
-"have subroutines with names. Before that, it was sort of like Basic, and the "
-"subroutines could only have single letters as their names. That was hard to "
-"program big programs with, so we added code so they could have longer names. "
-"Actually, there were some rather sophisticated facilities; I think that Lisp "
-"got its unwind-protect facility from TECO."
+"which was <code>&lt;&nbsp;&gt;</code>. You would put those around things and "
+"it would loop. There were other cryptic commands that could be used to "
+"conditionally exit the loop.  To make Emacs, we&#8239;<a href=\"#foot-1\">[1]"
+"</a> added facilities to have subroutines with names. Before that, it was "
+"sort of like Basic, and the subroutines could only have single letters as "
+"their names. That was hard to program big programs with, so we added code so "
+"they could have longer names. Actually, there were some rather sophisticated "
+"facilities; I think that Lisp got its unwind-protect facility from TECO."
 msgstr ""
 "まぁ、人々
がこの言語にプログラミングの機能を拡張したがり、いくつか足しまし"
 "た。たとえば、最初のものは、ループ構造で、&lt; &gt; 
でした。これを、あるもの"
@@ -178,10 +228,20 @@
 "い名前を持てるようにコードを追加
したのです。実際、洗練された機能もいくつかあ"
 
"りました。わたしは、LispはTECOからunwind-protectの機能を採ったと思います。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "We started putting in rather sophisticated facilities, all with the "
+#| "ugliest syntax you could ever think of, and it worked &mdash; people were "
+#| "able to write large programs in it anyway. The obvious lesson was that a "
+#| "language like TECO, which wasn't designed to be a programming language, "
+#| "was the wrong way to go. The language that you build your extensions on "
+#| "shouldn't be thought of as a programming language in afterthought; it "
+#| "should be designed as a programming language. In fact, we discovered that "
+#| "the best programming language for that purpose was Lisp."
 msgid ""
 "We started putting in rather sophisticated facilities, all with the ugliest "
-"syntax you could ever think of, and it worked &mdash; people were able to "
+"syntax you could ever think of, and it worked&mdash;people were able to "
 "write large programs in it anyway. The obvious lesson was that a language "
 "like TECO, which wasn't designed to be a programming language, was the wrong "
 "way to go. The language that you build your extensions on shouldn't be "
@@ -197,18 +257,30 @@
 
"れはプログラミング言語として設計されるべきです。実際、その目的に最適のプログ"
 "ラミング言語はLispだと、わたしたちは発見しました。"
 
-#. type: Content of: <p>
-msgid ""
-"It was Bernie Greenberg, who discovered that it was <a href=\"#foot-2\">(2)</"
-"a>.  He wrote a version of Emacs in Multics MacLisp, and he wrote his "
-"commands in MacLisp in a straightforward fashion. The editor itself was "
-"written entirely in Lisp. Multics Emacs proved to be a great success &mdash; "
-"programming new editing commands was so convenient that even the secretaries "
-"in his office started learning how to use it. They used a manual someone had "
-"written which showed how to extend Emacs, but didn't say it was a "
-"programming. So the secretaries, who believed they couldn't do programming, "
-"weren't scared off. They read the manual, discovered they could do useful "
-"things and they learned to program."
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "It was Bernie Greenberg, who discovered that it was <a href=\"#foot-2\">"
+#| "(2)</a>.  He wrote a version of Emacs in Multics MacLisp, and he wrote "
+#| "his commands in MacLisp in a straightforward fashion. The editor itself "
+#| "was written entirely in Lisp. Multics Emacs proved to be a great success "
+#| "&mdash; programming new editing commands was so convenient that even the "
+#| "secretaries in his office started learning how to use it. They used a "
+#| "manual someone had written which showed how to extend Emacs, but didn't "
+#| "say it was a programming. So the secretaries, who believed they couldn't "
+#| "do programming, weren't scared off. They read the manual, discovered they "
+#| "could do useful things and they learned to program."
+msgid ""
+"It was Bernie Greenberg, who discovered that it was&#8239;<a href="
+"\"#foot-2\">[2]</a>.  He wrote a version of Emacs in Multics MacLisp, and he "
+"wrote his commands in MacLisp in a straightforward fashion. The editor "
+"itself was written entirely in Lisp. Multics Emacs proved to be a great "
+"success&mdash;programming new editing commands was so convenient that even "
+"the secretaries in his office started learning how to use it. They used a "
+"manual someone had written which showed how to extend Emacs, but didn't say "
+"it was a programming. So the secretaries, who believed they couldn't do "
+"programming, weren't scared off. They read the manual, discovered they could "
+"do useful things and they learned to program."
 msgstr ""
 "こうだと<a 
href=\"#foot-2\">(2)</a>発見したのは、バーニー・グリーンバーグでし"
 "た。かれはMultics 
MacLispでEmacsのあるバージョンを書き、まっすぐなやり方で、"
@@ -221,16 +293,27 @@
 
"がらなかったのです。マニュアルを読んで、有用な事ができることを発見し、プログ"
 "ラムすることを学習したのです。"
 
-#. type: Content of: <p>
-msgid ""
-"So Bernie saw that an application &mdash; a program that does something "
-"useful for you &mdash; which has Lisp inside it and which you could extend "
-"by rewriting the Lisp programs, is actually a very good way for people to "
-"learn programming. It gives them a chance to write small programs that are "
-"useful for them, which in most arenas you can't possibly do. They can get "
-"encouragement for their own practical use &mdash; at the stage where it's "
-"the hardest &mdash; where they don't believe they can program, until they "
-"get to the point where they are programmers."
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "So Bernie saw that an application &mdash; a program that does something "
+#| "useful for you &mdash; which has Lisp inside it and which you could "
+#| "extend by rewriting the Lisp programs, is actually a very good way for "
+#| "people to learn programming. It gives them a chance to write small "
+#| "programs that are useful for them, which in most arenas you can't "
+#| "possibly do. They can get encouragement for their own practical use "
+#| "&mdash; at the stage where it's the hardest &mdash; where they don't "
+#| "believe they can program, until they get to the point where they are "
+#| "programmers."
+msgid ""
+"So Bernie saw that an application&mdash;a program that does something useful "
+"for you&mdash;which has Lisp inside it and which you could extend by "
+"rewriting the Lisp programs, is actually a very good way for people to learn "
+"programming. It gives them a chance to write small programs that are useful "
+"for them, which in most arenas you can't possibly do. They can get "
+"encouragement for their own practical use&mdash;at the stage where it's the "
+"hardest&mdash;where they don't believe they can program, until they get to "
+"the point where they are programmers."
 msgstr ""
 
"ですから、バーニーは、気づきました。あるアプリケーション(なにか有用なプログラ"
 "ム)がLispを内蔵し、Lispプログラム
を書き直すことで拡張できること &mdash; これ"
@@ -240,30 +323,55 @@
 "思われて、プログラム
することなど考えられなかったのが、プログラマとなるところ"
 "まで至ったのです。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "At that point, people began to wonder how they could get something like "
+#| "this on a platform where they didn't have full service Lisp "
+#| "implementation. Multics MacLisp had a compiler as well as an interpreter "
+#| "&mdash; it was a full-fledged Lisp system &mdash; but people wanted to "
+#| "implement something like that on other systems where they had not already "
+#| "written a Lisp compiler. Well, if you didn't have the Lisp compiler you "
+#| "couldn't write the whole editor in Lisp &mdash; it would be too slow, "
+#| "especially redisplay, if it had to run interpreted Lisp.  So we developed "
+#| "a hybrid technique. The idea was to write a Lisp interpreter and the "
+#| "lower level parts of the editor together, so that parts of the editor "
+#| "were built-in Lisp facilities. Those would be whatever parts we felt we "
+#| "had to optimize. This was a technique that we had already consciously "
+#| "practiced in the original Emacs, because there were certain fairly high "
+#| "level features which we re-implemented in machine language, making them "
+#| "into TECO primitives. For instance, there was a TECO primitive to fill a "
+#| "paragraph (actually, to do most of the work of filling a paragraph, "
+#| "because some of the less time-consuming parts of the job would be done at "
+#| "the higher level by a TECO program). You could do the whole job by "
+#| "writing a TECO program, but that was too slow, so we optimized it by "
+#| "putting part of it in machine language. We used the same idea here (in "
+#| "the hybrid technique), that most of the editor would be written in Lisp, "
+#| "but certain parts of it that had to run particularly fast would be "
+#| "written at a lower level."
 msgid ""
 "At that point, people began to wonder how they could get something like this "
 "on a platform where they didn't have full service Lisp implementation. "
-"Multics MacLisp had a compiler as well as an interpreter &mdash; it was a "
-"full-fledged Lisp system &mdash; but people wanted to implement something "
-"like that on other systems where they had not already written a Lisp "
-"compiler. Well, if you didn't have the Lisp compiler you couldn't write the "
-"whole editor in Lisp &mdash; it would be too slow, especially redisplay, if "
-"it had to run interpreted Lisp.  So we developed a hybrid technique. The "
-"idea was to write a Lisp interpreter and the lower level parts of the editor "
-"together, so that parts of the editor were built-in Lisp facilities. Those "
-"would be whatever parts we felt we had to optimize. This was a technique "
-"that we had already consciously practiced in the original Emacs, because "
-"there were certain fairly high level features which we re-implemented in "
-"machine language, making them into TECO primitives. For instance, there was "
-"a TECO primitive to fill a paragraph (actually, to do most of the work of "
-"filling a paragraph, because some of the less time-consuming parts of the "
-"job would be done at the higher level by a TECO program). You could do the "
-"whole job by writing a TECO program, but that was too slow, so we optimized "
-"it by putting part of it in machine language. We used the same idea here (in "
-"the hybrid technique), that most of the editor would be written in Lisp, but "
-"certain parts of it that had to run particularly fast would be written at a "
-"lower level."
+"Multics MacLisp had a compiler as well as an interpreter&mdash;it was a full-"
+"fledged Lisp system&mdash;but people wanted to implement something like that "
+"on other systems where they had not already written a Lisp compiler. Well, "
+"if you didn't have the Lisp compiler you couldn't write the whole editor in "
+"Lisp&mdash;it would be too slow, especially redisplay, if it had to run "
+"interpreted Lisp.  So we developed a hybrid technique. The idea was to write "
+"a Lisp interpreter and the lower level parts of the editor together, so that "
+"parts of the editor were built-in Lisp facilities. Those would be whatever "
+"parts we felt we had to optimize. This was a technique that we had already "
+"consciously practiced in the original Emacs, because there were certain "
+"fairly high level features which we re-implemented in machine language, "
+"making them into TECO primitives. For instance, there was a TECO primitive "
+"to fill a paragraph (actually, to do most of the work of filling a "
+"paragraph, because some of the less time-consuming parts of the job would be "
+"done at the higher level by a TECO program). You could do the whole job by "
+"writing a TECO program, but that was too slow, so we optimized it by putting "
+"part of it in machine language. We used the same idea here (in the hybrid "
+"technique), that most of the editor would be written in Lisp, but certain "
+"parts of it that had to run particularly fast would be written at a lower "
+"level."
 msgstr ""
 "この時点で、人々は、以前はLispの実装の完å…
¨ãªã‚µãƒ¼ãƒ“スを有さなかったプラット"
 "フォーム
で、なにかこのようなものを得ることが、どうしたらできるかを考え始める"
@@ -286,16 +394,25 @@
 
"Lispでエディタのほとんどの部分が書かれますが、特に速く実行しなければならない"
 "ある部分については、低レベルで書かれるのです。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Therefore, when I wrote my second implementation of Emacs, I followed the "
+#| "same kind of design. The low level language was not machine language "
+#| "anymore, it was C. C was a good, efficient language for portable programs "
+#| "to run in a Unix-like operating system. There was a Lisp interpreter, but "
+#| "I implemented facilities for special purpose editing jobs directly in C "
+#| "&mdash; manipulating editor buffers, inserting leading text, reading and "
+#| "writing files, redisplaying the buffer on the screen, managing editor "
+#| "windows."
 msgid ""
 "Therefore, when I wrote my second implementation of Emacs, I followed the "
 "same kind of design. The low level language was not machine language "
 "anymore, it was C. C was a good, efficient language for portable programs to "
 "run in a Unix-like operating system. There was a Lisp interpreter, but I "
-"implemented facilities for special purpose editing jobs directly in C "
-"&mdash; manipulating editor buffers, inserting leading text, reading and "
-"writing files, redisplaying the buffer on the screen, managing editor "
-"windows."
+"implemented facilities for special purpose editing jobs directly in C&mdash;"
+"manipulating editor buffers, inserting leading text, reading and writing "
+"files, redisplaying the buffer on the screen, managing editor windows."
 msgstr ""
 "ですから、わたしがEmacsのわたしの第二の実装
を書いたとき、同じような設計に従い"
 
"ました。低レベル言語は、もはや機械語ではなく、Cでした。Cは良いもので、Unixラ"
@@ -305,20 +422,34 @@
 
"る、ファイルに読み書きする、画面にバッファを再表示する、エディタのウィンドウ"
 "を管理する、などの機構です。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Now, this was not the first Emacs that was written in C and ran on Unix. "
+#| "The first was written by James Gosling, and was referred to as GosMacs. A "
+#| "strange thing happened with him. In the beginning, he seemed to be "
+#| "influenced by the same spirit of sharing and cooperation of the original "
+#| "Emacs. I first released the original Emacs to people at MIT. Someone "
+#| "wanted to port it to run on Twenex &mdash; it originally only ran on the "
+#| "Incompatible Timesharing System we used at MIT. They ported it to Twenex, "
+#| "which meant that there were a few hundred installations around the world "
+#| "that could potentially use it. We started distributing it to them, with "
+#| "the rule that &ldquo;you had to send back all of your improvements&rdquo; "
+#| "so we could all benefit. No one ever tried to enforce that, but as far as "
+#| "I know people did cooperate."
 msgid ""
 "Now, this was not the first Emacs that was written in C and ran on Unix. The "
 "first was written by James Gosling, and was referred to as GosMacs. A "
 "strange thing happened with him. In the beginning, he seemed to be "
 "influenced by the same spirit of sharing and cooperation of the original "
 "Emacs. I first released the original Emacs to people at MIT. Someone wanted "
-"to port it to run on Twenex &mdash; it originally only ran on the "
-"Incompatible Timesharing System we used at MIT. They ported it to Twenex, "
-"which meant that there were a few hundred installations around the world "
-"that could potentially use it. We started distributing it to them, with the "
-"rule that &ldquo;you had to send back all of your improvements&rdquo; so we "
-"could all benefit. No one ever tried to enforce that, but as far as I know "
-"people did cooperate."
+"to port it to run on Twenex&mdash;it originally only ran on the Incompatible "
+"Timesharing System we used at MIT. They ported it to Twenex, which meant "
+"that there were a few hundred installations around the world that could "
+"potentially use it. We started distributing it to them, with the rule that "
+"&ldquo;you had to send back all of your improvements&rdquo; so we could all "
+"benefit. No one ever tried to enforce that, but as far as I know people did "
+"cooperate."
 msgstr ""
 
"この時、これは、Cで書かれてUnixで動く最初のEmacsではありませんでした。最初の"
 "ものはジェーム
ス・ゴスリングによって書かれ、GosMacsと呼ばれました。おかしな事"
@@ -332,12 +463,20 @@
 
"が、その利益を享受するためです。誰もそれを強制しようとはしませんでしたが、わ"
 "たしの知る限り、人々は協力しました。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Gosling did, at first, seem to participate in this spirit. He wrote in a "
+#| "manual that he called the program Emacs hoping that others in the "
+#| "community would improve it until it was worthy of that name. That's the "
+#| "right approach to take towards a community &mdash; to ask them to join in "
+#| "and make the program better. But after that he seemed to change the "
+#| "spirit, and sold it to a company."
 msgid ""
 "Gosling did, at first, seem to participate in this spirit. He wrote in a "
 "manual that he called the program Emacs hoping that others in the community "
 "would improve it until it was worthy of that name. That's the right approach "
-"to take towards a community &mdash; to ask them to join in and make the "
+"to take towards a community&mdash;to ask them to join in and make the "
 "program better. But after that he seemed to change the spirit, and sold it "
 "to a company."
 msgstr ""
@@ -347,7 +486,20 @@
 "た。コミュニティに参加を呼びかけ、プログラム
をよりよいものとする、という。し"
 
"かし、その後、かれは心変わりしたようで、それを会社に売りました。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "At that time I was working on the GNU system (a free software Unix-like "
+#| "operating system that many people erroneously call &ldquo;Linux&rdquo;).  "
+#| "There was no free software Emacs editor that ran on Unix. I did, however, "
+#| "have a friend who had participated in developing Gosling's Emacs. Gosling "
+#| "had given him, by email, permission to distribute his own version. He "
+#| "proposed to me that I use that version. Then I discovered that Gosling's "
+#| "Emacs did not have a real Lisp. It had a programming language that was "
+#| "known as &lsquo;mocklisp&rsquo;, which looks syntactically like Lisp, but "
+#| "didn't have the data structures of Lisp.  So programs were not data, and "
+#| "vital elements of Lisp were missing.  Its data structures were strings, "
+#| "numbers and a few other specialized things."
 msgid ""
 "At that time I was working on the GNU system (a free software Unix-like "
 "operating system that many people erroneously call &ldquo;Linux&rdquo;).  "
@@ -356,7 +508,7 @@
 "had given him, by email, permission to distribute his own version. He "
 "proposed to me that I use that version. Then I discovered that Gosling's "
 "Emacs did not have a real Lisp. It had a programming language that was known "
-"as &lsquo;mocklisp&rsquo;, which looks syntactically like Lisp, but didn't "
+"as &ldquo;mocklisp,&rdquo; which looks syntactically like Lisp, but didn't "
 "have the data structures of Lisp.  So programs were not data, and vital "
 "elements of Lisp were missing.  Its data structures were strings, numbers "
 "and a few other specialized things."
@@ -373,7 +525,7 @@
 "グラムはデータではなく、Lispの主要な要素が欠
けていました。そのデータ構造は文"
 "字列、数、そして、いくつかの特別なものでした。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I concluded I couldn't use it and had to replace it all, the first step of "
 "which was to write an actual Lisp interpreter. I gradually adapted every "
@@ -387,13 +539,21 @@
 "データ構造ではなく。エディタの内部のデータ構造
を外部に引き出し、ユーザのLisp"
 "プログラムから操作できるものとしたのです。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The one exception was redisplay. For a long time, redisplay was sort of "
+#| "an alternate world. The editor would enter the world of redisplay and "
+#| "things would go on with very special data structures that were not safe "
+#| "for garbage collection, not safe for interruption, and you couldn't run "
+#| "any Lisp programs during that. We've changed that since &mdash; it's now "
+#| "possible to run Lisp code during redisplay. It's quite a convenient thing."
 msgid ""
 "The one exception was redisplay. For a long time, redisplay was sort of an "
 "alternate world. The editor would enter the world of redisplay and things "
 "would go on with very special data structures that were not safe for garbage "
 "collection, not safe for interruption, and you couldn't run any Lisp "
-"programs during that. We've changed that since &mdash; it's now possible to "
+"programs during that. We've changed that since&mdash;it's now possible to "
 "run Lisp code during redisplay. It's quite a convenient thing."
 msgstr ""
 
"一つの例外は再描画でした。長い間、再描画は、ある種の別世界でした。エディタが"
@@ -402,15 +562,26 @@
 "Lispのプログラム
も実行できないのです。わたしたちは、それを変更しました。いま"
 
"や、再描画の最中にLispのコードを実行できます。それは、とても便利なことです。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "This second Emacs program was &lsquo;free software&rsquo; in the modern "
+#| "sense of the term &mdash; it was part of an explicit political campaign "
+#| "to make software free. The essence of this campaign was that everybody "
+#| "should be free to do the things we did in the old days at MIT, working "
+#| "together on software and working with whomever wanted to work with us.  "
+#| "That is the basis for the free software movement &mdash; the experience I "
+#| "had, the life that I've lived at the MIT AI lab &mdash; to be working on "
+#| "human knowledge, and not be standing in the way of anybody's further "
+#| "using and further disseminating human knowledge."
 msgid ""
-"This second Emacs program was &lsquo;free software&rsquo; in the modern "
-"sense of the term &mdash; it was part of an explicit political campaign to "
+"This second Emacs program was &ldquo;free software&rdquo; in the modern "
+"sense of the term&mdash;it was part of an explicit political campaign to "
 "make software free. The essence of this campaign was that everybody should "
 "be free to do the things we did in the old days at MIT, working together on "
 "software and working with whomever wanted to work with us.  That is the "
-"basis for the free software movement &mdash; the experience I had, the life "
-"that I've lived at the MIT AI lab &mdash; to be working on human knowledge, "
+"basis for the free software movement&mdash;the experience I had, the life "
+"that I've lived at the MIT AI lab&mdash;to be working on human knowledge, "
 "and not be standing in the way of anybody's further using and further "
 "disseminating human knowledge."
 msgstr ""
@@ -422,7 +593,7 @@
 
"の経験、MITのAIラボで過ごした暮らし、です。人類の知識について働き、誰もがさら"
 
"に使うこと、さらに人類の知識を広めることについて阻んで停止するのでなくて。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "At the time, you could make a computer that was about the same price range "
 "as other computers that weren't meant for Lisp, except that it would run "
@@ -440,11 +611,21 @@
 "ラム
を速く実行することはできますが、数に対して<code>car</code>を取ろうとした"
 
"ときは、意味のない結果を出し、結局はどこかでクラッシュします。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The Lisp machine was able to execute instructions about as fast as those "
+#| "other machines, but each instruction &mdash; a <code>car</code> "
+#| "instruction would do data typechecking &mdash; so when you tried to get "
+#| "the <code>car</code> of a number in a compiled program, it would give you "
+#| "an immediate error. We built the machine and had a Lisp operating system "
+#| "for it. It was written almost entirely in Lisp, the only exceptions being "
+#| "parts written in the microcode. People became interested in manufacturing "
+#| "them, which meant they should start a company."
 msgid ""
 "The Lisp machine was able to execute instructions about as fast as those "
-"other machines, but each instruction &mdash; a <code>car</code> instruction "
-"would do data typechecking &mdash; so when you tried to get the <code>car</"
+"other machines, but each instruction&mdash;a <code>car</code> instruction "
+"would do data typechecking&mdash;so when you tried to get the <code>car</"
 "code> of a number in a compiled program, it would give you an immediate "
 "error. We built the machine and had a Lisp operating system for it. It was "
 "written almost entirely in Lisp, the only exceptions being parts written in "
@@ -459,15 +640,25 @@
 "ドで書かれたものが例外としてあるだけです。人々
はそれを製造する事に関心を示"
 "し、それは、会社を開始するべきことを意味しました。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "There were two different ideas about what this company should be like.  "
+#| "Greenblatt wanted to start what he called a &ldquo;hacker&rdquo; company. "
+#| "This meant it would be a company run by hackers and would operate in a "
+#| "way conducive to hackers. Another goal was to maintain the AI Lab culture "
+#| "<a href=\"#foot-3\">(3)</a>.  Unfortunately, Greenblatt didn't have any "
+#| "business experience, so other people in the Lisp machine group said they "
+#| "doubted whether he could succeed. They thought that his plan to avoid "
+#| "outside investment wouldn't work."
 msgid ""
 "There were two different ideas about what this company should be like.  "
 "Greenblatt wanted to start what he called a &ldquo;hacker&rdquo; company. "
 "This meant it would be a company run by hackers and would operate in a way "
-"conducive to hackers. Another goal was to maintain the AI Lab culture <a "
-"href=\"#foot-3\">(3)</a>.  Unfortunately, Greenblatt didn't have any "
-"business experience, so other people in the Lisp machine group said they "
-"doubted whether he could succeed. They thought that his plan to avoid "
+"conducive to hackers. Another goal was to maintain the AI Lab culture&#8239;"
+"<a class=\"ftn\" href=\"#foot-3\">[3]</a>.  Unfortunately, Greenblatt didn't "
+"have any business experience, so other people in the Lisp machine group said "
+"they doubted whether he could succeed. They thought that his plan to avoid "
 "outside investment wouldn't work."
 msgstr ""
 
"この会社がどのようであるべきかについて、二つの異なる考えがありました。グリー"
@@ -478,7 +669,7 @@
 "ンのグループのほかの人々
は、かれが成功できるか疑っていると言いました。かれの"
 
"外部からの投資を避ける計画はうまく行かないと考えていたのです。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Why did he want to avoid outside investment? Because when a company has "
 "outside investors, they take control and they don't let you have any "
@@ -490,7 +681,7 @@
 
"めでもためらうことをさせないからです。そして、結局は、なにか良心のとがめが"
 "あったå 
´åˆã€ã‹ã‚Œã‚‰ãŒãƒžãƒãƒ¼ã‚¸ãƒ£ã¨ã—てあなたの代わりとなるでしょう。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So Greenblatt had the idea that he would find a customer who would pay in "
 "advance to buy the parts. They would build machines and deliver them; with "
@@ -505,7 +696,7 @@
 
"のための部品を買う、というようにです。そのグループのほかの人ã€
…は、そうは行か"
 "ないだろうと考えていました。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Greenblatt then recruited Russell Noftsker, the man who had hired me, who "
 "had subsequently left the AI Lab and created a successful company.  Russell "
@@ -525,7 +716,7 @@
 
"決めました。外部の資金を受け、良心の呵責を感じることなく、勝利のためには何で"
 "もして。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "But Greenblatt didn't give up. He and the few people loyal to him decided to "
 "start Lisp Machines Inc. anyway and go ahead with their plans. And what do "
@@ -547,7 +738,7 @@
 
"が突っ伏すことがないのをシンボリックスが見たとき、かれらは、LMIをç
 ´å£Šã™ã‚‹æ–¹ç­–"
 "を探し出し始めました。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Thus, the abandonment of our lab was followed by &ldquo;war&rdquo; in our "
 "lab.  The abandonment happened when Symbolics hired away all the hackers, "
@@ -573,13 +764,20 @@
 "æ 
¼ãŒã‚るかどうかについては述べられていませんでした。誰も、AIラボのハッカーの"
 
"グループが一掃されるとは想像してませんでしたが、そうなったのです。"
 
-#. type: Content of: <p>
-msgid ""
-"So Symbolics came up with a plan <a href=\"#foot-4\">(4)</a>.  They said to "
-"the lab, &ldquo;We will continue making our changes to the system available "
-"for you to use, but you can't put it into the MIT Lisp machine system. "
-"Instead, we'll give you access to Symbolics' Lisp machine system, and you "
-"can run it, but that's all you can do.&rdquo;"
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "So Symbolics came up with a plan <a href=\"#foot-4\">(4)</a>.  They said "
+#| "to the lab, &ldquo;We will continue making our changes to the system "
+#| "available for you to use, but you can't put it into the MIT Lisp machine "
+#| "system. Instead, we'll give you access to Symbolics' Lisp machine system, "
+#| "and you can run it, but that's all you can do.&rdquo;"
+msgid ""
+"So Symbolics came up with a plan&#8239;<a href=\"#foot-4\">[4]</a>.  They "
+"said to the lab, &ldquo;We will continue making our changes to the system "
+"available for you to use, but you can't put it into the MIT Lisp machine "
+"system. Instead, we'll give you access to Symbolics' Lisp machine system, "
+"and you can run it, but that's all you can do.&rdquo;"
 msgstr ""
 "そうして、シンボリックスはプランを出しました<a 
href=\"#foot-4\">(4)</a>。かれ"
 "らはラボに言いました。「システム
へのわたしたちの変更を使用可能とするように続"
@@ -587,7 +785,7 @@
 "ンボリックスのLispマシン・システム
へのアクセスを提供し、実行することができま"
 "すが、それがわたしたちができることのすべてです。」"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This, in effect, meant that they demanded that we had to choose a side, and "
 "use either the MIT version of the system or the Symbolics version.  "
@@ -606,12 +804,21 @@
 
"助けていることになるので、シンボリックスはそれをLMIを支持しているとみなしま"
 
"す。ですから、もはや、中立であることは許されませんでした。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Up until that point, I hadn't taken the side of either company, although "
+#| "it made me miserable to see what had happened to our community and the "
+#| "software.  But now, Symbolics had forced the issue.  So, in an effort to "
+#| "help keep Lisp Machines Inc. going <a href=\"#foot-5\">(5)</a> &mdash; I "
+#| "began duplicating all of the improvements Symbolics had made to the Lisp "
+#| "machine system.  I wrote the equivalent improvements again myself (i.e., "
+#| "the code was my own)."
 msgid ""
 "Up until that point, I hadn't taken the side of either company, although it "
 "made me miserable to see what had happened to our community and the "
 "software.  But now, Symbolics had forced the issue.  So, in an effort to "
-"help keep Lisp Machines Inc. going <a href=\"#foot-5\">(5)</a> &mdash; I "
+"help keep Lisp Machines Inc. going&#8239;<a href=\"#foot-5\">[5]</a>&mdash;I "
 "began duplicating all of the improvements Symbolics had made to the Lisp "
 "machine system.  I wrote the equivalent improvements again myself (i.e., the "
 "code was my own)."
@@ -624,12 +831,19 @@
 
"た。わたしは、同等の改善を自分自身で再度書いたのです(すなわち、コードはわたし"
 "自身のものです)。"
 
-#. type: Content of: <p>
-msgid ""
-"After a while <a href=\"#foot-6\">(6)</a>, I came to the conclusion that it "
-"would be best if I didn't even look at their code. When they made a beta "
-"announcement that gave the release notes, I would see what the features were "
-"and then implement them. By the time they had a real release, I did too."
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "After a while <a href=\"#foot-6\">(6)</a>, I came to the conclusion that "
+#| "it would be best if I didn't even look at their code. When they made a "
+#| "beta announcement that gave the release notes, I would see what the "
+#| "features were and then implement them. By the time they had a real "
+#| "release, I did too."
+msgid ""
+"After a while&#8239;<a href=\"#foot-6\">[6]</a>, I came to the conclusion "
+"that it would be best if I didn't even look at their code. When they made a "
+"beta announcement that gave the release notes, I would see what the features "
+"were and then implement them. By the time they had a real release, I did too."
 msgstr ""
 "しばらくして<a 
href=\"#foot-6\">(6)</a>、わたしは、かれらのコードを見ないこと"
 
"が最善であろうとの結論に至りました。かれらがベータ版のアナウンスをし、リリー"
@@ -637,15 +851,24 @@
 
"のです。実際のリリースが行われるときには、わたしも同じようにリリースしまし"
 "た。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "In this way, for two years, I prevented them from wiping out Lisp "
+#| "Machines Incorporated, and the two companies went on. But, I didn't want "
+#| "to spend years and years punishing someone, just thwarting an evil deed. "
+#| "I figured they had been punished pretty thoroughly because they were "
+#| "stuck with competition that was not leaving or going to disappear <a href="
+#| "\"#foot-7\">(7)</a>. Meanwhile, it was time to start building a new "
+#| "community to replace the one that their actions and others had wiped out."
 msgid ""
 "In this way, for two years, I prevented them from wiping out Lisp Machines "
 "Incorporated, and the two companies went on. But, I didn't want to spend "
 "years and years punishing someone, just thwarting an evil deed. I figured "
 "they had been punished pretty thoroughly because they were stuck with "
-"competition that was not leaving or going to disappear <a href=\"#foot-7\">"
-"(7)</a>. Meanwhile, it was time to start building a new community to replace "
-"the one that their actions and others had wiped out."
+"competition that was not leaving or going to disappear&#8239;<a href="
+"\"#foot-7\">[7]</a>.  Meanwhile, it was time to start building a new "
+"community to replace the one that their actions and others had wiped out."
 msgstr ""
 
"このようにして、二年間、わたしはリスプ・マシン社(LMI)が葬り去られるのを阻止"
 
"し、そして、二つの会社は進みました。しかし、誰かを懲らしめるのに、悪事を妨害"
@@ -655,7 +878,7 @@
 
"a>。そうして、新しいコミュニティの構築を始める時が来ました。新しいコミュニ"
 "ティは、かれらやほかの人々
の行動が一掃してしまったものを置き換えるのです。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The Lisp community in the 70s was not limited to the MIT AI Lab, and the "
 "hackers were not all at MIT. The war that Symbolics started was what wiped "
@@ -668,18 +891,38 @@
 
"たものでしたが、当時、進んでいたほかの出来事もありました。協力をあきらめた"
 "人々
がいて、このコミュニティの一掃と合わせ、多くは残っていませんでした。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Once I stopped punishing Symbolics, I had to figure out what to do next. "
+#| "I had to make a free operating system, that was clear &mdash; the only "
+#| "way that people could work together and share was with a free operating "
+#| "system."
 msgid ""
 "Once I stopped punishing Symbolics, I had to figure out what to do next. I "
-"had to make a free operating system, that was clear &mdash; the only way "
-"that people could work together and share was with a free operating system."
+"had to make a free operating system, that was clear&mdash;the only way that "
+"people could work together and share was with a free operating system."
 msgstr ""
 
"シンボリックスを懲らしめるのを止めた後、次に何をすべきか考えなければなりませ"
 "んでした。わたしは、自由なオペレーティング・システム
を作る必要がありました。"
 "それは明確でした。人々が一緒に働きå…
±æœ‰ã™ã‚‹ã“とができる唯一の方法は、自由なオ"
 "ペレーティング・システムによって、だったのです。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "At first, I thought of making a Lisp-based system, but I realized that "
+#| "wouldn't be a good idea technically. To have something like the Lisp "
+#| "machine system, you needed special purpose microcode. That's what made it "
+#| "possible to run programs as fast as other computers would run their "
+#| "programs and still get the benefit of typechecking. Without that, you "
+#| "would be reduced to something like the Lisp compilers for other machines. "
+#| "The programs would be faster, but unstable. Now that's okay if you're "
+#| "running one program on a timesharing system &mdash; if one program "
+#| "crashes, that's not a disaster, that's something your program "
+#| "occasionally does. But that didn't make it good for writing the operating "
+#| "system in, so I rejected the idea of making a system like the Lisp "
+#| "machine."
 msgid ""
 "At first, I thought of making a Lisp-based system, but I realized that "
 "wouldn't be a good idea technically. To have something like the Lisp machine "
@@ -688,7 +931,7 @@
 "still get the benefit of typechecking. Without that, you would be reduced to "
 "something like the Lisp compilers for other machines. The programs would be "
 "faster, but unstable. Now that's okay if you're running one program on a "
-"timesharing system &mdash; if one program crashes, that's not a disaster, "
+"timesharing system&mdash;if one program crashes, that's not a disaster, "
 "that's something your program occasionally does. But that didn't make it "
 "good for writing the operating system in, so I rejected the idea of making a "
 "system like the Lisp machine."
@@ -705,7 +948,7 @@
 "ング・システム
をそれで書くのは適当ではありません。ですから、わたしは、Lispマ"
 "シンのようなシステム
を作るという考えを捨てたのです。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I decided instead to make a Unix-like operating system that would have Lisp "
 "implementations to run as user programs. The kernel wouldn't be written in "
@@ -721,7 +964,7 @@
 "れを行うにあたり、絶対的にありうる最小のLispの実装
を作ろうとしました。プログ"
 "ラムのサイズがとても重要な懸念だったからです。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There were people in those days, in 1985, who had one-megabyte machines "
 "without virtual memory. They wanted to be able to use GNU Emacs. This meant "
@@ -731,15 +974,25 @@
 "Emacsを使いたがりました。これは、プログラムをできるだ
け小さく保たなければなら"
 "ないことを意味しました。"
 
-#. type: Content of: <p>
-msgid ""
-"For instance, at the time the only looping construct was &lsquo;"
-"while&rsquo;, which was extremely simple. There was no way to break out of "
-"the &lsquo;while&rsquo; statement, you just had to do a catch and a throw, "
-"or test a variable that ran the loop. That shows how far I was pushing to "
-"keep things small. We didn't have &lsquo;caar&rsquo; and &lsquo;cadr&rsquo; "
-"and so on; &ldquo;squeeze out everything possible&rdquo; was the spirit of "
-"GNU Emacs, the spirit of Emacs Lisp, from the beginning."
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "For instance, at the time the only looping construct was &lsquo;"
+#| "while&rsquo;, which was extremely simple. There was no way to break out "
+#| "of the &lsquo;while&rsquo; statement, you just had to do a catch and a "
+#| "throw, or test a variable that ran the loop. That shows how far I was "
+#| "pushing to keep things small. We didn't have &lsquo;caar&rsquo; and "
+#| "&lsquo;cadr&rsquo; and so on; &ldquo;squeeze out everything "
+#| "possible&rdquo; was the spirit of GNU Emacs, the spirit of Emacs Lisp, "
+#| "from the beginning."
+msgid ""
+"For instance, at the time the only looping construct was <code>while</code>, "
+"which was extremely simple. There was no way to break out of the "
+"<code>while</code> statement, you just had to do a catch and a throw, or "
+"test a variable that ran the loop. That shows how far I was pushing to keep "
+"things small. We didn't have <code>caar</code> and <code>cadr</code> and so "
+"on; &ldquo;squeeze out everything possible&rdquo; was the spirit of GNU "
+"Emacs, the spirit of Emacs Lisp, from the beginning."
 msgstr ""
 "たとえば、当時、ループを構成するのは&lsquo;while&rsquo;だ
けで、とても単純でし"
 
"た。&lsquo;while&rsquo;文から抜け出す方法はなく、catchとthrowとするか、ループ"
@@ -748,15 +1001,25 @@
 "cadr&rsquo;などもありませんでした。最初から、「できるだ
け全部を絞り出す」のが"
 "GNU Emacsの精神、Emacs Lispの精神でした。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Obviously, machines are bigger now, and we don't do it that way any more. "
+#| "We put in &lsquo;caar&rsquo; and &lsquo;cadr&rsquo; and so on, and we "
+#| "might put in another looping construct one of these days. We're willing "
+#| "to extend it some now, but we don't want to extend it to the level of "
+#| "common Lisp. I implemented Common Lisp once on the Lisp machine, and I'm "
+#| "not all that happy with it. One thing I don't like terribly much is "
+#| "keyword arguments <a href=\"#foot-8\">(8)</a>.  They don't seem quite "
+#| "Lispy to me; I'll do it sometimes but I minimize the times when I do that."
 msgid ""
 "Obviously, machines are bigger now, and we don't do it that way any more. We "
-"put in &lsquo;caar&rsquo; and &lsquo;cadr&rsquo; and so on, and we might put "
+"put in <code>caar</code> and <code>cadr</code> and so on, and we might put "
 "in another looping construct one of these days. We're willing to extend it "
 "some now, but we don't want to extend it to the level of common Lisp. I "
 "implemented Common Lisp once on the Lisp machine, and I'm not all that happy "
-"with it. One thing I don't like terribly much is keyword arguments <a href="
-"\"#foot-8\">(8)</a>.  They don't seem quite Lispy to me; I'll do it "
+"with it. One thing I don't like terribly much is keyword arguments&#8239;<a "
+"href=\"#foot-8\">[8]</a>.  They don't seem quite Lispy to me; I'll do it "
 "sometimes but I minimize the times when I do that."
 msgstr ""
 
"あきらかに、マシンは今や大きくなり、もはやそのようにわたしたちは行っていませ"
@@ -768,7 +1031,7 @@
 
"\"#foot-8\">(8)</a>。あれは、わたしにはあまりLispらしくありません。わたしは"
 
"キーワード引数をたまに使いますが、使うのは最小にします。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "That was not the end of the GNU projects involved with Lisp. Later on around "
 "1995, we were looking into starting a graphical desktop project. It was "
@@ -782,7 +1045,7 @@
 "書き、プログラム
がエディタのように簡単に拡張可能となるようなもの、を期å¾
…して"
 
"いました。問題は、どのようなプログラミング言語であるべきか、です。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "At the time, <abbr title=\"Tool Command Language\">TCL</abbr> was being "
 "pushed heavily for this purpose. I had a very low opinion of TCL, basically "
@@ -810,7 +1073,7 @@
 "すべてのGNUプログラム
に対して、それを好むべき拡張パッケージとして推奨するので"
 "す。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There's an interesting benefit you can get from using such a powerful "
 "language as a version of Lisp as your primary extensibility language.  You "
@@ -834,18 +1097,34 @@
 
"した。そして、それをどんなアプリケーションにもロードして、望みの言語でカスタ"
 
"マイズできて、ほかのカスタマイズと同じように動作するでしょう。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "As long as the extensibility languages are weak, the users have to use "
+#| "only the language you provided them. Which means that people who love any "
+#| "given language have to compete for the choice of the developers of "
+#| "applications &mdash; saying &ldquo;Please, application developer, put my "
+#| "language into your application, not his language.&rdquo; Then the users "
+#| "get no choices at all &mdash; whichever application they're using comes "
+#| "with one language and they're stuck with [that language]. But when you "
+#| "have a powerful language that can implement others by translating into "
+#| "it, then you give the user a choice of language and we don't have to have "
+#| "a language war anymore. That's what we're hoping &lsquo;Guile&rsquo;, our "
+#| "scheme interpreter, will do. We had a person working last summer "
+#| "finishing up a translator from Python to Scheme. I don't know if it's "
+#| "entirely finished yet, but for anyone interested in this project, please "
+#| "get in touch. So that's the plan we have for the future."
 msgid ""
 "As long as the extensibility languages are weak, the users have to use only "
 "the language you provided them. Which means that people who love any given "
-"language have to compete for the choice of the developers of applications "
-"&mdash; saying &ldquo;Please, application developer, put my language into "
-"your application, not his language.&rdquo; Then the users get no choices at "
-"all &mdash; whichever application they're using comes with one language and "
-"they're stuck with [that language]. But when you have a powerful language "
-"that can implement others by translating into it, then you give the user a "
-"choice of language and we don't have to have a language war anymore. That's "
-"what we're hoping &lsquo;Guile&rsquo;, our scheme interpreter, will do. We "
+"language have to compete for the choice of the developers of "
+"applications&mdash;saying &ldquo;Please, application developer, put my "
+"language into your application, not his language.&rdquo; Then the users get "
+"no choices at all&mdash;whichever application they're using comes with one "
+"language and they're stuck with [that language]. But when you have a "
+"powerful language that can implement others by translating into it, then you "
+"give the user a choice of language and we don't have to have a language war "
+"anymore. That's what we're hoping Guile, our scheme interpreter, will do. We "
 "had a person working last summer finishing up a translator from Python to "
 "Scheme. I don't know if it's entirely finished yet, but for anyone "
 "interested in this project, please get in touch. So that's the plan we have "
@@ -864,7 +1143,18 @@
 
"ないのですが、このプロジェクトに感心がある方は、どうぞ連絡くã
 ã•ã„。これが未"
 "来のためにわたしたちが考えている計画です。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "I haven't been speaking about free software, but let me briefly tell you "
+#| "a little bit about what that means. Free software does not refer to "
+#| "price; it doesn't mean that you get it for free. (You may have paid for a "
+#| "copy, or gotten a copy gratis.) It means that you have freedom as a user. "
+#| "The crucial thing is that you are free to run the program, free to study "
+#| "what it does, free to change it to suit your needs, free to redistribute "
+#| "the copies of others and free to publish improved, extended versions. "
+#| "This is what free software means. If you are using a non-free program, "
+#| "you have lost crucial freedom, so don't ever do that."
 msgid ""
 "I haven't been speaking about free software, but let me briefly tell you a "
 "little bit about what that means. Free software does not refer to price; it "
@@ -873,7 +1163,7 @@
 "thing is that you are free to run the program, free to study what it does, "
 "free to change it to suit your needs, free to redistribute the copies of "
 "others and free to publish improved, extended versions. This is what free "
-"software means. If you are using a non-free program, you have lost crucial "
+"software means. If you are using a nonfree program, you have lost crucial "
 "freedom, so don't ever do that."
 msgstr ""
 "まだ
、自由ソフトウェアについて話していませんが、それが何を意味するかについて"
@@ -886,12 +1176,22 @@
 
"す。これが、自由ソフトウェアが意味することです。不自由なプログラãƒ
 ã‚’使う場"
 
"合、重要な自由を失います。ですから、決して、そうしないでくã
 ã•ã„。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The purpose of the GNU project is to make it easier for people to reject "
+#| "freedom-trampling, user-dominating, non-free software by providing free "
+#| "software to replace it. For those who don't have the moral courage to "
+#| "reject the non-free software, when that means some practical "
+#| "inconvenience, what we try to do is give a free alternative so that you "
+#| "can move to freedom with less of a mess and less of a sacrifice in "
+#| "practical terms. The less sacrifice the better. We want to make it easier "
+#| "for you to live in freedom, to cooperate."
 msgid ""
 "The purpose of the GNU project is to make it easier for people to reject "
-"freedom-trampling, user-dominating, non-free software by providing free "
+"freedom-trampling, user-dominating, nonfree software by providing free "
 "software to replace it. For those who don't have the moral courage to reject "
-"the non-free software, when that means some practical inconvenience, what we "
+"the nonfree software, when that means some practical inconvenience, what we "
 "try to do is give a free alternative so that you can move to freedom with "
 "less of a mess and less of a sacrifice in practical terms. The less "
 "sacrifice the better. We want to make it easier for you to live in freedom, "
@@ -905,16 +1205,26 @@
 "とです。より少ない犠
牲がよりよいものです。あなた方が、自由とともに暮らすのを"
 "容易とし、協力できるようにしたいと願っています。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "This is a matter of the freedom to cooperate. We're used to thinking of "
+#| "freedom and cooperation with society as if they are opposites. But here "
+#| "they're on the same side. With free software you are free to cooperate "
+#| "with other people as well as free to help yourself. With non-free "
+#| "software, somebody is dominating you and keeping people divided. You're "
+#| "not allowed to share with them, you're not free to cooperate or help "
+#| "society, anymore than you're free to help yourself.  Divided and helpless "
+#| "is the state of users using non-free software."
 msgid ""
 "This is a matter of the freedom to cooperate. We're used to thinking of "
 "freedom and cooperation with society as if they are opposites. But here "
 "they're on the same side. With free software you are free to cooperate with "
-"other people as well as free to help yourself. With non-free software, "
+"other people as well as free to help yourself. With nonfree software, "
 "somebody is dominating you and keeping people divided. You're not allowed to "
 "share with them, you're not free to cooperate or help society, anymore than "
 "you're free to help yourself.  Divided and helpless is the state of users "
-"using non-free software."
+"using nonfree software."
 msgstr ""
 
"これは協力する自由の問題です。かつてわれわれは自由と社会との協力を、それが反"
 
"するものであるかのように考えてきましたが、ここでは同じ側にあります。自由ソフ"
@@ -925,21 +1235,37 @@
 
"ん。バラバラにされ助けがないのが、不自由なソフトウェアを使うユーザの状æ
…‹ã§"
 "す。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "We've produced a tremendous range of free software. We've done what "
+#| "people said we could never do; we have two operating systems of free "
+#| "software. We have many applications and we obviously have a lot farther "
+#| "to go. So we need your help. I would like to ask you to volunteer for the "
+#| "GNU project; help us develop free software for more jobs. Take a look at "
+#| "<a href=\"/help/\">http://www.gnu.org/help</a> to find suggestions for "
+#| "how to help. If you want to order things, there's a link to that from the "
+#| "home page. If you want to read about philosophical issues, look in /"
+#| "philosophy. If you're looking for free software to use, look in /"
+#| "directory, which lists about 1900 packages now (which is a fraction of "
+#| "all the free software out there). Please write more and contribute to us. "
+#| "My book of essays, &ldquo;Free Software and Free Society&rdquo;, is on "
+#| "sale and can be purchased at <a href=\"http://www.gnu.org/\";>www.gnu.org</"
+#| "a>. Happy hacking!"
 msgid ""
 "We've produced a tremendous range of free software. We've done what people "
 "said we could never do; we have two operating systems of free software. We "
 "have many applications and we obviously have a lot farther to go. So we need "
 "your help. I would like to ask you to volunteer for the GNU project; help us "
-"develop free software for more jobs. Take a look at <a href=\"/help/"
-"\">http://www.gnu.org/help</a> to find suggestions for how to help. If you "
-"want to order things, there's a link to that from the home page. If you want "
-"to read about philosophical issues, look in /philosophy. If you're looking "
-"for free software to use, look in /directory, which lists about 1900 "
-"packages now (which is a fraction of all the free software out there). "
-"Please write more and contribute to us. My book of essays, &ldquo;Free "
-"Software and Free Society&rdquo;, is on sale and can be purchased at <a href="
-"\"http://www.gnu.org/\";>www.gnu.org</a>. Happy hacking!"
+"develop free software for more jobs. Take a look at <a href=\"/help/help.html"
+"\">gnu.org/help</a> to find suggestions for how to help. If you want to "
+"order things, there's a link to that from the home page. If you want to read "
+"about philosophical issues, look in /philosophy. If you're looking for free "
+"software to use, look in /directory, which lists about 1900 packages now "
+"(which is a fraction of all the free software out there). Please write more "
+"and contribute to us. My book of essays, &ldquo;Free Software and Free "
+"Society,&rdquo; is on sale and can be purchased at www.gnu.org&#8239;<a href="
+"\"#foot-9\">[9]</a>.  Happy hacking!"
 msgstr ""
 
"わたしたちは、とてつもなく広範囲の自由ソフトウェアを製作してきました。できっ"
 "こないと人々
が言ったことをわたしたちは行いました。自由ソフトウェアの二つのオ"
@@ -956,7 +1282,11 @@
 "は売出し中で、<a href=\"http://www.gnu.org/\";>www.gnu.org</a>で購å…
¥ã§ãã¾ã™ã€‚"
 "どうか、幸福なハッキングを!"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><h3>
+msgid "Footnotes"
+msgstr "脚注"
+
+#. type: Content of: <div><ol><li>
 msgid ""
 "Guy Steele designed the original symmetrical Emacs command set; then he and "
 "I began implementing Emacs (on top of TECO), but after one long joint "
@@ -970,7 +1300,7 @@
 "させました。ほかの人々
も、特に、ユジーン・C・チェッカレリとマイク・マクマホン"
 "もその後、重要な貢献をしました。"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Bernie Greenberg says that Dan Weinreb's implementation of Emacs for the "
 "Lisp Machine came before Greenberg's implementation for Multics.  I "
@@ -980,7 +1310,7 @@
 "リーンバーグのMulticsの実装
より前に出たと言っています。わたしは、この間違いを"
 "謝ります。"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Greenblatt's plan, as I understood it, was to hire lab people part time, so "
 "that they could continue working at the AI Lab.  Symbolics hired them full "
@@ -991,13 +1321,20 @@
 "ではなく、ラボの人々をフルタイム
で雇いました。かれらはMITで働くことを止めたの"
 "です。"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "The background of this plan, which I did not state explicitly in the "
+#| "talk, is that during an initial period the ex-AI-Lab hackers, whether at "
+#| "Symbolics or LMI, continued contributing their changes to the MIT Lisp "
+#| "Machine system &mdash; even though the contract did not require this.  "
+#| "Symbolics' plan was to rupture this cooperation unilaterally."
 msgid ""
 "The background of this plan, which I did not state explicitly in the talk, "
 "is that during an initial period the ex-AI-Lab hackers, whether at Symbolics "
-"or LMI, continued contributing their changes to the MIT Lisp Machine system "
-"&mdash; even though the contract did not require this.  Symbolics' plan was "
-"to rupture this cooperation unilaterally."
+"or LMI, continued contributing their changes to the MIT Lisp Machine "
+"system&mdash;even though the contract did not require this.  Symbolics' plan "
+"was to rupture this cooperation unilaterally."
 msgstr ""
 
"このプランの背景には、講演では明示的に述べませんでしたが、å
…ƒAIラボのハッカー"
 "の初期の段階では、シンボリックスあるいはLMIでも、MIT 
Lisp マシンのシステム"
@@ -1005,7 +1342,7 @@
 
"かったにも関わらず)。シンボリックスのプランはこの協力を一方的に決裂させるもの"
 "でした。"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "It was not that I cared particularly about the fate of LMI, but rather I did "
 "not want to let Symbolics gain through its aggression against the AI Lab."
@@ -1013,7 +1350,7 @@
 
"LMIの運命に特に関心があったのではなくて、むしろ、シンボリックスが、AIラボに対"
 
"する侵略を通じて得をするのを止めさせたかったのです。"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "This statement has been misconstrued as saying that I never, ever looked at "
 "Symbolics' code.  Actually it says I did look, at first.  The Symbolics "
@@ -1025,7 +1362,7 @@
 
"言っています。シンボリックスのソースコードはMITで利用可能で、わたしは読む資æ
 ¼"
 
"がありました。そして、最初は、それがシンボリックスの変更を知る方法でした。"
 
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
 msgid ""
 "But that meant I had to make a special effort to solve each problem "
 "differently, in order to avoid copying Symbolics code.  After a while, I "
@@ -1038,7 +1375,7 @@
 
"法で、シンボリックスのコードではどうなっているかの懸念なく、一番良い方法で"
 "コードを書くことができました。"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Symbolics at one point protested to MIT that my work, by thwarting their "
 "plan, had cost Symbolics a million dollars."
@@ -1046,7 +1383,7 @@
 
"シンボリックスは、ある時点でMITに主張しました。わたしの仕事は、かれらの計画を"
 
"妨害することにより、シンボリクスに百万ドルのコストがかかった、と。"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "I don't mind if a very complex and heavyweight function takes keyword "
 "arguments.  What bothers me is making simple basic functions such as &ldquo;"
@@ -1056,6 +1393,21 @@
 
"&ldquo;member&rdquo;のような単純な基本関数でキーワード引数を使うようにするこ"
 "とです。"
 
+#. type: Content of: <div><ol><li>
+#, 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 ""
+"In 2021, this book can be purchased from <a href=\"https://shop.fsf.org/";
+"books-docs/free-software-free-society-selected-essays-richard-m-stallman-3rd-"
+"edition\"> GNU Press</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*"
@@ -1081,25 +1433,28 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 
"正確で良い品質の翻訳を提供するよう努力していますが、不完å
…¨ãªå ´åˆã‚‚あるかと思"
 "います。翻訳に関するコメントと提案は、<a 
href=\"mailto:web-translators@gnu.";
 
"org\">&lt;web-translators@gnu.org&gt;</a>におねがいします。</p><p>わたしたち"
-"のウェブページの翻訳の調整と提出については、<a 
href=\"/server/standards/"
+"のウェブページの翻訳の調整と貢献については、<a 
href=\"/server/standards/"
 "README.translations.html\">翻訳 README</a>をご覧ください。"
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2003, 2007, 2013, 2014, 2020 Free Software Foundation, Inc."
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2003, 2007, 2013, 2014, 2020 Free Software Foundation, "
+#| "Inc."
+msgid "Copyright &copy; 2003, 2007, 2013, 2021 Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 2003, 2007, 2013, 2014, 2020 Free Software Foundation, Inc."
 
@@ -1123,10 +1478,9 @@
 msgid "Updated:"
 msgstr "最終更新:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2003, 2007, 2013, 2014, 2020, 2021 Free Software "
-"Foundation, Inc."
-msgstr ""
-"Copyright &copy; 2003, 2007, 2013, 2014, 2020, 2021 Free Software "
-"Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 2003, 2007, 2013, 2014, 2020, 2021 Free Software "
+#~ "Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2003, 2007, 2013, 2014, 2020, 2021 Free Software "
+#~ "Foundation, Inc."

Index: po/rms-lisp.pot
===================================================================
RCS file: /web/www/www/gnu/po/rms-lisp.pot,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- po/rms-lisp.pot     21 Sep 2020 18:59:13 -0000      1.21
+++ po/rms-lisp.pot     2 Nov 2021 14:41:54 -0000       1.22
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rms-lisp.html\n"
-"POT-Creation-Date: 2020-09-21 18:55+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+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,17 +22,17 @@
 "Software Foundation"
 msgstr ""
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "My Lisp Experiences and the Development of GNU Emacs"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><p>
 msgid ""
-"(Transcript of Richard Stallman's Speech, 28 Oct 2002, at the International "
-"Lisp Conference)."
+"Transcript of Richard Stallman's speech at the International Lisp "
+"Conference, 28 Oct 2002."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Since none of my usual speeches have anything to do with Lisp, none of them "
 "were appropriate for today. So I'm going to have to wing it.  Since I've "
@@ -40,30 +40,30 @@
 "something interesting."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "My first experience with Lisp was when I read the Lisp 1.5 manual in high "
 "school. That's when I had my mind blown by the idea that there could be a "
 "computer language like that. The first time I had a chance to do anything "
 "with Lisp was when I was a freshman at Harvard and I wrote a Lisp "
 "interpreter for the <abbr title=\"Programmed Data "
-"Processor\">PDP</abbr>-11. It was a very small machine &mdash; it had "
-"something like 8k of memory &mdash; and I managed to write the interpreter "
-"in a thousand instructions. This gave me some room for a little bit of "
+"Processor\">PDP</abbr>-11. It was a very small machine&mdash;it had "
+"something like 8k of memory&mdash;and I managed to write the interpreter in "
+"a thousand instructions. This gave me some room for a little bit of "
 "data. That was before I got to see what real software was like, that did "
 "real system jobs."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I began doing work on a real Lisp implementation with JonL White once I "
 "started working at <abbr title=\"Massachusetts Institute of "
 "Technology\">MIT</abbr>. I got hired at the Artificial Intelligence Lab not "
 "by JonL, but by Russ Noftsker, which was most ironic considering what was to "
-"come &mdash; he must have really regretted that day."
+"come&mdash;he must have really regretted that day."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "During the 1970s, before my life became politicized by horrible events, I "
 "was just going along making one extension after another for various "
@@ -78,7 +78,7 @@
 "those, but it certainly was the first editor like that."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This spirit of building up gigantic, complicated programs to use in your own "
 "editing, and then exchanging them with other people, fueled the spirit of "
@@ -92,39 +92,40 @@
 "made it what it was."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The original Emacs did not have Lisp in it. The lower level language, the "
-"non-interpreted language &mdash; was PDP-10 Assembler. The interpreter we "
+"non-interpreted language&mdash;was PDP-10 Assembler. The interpreter we "
 "wrote in that actually wasn't written for Emacs, it was written for <abbr "
 "title=\"Text Editor and COrrector\">TECO</abbr>. It was our text editor, and "
 "was an extremely ugly programming language, as ugly as could possibly "
 "be. The reason was that it wasn't designed to be a programming language, it "
 "was designed to be an editor and command language. There were commands like "
-"&lsquo;5l&rsquo;, meaning &lsquo;move five lines&rsquo;, or &lsquo;i&rsquo; "
-"and then a string and then an ESC to insert that string. You would type a "
-"string that was a series of commands, which was called a command string. You "
-"would end it with ESC ESC, and it would get executed."
+"<code>5l</code>, meaning <code>move five lines</code>, or <code>i</code> and "
+"then a string and then an ESC to insert that string. You would type a string "
+"that was a series of commands, which was called a command string. You would "
+"end it with ESC ESC, and it would get executed."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Well, people wanted to extend this language with programming facilities, so "
 "they added some. For instance, one of the first was a looping construct, "
-"which was &lt; &gt;. You would put those around things and it would "
-"loop. There were other cryptic commands that could be used to conditionally "
-"exit the loop.  To make Emacs, we <a href=\"#foot-1\">(1)</a> added "
-"facilities to have subroutines with names. Before that, it was sort of like "
-"Basic, and the subroutines could only have single letters as their "
-"names. That was hard to program big programs with, so we added code so they "
-"could have longer names. Actually, there were some rather sophisticated "
-"facilities; I think that Lisp got its unwind-protect facility from TECO."
+"which was <code>&lt;&nbsp;&gt;</code>. You would put those around things and "
+"it would loop. There were other cryptic commands that could be used to "
+"conditionally exit the loop.  To make Emacs, we&#8239;<a "
+"href=\"#foot-1\">[1]</a> added facilities to have subroutines with "
+"names. Before that, it was sort of like Basic, and the subroutines could "
+"only have single letters as their names. That was hard to program big "
+"programs with, so we added code so they could have longer names. Actually, "
+"there were some rather sophisticated facilities; I think that Lisp got its "
+"unwind-protect facility from TECO."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We started putting in rather sophisticated facilities, all with the ugliest "
-"syntax you could ever think of, and it worked &mdash; people were able to "
+"syntax you could ever think of, and it worked&mdash;people were able to "
 "write large programs in it anyway. The obvious lesson was that a language "
 "like TECO, which wasn't designed to be a programming language, was the wrong "
 "way to go. The language that you build your extensions on shouldn't be "
@@ -133,41 +134,41 @@
 "language for that purpose was Lisp."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"It was Bernie Greenberg, who discovered that it was <a "
-"href=\"#foot-2\">(2)</a>.  He wrote a version of Emacs in Multics MacLisp, "
+"It was Bernie Greenberg, who discovered that it was&#8239;<a "
+"href=\"#foot-2\">[2]</a>.  He wrote a version of Emacs in Multics MacLisp, "
 "and he wrote his commands in MacLisp in a straightforward fashion. The "
 "editor itself was written entirely in Lisp. Multics Emacs proved to be a "
-"great success &mdash; programming new editing commands was so convenient "
-"that even the secretaries in his office started learning how to use it. They "
-"used a manual someone had written which showed how to extend Emacs, but "
-"didn't say it was a programming. So the secretaries, who believed they "
-"couldn't do programming, weren't scared off. They read the manual, "
-"discovered they could do useful things and they learned to program."
-msgstr ""
-
-#. type: Content of: <p>
-msgid ""
-"So Bernie saw that an application &mdash; a program that does something "
-"useful for you &mdash; which has Lisp inside it and which you could extend "
-"by rewriting the Lisp programs, is actually a very good way for people to "
-"learn programming. It gives them a chance to write small programs that are "
-"useful for them, which in most arenas you can't possibly do. They can get "
-"encouragement for their own practical use &mdash; at the stage where it's "
-"the hardest &mdash; where they don't believe they can program, until they "
-"get to the point where they are programmers."
+"great success&mdash;programming new editing commands was so convenient that "
+"even the secretaries in his office started learning how to use it. They used "
+"a manual someone had written which showed how to extend Emacs, but didn't "
+"say it was a programming. So the secretaries, who believed they couldn't do "
+"programming, weren't scared off. They read the manual, discovered they could "
+"do useful things and they learned to program."
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid ""
+"So Bernie saw that an application&mdash;a program that does something useful "
+"for you&mdash;which has Lisp inside it and which you could extend by "
+"rewriting the Lisp programs, is actually a very good way for people to learn "
+"programming. It gives them a chance to write small programs that are useful "
+"for them, which in most arenas you can't possibly do. They can get "
+"encouragement for their own practical use&mdash;at the stage where it's the "
+"hardest&mdash;where they don't believe they can program, until they get to "
+"the point where they are programmers."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "At that point, people began to wonder how they could get something like this "
 "on a platform where they didn't have full service Lisp "
-"implementation. Multics MacLisp had a compiler as well as an interpreter "
-"&mdash; it was a full-fledged Lisp system &mdash; but people wanted to "
-"implement something like that on other systems where they had not already "
+"implementation. Multics MacLisp had a compiler as well as an "
+"interpreter&mdash;it was a full-fledged Lisp system&mdash;but people wanted "
+"to implement something like that on other systems where they had not already "
 "written a Lisp compiler. Well, if you didn't have the Lisp compiler you "
-"couldn't write the whole editor in Lisp &mdash; it would be too slow, "
+"couldn't write the whole editor in Lisp&mdash;it would be too slow, "
 "especially redisplay, if it had to run interpreted Lisp.  So we developed a "
 "hybrid technique. The idea was to write a Lisp interpreter and the lower "
 "level parts of the editor together, so that parts of the editor were "
@@ -185,45 +186,45 @@
 "particularly fast would be written at a lower level."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Therefore, when I wrote my second implementation of Emacs, I followed the "
 "same kind of design. The low level language was not machine language "
 "anymore, it was C. C was a good, efficient language for portable programs to "
 "run in a Unix-like operating system. There was a Lisp interpreter, but I "
-"implemented facilities for special purpose editing jobs directly in C "
-"&mdash; manipulating editor buffers, inserting leading text, reading and "
+"implemented facilities for special purpose editing jobs directly in "
+"C&mdash;manipulating editor buffers, inserting leading text, reading and "
 "writing files, redisplaying the buffer on the screen, managing editor "
 "windows."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Now, this was not the first Emacs that was written in C and ran on Unix. The "
 "first was written by James Gosling, and was referred to as GosMacs. A "
 "strange thing happened with him. In the beginning, he seemed to be "
 "influenced by the same spirit of sharing and cooperation of the original "
 "Emacs. I first released the original Emacs to people at MIT. Someone wanted "
-"to port it to run on Twenex &mdash; it originally only ran on the "
-"Incompatible Timesharing System we used at MIT. They ported it to Twenex, "
-"which meant that there were a few hundred installations around the world "
-"that could potentially use it. We started distributing it to them, with the "
-"rule that &ldquo;you had to send back all of your improvements&rdquo; so we "
-"could all benefit. No one ever tried to enforce that, but as far as I know "
-"people did cooperate."
+"to port it to run on Twenex&mdash;it originally only ran on the Incompatible "
+"Timesharing System we used at MIT. They ported it to Twenex, which meant "
+"that there were a few hundred installations around the world that could "
+"potentially use it. We started distributing it to them, with the rule that "
+"&ldquo;you had to send back all of your improvements&rdquo; so we could all "
+"benefit. No one ever tried to enforce that, but as far as I know people did "
+"cooperate."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Gosling did, at first, seem to participate in this spirit. He wrote in a "
 "manual that he called the program Emacs hoping that others in the community "
 "would improve it until it was worthy of that name. That's the right approach "
-"to take towards a community &mdash; to ask them to join in and make the "
+"to take towards a community&mdash;to ask them to join in and make the "
 "program better. But after that he seemed to change the spirit, and sold it "
 "to a company."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "At that time I was working on the GNU system (a free software Unix-like "
 "operating system that many people erroneously call &ldquo;Linux&rdquo;).  "
@@ -232,13 +233,13 @@
 "had given him, by email, permission to distribute his own version. He "
 "proposed to me that I use that version. Then I discovered that Gosling's "
 "Emacs did not have a real Lisp. It had a programming language that was known "
-"as &lsquo;mocklisp&rsquo;, which looks syntactically like Lisp, but didn't "
+"as &ldquo;mocklisp,&rdquo; which looks syntactically like Lisp, but didn't "
 "have the data structures of Lisp.  So programs were not data, and vital "
 "elements of Lisp were missing.  Its data structures were strings, numbers "
 "and a few other specialized things."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I concluded I couldn't use it and had to replace it all, the first step of "
 "which was to write an actual Lisp interpreter. I gradually adapted every "
@@ -247,30 +248,30 @@
 "exposable and manipulable by the user's Lisp programs."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The one exception was redisplay. For a long time, redisplay was sort of an "
 "alternate world. The editor would enter the world of redisplay and things "
 "would go on with very special data structures that were not safe for garbage "
 "collection, not safe for interruption, and you couldn't run any Lisp "
-"programs during that. We've changed that since &mdash; it's now possible to "
+"programs during that. We've changed that since&mdash;it's now possible to "
 "run Lisp code during redisplay. It's quite a convenient thing."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"This second Emacs program was &lsquo;free software&rsquo; in the modern "
-"sense of the term &mdash; it was part of an explicit political campaign to "
+"This second Emacs program was &ldquo;free software&rdquo; in the modern "
+"sense of the term&mdash;it was part of an explicit political campaign to "
 "make software free. The essence of this campaign was that everybody should "
 "be free to do the things we did in the old days at MIT, working together on "
 "software and working with whomever wanted to work with us.  That is the "
-"basis for the free software movement &mdash; the experience I had, the life "
-"that I've lived at the MIT AI lab &mdash; to be working on human knowledge, "
+"basis for the free software movement&mdash;the experience I had, the life "
+"that I've lived at the MIT AI lab&mdash;to be working on human knowledge, "
 "and not be standing in the way of anybody's further using and further "
 "disseminating human knowledge."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "At the time, you could make a computer that was about the same price range "
 "as other computers that weren't meant for Lisp, except that it would run "
@@ -282,11 +283,11 @@
 "crashed at some point."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The Lisp machine was able to execute instructions about as fast as those "
-"other machines, but each instruction &mdash; a <code>car</code> instruction "
-"would do data typechecking &mdash; so when you tried to get the "
+"other machines, but each instruction&mdash;a <code>car</code> instruction "
+"would do data typechecking&mdash;so when you tried to get the "
 "<code>car</code> of a number in a compiled program, it would give you an "
 "immediate error. We built the machine and had a Lisp operating system for "
 "it. It was written almost entirely in Lisp, the only exceptions being parts "
@@ -294,19 +295,19 @@
 "which meant they should start a company."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There were two different ideas about what this company should be like.  "
 "Greenblatt wanted to start what he called a &ldquo;hacker&rdquo; "
 "company. This meant it would be a company run by hackers and would operate "
 "in a way conducive to hackers. Another goal was to maintain the AI Lab "
-"culture <a href=\"#foot-3\">(3)</a>.  Unfortunately, Greenblatt didn't have "
-"any business experience, so other people in the Lisp machine group said they "
-"doubted whether he could succeed. They thought that his plan to avoid "
-"outside investment wouldn't work."
+"culture&#8239;<a class=\"ftn\" href=\"#foot-3\">[3]</a>.  Unfortunately, "
+"Greenblatt didn't have any business experience, so other people in the Lisp "
+"machine group said they doubted whether he could succeed. They thought that "
+"his plan to avoid outside investment wouldn't work."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Why did he want to avoid outside investment? Because when a company has "
 "outside investors, they take control and they don't let you have any "
@@ -314,7 +315,7 @@
 "the manager."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So Greenblatt had the idea that he would find a customer who would pay in "
 "advance to buy the parts. They would build machines and deliver them; with "
@@ -324,7 +325,7 @@
 "couldn't possibly work."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Greenblatt then recruited Russell Noftsker, the man who had hired me, who "
 "had subsequently left the AI Lab and created a successful company.  Russell "
@@ -336,7 +337,7 @@
 "not have scruples, and do everything possible to win."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "But Greenblatt didn't give up. He and the few people loyal to him decided to "
 "start Lisp Machines Inc. anyway and go ahead with their plans. And what do "
@@ -349,7 +350,7 @@
 "ways to destroy it."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Thus, the abandonment of our lab was followed by &ldquo;war&rdquo; in our "
 "lab.  The abandonment happened when Symbolics hired away all the hackers, "
@@ -364,16 +365,16 @@
 "that the AI lab's hacker group would be wiped out, but it was."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"So Symbolics came up with a plan <a href=\"#foot-4\">(4)</a>.  They said to "
-"the lab, &ldquo;We will continue making our changes to the system available "
-"for you to use, but you can't put it into the MIT Lisp machine "
+"So Symbolics came up with a plan&#8239;<a href=\"#foot-4\">[4]</a>.  They "
+"said to the lab, &ldquo;We will continue making our changes to the system "
+"available for you to use, but you can't put it into the MIT Lisp machine "
 "system. Instead, we'll give you access to Symbolics' Lisp machine system, "
 "and you can run it, but that's all you can do.&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This, in effect, meant that they demanded that we had to choose a side, and "
 "use either the MIT version of the system or the Symbolics version.  "
@@ -385,37 +386,38 @@
 "continue to exist. So we were not allowed to be neutral anymore."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Up until that point, I hadn't taken the side of either company, although it "
 "made me miserable to see what had happened to our community and the "
 "software.  But now, Symbolics had forced the issue.  So, in an effort to "
-"help keep Lisp Machines Inc. going <a href=\"#foot-5\">(5)</a> &mdash; I "
+"help keep Lisp Machines Inc. going&#8239;<a href=\"#foot-5\">[5]</a>&mdash;I "
 "began duplicating all of the improvements Symbolics had made to the Lisp "
 "machine system.  I wrote the equivalent improvements again myself (i.e., the "
 "code was my own)."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"After a while <a href=\"#foot-6\">(6)</a>, I came to the conclusion that it "
-"would be best if I didn't even look at their code. When they made a beta "
-"announcement that gave the release notes, I would see what the features were "
-"and then implement them. By the time they had a real release, I did too."
+"After a while&#8239;<a href=\"#foot-6\">[6]</a>, I came to the conclusion "
+"that it would be best if I didn't even look at their code. When they made a "
+"beta announcement that gave the release notes, I would see what the features "
+"were and then implement them. By the time they had a real release, I did "
+"too."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In this way, for two years, I prevented them from wiping out Lisp Machines "
 "Incorporated, and the two companies went on. But, I didn't want to spend "
 "years and years punishing someone, just thwarting an evil deed. I figured "
 "they had been punished pretty thoroughly because they were stuck with "
-"competition that was not leaving or going to disappear <a "
-"href=\"#foot-7\">(7)</a>. Meanwhile, it was time to start building a new "
+"competition that was not leaving or going to disappear&#8239;<a "
+"href=\"#foot-7\">[7]</a>.  Meanwhile, it was time to start building a new "
 "community to replace the one that their actions and others had wiped out."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The Lisp community in the 70s was not limited to the MIT AI Lab, and the "
 "hackers were not all at MIT. The war that Symbolics started was what wiped "
@@ -424,14 +426,14 @@
 "wasn't much left."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Once I stopped punishing Symbolics, I had to figure out what to do next. I "
-"had to make a free operating system, that was clear &mdash; the only way "
-"that people could work together and share was with a free operating system."
+"had to make a free operating system, that was clear&mdash;the only way that "
+"people could work together and share was with a free operating system."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "At first, I thought of making a Lisp-based system, but I realized that "
 "wouldn't be a good idea technically. To have something like the Lisp machine "
@@ -440,13 +442,13 @@
 "still get the benefit of typechecking. Without that, you would be reduced to "
 "something like the Lisp compilers for other machines. The programs would be "
 "faster, but unstable. Now that's okay if you're running one program on a "
-"timesharing system &mdash; if one program crashes, that's not a disaster, "
+"timesharing system&mdash;if one program crashes, that's not a disaster, "
 "that's something your program occasionally does. But that didn't make it "
 "good for writing the operating system in, so I rejected the idea of making a "
 "system like the Lisp machine."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I decided instead to make a Unix-like operating system that would have Lisp "
 "implementations to run as user programs. The kernel wouldn't be written in "
@@ -456,37 +458,37 @@
 "of the programs was a tremendous concern."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There were people in those days, in 1985, who had one-megabyte machines "
 "without virtual memory. They wanted to be able to use GNU Emacs. This meant "
 "I had to keep the program as small as possible."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"For instance, at the time the only looping construct was "
-"&lsquo;while&rsquo;, which was extremely simple. There was no way to break "
-"out of the &lsquo;while&rsquo; statement, you just had to do a catch and a "
-"throw, or test a variable that ran the loop. That shows how far I was "
-"pushing to keep things small. We didn't have &lsquo;caar&rsquo; and "
-"&lsquo;cadr&rsquo; and so on; &ldquo;squeeze out everything possible&rdquo; "
-"was the spirit of GNU Emacs, the spirit of Emacs Lisp, from the beginning."
+"For instance, at the time the only looping construct was <code>while</code>, "
+"which was extremely simple. There was no way to break out of the "
+"<code>while</code> statement, you just had to do a catch and a throw, or "
+"test a variable that ran the loop. That shows how far I was pushing to keep "
+"things small. We didn't have <code>caar</code> and <code>cadr</code> and so "
+"on; &ldquo;squeeze out everything possible&rdquo; was the spirit of GNU "
+"Emacs, the spirit of Emacs Lisp, from the beginning."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Obviously, machines are bigger now, and we don't do it that way any more. We "
-"put in &lsquo;caar&rsquo; and &lsquo;cadr&rsquo; and so on, and we might put "
+"put in <code>caar</code> and <code>cadr</code> and so on, and we might put "
 "in another looping construct one of these days. We're willing to extend it "
 "some now, but we don't want to extend it to the level of common Lisp. I "
 "implemented Common Lisp once on the Lisp machine, and I'm not all that happy "
-"with it. One thing I don't like terribly much is keyword arguments <a "
-"href=\"#foot-8\">(8)</a>.  They don't seem quite Lispy to me; I'll do it "
+"with it. One thing I don't like terribly much is keyword arguments&#8239;<a "
+"href=\"#foot-8\">[8]</a>.  They don't seem quite Lispy to me; I'll do it "
 "sometimes but I minimize the times when I do that."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "That was not the end of the GNU projects involved with Lisp. Later on around "
 "1995, we were looking into starting a graphical desktop project. It was "
@@ -495,7 +497,7 @@
 "question was what it should be."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "At the time, <abbr title=\"Tool Command Language\">TCL</abbr> was being "
 "pushed heavily for this purpose. I had a very low opinion of TCL, basically "
@@ -511,7 +513,7 @@
 "package for all GNU programs."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There's an interesting benefit you can get from using such a powerful "
 "language as a version of Lisp as your primary extensibility language.  You "
@@ -526,25 +528,25 @@
 "customizations as well."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "As long as the extensibility languages are weak, the users have to use only "
 "the language you provided them. Which means that people who love any given "
-"language have to compete for the choice of the developers of applications "
-"&mdash; saying &ldquo;Please, application developer, put my language into "
-"your application, not his language.&rdquo; Then the users get no choices at "
-"all &mdash; whichever application they're using comes with one language and "
-"they're stuck with [that language]. But when you have a powerful language "
-"that can implement others by translating into it, then you give the user a "
-"choice of language and we don't have to have a language war anymore. That's "
-"what we're hoping &lsquo;Guile&rsquo;, our scheme interpreter, will do. We "
+"language have to compete for the choice of the developers of "
+"applications&mdash;saying &ldquo;Please, application developer, put my "
+"language into your application, not his language.&rdquo; Then the users get "
+"no choices at all&mdash;whichever application they're using comes with one "
+"language and they're stuck with [that language]. But when you have a "
+"powerful language that can implement others by translating into it, then you "
+"give the user a choice of language and we don't have to have a language war "
+"anymore. That's what we're hoping Guile, our scheme interpreter, will do. We "
 "had a person working last summer finishing up a translator from Python to "
 "Scheme. I don't know if it's entirely finished yet, but for anyone "
 "interested in this project, please get in touch. So that's the plan we have "
 "for the future."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I haven't been speaking about free software, but let me briefly tell you a "
 "little bit about what that means. Free software does not refer to price; it "
@@ -553,52 +555,56 @@
 "thing is that you are free to run the program, free to study what it does, "
 "free to change it to suit your needs, free to redistribute the copies of "
 "others and free to publish improved, extended versions. This is what free "
-"software means. If you are using a non-free program, you have lost crucial "
+"software means. If you are using a nonfree program, you have lost crucial "
 "freedom, so don't ever do that."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The purpose of the GNU project is to make it easier for people to reject "
-"freedom-trampling, user-dominating, non-free software by providing free "
+"freedom-trampling, user-dominating, nonfree software by providing free "
 "software to replace it. For those who don't have the moral courage to reject "
-"the non-free software, when that means some practical inconvenience, what we "
+"the nonfree software, when that means some practical inconvenience, what we "
 "try to do is give a free alternative so that you can move to freedom with "
 "less of a mess and less of a sacrifice in practical terms. The less "
 "sacrifice the better. We want to make it easier for you to live in freedom, "
 "to cooperate."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This is a matter of the freedom to cooperate. We're used to thinking of "
 "freedom and cooperation with society as if they are opposites. But here "
 "they're on the same side. With free software you are free to cooperate with "
-"other people as well as free to help yourself. With non-free software, "
+"other people as well as free to help yourself. With nonfree software, "
 "somebody is dominating you and keeping people divided. You're not allowed to "
 "share with them, you're not free to cooperate or help society, anymore than "
 "you're free to help yourself.  Divided and helpless is the state of users "
-"using non-free software."
+"using nonfree software."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We've produced a tremendous range of free software. We've done what people "
 "said we could never do; we have two operating systems of free software. We "
 "have many applications and we obviously have a lot farther to go. So we need "
 "your help. I would like to ask you to volunteer for the GNU project; help us "
 "develop free software for more jobs. Take a look at <a "
-"href=\"/help/\">http://www.gnu.org/help</a> to find suggestions for how to "
+"href=\"/help/help.html\">gnu.org/help</a> to find suggestions for how to "
 "help. If you want to order things, there's a link to that from the home "
 "page. If you want to read about philosophical issues, look in "
 "/philosophy. If you're looking for free software to use, look in /directory, "
 "which lists about 1900 packages now (which is a fraction of all the free "
 "software out there). Please write more and contribute to us. My book of "
-"essays, &ldquo;Free Software and Free Society&rdquo;, is on sale and can be "
-"purchased at <a href=\"http://www.gnu.org/\";>www.gnu.org</a>. Happy hacking!"
+"essays, &ldquo;Free Software and Free Society,&rdquo; is on sale and can be "
+"purchased at www.gnu.org&#8239;<a href=\"#foot-9\">[9]</a>.  Happy hacking!"
+msgstr ""
+
+#. type: Content of: <div><h3>
+msgid "Footnotes"
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Guy Steele designed the original symmetrical Emacs command set; then he and "
 "I began implementing Emacs (on top of TECO), but after one long joint "
@@ -607,36 +613,36 @@
 "contributed substantially later on."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Bernie Greenberg says that Dan Weinreb's implementation of Emacs for the "
 "Lisp Machine came before Greenberg's implementation for Multics.  I "
 "apologize for the mistake."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Greenblatt's plan, as I understood it, was to hire lab people part time, so "
 "that they could continue working at the AI Lab.  Symbolics hired them full "
 "time instead, so they stopped working at MIT."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The background of this plan, which I did not state explicitly in the talk, "
 "is that during an initial period the ex-AI-Lab hackers, whether at Symbolics "
-"or LMI, continued contributing their changes to the MIT Lisp Machine system "
-"&mdash; even though the contract did not require this.  Symbolics' plan was "
-"to rupture this cooperation unilaterally."
+"or LMI, continued contributing their changes to the MIT Lisp Machine "
+"system&mdash;even though the contract did not require this.  Symbolics' plan "
+"was to rupture this cooperation unilaterally."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "It was not that I cared particularly about the fate of LMI, but rather I did "
 "not want to let Symbolics gain through its aggression against the AI Lab."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "This statement has been misconstrued as saying that I never, ever looked at "
 "Symbolics' code.  Actually it says I did look, at first.  The Symbolics "
@@ -644,7 +650,7 @@
 "first that's how I found out about their changes."
 msgstr ""
 
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
 msgid ""
 "But that meant I had to make a special effort to solve each problem "
 "differently, in order to avoid copying Symbolics code.  After a while, I "
@@ -652,19 +658,26 @@
 "whatever way was best, without concern for what might be in Symbolics' code."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Symbolics at one point protested to MIT that my work, by thwarting their "
 "plan, had cost Symbolics a million dollars."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "I don't mind if a very complex and heavyweight function takes keyword "
 "arguments.  What bothers me is making simple basic functions such as "
 "&ldquo;member&rdquo; use them."
 msgstr ""
 
+#. type: Content of: <div><ol><li>
+msgid ""
+"In 2021, this book can be purchased from <a "
+"href=\"https://shop.fsf.org/books-docs/free-software-free-society-selected-essays-richard-m-stallman-3rd-edition\";>
 "
+"GNU Press</a>."
+msgstr ""
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -689,7 +702,7 @@
 #
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
 #
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
@@ -697,11 +710,12 @@
 msgid ""
 "Please see the <a "
 "href=\"/server/standards/README.translations.html\">Translations README</a> "
-"for information on coordinating and submitting translations of this article."
+"for information on coordinating and contributing translations of this "
+"article."
 msgstr ""
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2003, 2007, 2013, 2014, 2020 Free Software Foundation, 
Inc."
+msgid "Copyright &copy; 2003, 2007, 2013, 2021 Free Software Foundation, Inc."
 msgstr ""
 
 #. type: Content of: <div><p>

Index: po/rms-lisp.pt-br.po
===================================================================
RCS file: /web/www/www/gnu/po/rms-lisp.pt-br.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- po/rms-lisp.pt-br.po        2 Nov 2021 13:56:42 -0000       1.20
+++ po/rms-lisp.pt-br.po        2 Nov 2021 14:41:54 -0000       1.21
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rms-lisp.html\n"
-"POT-Creation-Date: 2020-09-21 18:55+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2020-07-25 16:32-0300\n"
 "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
 "Language-Team: Brazilian Portuguese <www-pt-br-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-11-02 14:27+0000\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Virtaal 1.0.0-beta1\n"
 
@@ -26,19 +27,23 @@
 "Minhas experiências com Lisp e o desenvolvimento do GNU Emacs - Projeto GNU "
 "- Free Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "My Lisp Experiences and the Development of GNU Emacs"
 msgstr "Minhas experiências com Lisp e o desenvolvimento do GNU Emacs"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "(Transcript of Richard Stallman's Speech, 28 Oct 2002, at the "
+#| "International Lisp Conference)."
 msgid ""
-"(Transcript of Richard Stallman's Speech, 28 Oct 2002, at the International "
-"Lisp Conference)."
+"Transcript of Richard Stallman's speech at the International Lisp "
+"Conference, 28 Oct 2002."
 msgstr ""
 "(Tradução da transcrição do discurso de Richard Stallman, 28 de outubro 
de "
 "2002, na International Lisp Conference)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Since none of my usual speeches have anything to do with Lisp, none of them "
 "were appropriate for today. So I'm going to have to wing it.  Since I've "
@@ -50,17 +55,29 @@
 "fiz coisas suficientes em minha carreira conectadas com Lisp, eu deveria "
 "poder dizer algo interessante."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "My first experience with Lisp was when I read the Lisp 1.5 manual in high "
+#| "school. That's when I had my mind blown by the idea that there could be a "
+#| "computer language like that. The first time I had a chance to do anything "
+#| "with Lisp was when I was a freshman at Harvard and I wrote a Lisp "
+#| "interpreter for the <abbr title=\"Programmed Data Processor\">PDP</"
+#| "abbr>-11. It was a very small machine &mdash; it had something like 8k of "
+#| "memory &mdash; and I managed to write the interpreter in a thousand "
+#| "instructions. This gave me some room for a little bit of data. That was "
+#| "before I got to see what real software was like, that did real system "
+#| "jobs."
 msgid ""
 "My first experience with Lisp was when I read the Lisp 1.5 manual in high "
 "school. That's when I had my mind blown by the idea that there could be a "
 "computer language like that. The first time I had a chance to do anything "
 "with Lisp was when I was a freshman at Harvard and I wrote a Lisp "
 "interpreter for the <abbr title=\"Programmed Data Processor\">PDP</abbr>-11. "
-"It was a very small machine &mdash; it had something like 8k of memory "
-"&mdash; and I managed to write the interpreter in a thousand instructions. "
-"This gave me some room for a little bit of data. That was before I got to "
-"see what real software was like, that did real system jobs."
+"It was a very small machine&mdash;it had something like 8k of memory&mdash;"
+"and I managed to write the interpreter in a thousand instructions. This gave "
+"me some room for a little bit of data. That was before I got to see what "
+"real software was like, that did real system jobs."
 msgstr ""
 "Minha primeira experiência com Lisp foi quando li o manual do Lisp 1.5 no "
 "ensino médio. Foi quando tive a impressão de que poderia haver uma 
linguagem "
@@ -72,13 +89,20 @@
 "me deu algum espaço para um pouco de dados. Isso foi antes de eu ver como "
 "era o software real, que funcionava no sistema real."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "I began doing work on a real Lisp implementation with JonL White once I "
+#| "started working at <abbr title=\"Massachusetts Institute of Technology"
+#| "\">MIT</abbr>. I got hired at the Artificial Intelligence Lab not by "
+#| "JonL, but by Russ Noftsker, which was most ironic considering what was to "
+#| "come &mdash; he must have really regretted that day."
 msgid ""
 "I began doing work on a real Lisp implementation with JonL White once I "
 "started working at <abbr title=\"Massachusetts Institute of Technology"
 "\">MIT</abbr>. I got hired at the Artificial Intelligence Lab not by JonL, "
-"but by Russ Noftsker, which was most ironic considering what was to come "
-"&mdash; he must have really regretted that day."
+"but by Russ Noftsker, which was most ironic considering what was to "
+"come&mdash;he must have really regretted that day."
 msgstr ""
 "Comecei a trabalhar em uma implementação real do Lisp com JonL White quando 
"
 "comecei a trabalhar no <abbr title=\"Massachusetts Institute of Technology"
@@ -87,7 +111,7 @@
 "JonL, mas por Russ Noftsker, o que foi muito irônico considerando o que "
 "estava por vir &ndash; ele deve ter realmente se arrependido daquele dia."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "During the 1970s, before my life became politicized by horrible events, I "
 "was just going along making one extension after another for various "
@@ -114,7 +138,7 @@
 "poderia programá-lo enquanto você o estivesse usando. Não sei se foi o "
 "primeiro deles, mas certamente foi o primeiro editor assim."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This spirit of building up gigantic, complicated programs to use in your own "
 "editing, and then exchanging them with other people, fueled the spirit of "
@@ -138,19 +162,32 @@
 "talvez uma conexão inconsciente. Eu acho que é a natureza do jeito que "
 "vivemos no AI Lab que levou ao Emacs e fez dele o que se tornou."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The original Emacs did not have Lisp in it. The lower level language, the "
+#| "non-interpreted language &mdash; was PDP-10 Assembler. The interpreter we "
+#| "wrote in that actually wasn't written for Emacs, it was written for <abbr "
+#| "title=\"Text Editor and COrrector\">TECO</abbr>. It was our text editor, "
+#| "and was an extremely ugly programming language, as ugly as could possibly "
+#| "be. The reason was that it wasn't designed to be a programming language, "
+#| "it was designed to be an editor and command language. There were commands "
+#| "like &lsquo;5l&rsquo;, meaning &lsquo;move five lines&rsquo;, or &lsquo;"
+#| "i&rsquo; and then a string and then an ESC to insert that string. You "
+#| "would type a string that was a series of commands, which was called a "
+#| "command string. You would end it with ESC ESC, and it would get executed."
 msgid ""
 "The original Emacs did not have Lisp in it. The lower level language, the "
-"non-interpreted language &mdash; was PDP-10 Assembler. The interpreter we "
+"non-interpreted language&mdash;was PDP-10 Assembler. The interpreter we "
 "wrote in that actually wasn't written for Emacs, it was written for <abbr "
 "title=\"Text Editor and COrrector\">TECO</abbr>. It was our text editor, and "
 "was an extremely ugly programming language, as ugly as could possibly be. "
 "The reason was that it wasn't designed to be a programming language, it was "
 "designed to be an editor and command language. There were commands like "
-"&lsquo;5l&rsquo;, meaning &lsquo;move five lines&rsquo;, or &lsquo;i&rsquo; "
-"and then a string and then an ESC to insert that string. You would type a "
-"string that was a series of commands, which was called a command string. You "
-"would end it with ESC ESC, and it would get executed."
+"<code>5l</code>, meaning <code>move five lines</code>, or <code>i</code> and "
+"then a string and then an ESC to insert that string. You would type a string "
+"that was a series of commands, which was called a command string. You would "
+"end it with ESC ESC, and it would get executed."
 msgstr ""
 "O Emacs original não tinha Lisp nele. A linguagem de baixo nível, a "
 "linguagem não interpretada &ndash; era o Assembler de PDP-10. O "
@@ -165,18 +202,31 @@
 "série de comandos, que era chamada de string de comando. Você terminaria 
com "
 "ESC ESC, e o comando seria executado."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Well, people wanted to extend this language with programming facilities, "
+#| "so they added some. For instance, one of the first was a looping "
+#| "construct, which was &lt; &gt;. You would put those around things and it "
+#| "would loop. There were other cryptic commands that could be used to "
+#| "conditionally exit the loop.  To make Emacs, we <a href=\"#foot-1\">(1)</"
+#| "a> added facilities to have subroutines with names. Before that, it was "
+#| "sort of like Basic, and the subroutines could only have single letters as "
+#| "their names. That was hard to program big programs with, so we added code "
+#| "so they could have longer names. Actually, there were some rather "
+#| "sophisticated facilities; I think that Lisp got its unwind-protect "
+#| "facility from TECO."
 msgid ""
 "Well, people wanted to extend this language with programming facilities, so "
 "they added some. For instance, one of the first was a looping construct, "
-"which was &lt; &gt;. You would put those around things and it would loop. "
-"There were other cryptic commands that could be used to conditionally exit "
-"the loop.  To make Emacs, we <a href=\"#foot-1\">(1)</a> added facilities to "
-"have subroutines with names. Before that, it was sort of like Basic, and the "
-"subroutines could only have single letters as their names. That was hard to "
-"program big programs with, so we added code so they could have longer names. "
-"Actually, there were some rather sophisticated facilities; I think that Lisp "
-"got its unwind-protect facility from TECO."
+"which was <code>&lt;&nbsp;&gt;</code>. You would put those around things and "
+"it would loop. There were other cryptic commands that could be used to "
+"conditionally exit the loop.  To make Emacs, we&#8239;<a href=\"#foot-1\">[1]"
+"</a> added facilities to have subroutines with names. Before that, it was "
+"sort of like Basic, and the subroutines could only have single letters as "
+"their names. That was hard to program big programs with, so we added code so "
+"they could have longer names. Actually, there were some rather sophisticated "
+"facilities; I think that Lisp got its unwind-protect facility from TECO."
 msgstr ""
 "Bem, as pessoas queriam estender essa linguagem com recursos de 
programação, "
 "então elas adicionaram alguns. Por exemplo, um dos primeiros foi uma "
@@ -191,10 +241,20 @@
 "bastante sofisticadas; eu acho que o Lisp obteve seu mecanismo de <i>unwind-"
 "protect</i> do TECO."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "We started putting in rather sophisticated facilities, all with the "
+#| "ugliest syntax you could ever think of, and it worked &mdash; people were "
+#| "able to write large programs in it anyway. The obvious lesson was that a "
+#| "language like TECO, which wasn't designed to be a programming language, "
+#| "was the wrong way to go. The language that you build your extensions on "
+#| "shouldn't be thought of as a programming language in afterthought; it "
+#| "should be designed as a programming language. In fact, we discovered that "
+#| "the best programming language for that purpose was Lisp."
 msgid ""
 "We started putting in rather sophisticated facilities, all with the ugliest "
-"syntax you could ever think of, and it worked &mdash; people were able to "
+"syntax you could ever think of, and it worked&mdash;people were able to "
 "write large programs in it anyway. The obvious lesson was that a language "
 "like TECO, which wasn't designed to be a programming language, was the wrong "
 "way to go. The language that you build your extensions on shouldn't be "
@@ -212,18 +272,30 @@
 "programação. De fato, descobrimos que a melhor linguagem de programação 
para "
 "esse propósito era Lisp."
 
-#. type: Content of: <p>
-msgid ""
-"It was Bernie Greenberg, who discovered that it was <a href=\"#foot-2\">(2)</"
-"a>.  He wrote a version of Emacs in Multics MacLisp, and he wrote his "
-"commands in MacLisp in a straightforward fashion. The editor itself was "
-"written entirely in Lisp. Multics Emacs proved to be a great success &mdash; "
-"programming new editing commands was so convenient that even the secretaries "
-"in his office started learning how to use it. They used a manual someone had "
-"written which showed how to extend Emacs, but didn't say it was a "
-"programming. So the secretaries, who believed they couldn't do programming, "
-"weren't scared off. They read the manual, discovered they could do useful "
-"things and they learned to program."
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "It was Bernie Greenberg, who discovered that it was <a href=\"#foot-2\">"
+#| "(2)</a>.  He wrote a version of Emacs in Multics MacLisp, and he wrote "
+#| "his commands in MacLisp in a straightforward fashion. The editor itself "
+#| "was written entirely in Lisp. Multics Emacs proved to be a great success "
+#| "&mdash; programming new editing commands was so convenient that even the "
+#| "secretaries in his office started learning how to use it. They used a "
+#| "manual someone had written which showed how to extend Emacs, but didn't "
+#| "say it was a programming. So the secretaries, who believed they couldn't "
+#| "do programming, weren't scared off. They read the manual, discovered they "
+#| "could do useful things and they learned to program."
+msgid ""
+"It was Bernie Greenberg, who discovered that it was&#8239;<a href="
+"\"#foot-2\">[2]</a>.  He wrote a version of Emacs in Multics MacLisp, and he "
+"wrote his commands in MacLisp in a straightforward fashion. The editor "
+"itself was written entirely in Lisp. Multics Emacs proved to be a great "
+"success&mdash;programming new editing commands was so convenient that even "
+"the secretaries in his office started learning how to use it. They used a "
+"manual someone had written which showed how to extend Emacs, but didn't say "
+"it was a programming. So the secretaries, who believed they couldn't do "
+"programming, weren't scared off. They read the manual, discovered they could "
+"do useful things and they learned to program."
 msgstr ""
 "Foi Bernie Greenberg, que descobriu que ela era <a href=\"#foot-2\">(2)</a>. "
 "Ele escreveu uma versão do Emacs no Multics MacLisp e escreveu seus comandos 
"
@@ -236,16 +308,27 @@
 "programar, não ficaram assustados. Eles leram o manual, descobriram que "
 "podiam fazer coisas úteis e aprenderam a programar."
 
-#. type: Content of: <p>
-msgid ""
-"So Bernie saw that an application &mdash; a program that does something "
-"useful for you &mdash; which has Lisp inside it and which you could extend "
-"by rewriting the Lisp programs, is actually a very good way for people to "
-"learn programming. It gives them a chance to write small programs that are "
-"useful for them, which in most arenas you can't possibly do. They can get "
-"encouragement for their own practical use &mdash; at the stage where it's "
-"the hardest &mdash; where they don't believe they can program, until they "
-"get to the point where they are programmers."
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "So Bernie saw that an application &mdash; a program that does something "
+#| "useful for you &mdash; which has Lisp inside it and which you could "
+#| "extend by rewriting the Lisp programs, is actually a very good way for "
+#| "people to learn programming. It gives them a chance to write small "
+#| "programs that are useful for them, which in most arenas you can't "
+#| "possibly do. They can get encouragement for their own practical use "
+#| "&mdash; at the stage where it's the hardest &mdash; where they don't "
+#| "believe they can program, until they get to the point where they are "
+#| "programmers."
+msgid ""
+"So Bernie saw that an application&mdash;a program that does something useful "
+"for you&mdash;which has Lisp inside it and which you could extend by "
+"rewriting the Lisp programs, is actually a very good way for people to learn "
+"programming. It gives them a chance to write small programs that are useful "
+"for them, which in most arenas you can't possibly do. They can get "
+"encouragement for their own practical use&mdash;at the stage where it's the "
+"hardest&mdash;where they don't believe they can program, until they get to "
+"the point where they are programmers."
 msgstr ""
 "Então Bernie percebeu que um aplicativo &ndash; um programa que faz algo "
 "útil para você &ndash; que tem Lisp dentro dele e que você poderia 
estender "
@@ -256,30 +339,55 @@
 "que é o mais difícil &ndash; onde eles não acreditam que podem programar, "
 "até chegarem ao ponto em que são programadores."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "At that point, people began to wonder how they could get something like "
+#| "this on a platform where they didn't have full service Lisp "
+#| "implementation. Multics MacLisp had a compiler as well as an interpreter "
+#| "&mdash; it was a full-fledged Lisp system &mdash; but people wanted to "
+#| "implement something like that on other systems where they had not already "
+#| "written a Lisp compiler. Well, if you didn't have the Lisp compiler you "
+#| "couldn't write the whole editor in Lisp &mdash; it would be too slow, "
+#| "especially redisplay, if it had to run interpreted Lisp.  So we developed "
+#| "a hybrid technique. The idea was to write a Lisp interpreter and the "
+#| "lower level parts of the editor together, so that parts of the editor "
+#| "were built-in Lisp facilities. Those would be whatever parts we felt we "
+#| "had to optimize. This was a technique that we had already consciously "
+#| "practiced in the original Emacs, because there were certain fairly high "
+#| "level features which we re-implemented in machine language, making them "
+#| "into TECO primitives. For instance, there was a TECO primitive to fill a "
+#| "paragraph (actually, to do most of the work of filling a paragraph, "
+#| "because some of the less time-consuming parts of the job would be done at "
+#| "the higher level by a TECO program). You could do the whole job by "
+#| "writing a TECO program, but that was too slow, so we optimized it by "
+#| "putting part of it in machine language. We used the same idea here (in "
+#| "the hybrid technique), that most of the editor would be written in Lisp, "
+#| "but certain parts of it that had to run particularly fast would be "
+#| "written at a lower level."
 msgid ""
 "At that point, people began to wonder how they could get something like this "
 "on a platform where they didn't have full service Lisp implementation. "
-"Multics MacLisp had a compiler as well as an interpreter &mdash; it was a "
-"full-fledged Lisp system &mdash; but people wanted to implement something "
-"like that on other systems where they had not already written a Lisp "
-"compiler. Well, if you didn't have the Lisp compiler you couldn't write the "
-"whole editor in Lisp &mdash; it would be too slow, especially redisplay, if "
-"it had to run interpreted Lisp.  So we developed a hybrid technique. The "
-"idea was to write a Lisp interpreter and the lower level parts of the editor "
-"together, so that parts of the editor were built-in Lisp facilities. Those "
-"would be whatever parts we felt we had to optimize. This was a technique "
-"that we had already consciously practiced in the original Emacs, because "
-"there were certain fairly high level features which we re-implemented in "
-"machine language, making them into TECO primitives. For instance, there was "
-"a TECO primitive to fill a paragraph (actually, to do most of the work of "
-"filling a paragraph, because some of the less time-consuming parts of the "
-"job would be done at the higher level by a TECO program). You could do the "
-"whole job by writing a TECO program, but that was too slow, so we optimized "
-"it by putting part of it in machine language. We used the same idea here (in "
-"the hybrid technique), that most of the editor would be written in Lisp, but "
-"certain parts of it that had to run particularly fast would be written at a "
-"lower level."
+"Multics MacLisp had a compiler as well as an interpreter&mdash;it was a full-"
+"fledged Lisp system&mdash;but people wanted to implement something like that "
+"on other systems where they had not already written a Lisp compiler. Well, "
+"if you didn't have the Lisp compiler you couldn't write the whole editor in "
+"Lisp&mdash;it would be too slow, especially redisplay, if it had to run "
+"interpreted Lisp.  So we developed a hybrid technique. The idea was to write "
+"a Lisp interpreter and the lower level parts of the editor together, so that "
+"parts of the editor were built-in Lisp facilities. Those would be whatever "
+"parts we felt we had to optimize. This was a technique that we had already "
+"consciously practiced in the original Emacs, because there were certain "
+"fairly high level features which we re-implemented in machine language, "
+"making them into TECO primitives. For instance, there was a TECO primitive "
+"to fill a paragraph (actually, to do most of the work of filling a "
+"paragraph, because some of the less time-consuming parts of the job would be "
+"done at the higher level by a TECO program). You could do the whole job by "
+"writing a TECO program, but that was too slow, so we optimized it by putting "
+"part of it in machine language. We used the same idea here (in the hybrid "
+"technique), that most of the editor would be written in Lisp, but certain "
+"parts of it that had to run particularly fast would be written at a lower "
+"level."
 msgstr ""
 "Nesse ponto, as pessoas começaram a se perguntar como poderiam obter algo "
 "assim em uma plataforma em que não tivessem a implementação de Lisp de "
@@ -306,16 +414,25 @@
 "tinham que rodar particularmente rápido seriam escritas em um nível mais "
 "baixo."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Therefore, when I wrote my second implementation of Emacs, I followed the "
+#| "same kind of design. The low level language was not machine language "
+#| "anymore, it was C. C was a good, efficient language for portable programs "
+#| "to run in a Unix-like operating system. There was a Lisp interpreter, but "
+#| "I implemented facilities for special purpose editing jobs directly in C "
+#| "&mdash; manipulating editor buffers, inserting leading text, reading and "
+#| "writing files, redisplaying the buffer on the screen, managing editor "
+#| "windows."
 msgid ""
 "Therefore, when I wrote my second implementation of Emacs, I followed the "
 "same kind of design. The low level language was not machine language "
 "anymore, it was C. C was a good, efficient language for portable programs to "
 "run in a Unix-like operating system. There was a Lisp interpreter, but I "
-"implemented facilities for special purpose editing jobs directly in C "
-"&mdash; manipulating editor buffers, inserting leading text, reading and "
-"writing files, redisplaying the buffer on the screen, managing editor "
-"windows."
+"implemented facilities for special purpose editing jobs directly in C&mdash;"
+"manipulating editor buffers, inserting leading text, reading and writing "
+"files, redisplaying the buffer on the screen, managing editor windows."
 msgstr ""
 "Portanto, quando escrevi minha segunda implementação do Emacs, segui o 
mesmo "
 "tipo de design. A linguagem de baixo nível não era mais linguagem de "
@@ -326,20 +443,34 @@
 "inicial, leitura e gravação de arquivos, exibição do buffer novamente na "
 "tela, gerenciamento de janelas do editor."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Now, this was not the first Emacs that was written in C and ran on Unix. "
+#| "The first was written by James Gosling, and was referred to as GosMacs. A "
+#| "strange thing happened with him. In the beginning, he seemed to be "
+#| "influenced by the same spirit of sharing and cooperation of the original "
+#| "Emacs. I first released the original Emacs to people at MIT. Someone "
+#| "wanted to port it to run on Twenex &mdash; it originally only ran on the "
+#| "Incompatible Timesharing System we used at MIT. They ported it to Twenex, "
+#| "which meant that there were a few hundred installations around the world "
+#| "that could potentially use it. We started distributing it to them, with "
+#| "the rule that &ldquo;you had to send back all of your improvements&rdquo; "
+#| "so we could all benefit. No one ever tried to enforce that, but as far as "
+#| "I know people did cooperate."
 msgid ""
 "Now, this was not the first Emacs that was written in C and ran on Unix. The "
 "first was written by James Gosling, and was referred to as GosMacs. A "
 "strange thing happened with him. In the beginning, he seemed to be "
 "influenced by the same spirit of sharing and cooperation of the original "
 "Emacs. I first released the original Emacs to people at MIT. Someone wanted "
-"to port it to run on Twenex &mdash; it originally only ran on the "
-"Incompatible Timesharing System we used at MIT. They ported it to Twenex, "
-"which meant that there were a few hundred installations around the world "
-"that could potentially use it. We started distributing it to them, with the "
-"rule that &ldquo;you had to send back all of your improvements&rdquo; so we "
-"could all benefit. No one ever tried to enforce that, but as far as I know "
-"people did cooperate."
+"to port it to run on Twenex&mdash;it originally only ran on the Incompatible "
+"Timesharing System we used at MIT. They ported it to Twenex, which meant "
+"that there were a few hundred installations around the world that could "
+"potentially use it. We started distributing it to them, with the rule that "
+"&ldquo;you had to send back all of your improvements&rdquo; so we could all "
+"benefit. No one ever tried to enforce that, but as far as I know people did "
+"cooperate."
 msgstr ""
 "Agora, este não foi o primeiro Emacs que foi escrito em C e rodou no Unix. O 
"
 "primeiro foi escrito por James Gosling e foi referido como GosMacs. Uma "
@@ -355,12 +486,20 @@
 "para que todos pudéssemos nos beneficiar. Ninguém nunca tentou impor isso, "
 "mas até onde eu sei, as pessoas cooperaram."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Gosling did, at first, seem to participate in this spirit. He wrote in a "
+#| "manual that he called the program Emacs hoping that others in the "
+#| "community would improve it until it was worthy of that name. That's the "
+#| "right approach to take towards a community &mdash; to ask them to join in "
+#| "and make the program better. But after that he seemed to change the "
+#| "spirit, and sold it to a company."
 msgid ""
 "Gosling did, at first, seem to participate in this spirit. He wrote in a "
 "manual that he called the program Emacs hoping that others in the community "
 "would improve it until it was worthy of that name. That's the right approach "
-"to take towards a community &mdash; to ask them to join in and make the "
+"to take towards a community&mdash;to ask them to join in and make the "
 "program better. But after that he seemed to change the spirit, and sold it "
 "to a company."
 msgstr ""
@@ -371,7 +510,20 @@
 "programa. Mas depois disso ele pareceu mudar o espírito e vendeu o programa "
 "o vendeu para uma empresa."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "At that time I was working on the GNU system (a free software Unix-like "
+#| "operating system that many people erroneously call &ldquo;Linux&rdquo;).  "
+#| "There was no free software Emacs editor that ran on Unix. I did, however, "
+#| "have a friend who had participated in developing Gosling's Emacs. Gosling "
+#| "had given him, by email, permission to distribute his own version. He "
+#| "proposed to me that I use that version. Then I discovered that Gosling's "
+#| "Emacs did not have a real Lisp. It had a programming language that was "
+#| "known as &lsquo;mocklisp&rsquo;, which looks syntactically like Lisp, but "
+#| "didn't have the data structures of Lisp.  So programs were not data, and "
+#| "vital elements of Lisp were missing.  Its data structures were strings, "
+#| "numbers and a few other specialized things."
 msgid ""
 "At that time I was working on the GNU system (a free software Unix-like "
 "operating system that many people erroneously call &ldquo;Linux&rdquo;).  "
@@ -380,7 +532,7 @@
 "had given him, by email, permission to distribute his own version. He "
 "proposed to me that I use that version. Then I discovered that Gosling's "
 "Emacs did not have a real Lisp. It had a programming language that was known "
-"as &lsquo;mocklisp&rsquo;, which looks syntactically like Lisp, but didn't "
+"as &ldquo;mocklisp,&rdquo; which looks syntactically like Lisp, but didn't "
 "have the data structures of Lisp.  So programs were not data, and vital "
 "elements of Lisp were missing.  Its data structures were strings, numbers "
 "and a few other specialized things."
@@ -398,7 +550,7 @@
 "estavam faltando. Suas estruturas de dados eram sequências de caracteres, "
 "números e algumas outras coisas especializadas."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I concluded I couldn't use it and had to replace it all, the first step of "
 "which was to write an actual Lisp interpreter. I gradually adapted every "
@@ -412,13 +564,21 @@
 "dados <em>ad hoc</em>, tornando as estruturas de dados internas do editor "
 "expostas e manipuláveis pelos programas Lisp do usuário."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The one exception was redisplay. For a long time, redisplay was sort of "
+#| "an alternate world. The editor would enter the world of redisplay and "
+#| "things would go on with very special data structures that were not safe "
+#| "for garbage collection, not safe for interruption, and you couldn't run "
+#| "any Lisp programs during that. We've changed that since &mdash; it's now "
+#| "possible to run Lisp code during redisplay. It's quite a convenient thing."
 msgid ""
 "The one exception was redisplay. For a long time, redisplay was sort of an "
 "alternate world. The editor would enter the world of redisplay and things "
 "would go on with very special data structures that were not safe for garbage "
 "collection, not safe for interruption, and you couldn't run any Lisp "
-"programs during that. We've changed that since &mdash; it's now possible to "
+"programs during that. We've changed that since&mdash;it's now possible to "
 "run Lisp code during redisplay. It's quite a convenient thing."
 msgstr ""
 "A única exceção foi a reexibição. Durante muito tempo, a reexibição 
era uma "
@@ -429,15 +589,26 @@
 "desde então &ndash; agora é possível executar o código Lisp durante a "
 "reexibição. É uma coisa bastante conveniente."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "This second Emacs program was &lsquo;free software&rsquo; in the modern "
+#| "sense of the term &mdash; it was part of an explicit political campaign "
+#| "to make software free. The essence of this campaign was that everybody "
+#| "should be free to do the things we did in the old days at MIT, working "
+#| "together on software and working with whomever wanted to work with us.  "
+#| "That is the basis for the free software movement &mdash; the experience I "
+#| "had, the life that I've lived at the MIT AI lab &mdash; to be working on "
+#| "human knowledge, and not be standing in the way of anybody's further "
+#| "using and further disseminating human knowledge."
 msgid ""
-"This second Emacs program was &lsquo;free software&rsquo; in the modern "
-"sense of the term &mdash; it was part of an explicit political campaign to "
+"This second Emacs program was &ldquo;free software&rdquo; in the modern "
+"sense of the term&mdash;it was part of an explicit political campaign to "
 "make software free. The essence of this campaign was that everybody should "
 "be free to do the things we did in the old days at MIT, working together on "
 "software and working with whomever wanted to work with us.  That is the "
-"basis for the free software movement &mdash; the experience I had, the life "
-"that I've lived at the MIT AI lab &mdash; to be working on human knowledge, "
+"basis for the free software movement&mdash;the experience I had, the life "
+"that I've lived at the MIT AI lab&mdash;to be working on human knowledge, "
 "and not be standing in the way of anybody's further using and further "
 "disseminating human knowledge."
 msgstr ""
@@ -451,7 +622,7 @@
 "estar no caminho impedindo as pessoas de usar e disseminar ainda mais o "
 "conhecimento humano."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "At the time, you could make a computer that was about the same price range "
 "as other computers that weren't meant for Lisp, except that it would run "
@@ -472,11 +643,21 @@
 "um número, ele obtinha resultados absurdos e eventualmente falhava em algum "
 "ponto."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The Lisp machine was able to execute instructions about as fast as those "
+#| "other machines, but each instruction &mdash; a <code>car</code> "
+#| "instruction would do data typechecking &mdash; so when you tried to get "
+#| "the <code>car</code> of a number in a compiled program, it would give you "
+#| "an immediate error. We built the machine and had a Lisp operating system "
+#| "for it. It was written almost entirely in Lisp, the only exceptions being "
+#| "parts written in the microcode. People became interested in manufacturing "
+#| "them, which meant they should start a company."
 msgid ""
 "The Lisp machine was able to execute instructions about as fast as those "
-"other machines, but each instruction &mdash; a <code>car</code> instruction "
-"would do data typechecking &mdash; so when you tried to get the <code>car</"
+"other machines, but each instruction&mdash;a <code>car</code> instruction "
+"would do data typechecking&mdash;so when you tried to get the <code>car</"
 "code> of a number in a compiled program, it would give you an immediate "
 "error. We built the machine and had a Lisp operating system for it. It was "
 "written almost entirely in Lisp, the only exceptions being parts written in "
@@ -493,15 +674,25 @@
 "interessadas em fabricá-las, o que significava que deveriam abrir uma "
 "empresa."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "There were two different ideas about what this company should be like.  "
+#| "Greenblatt wanted to start what he called a &ldquo;hacker&rdquo; company. "
+#| "This meant it would be a company run by hackers and would operate in a "
+#| "way conducive to hackers. Another goal was to maintain the AI Lab culture "
+#| "<a href=\"#foot-3\">(3)</a>.  Unfortunately, Greenblatt didn't have any "
+#| "business experience, so other people in the Lisp machine group said they "
+#| "doubted whether he could succeed. They thought that his plan to avoid "
+#| "outside investment wouldn't work."
 msgid ""
 "There were two different ideas about what this company should be like.  "
 "Greenblatt wanted to start what he called a &ldquo;hacker&rdquo; company. "
 "This meant it would be a company run by hackers and would operate in a way "
-"conducive to hackers. Another goal was to maintain the AI Lab culture <a "
-"href=\"#foot-3\">(3)</a>.  Unfortunately, Greenblatt didn't have any "
-"business experience, so other people in the Lisp machine group said they "
-"doubted whether he could succeed. They thought that his plan to avoid "
+"conducive to hackers. Another goal was to maintain the AI Lab culture&#8239;"
+"<a class=\"ftn\" href=\"#foot-3\">[3]</a>.  Unfortunately, Greenblatt didn't "
+"have any business experience, so other people in the Lisp machine group said "
+"they doubted whether he could succeed. They thought that his plan to avoid "
 "outside investment wouldn't work."
 msgstr ""
 "Havia duas ideias diferentes sobre como essa empresa deveria ser. Greenblatt "
@@ -513,7 +704,7 @@
 "que ele pudesse ter sucesso. Eles pensaram que seu plano para evitar "
 "investimentos externos não funcionaria."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Why did he want to avoid outside investment? Because when a company has "
 "outside investors, they take control and they don't let you have any "
@@ -525,7 +716,7 @@
 "tenha nenhum escrúpulo. E, eventualmente, se você tiver algum escrúpulo, "
 "eles também o substituirão como administrador."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So Greenblatt had the idea that he would find a customer who would pay in "
 "advance to buy the parts. They would build machines and deliver them; with "
@@ -541,7 +732,7 @@
 "de máquinas, e assim por diante. As outras pessoas do grupo acharam que isso 
"
 "possivelmente não funcionaria."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Greenblatt then recruited Russell Noftsker, the man who had hired me, who "
 "had subsequently left the AI Lab and created a successful company.  Russell "
@@ -562,7 +753,7 @@
 "obteriam investimento externo, não teriam escrúpulos e fariam todo o "
 "possível para vencer."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "But Greenblatt didn't give up. He and the few people loyal to him decided to "
 "start Lisp Machines Inc. anyway and go ahead with their plans. And what do "
@@ -584,7 +775,7 @@
 "concorrentes de máquinas Lisp. Quando a Symbolics viu que a LMI não ia cair 
"
 "de cara no chão, eles começaram a procurar maneiras de destruí-la."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Thus, the abandonment of our lab was followed by &ldquo;war&rdquo; in our "
 "lab.  The abandonment happened when Symbolics hired away all the hackers, "
@@ -611,13 +802,20 @@
 "que ambas as empresas tinham licenciado. Ninguém previra que o grupo de "
 "hackers do AI Lab seria aniquilado, mas foi."
 
-#. type: Content of: <p>
-msgid ""
-"So Symbolics came up with a plan <a href=\"#foot-4\">(4)</a>.  They said to "
-"the lab, &ldquo;We will continue making our changes to the system available "
-"for you to use, but you can't put it into the MIT Lisp machine system. "
-"Instead, we'll give you access to Symbolics' Lisp machine system, and you "
-"can run it, but that's all you can do.&rdquo;"
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "So Symbolics came up with a plan <a href=\"#foot-4\">(4)</a>.  They said "
+#| "to the lab, &ldquo;We will continue making our changes to the system "
+#| "available for you to use, but you can't put it into the MIT Lisp machine "
+#| "system. Instead, we'll give you access to Symbolics' Lisp machine system, "
+#| "and you can run it, but that's all you can do.&rdquo;"
+msgid ""
+"So Symbolics came up with a plan&#8239;<a href=\"#foot-4\">[4]</a>.  They "
+"said to the lab, &ldquo;We will continue making our changes to the system "
+"available for you to use, but you can't put it into the MIT Lisp machine "
+"system. Instead, we'll give you access to Symbolics' Lisp machine system, "
+"and you can run it, but that's all you can do.&rdquo;"
 msgstr ""
 "Então, a Symbolics criou um plano <a href=\"#foot-4\">(4)</a>. Eles disseram 
"
 "para o laboratório, “Continuaremos a disponibilizar nossas alterações no 
"
@@ -625,7 +823,7 @@
 "Lisp do MIT. Em vez disso, daremos acesso ao sistema de máquina Lisp da "
 "Symbolics e você poderá executá-lo, mas isso é tudo que você pode 
fazer.”"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This, in effect, meant that they demanded that we had to choose a side, and "
 "use either the MIT version of the system or the Symbolics version.  "
@@ -645,12 +843,21 @@
 "Symbolics viu que estaríamos apoiando a LMI porque estaríamos ajudando-a a "
 "continuar existindo. Então não nos permitiram mais ser neutros."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Up until that point, I hadn't taken the side of either company, although "
+#| "it made me miserable to see what had happened to our community and the "
+#| "software.  But now, Symbolics had forced the issue.  So, in an effort to "
+#| "help keep Lisp Machines Inc. going <a href=\"#foot-5\">(5)</a> &mdash; I "
+#| "began duplicating all of the improvements Symbolics had made to the Lisp "
+#| "machine system.  I wrote the equivalent improvements again myself (i.e., "
+#| "the code was my own)."
 msgid ""
 "Up until that point, I hadn't taken the side of either company, although it "
 "made me miserable to see what had happened to our community and the "
 "software.  But now, Symbolics had forced the issue.  So, in an effort to "
-"help keep Lisp Machines Inc. going <a href=\"#foot-5\">(5)</a> &mdash; I "
+"help keep Lisp Machines Inc. going&#8239;<a href=\"#foot-5\">[5]</a>&mdash;I "
 "began duplicating all of the improvements Symbolics had made to the Lisp "
 "machine system.  I wrote the equivalent improvements again myself (i.e., the "
 "code was my own)."
@@ -663,12 +870,19 @@
 "melhorias que a Symbolics tinha feito no sistema de máquinas Lisp. Escrevi "
 "as melhorias equivalentes novamente (ou seja, o código era meu)."
 
-#. type: Content of: <p>
-msgid ""
-"After a while <a href=\"#foot-6\">(6)</a>, I came to the conclusion that it "
-"would be best if I didn't even look at their code. When they made a beta "
-"announcement that gave the release notes, I would see what the features were "
-"and then implement them. By the time they had a real release, I did too."
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "After a while <a href=\"#foot-6\">(6)</a>, I came to the conclusion that "
+#| "it would be best if I didn't even look at their code. When they made a "
+#| "beta announcement that gave the release notes, I would see what the "
+#| "features were and then implement them. By the time they had a real "
+#| "release, I did too."
+msgid ""
+"After a while&#8239;<a href=\"#foot-6\">[6]</a>, I came to the conclusion "
+"that it would be best if I didn't even look at their code. When they made a "
+"beta announcement that gave the release notes, I would see what the features "
+"were and then implement them. By the time they had a real release, I did too."
 msgstr ""
 "Após algum tempo <a href=\"#foot-6\">(6)</a>, cheguei à conclusão de que "
 "seria melhor se eu nem olhasse para o código deles. Quando eles fizeram um "
@@ -676,15 +890,24 @@
 "os recursos e depois os implementaria. No momento em que eles tinham um "
 "lançamento real, eu também lançava."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "In this way, for two years, I prevented them from wiping out Lisp "
+#| "Machines Incorporated, and the two companies went on. But, I didn't want "
+#| "to spend years and years punishing someone, just thwarting an evil deed. "
+#| "I figured they had been punished pretty thoroughly because they were "
+#| "stuck with competition that was not leaving or going to disappear <a href="
+#| "\"#foot-7\">(7)</a>. Meanwhile, it was time to start building a new "
+#| "community to replace the one that their actions and others had wiped out."
 msgid ""
 "In this way, for two years, I prevented them from wiping out Lisp Machines "
 "Incorporated, and the two companies went on. But, I didn't want to spend "
 "years and years punishing someone, just thwarting an evil deed. I figured "
 "they had been punished pretty thoroughly because they were stuck with "
-"competition that was not leaving or going to disappear <a href=\"#foot-7\">"
-"(7)</a>. Meanwhile, it was time to start building a new community to replace "
-"the one that their actions and others had wiped out."
+"competition that was not leaving or going to disappear&#8239;<a href="
+"\"#foot-7\">[7]</a>.  Meanwhile, it was time to start building a new "
+"community to replace the one that their actions and others had wiped out."
 msgstr ""
 "Desta forma, por dois anos, eu os impedi de eliminar a Lisp Machines "
 "Incorporated, e as duas empresas sobreviveram. Mas eu não queria passar anos 
"
@@ -694,7 +917,7 @@
 "hora de começar a construir uma nova comunidade para substituir aquela que "
 "as ações da Symbolics e outros haviam eliminado."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The Lisp community in the 70s was not limited to the MIT AI Lab, and the "
 "hackers were not all at MIT. The war that Symbolics started was what wiped "
@@ -708,18 +931,38 @@
 "desistindo da cooperação, e juntos eles acabaram com a comunidade e não "
 "sobrou muito."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Once I stopped punishing Symbolics, I had to figure out what to do next. "
+#| "I had to make a free operating system, that was clear &mdash; the only "
+#| "way that people could work together and share was with a free operating "
+#| "system."
 msgid ""
 "Once I stopped punishing Symbolics, I had to figure out what to do next. I "
-"had to make a free operating system, that was clear &mdash; the only way "
-"that people could work together and share was with a free operating system."
+"had to make a free operating system, that was clear&mdash;the only way that "
+"people could work together and share was with a free operating system."
 msgstr ""
 "Quando parei de punir a Symbolics, tive que descobrir o que fazer em "
 "seguida. Eu tinha que fazer um sistema operacional livre, isso estava claro "
 "&ndash; a única maneira que as pessoas poderiam trabalhar juntas e "
 "compartilhar era com um sistema operacional livre."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "At first, I thought of making a Lisp-based system, but I realized that "
+#| "wouldn't be a good idea technically. To have something like the Lisp "
+#| "machine system, you needed special purpose microcode. That's what made it "
+#| "possible to run programs as fast as other computers would run their "
+#| "programs and still get the benefit of typechecking. Without that, you "
+#| "would be reduced to something like the Lisp compilers for other machines. "
+#| "The programs would be faster, but unstable. Now that's okay if you're "
+#| "running one program on a timesharing system &mdash; if one program "
+#| "crashes, that's not a disaster, that's something your program "
+#| "occasionally does. But that didn't make it good for writing the operating "
+#| "system in, so I rejected the idea of making a system like the Lisp "
+#| "machine."
 msgid ""
 "At first, I thought of making a Lisp-based system, but I realized that "
 "wouldn't be a good idea technically. To have something like the Lisp machine "
@@ -728,7 +971,7 @@
 "still get the benefit of typechecking. Without that, you would be reduced to "
 "something like the Lisp compilers for other machines. The programs would be "
 "faster, but unstable. Now that's okay if you're running one program on a "
-"timesharing system &mdash; if one program crashes, that's not a disaster, "
+"timesharing system&mdash;if one program crashes, that's not a disaster, "
 "that's something your program occasionally does. But that didn't make it "
 "good for writing the operating system in, so I rejected the idea of making a "
 "system like the Lisp machine."
@@ -745,7 +988,7 @@
 "ocasionalmente faz. Mas isso não era bom em setratando de um sistema "
 "operacional, então rejeitei a ideia de fazer um sistema como o da Lisp."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I decided instead to make a Unix-like operating system that would have Lisp "
 "implementations to run as user programs. The kernel wouldn't be written in "
@@ -762,7 +1005,7 @@
 "implementação mínima possível do Lisp. O tamanho dos programas foi uma "
 "tremenda preocupação."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There were people in those days, in 1985, who had one-megabyte machines "
 "without virtual memory. They wanted to be able to use GNU Emacs. This meant "
@@ -772,15 +1015,25 @@
 "memória virtual. Eles queriam poder usar o GNU Emacs. Isso significava que "
 "eu tinha que manter o programa o menor possível."
 
-#. type: Content of: <p>
-msgid ""
-"For instance, at the time the only looping construct was &lsquo;"
-"while&rsquo;, which was extremely simple. There was no way to break out of "
-"the &lsquo;while&rsquo; statement, you just had to do a catch and a throw, "
-"or test a variable that ran the loop. That shows how far I was pushing to "
-"keep things small. We didn't have &lsquo;caar&rsquo; and &lsquo;cadr&rsquo; "
-"and so on; &ldquo;squeeze out everything possible&rdquo; was the spirit of "
-"GNU Emacs, the spirit of Emacs Lisp, from the beginning."
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "For instance, at the time the only looping construct was &lsquo;"
+#| "while&rsquo;, which was extremely simple. There was no way to break out "
+#| "of the &lsquo;while&rsquo; statement, you just had to do a catch and a "
+#| "throw, or test a variable that ran the loop. That shows how far I was "
+#| "pushing to keep things small. We didn't have &lsquo;caar&rsquo; and "
+#| "&lsquo;cadr&rsquo; and so on; &ldquo;squeeze out everything "
+#| "possible&rdquo; was the spirit of GNU Emacs, the spirit of Emacs Lisp, "
+#| "from the beginning."
+msgid ""
+"For instance, at the time the only looping construct was <code>while</code>, "
+"which was extremely simple. There was no way to break out of the "
+"<code>while</code> statement, you just had to do a catch and a throw, or "
+"test a variable that ran the loop. That shows how far I was pushing to keep "
+"things small. We didn't have <code>caar</code> and <code>cadr</code> and so "
+"on; &ldquo;squeeze out everything possible&rdquo; was the spirit of GNU "
+"Emacs, the spirit of Emacs Lisp, from the beginning."
 msgstr ""
 "Por exemplo, naquele momento a única construção em <em>loop</em> era o "
 "<i>while</i>, o que era extremamente simples. Não havia maneira de sair da "
@@ -790,15 +1043,25 @@
 "“cadr” e assim por diante; “espremer tudo o que for possível” era o 
espírito "
 "do GNU Emacs, o espírito do Emacs Lisp, desde o começo."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Obviously, machines are bigger now, and we don't do it that way any more. "
+#| "We put in &lsquo;caar&rsquo; and &lsquo;cadr&rsquo; and so on, and we "
+#| "might put in another looping construct one of these days. We're willing "
+#| "to extend it some now, but we don't want to extend it to the level of "
+#| "common Lisp. I implemented Common Lisp once on the Lisp machine, and I'm "
+#| "not all that happy with it. One thing I don't like terribly much is "
+#| "keyword arguments <a href=\"#foot-8\">(8)</a>.  They don't seem quite "
+#| "Lispy to me; I'll do it sometimes but I minimize the times when I do that."
 msgid ""
 "Obviously, machines are bigger now, and we don't do it that way any more. We "
-"put in &lsquo;caar&rsquo; and &lsquo;cadr&rsquo; and so on, and we might put "
+"put in <code>caar</code> and <code>cadr</code> and so on, and we might put "
 "in another looping construct one of these days. We're willing to extend it "
 "some now, but we don't want to extend it to the level of common Lisp. I "
 "implemented Common Lisp once on the Lisp machine, and I'm not all that happy "
-"with it. One thing I don't like terribly much is keyword arguments <a href="
-"\"#foot-8\">(8)</a>.  They don't seem quite Lispy to me; I'll do it "
+"with it. One thing I don't like terribly much is keyword arguments&#8239;<a "
+"href=\"#foot-8\">[8]</a>.  They don't seem quite Lispy to me; I'll do it "
 "sometimes but I minimize the times when I do that."
 msgstr ""
 "Obviamente, as máquinas são maiores agora, e nós não fazemos mais isso. 
Nós "
@@ -810,7 +1073,7 @@
 "\"#foot-8\">(8)</a>. Eles não se parecem muito com algo do Lisp para mim; 
Às "
 "vezes faço isso, mas minimizo as vezes em que faço isso."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "That was not the end of the GNU projects involved with Lisp. Later on around "
 "1995, we were looking into starting a graphical desktop project. It was "
@@ -824,7 +1087,7 @@
 "que uma linguagem de programação escrevesse muito nela para torná-la "
 "facilmente extensível, como o editor. A questão era o que deveria ser."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "At the time, <abbr title=\"Tool Command Language\">TCL</abbr> was being "
 "pushed heavily for this purpose. I had a very low opinion of TCL, basically "
@@ -852,7 +1115,7 @@
 "aplicativos. Recomendaríamos então que ela fosse o pacote de 
extensibilidade "
 "preferido para todos os programas GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There's an interesting benefit you can get from using such a powerful "
 "language as a version of Lisp as your primary extensibility language.  You "
@@ -878,18 +1141,34 @@
 "carregá-lo em qualquer aplicativo e personalizá-lo em seu idioma favorito e 
"
 "também funcionaria com outras personalizações."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "As long as the extensibility languages are weak, the users have to use "
+#| "only the language you provided them. Which means that people who love any "
+#| "given language have to compete for the choice of the developers of "
+#| "applications &mdash; saying &ldquo;Please, application developer, put my "
+#| "language into your application, not his language.&rdquo; Then the users "
+#| "get no choices at all &mdash; whichever application they're using comes "
+#| "with one language and they're stuck with [that language]. But when you "
+#| "have a powerful language that can implement others by translating into "
+#| "it, then you give the user a choice of language and we don't have to have "
+#| "a language war anymore. That's what we're hoping &lsquo;Guile&rsquo;, our "
+#| "scheme interpreter, will do. We had a person working last summer "
+#| "finishing up a translator from Python to Scheme. I don't know if it's "
+#| "entirely finished yet, but for anyone interested in this project, please "
+#| "get in touch. So that's the plan we have for the future."
 msgid ""
 "As long as the extensibility languages are weak, the users have to use only "
 "the language you provided them. Which means that people who love any given "
-"language have to compete for the choice of the developers of applications "
-"&mdash; saying &ldquo;Please, application developer, put my language into "
-"your application, not his language.&rdquo; Then the users get no choices at "
-"all &mdash; whichever application they're using comes with one language and "
-"they're stuck with [that language]. But when you have a powerful language "
-"that can implement others by translating into it, then you give the user a "
-"choice of language and we don't have to have a language war anymore. That's "
-"what we're hoping &lsquo;Guile&rsquo;, our scheme interpreter, will do. We "
+"language have to compete for the choice of the developers of "
+"applications&mdash;saying &ldquo;Please, application developer, put my "
+"language into your application, not his language.&rdquo; Then the users get "
+"no choices at all&mdash;whichever application they're using comes with one "
+"language and they're stuck with [that language]. But when you have a "
+"powerful language that can implement others by translating into it, then you "
+"give the user a choice of language and we don't have to have a language war "
+"anymore. That's what we're hoping Guile, our scheme interpreter, will do. We "
 "had a person working last summer finishing up a translator from Python to "
 "Scheme. I don't know if it's entirely finished yet, but for anyone "
 "interested in this project, please get in touch. So that's the plan we have "
@@ -911,7 +1190,18 @@
 "interessada neste projeto, por favor entre em contato. Então esse é o plano 
"
 "que temos para o futuro."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "I haven't been speaking about free software, but let me briefly tell you "
+#| "a little bit about what that means. Free software does not refer to "
+#| "price; it doesn't mean that you get it for free. (You may have paid for a "
+#| "copy, or gotten a copy gratis.) It means that you have freedom as a user. "
+#| "The crucial thing is that you are free to run the program, free to study "
+#| "what it does, free to change it to suit your needs, free to redistribute "
+#| "the copies of others and free to publish improved, extended versions. "
+#| "This is what free software means. If you are using a non-free program, "
+#| "you have lost crucial freedom, so don't ever do that."
 msgid ""
 "I haven't been speaking about free software, but let me briefly tell you a "
 "little bit about what that means. Free software does not refer to price; it "
@@ -920,7 +1210,7 @@
 "thing is that you are free to run the program, free to study what it does, "
 "free to change it to suit your needs, free to redistribute the copies of "
 "others and free to publish improved, extended versions. This is what free "
-"software means. If you are using a non-free program, you have lost crucial "
+"software means. If you are using a nonfree program, you have lost crucial "
 "freedom, so don't ever do that."
 msgstr ""
 "Eu não tenho falado sobre software livre, mas deixe-me contar um pouco sobre 
"
@@ -934,12 +1224,22 @@
 "estiver usando um programa não livre, você perdeu a liberdade crucial, 
então "
 "nunca faça isso."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The purpose of the GNU project is to make it easier for people to reject "
+#| "freedom-trampling, user-dominating, non-free software by providing free "
+#| "software to replace it. For those who don't have the moral courage to "
+#| "reject the non-free software, when that means some practical "
+#| "inconvenience, what we try to do is give a free alternative so that you "
+#| "can move to freedom with less of a mess and less of a sacrifice in "
+#| "practical terms. The less sacrifice the better. We want to make it easier "
+#| "for you to live in freedom, to cooperate."
 msgid ""
 "The purpose of the GNU project is to make it easier for people to reject "
-"freedom-trampling, user-dominating, non-free software by providing free "
+"freedom-trampling, user-dominating, nonfree software by providing free "
 "software to replace it. For those who don't have the moral courage to reject "
-"the non-free software, when that means some practical inconvenience, what we "
+"the nonfree software, when that means some practical inconvenience, what we "
 "try to do is give a free alternative so that you can move to freedom with "
 "less of a mess and less of a sacrifice in practical terms. The less "
 "sacrifice the better. We want to make it easier for you to live in freedom, "
@@ -954,16 +1254,26 @@
 "confusão e menos sacrifício em termos práticos. Quanto menos sacrifício, "
 "melhor. Queremos que seja mais fácil viver em liberdade, cooperar."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "This is a matter of the freedom to cooperate. We're used to thinking of "
+#| "freedom and cooperation with society as if they are opposites. But here "
+#| "they're on the same side. With free software you are free to cooperate "
+#| "with other people as well as free to help yourself. With non-free "
+#| "software, somebody is dominating you and keeping people divided. You're "
+#| "not allowed to share with them, you're not free to cooperate or help "
+#| "society, anymore than you're free to help yourself.  Divided and helpless "
+#| "is the state of users using non-free software."
 msgid ""
 "This is a matter of the freedom to cooperate. We're used to thinking of "
 "freedom and cooperation with society as if they are opposites. But here "
 "they're on the same side. With free software you are free to cooperate with "
-"other people as well as free to help yourself. With non-free software, "
+"other people as well as free to help yourself. With nonfree software, "
 "somebody is dominating you and keeping people divided. You're not allowed to "
 "share with them, you're not free to cooperate or help society, anymore than "
 "you're free to help yourself.  Divided and helpless is the state of users "
-"using non-free software."
+"using nonfree software."
 msgstr ""
 "Cooperação é uma questão de liberdade. Estamos acostumados a pensar que "
 "liberdade e cooperação na sociedade são coisas opostas. Mas elas estão do 
"
@@ -974,21 +1284,37 @@
 "ajudar a sociedade, para ajudar a si mesmo. Divididos e desamparados são os "
 "estados dos usuários que usam software não-livre."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "We've produced a tremendous range of free software. We've done what "
+#| "people said we could never do; we have two operating systems of free "
+#| "software. We have many applications and we obviously have a lot farther "
+#| "to go. So we need your help. I would like to ask you to volunteer for the "
+#| "GNU project; help us develop free software for more jobs. Take a look at "
+#| "<a href=\"/help/\">http://www.gnu.org/help</a> to find suggestions for "
+#| "how to help. If you want to order things, there's a link to that from the "
+#| "home page. If you want to read about philosophical issues, look in /"
+#| "philosophy. If you're looking for free software to use, look in /"
+#| "directory, which lists about 1900 packages now (which is a fraction of "
+#| "all the free software out there). Please write more and contribute to us. "
+#| "My book of essays, &ldquo;Free Software and Free Society&rdquo;, is on "
+#| "sale and can be purchased at <a href=\"http://www.gnu.org/\";>www.gnu.org</"
+#| "a>. Happy hacking!"
 msgid ""
 "We've produced a tremendous range of free software. We've done what people "
 "said we could never do; we have two operating systems of free software. We "
 "have many applications and we obviously have a lot farther to go. So we need "
 "your help. I would like to ask you to volunteer for the GNU project; help us "
-"develop free software for more jobs. Take a look at <a href=\"/help/"
-"\">http://www.gnu.org/help</a> to find suggestions for how to help. If you "
-"want to order things, there's a link to that from the home page. If you want "
-"to read about philosophical issues, look in /philosophy. If you're looking "
-"for free software to use, look in /directory, which lists about 1900 "
-"packages now (which is a fraction of all the free software out there). "
-"Please write more and contribute to us. My book of essays, &ldquo;Free "
-"Software and Free Society&rdquo;, is on sale and can be purchased at <a href="
-"\"http://www.gnu.org/\";>www.gnu.org</a>. Happy hacking!"
+"develop free software for more jobs. Take a look at <a href=\"/help/help.html"
+"\">gnu.org/help</a> to find suggestions for how to help. If you want to "
+"order things, there's a link to that from the home page. If you want to read "
+"about philosophical issues, look in /philosophy. If you're looking for free "
+"software to use, look in /directory, which lists about 1900 packages now "
+"(which is a fraction of all the free software out there). Please write more "
+"and contribute to us. My book of essays, &ldquo;Free Software and Free "
+"Society,&rdquo; is on sale and can be purchased at www.gnu.org&#8239;<a href="
+"\"#foot-9\">[9]</a>.  Happy hacking!"
 msgstr ""
 "Nós produzimos uma tremenda variedade de software livre. Fizemos o que as "
 "pessoas disseram que nunca poderíamos fazer; temos dois sistemas "
@@ -1005,7 +1331,13 @@
 "ensaios, “Free Software and Free Society”, está à venda e pode ser 
adquirido "
 "em <a href=\"http://www.gnu.org/\";>www.gnu.org</a>. <i>Happy hacking</i>!"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><h3>
+#, fuzzy
+#| msgid "Footnotes"
+msgid "Footnotes"
+msgstr "Notas de rodapé"
+
+#. type: Content of: <div><ol><li>
 msgid ""
 "Guy Steele designed the original symmetrical Emacs command set; then he and "
 "I began implementing Emacs (on top of TECO), but after one long joint "
@@ -1019,7 +1351,7 @@
 "então terminei o Emacs. Outros, particularmente incluindo Eugene C. "
 "Cicciarelli e Mike McMahon contribuíram substancialmente mais tarde."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Bernie Greenberg says that Dan Weinreb's implementation of Emacs for the "
 "Lisp Machine came before Greenberg's implementation for Multics.  I "
@@ -1029,7 +1361,7 @@
 "Máquina Lisp <i>(Lisp Machine)</i> veio antes da implementação de 
Greenberg "
 "para o Multics. Peço desculpas pelo erro."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Greenblatt's plan, as I understood it, was to hire lab people part time, so "
 "that they could continue working at the AI Lab.  Symbolics hired them full "
@@ -1040,13 +1372,20 @@
 "AI Lab. A Symbolics os contratou em tempo integral, então pararam de "
 "trabalhar no MIT."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "The background of this plan, which I did not state explicitly in the "
+#| "talk, is that during an initial period the ex-AI-Lab hackers, whether at "
+#| "Symbolics or LMI, continued contributing their changes to the MIT Lisp "
+#| "Machine system &mdash; even though the contract did not require this.  "
+#| "Symbolics' plan was to rupture this cooperation unilaterally."
 msgid ""
 "The background of this plan, which I did not state explicitly in the talk, "
 "is that during an initial period the ex-AI-Lab hackers, whether at Symbolics "
-"or LMI, continued contributing their changes to the MIT Lisp Machine system "
-"&mdash; even though the contract did not require this.  Symbolics' plan was "
-"to rupture this cooperation unilaterally."
+"or LMI, continued contributing their changes to the MIT Lisp Machine "
+"system&mdash;even though the contract did not require this.  Symbolics' plan "
+"was to rupture this cooperation unilaterally."
 msgstr ""
 "O cenário por trás desse plano, que não mencionei explicitamente na "
 "palestra, é que durante um período inicial os ex-hackers da AI Lab, seja na 
"
@@ -1054,7 +1393,7 @@
 "da Máquina Lisp do MIT &ndash; mesmo que o contrato não exigisse isso. O "
 "plano da Symbolics era romper essa cooperação unilateralmente."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "It was not that I cared particularly about the fate of LMI, but rather I did "
 "not want to let Symbolics gain through its aggression against the AI Lab."
@@ -1062,7 +1401,7 @@
 "Não era que eu me importasse particularmente com o destino da LMI, mas eu "
 "não queria deixar a Symbolics ganhar através de sua agressão contra o AI 
Lab."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "This statement has been misconstrued as saying that I never, ever looked at "
 "Symbolics' code.  Actually it says I did look, at first.  The Symbolics "
@@ -1074,7 +1413,7 @@
 "da Symbolics estava disponível no MIT, onde eu tinha o direito de lê-lo e, 
a "
 "princípio, foi assim que descobri suas mudanças."
 
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
 msgid ""
 "But that meant I had to make a special effort to solve each problem "
 "differently, in order to avoid copying Symbolics code.  After a while, I "
@@ -1087,7 +1426,7 @@
 "forma, eu poderia escrever o código da maneira que fosse melhor, sem me "
 "preocupar com o que poderia estar no código da Symbolics."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Symbolics at one point protested to MIT that my work, by thwarting their "
 "plan, had cost Symbolics a million dollars."
@@ -1095,7 +1434,7 @@
 "A Symbolics, em certa altura, protestou ao MIT que meu trabalho, frustrando "
 "o plano deles, havia custado à Symbolics um milhão de dólares."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "I don't mind if a very complex and heavyweight function takes keyword "
 "arguments.  What bothers me is making simple basic functions such as &ldquo;"
@@ -1105,6 +1444,21 @@
 "palavras-chave. O que me incomoda é fazer funções básicas simples, como "
 "“member” usá-los."
 
+#. type: Content of: <div><ol><li>
+#, 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 ""
+"In 2021, this book can be purchased from <a href=\"https://shop.fsf.org/";
+"books-docs/free-software-free-society-selected-essays-richard-m-stallman-3rd-"
+"edition\"> GNU Press</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*"
@@ -1131,14 +1485,14 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "A equipe de traduções para o português brasileiro se esforça para 
oferecer "
@@ -1146,12 +1500,15 @@
 "favor, envie seus comentários e sugestões em geral sobre as traduções 
para "
 "<a href=\"mailto:web-translators@gnu.org\";>&lt;web-translators@gnu.org&gt;</"
 "a>. </p><p>Consulte o <a href=\"/server/standards/README.translations.html"
-"\">Guia para as traduções</a> para mais informações sobre a coordenação 
e o "
-"envio de traduções das páginas deste site."
+"\">Guia para as traduções</a> para mais informações sobre a coordenação 
e a "
+"contribuição com traduções das páginas deste site."
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2003, 2007, 2013, 2014, 2020 Free Software Foundation, Inc."
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2003, 2007, 2013, 2014, 2020 Free Software Foundation, "
+#| "Inc."
+msgid "Copyright &copy; 2003, 2007, 2013, 2021 Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 2003, 2007, 2013, 2014, 2020 Free Software Foundation, Inc."
 
@@ -1180,10 +1537,9 @@
 msgid "Updated:"
 msgstr "Última atualização:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2003, 2007, 2013, 2014, 2020, 2021 Free Software "
-"Foundation, Inc."
-msgstr ""
-"Copyright &copy; 2003, 2007, 2013, 2014, 2020, 2021 Free Software "
-"Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 2003, 2007, 2013, 2014, 2020, 2021 Free Software "
+#~ "Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2003, 2007, 2013, 2014, 2020, 2021 Free Software "
+#~ "Foundation, Inc."

Index: po/rms-lisp.ru.po
===================================================================
RCS file: /web/www/www/gnu/po/rms-lisp.ru.po,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- po/rms-lisp.ru.po   2 Nov 2021 13:56:43 -0000       1.23
+++ po/rms-lisp.ru.po   2 Nov 2021 14:41:54 -0000       1.24
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rms-lisp.html\n"
-"POT-Creation-Date: 2020-09-21 18:55+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2020-09-21 17:34+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-11-02 14:27+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -24,19 +25,25 @@
 "Мой опыт работы с Лиспом и развитие GNU Emacs - 
Проект GNU - Фонд свободного "
 "программного обеспечения"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "My Lisp Experiences and the Development of GNU Emacs"
 msgstr "Мой опыт работы с Лиспом и развитие GNU 
Emacs"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><p>
+# | [-(-]Transcript of Richard Stallman's [-Speech, 28 Oct 2002,-] {+speech+}
+# | at the International Lisp [-Conference).-] {+Conference, 28 Oct 2002.+}
+#, fuzzy
+#| msgid ""
+#| "(Transcript of Richard Stallman's Speech, 28 Oct 2002, at the "
+#| "International Lisp Conference)."
 msgid ""
-"(Transcript of Richard Stallman's Speech, 28 Oct 2002, at the International "
-"Lisp Conference)."
+"Transcript of Richard Stallman's speech at the International Lisp "
+"Conference, 28 Oct 2002."
 msgstr ""
 "(Запись речи Ричарда Столмена, 
произнесенной 28&nbsp;октября 2002&nbsp;года "
 "на Международной конференции по Лиспу)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Since none of my usual speeches have anything to do with Lisp, none of them "
 "were appropriate for today. So I'm going to have to wing it.  Since I've "
@@ -49,17 +56,39 @@
 "мне доводилось выполнять довольно много 
работы, связанной с Лиспом, у меня, "
 "должно быть, есть что порассказать."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | My first experience with Lisp was when I read the Lisp 1.5 manual in high
+# | school. That's when I had my mind blown by the idea that there could be a
+# | computer language like that. The first time I had a chance to do anything
+# | with Lisp was when I was a freshman at Harvard and I wrote a Lisp
+# | interpreter for the <abbr title=\"Programmed Data
+# | Processor\">PDP</abbr>-11. It was a very small [-machine &mdash; it-]
+# | {+machine&mdash;it+} had something like 8k of [-memory &mdash; and-]
+# | {+memory&mdash;and+} I managed to write the interpreter in a thousand
+# | instructions. This gave me some room for a little bit of data. That was
+# | before I got to see what real software was like, that did real system jobs.
+#, fuzzy
+#| msgid ""
+#| "My first experience with Lisp was when I read the Lisp 1.5 manual in high "
+#| "school. That's when I had my mind blown by the idea that there could be a "
+#| "computer language like that. The first time I had a chance to do anything "
+#| "with Lisp was when I was a freshman at Harvard and I wrote a Lisp "
+#| "interpreter for the <abbr title=\"Programmed Data Processor\">PDP</"
+#| "abbr>-11. It was a very small machine &mdash; it had something like 8k of "
+#| "memory &mdash; and I managed to write the interpreter in a thousand "
+#| "instructions. This gave me some room for a little bit of data. That was "
+#| "before I got to see what real software was like, that did real system "
+#| "jobs."
 msgid ""
 "My first experience with Lisp was when I read the Lisp 1.5 manual in high "
 "school. That's when I had my mind blown by the idea that there could be a "
 "computer language like that. The first time I had a chance to do anything "
 "with Lisp was when I was a freshman at Harvard and I wrote a Lisp "
 "interpreter for the <abbr title=\"Programmed Data Processor\">PDP</abbr>-11. "
-"It was a very small machine &mdash; it had something like 8k of memory "
-"&mdash; and I managed to write the interpreter in a thousand instructions. "
-"This gave me some room for a little bit of data. That was before I got to "
-"see what real software was like, that did real system jobs."
+"It was a very small machine&mdash;it had something like 8k of memory&mdash;"
+"and I managed to write the interpreter in a thousand instructions. This gave "
+"me some room for a little bit of data. That was before I got to see what "
+"real software was like, that did real system jobs."
 msgstr ""
 "Моя первая встреча с Лиспом произошла, 
когда я прочел руководство по "
 "Лисп&nbsp;1.5 в старших классах. Именно тогда 
меня поразила идея, что может "
@@ -71,13 +100,26 @@
 "данных. Это было до того, как я узнал, как 
выглядят настоящие программы, "
 "которые выполняют настоящие системные 
задачи."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | I began doing work on a real Lisp implementation with JonL White once I
+# | started working at <abbr title=\"Massachusetts Institute of
+# | Technology\">MIT</abbr>. I got hired at the Artificial Intelligence Lab
+# | not by JonL, but by Russ Noftsker, which was most ironic considering what
+# | was to [-come &mdash; he-] {+come&mdash;he+} must have really regretted
+# | that day.
+#, fuzzy
+#| msgid ""
+#| "I began doing work on a real Lisp implementation with JonL White once I "
+#| "started working at <abbr title=\"Massachusetts Institute of Technology"
+#| "\">MIT</abbr>. I got hired at the Artificial Intelligence Lab not by "
+#| "JonL, but by Russ Noftsker, which was most ironic considering what was to "
+#| "come &mdash; he must have really regretted that day."
 msgid ""
 "I began doing work on a real Lisp implementation with JonL White once I "
 "started working at <abbr title=\"Massachusetts Institute of Technology"
 "\">MIT</abbr>. I got hired at the Artificial Intelligence Lab not by JonL, "
-"but by Russ Noftsker, which was most ironic considering what was to come "
-"&mdash; he must have really regretted that day."
+"but by Russ Noftsker, which was most ironic considering what was to "
+"come&mdash;he must have really regretted that day."
 msgstr ""
 "Я начал выполнять работы над настоящей 
реализацией Лиспа с Джоном-Л Уайтом, "
 "как только я начал работать в 
Массачусетском техническом институте. 
Туда "
@@ -85,7 +127,7 @@
 "парадоксально, если учесть то, что 
случилось впоследствии&nbsp;&mdash; он, "
 "должно быть, сильно об этом пожалел."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "During the 1970s, before my life became politicized by horrible events, I "
 "was just going along making one extension after another for various "
@@ -112,7 +154,7 @@
 "ею можно было программировать. Я не знаю, 
была ли это первая такая система, "
 "но это определенно был первый такой 
редактор."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This spirit of building up gigantic, complicated programs to use in your own "
 "editing, and then exchanging them with other people, fueled the spirit of "
@@ -137,19 +179,46 @@
 "думаю, что именно природа нашего образа 
жизни в Лаборатории искусственного "
 "интеллекта привела к созданию Emacs и 
сделала его таким, каким он был."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The original Emacs did not have Lisp in it. The lower level language, the
+# | non-interpreted [-language &mdash; was-] {+language&mdash;was+} PDP-10
+# | Assembler. The interpreter we wrote in that actually wasn't written for
+# | Emacs, it was written for <abbr title=\"Text Editor and
+# | COrrector\">TECO</abbr>. It was our text editor, and was an extremely ugly
+# | programming language, as ugly as could possibly be. The reason was that it
+# | wasn't designed to be a programming language, it was designed to be an
+# | editor and command language. There were commands like
+# | [-&lsquo;5l&rsquo;,-] {+<code>5l</code>,+} meaning [-&lsquo;move-]
+# | {+<code>move+} five [-lines&rsquo;,-] {+lines</code>,+} or
+# | [-&lsquo;i&rsquo;-] {+<code>i</code>+} and then a string and then an ESC
+# | to insert that string. You would type a string that was a series of
+# | commands, which was called a command string. You would end it with ESC
+# | ESC, and it would get executed.
+#, fuzzy
+#| msgid ""
+#| "The original Emacs did not have Lisp in it. The lower level language, the "
+#| "non-interpreted language &mdash; was PDP-10 Assembler. The interpreter we "
+#| "wrote in that actually wasn't written for Emacs, it was written for <abbr "
+#| "title=\"Text Editor and COrrector\">TECO</abbr>. It was our text editor, "
+#| "and was an extremely ugly programming language, as ugly as could possibly "
+#| "be. The reason was that it wasn't designed to be a programming language, "
+#| "it was designed to be an editor and command language. There were commands "
+#| "like &lsquo;5l&rsquo;, meaning &lsquo;move five lines&rsquo;, or &lsquo;"
+#| "i&rsquo; and then a string and then an ESC to insert that string. You "
+#| "would type a string that was a series of commands, which was called a "
+#| "command string. You would end it with ESC ESC, and it would get executed."
 msgid ""
 "The original Emacs did not have Lisp in it. The lower level language, the "
-"non-interpreted language &mdash; was PDP-10 Assembler. The interpreter we "
+"non-interpreted language&mdash;was PDP-10 Assembler. The interpreter we "
 "wrote in that actually wasn't written for Emacs, it was written for <abbr "
 "title=\"Text Editor and COrrector\">TECO</abbr>. It was our text editor, and "
 "was an extremely ugly programming language, as ugly as could possibly be. "
 "The reason was that it wasn't designed to be a programming language, it was "
 "designed to be an editor and command language. There were commands like "
-"&lsquo;5l&rsquo;, meaning &lsquo;move five lines&rsquo;, or &lsquo;i&rsquo; "
-"and then a string and then an ESC to insert that string. You would type a "
-"string that was a series of commands, which was called a command string. You "
-"would end it with ESC ESC, and it would get executed."
+"<code>5l</code>, meaning <code>move five lines</code>, or <code>i</code> and "
+"then a string and then an ESC to insert that string. You would type a string "
+"that was a series of commands, which was called a command string. You would "
+"end it with ESC ESC, and it would get executed."
 msgstr ""
 "В первоначальном Emacs Лиспа не было. Языком 
низкого уровня&nbsp;&mdash; "
 "неинтерпретируемым языком&nbsp;&mdash; был 
ассемблер PDP-10. Интерпретатор, "
@@ -165,18 +234,43 @@
 "завершалась символами <em>ESC</em> <em>ESC</em>, и 
тогда последовательность "
 "выполнялась."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Well, people wanted to extend this language with programming facilities,
+# | so they added some. For instance, one of the first was a looping
+# | construct, which was [-&lt; &gt;.-] {+<code>&lt;&nbsp;&gt;</code>.+} You
+# | would put those around things and it would loop. There were other cryptic
+# | commands that could be used to conditionally exit the loop.  To make
+# | Emacs, [-we <a href=\"#foot-1\">(1)</a>-] {+we&#8239;<a
+# | href=\"#foot-1\">[1]</a>+} added facilities to have subroutines with
+# | names. Before that, it was sort of like Basic, and the subroutines could
+# | only have single letters as their names. That was hard to program big
+# | programs with, so we added code so they could have longer names. Actually,
+# | there were some rather sophisticated facilities; I think that Lisp got its
+# | unwind-protect facility from TECO.
+#, fuzzy
+#| msgid ""
+#| "Well, people wanted to extend this language with programming facilities, "
+#| "so they added some. For instance, one of the first was a looping "
+#| "construct, which was &lt; &gt;. You would put those around things and it "
+#| "would loop. There were other cryptic commands that could be used to "
+#| "conditionally exit the loop.  To make Emacs, we <a href=\"#foot-1\">(1)</"
+#| "a> added facilities to have subroutines with names. Before that, it was "
+#| "sort of like Basic, and the subroutines could only have single letters as "
+#| "their names. That was hard to program big programs with, so we added code "
+#| "so they could have longer names. Actually, there were some rather "
+#| "sophisticated facilities; I think that Lisp got its unwind-protect "
+#| "facility from TECO."
 msgid ""
 "Well, people wanted to extend this language with programming facilities, so "
 "they added some. For instance, one of the first was a looping construct, "
-"which was &lt; &gt;. You would put those around things and it would loop. "
-"There were other cryptic commands that could be used to conditionally exit "
-"the loop.  To make Emacs, we <a href=\"#foot-1\">(1)</a> added facilities to "
-"have subroutines with names. Before that, it was sort of like Basic, and the "
-"subroutines could only have single letters as their names. That was hard to "
-"program big programs with, so we added code so they could have longer names. "
-"Actually, there were some rather sophisticated facilities; I think that Lisp "
-"got its unwind-protect facility from TECO."
+"which was <code>&lt;&nbsp;&gt;</code>. You would put those around things and "
+"it would loop. There were other cryptic commands that could be used to "
+"conditionally exit the loop.  To make Emacs, we&#8239;<a href=\"#foot-1\">[1]"
+"</a> added facilities to have subroutines with names. Before that, it was "
+"sort of like Basic, and the subroutines could only have single letters as "
+"their names. That was hard to program big programs with, so we added code so "
+"they could have longer names. Actually, there were some rather sophisticated "
+"facilities; I think that Lisp got its unwind-protect facility from TECO."
 msgstr ""
 "Ну, люди хотели дополнить этот язык 
средствами программирования, так что они "
 "добавили некоторые такие средства. 
Например, одной из первых была добавлена "
@@ -190,10 +284,28 @@
 "деле там были довольно замысловатые 
средства; по-моему, средство &ldquo;"
 "unwind-protect&rdquo; Лисп заимствовал из TECO."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | We started putting in rather sophisticated facilities, all with the
+# | ugliest syntax you could ever think of, and it [-worked &mdash; people-]
+# | {+worked&mdash;people+} were able to write large programs in it anyway.
+# | The obvious lesson was that a language like TECO, which wasn't designed to
+# | be a programming language, was the wrong way to go. The language that you
+# | build your extensions on shouldn't be thought of as a programming language
+# | in afterthought; it should be designed as a programming language. In fact,
+# | we discovered that the best programming language for that purpose was Lisp.
+#, fuzzy
+#| msgid ""
+#| "We started putting in rather sophisticated facilities, all with the "
+#| "ugliest syntax you could ever think of, and it worked &mdash; people were "
+#| "able to write large programs in it anyway. The obvious lesson was that a "
+#| "language like TECO, which wasn't designed to be a programming language, "
+#| "was the wrong way to go. The language that you build your extensions on "
+#| "shouldn't be thought of as a programming language in afterthought; it "
+#| "should be designed as a programming language. In fact, we discovered that "
+#| "the best programming language for that purpose was Lisp."
 msgid ""
 "We started putting in rather sophisticated facilities, all with the ugliest "
-"syntax you could ever think of, and it worked &mdash; people were able to "
+"syntax you could ever think of, and it worked&mdash;people were able to "
 "write large programs in it anyway. The obvious lesson was that a language "
 "like TECO, which wasn't designed to be a programming language, was the wrong "
 "way to go. The language that you build your extensions on shouldn't be "
@@ -211,18 +323,41 @@
 "программирования. Фактически, мы 
обнаружили, что лучшим языком "
 "программирования для этих целей был Лисп."
 
-#. type: Content of: <p>
-msgid ""
-"It was Bernie Greenberg, who discovered that it was <a href=\"#foot-2\">(2)</"
-"a>.  He wrote a version of Emacs in Multics MacLisp, and he wrote his "
-"commands in MacLisp in a straightforward fashion. The editor itself was "
-"written entirely in Lisp. Multics Emacs proved to be a great success &mdash; "
-"programming new editing commands was so convenient that even the secretaries "
-"in his office started learning how to use it. They used a manual someone had "
-"written which showed how to extend Emacs, but didn't say it was a "
-"programming. So the secretaries, who believed they couldn't do programming, "
-"weren't scared off. They read the manual, discovered they could do useful "
-"things and they learned to program."
+#. type: Content of: <div><p>
+# | It was Bernie Greenberg, who discovered that it [-was <a
+# | href=\"#foot-2\">(2)</a>.-] {+was&#8239;<a href=\"#foot-2\">[2]</a>.+}  He
+# | wrote a version of Emacs in Multics MacLisp, and he wrote his commands in
+# | MacLisp in a straightforward fashion. The editor itself was written
+# | entirely in Lisp. Multics Emacs proved to be a great [-success &mdash;
+# | programming-] {+success&mdash;programming+} new editing commands was so
+# | convenient that even the secretaries in his office started learning how to
+# | use it. They used a manual someone had written which showed how to extend
+# | Emacs, but didn't say it was a programming. So the secretaries, who
+# | believed they couldn't do programming, weren't scared off. They read the
+# | manual, discovered they could do useful things and they learned to program.
+#, fuzzy
+#| msgid ""
+#| "It was Bernie Greenberg, who discovered that it was <a href=\"#foot-2\">"
+#| "(2)</a>.  He wrote a version of Emacs in Multics MacLisp, and he wrote "
+#| "his commands in MacLisp in a straightforward fashion. The editor itself "
+#| "was written entirely in Lisp. Multics Emacs proved to be a great success "
+#| "&mdash; programming new editing commands was so convenient that even the "
+#| "secretaries in his office started learning how to use it. They used a "
+#| "manual someone had written which showed how to extend Emacs, but didn't "
+#| "say it was a programming. So the secretaries, who believed they couldn't "
+#| "do programming, weren't scared off. They read the manual, discovered they "
+#| "could do useful things and they learned to program."
+msgid ""
+"It was Bernie Greenberg, who discovered that it was&#8239;<a href="
+"\"#foot-2\">[2]</a>.  He wrote a version of Emacs in Multics MacLisp, and he "
+"wrote his commands in MacLisp in a straightforward fashion. The editor "
+"itself was written entirely in Lisp. Multics Emacs proved to be a great "
+"success&mdash;programming new editing commands was so convenient that even "
+"the secretaries in his office started learning how to use it. They used a "
+"manual someone had written which showed how to extend Emacs, but didn't say "
+"it was a programming. So the secretaries, who believed they couldn't do "
+"programming, weren't scared off. They read the manual, discovered they could "
+"do useful things and they learned to program."
 msgstr ""
 "Это открыл Берни Гринберг&nbsp;<a 
href=\"#foot-2\">(2)</a>. Он написал "
 "версию Emacs на MacLisp в Multics, и он писал свои 
программы на MacLisp "
@@ -235,16 +370,37 @@
 "не могут программировать, это не 
отпугивало. Они читали руководство, "
 "обнаруживали, что могут делать что-то 
полезное, и учились программировать."
 
-#. type: Content of: <p>
-msgid ""
-"So Bernie saw that an application &mdash; a program that does something "
-"useful for you &mdash; which has Lisp inside it and which you could extend "
-"by rewriting the Lisp programs, is actually a very good way for people to "
-"learn programming. It gives them a chance to write small programs that are "
-"useful for them, which in most arenas you can't possibly do. They can get "
-"encouragement for their own practical use &mdash; at the stage where it's "
-"the hardest &mdash; where they don't believe they can program, until they "
-"get to the point where they are programmers."
+#. type: Content of: <div><p>
+# | So Bernie saw that an [-application &mdash; a-] {+application&mdash;a+}
+# | program that does something useful for [-you &mdash; which-]
+# | {+you&mdash;which+} has Lisp inside it and which you could extend by
+# | rewriting the Lisp programs, is actually a very good way for people to
+# | learn programming. It gives them a chance to write small programs that are
+# | useful for them, which in most arenas you can't possibly do. They can get
+# | encouragement for their own practical [-use &mdash; at-] {+use&mdash;at+}
+# | the stage where it's the [-hardest &mdash; where-] {+hardest&mdash;where+}
+# | they don't believe they can program, until they get to the point where
+# | they are programmers.
+#, fuzzy
+#| msgid ""
+#| "So Bernie saw that an application &mdash; a program that does something "
+#| "useful for you &mdash; which has Lisp inside it and which you could "
+#| "extend by rewriting the Lisp programs, is actually a very good way for "
+#| "people to learn programming. It gives them a chance to write small "
+#| "programs that are useful for them, which in most arenas you can't "
+#| "possibly do. They can get encouragement for their own practical use "
+#| "&mdash; at the stage where it's the hardest &mdash; where they don't "
+#| "believe they can program, until they get to the point where they are "
+#| "programmers."
+msgid ""
+"So Bernie saw that an application&mdash;a program that does something useful "
+"for you&mdash;which has Lisp inside it and which you could extend by "
+"rewriting the Lisp programs, is actually a very good way for people to learn "
+"programming. It gives them a chance to write small programs that are useful "
+"for them, which in most arenas you can't possibly do. They can get "
+"encouragement for their own practical use&mdash;at the stage where it's the "
+"hardest&mdash;where they don't believe they can program, until they get to "
+"the point where they are programmers."
 msgstr ""
 "Так что Берни понял, что приложение&mdash; 
программа, которая делает что-то "
 "полезное для вас&nbsp;&mdash; внутри которого 
был Лисп и которое вы можете "
@@ -256,30 +412,79 @@
 "думают, что могут программировать,&mdash; 
пока они не дойдут до точки, в "
 "которой они уже стали программистами."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | At that point, people began to wonder how they could get something like
+# | this on a platform where they didn't have full service Lisp
+# | implementation. Multics MacLisp had a compiler as well as an [-interpreter
+# | &mdash; it-] {+interpreter&mdash;it+} was a full-fledged Lisp [-system
+# | &mdash; but-] {+system&mdash;but+} people wanted to implement something
+# | like that on other systems where they had not already written a Lisp
+# | compiler. Well, if you didn't have the Lisp compiler you couldn't write
+# | the whole editor in [-Lisp &mdash; it-] {+Lisp&mdash;it+} would be too
+# | slow, especially redisplay, if it had to run interpreted Lisp.  So we
+# | developed a hybrid technique. The idea was to write a Lisp interpreter and
+# | the lower level parts of the editor together, so that parts of the editor
+# | were built-in Lisp facilities. Those would be whatever parts we felt we
+# | had to optimize. This was a technique that we had already consciously
+# | practiced in the original Emacs, because there were certain fairly high
+# | level features which we re-implemented in machine language, making them
+# | into TECO primitives. For instance, there was a TECO primitive to fill a
+# | paragraph (actually, to do most of the work of filling a paragraph,
+# | because some of the less time-consuming parts of the job would be done at
+# | the higher level by a TECO program). You could do the whole job by writing
+# | a TECO program, but that was too slow, so we optimized it by putting part
+# | of it in machine language. We used the same idea here (in the hybrid
+# | technique), that most of the editor would be written in Lisp, but certain
+# | parts of it that had to run particularly fast would be written at a lower
+# | level.
+#, fuzzy
+#| msgid ""
+#| "At that point, people began to wonder how they could get something like "
+#| "this on a platform where they didn't have full service Lisp "
+#| "implementation. Multics MacLisp had a compiler as well as an interpreter "
+#| "&mdash; it was a full-fledged Lisp system &mdash; but people wanted to "
+#| "implement something like that on other systems where they had not already "
+#| "written a Lisp compiler. Well, if you didn't have the Lisp compiler you "
+#| "couldn't write the whole editor in Lisp &mdash; it would be too slow, "
+#| "especially redisplay, if it had to run interpreted Lisp.  So we developed "
+#| "a hybrid technique. The idea was to write a Lisp interpreter and the "
+#| "lower level parts of the editor together, so that parts of the editor "
+#| "were built-in Lisp facilities. Those would be whatever parts we felt we "
+#| "had to optimize. This was a technique that we had already consciously "
+#| "practiced in the original Emacs, because there were certain fairly high "
+#| "level features which we re-implemented in machine language, making them "
+#| "into TECO primitives. For instance, there was a TECO primitive to fill a "
+#| "paragraph (actually, to do most of the work of filling a paragraph, "
+#| "because some of the less time-consuming parts of the job would be done at "
+#| "the higher level by a TECO program). You could do the whole job by "
+#| "writing a TECO program, but that was too slow, so we optimized it by "
+#| "putting part of it in machine language. We used the same idea here (in "
+#| "the hybrid technique), that most of the editor would be written in Lisp, "
+#| "but certain parts of it that had to run particularly fast would be "
+#| "written at a lower level."
 msgid ""
 "At that point, people began to wonder how they could get something like this "
 "on a platform where they didn't have full service Lisp implementation. "
-"Multics MacLisp had a compiler as well as an interpreter &mdash; it was a "
-"full-fledged Lisp system &mdash; but people wanted to implement something "
-"like that on other systems where they had not already written a Lisp "
-"compiler. Well, if you didn't have the Lisp compiler you couldn't write the "
-"whole editor in Lisp &mdash; it would be too slow, especially redisplay, if "
-"it had to run interpreted Lisp.  So we developed a hybrid technique. The "
-"idea was to write a Lisp interpreter and the lower level parts of the editor "
-"together, so that parts of the editor were built-in Lisp facilities. Those "
-"would be whatever parts we felt we had to optimize. This was a technique "
-"that we had already consciously practiced in the original Emacs, because "
-"there were certain fairly high level features which we re-implemented in "
-"machine language, making them into TECO primitives. For instance, there was "
-"a TECO primitive to fill a paragraph (actually, to do most of the work of "
-"filling a paragraph, because some of the less time-consuming parts of the "
-"job would be done at the higher level by a TECO program). You could do the "
-"whole job by writing a TECO program, but that was too slow, so we optimized "
-"it by putting part of it in machine language. We used the same idea here (in "
-"the hybrid technique), that most of the editor would be written in Lisp, but "
-"certain parts of it that had to run particularly fast would be written at a "
-"lower level."
+"Multics MacLisp had a compiler as well as an interpreter&mdash;it was a full-"
+"fledged Lisp system&mdash;but people wanted to implement something like that "
+"on other systems where they had not already written a Lisp compiler. Well, "
+"if you didn't have the Lisp compiler you couldn't write the whole editor in "
+"Lisp&mdash;it would be too slow, especially redisplay, if it had to run "
+"interpreted Lisp.  So we developed a hybrid technique. The idea was to write "
+"a Lisp interpreter and the lower level parts of the editor together, so that "
+"parts of the editor were built-in Lisp facilities. Those would be whatever "
+"parts we felt we had to optimize. This was a technique that we had already "
+"consciously practiced in the original Emacs, because there were certain "
+"fairly high level features which we re-implemented in machine language, "
+"making them into TECO primitives. For instance, there was a TECO primitive "
+"to fill a paragraph (actually, to do most of the work of filling a "
+"paragraph, because some of the less time-consuming parts of the job would be "
+"done at the higher level by a TECO program). You could do the whole job by "
+"writing a TECO program, but that was too slow, so we optimized it by putting "
+"part of it in machine language. We used the same idea here (in the hybrid "
+"technique), that most of the editor would be written in Lisp, but certain "
+"parts of it that had to run particularly fast would be written at a lower "
+"level."
 msgstr ""
 "В этот момент люди начали размышлять, как 
получить что-то вроде этого на "
 "платформе, где у них не было 
полнофункциональной реализации Лиспа. У 
MacLisp "
@@ -305,16 +510,33 @@
 "будет написана на Лиспе, но определенные 
его части, которые нужно было "
 "выполнять особенно быстро, будут написаны 
на низком уровне."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Therefore, when I wrote my second implementation of Emacs, I followed the
+# | same kind of design. The low level language was not machine language
+# | anymore, it was C. C was a good, efficient language for portable programs
+# | to run in a Unix-like operating system. There was a Lisp interpreter, but
+# | I implemented facilities for special purpose editing jobs directly in [-C
+# | &mdash; manipulating-] {+C&mdash;manipulating+} editor buffers, inserting
+# | leading text, reading and writing files, redisplaying the buffer on the
+# | screen, managing editor windows.
+#, fuzzy
+#| msgid ""
+#| "Therefore, when I wrote my second implementation of Emacs, I followed the "
+#| "same kind of design. The low level language was not machine language "
+#| "anymore, it was C. C was a good, efficient language for portable programs "
+#| "to run in a Unix-like operating system. There was a Lisp interpreter, but "
+#| "I implemented facilities for special purpose editing jobs directly in C "
+#| "&mdash; manipulating editor buffers, inserting leading text, reading and "
+#| "writing files, redisplaying the buffer on the screen, managing editor "
+#| "windows."
 msgid ""
 "Therefore, when I wrote my second implementation of Emacs, I followed the "
 "same kind of design. The low level language was not machine language "
 "anymore, it was C. C was a good, efficient language for portable programs to "
 "run in a Unix-like operating system. There was a Lisp interpreter, but I "
-"implemented facilities for special purpose editing jobs directly in C "
-"&mdash; manipulating editor buffers, inserting leading text, reading and "
-"writing files, redisplaying the buffer on the screen, managing editor "
-"windows."
+"implemented facilities for special purpose editing jobs directly in C&mdash;"
+"manipulating editor buffers, inserting leading text, reading and writing "
+"files, redisplaying the buffer on the screen, managing editor windows."
 msgstr ""
 "Таким образом, когда я писал свою вторую 
реализацию Emacs, я следовал такого "
 "же рода схеме. Язык низкого уровня больше 
не был машинным языком, это был "
@@ -325,20 +547,46 @@
 "редактора, вставка текста в начало, чтение 
и запись файлов, перерисовка "
 "буфера на экране, управление окнами 
редактора."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Now, this was not the first Emacs that was written in C and ran on Unix.
+# | The first was written by James Gosling, and was referred to as GosMacs. A
+# | strange thing happened with him. In the beginning, he seemed to be
+# | influenced by the same spirit of sharing and cooperation of the original
+# | Emacs. I first released the original Emacs to people at MIT. Someone
+# | wanted to port it to run on [-Twenex &mdash; it-] {+Twenex&mdash;it+}
+# | originally only ran on the Incompatible Timesharing System we used at MIT.
+# | They ported it to Twenex, which meant that there were a few hundred
+# | installations around the world that could potentially use it. We started
+# | distributing it to them, with the rule that &ldquo;you had to send back
+# | all of your improvements&rdquo; so we could all benefit. No one ever tried
+# | to enforce that, but as far as I know people did cooperate.
+#, fuzzy
+#| msgid ""
+#| "Now, this was not the first Emacs that was written in C and ran on Unix. "
+#| "The first was written by James Gosling, and was referred to as GosMacs. A "
+#| "strange thing happened with him. In the beginning, he seemed to be "
+#| "influenced by the same spirit of sharing and cooperation of the original "
+#| "Emacs. I first released the original Emacs to people at MIT. Someone "
+#| "wanted to port it to run on Twenex &mdash; it originally only ran on the "
+#| "Incompatible Timesharing System we used at MIT. They ported it to Twenex, "
+#| "which meant that there were a few hundred installations around the world "
+#| "that could potentially use it. We started distributing it to them, with "
+#| "the rule that &ldquo;you had to send back all of your improvements&rdquo; "
+#| "so we could all benefit. No one ever tried to enforce that, but as far as "
+#| "I know people did cooperate."
 msgid ""
 "Now, this was not the first Emacs that was written in C and ran on Unix. The "
 "first was written by James Gosling, and was referred to as GosMacs. A "
 "strange thing happened with him. In the beginning, he seemed to be "
 "influenced by the same spirit of sharing and cooperation of the original "
 "Emacs. I first released the original Emacs to people at MIT. Someone wanted "
-"to port it to run on Twenex &mdash; it originally only ran on the "
-"Incompatible Timesharing System we used at MIT. They ported it to Twenex, "
-"which meant that there were a few hundred installations around the world "
-"that could potentially use it. We started distributing it to them, with the "
-"rule that &ldquo;you had to send back all of your improvements&rdquo; so we "
-"could all benefit. No one ever tried to enforce that, but as far as I know "
-"people did cooperate."
+"to port it to run on Twenex&mdash;it originally only ran on the Incompatible "
+"Timesharing System we used at MIT. They ported it to Twenex, which meant "
+"that there were a few hundred installations around the world that could "
+"potentially use it. We started distributing it to them, with the rule that "
+"&ldquo;you had to send back all of your improvements&rdquo; so we could all "
+"benefit. No one ever tried to enforce that, but as far as I know people did "
+"cooperate."
 msgstr ""
 "Так вот, это был не первый Emacs, написанный 
на Си и работавший в Unix. "
 "Первый был написан Джеймсом Гослингом, 
его называли GosMacs. С ним вышла "
@@ -354,12 +602,26 @@
 "извлекать из этого пользу. Никто никогда 
не пытался следить за соблюдением "
 "этого, но насколько я знаю, люди 
действительно сотрудничали."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Gosling did, at first, seem to participate in this spirit. He wrote in a
+# | manual that he called the program Emacs hoping that others in the
+# | community would improve it until it was worthy of that name. That's the
+# | right approach to take towards a [-community &mdash; to-]
+# | {+community&mdash;to+} ask them to join in and make the program better.
+# | But after that he seemed to change the spirit, and sold it to a company.
+#, fuzzy
+#| msgid ""
+#| "Gosling did, at first, seem to participate in this spirit. He wrote in a "
+#| "manual that he called the program Emacs hoping that others in the "
+#| "community would improve it until it was worthy of that name. That's the "
+#| "right approach to take towards a community &mdash; to ask them to join in "
+#| "and make the program better. But after that he seemed to change the "
+#| "spirit, and sold it to a company."
 msgid ""
 "Gosling did, at first, seem to participate in this spirit. He wrote in a "
 "manual that he called the program Emacs hoping that others in the community "
 "would improve it until it was worthy of that name. That's the right approach "
-"to take towards a community &mdash; to ask them to join in and make the "
+"to take towards a community&mdash;to ask them to join in and make the "
 "program better. But after that he seemed to change the spirit, and sold it "
 "to a company."
 msgstr ""
@@ -370,7 +632,32 @@
 "улучшать программу. Но после этого его 
отношение, кажется, изменилось, и он "
 "продал программу одной компании."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | At that time I was working on the GNU system (a free software Unix-like
+# | operating system that many people erroneously call &ldquo;Linux&rdquo;). 
+# | There was no free software Emacs editor that ran on Unix. I did, however,
+# | have a friend who had participated in developing Gosling's Emacs. Gosling
+# | had given him, by email, permission to distribute his own version. He
+# | proposed to me that I use that version. Then I discovered that Gosling's
+# | Emacs did not have a real Lisp. It had a programming language that was
+# | known as [-&lsquo;mocklisp&rsquo;,-] {+&ldquo;mocklisp,&rdquo;+} which
+# | looks syntactically like Lisp, but didn't have the data structures of
+# | Lisp.  So programs were not data, and vital elements of Lisp were missing.
+# |  Its data structures were strings, numbers and a few other specialized
+# | things.
+#, fuzzy
+#| msgid ""
+#| "At that time I was working on the GNU system (a free software Unix-like "
+#| "operating system that many people erroneously call &ldquo;Linux&rdquo;).  "
+#| "There was no free software Emacs editor that ran on Unix. I did, however, "
+#| "have a friend who had participated in developing Gosling's Emacs. Gosling "
+#| "had given him, by email, permission to distribute his own version. He "
+#| "proposed to me that I use that version. Then I discovered that Gosling's "
+#| "Emacs did not have a real Lisp. It had a programming language that was "
+#| "known as &lsquo;mocklisp&rsquo;, which looks syntactically like Lisp, but "
+#| "didn't have the data structures of Lisp.  So programs were not data, and "
+#| "vital elements of Lisp were missing.  Its data structures were strings, "
+#| "numbers and a few other specialized things."
 msgid ""
 "At that time I was working on the GNU system (a free software Unix-like "
 "operating system that many people erroneously call &ldquo;Linux&rdquo;).  "
@@ -379,7 +666,7 @@
 "had given him, by email, permission to distribute his own version. He "
 "proposed to me that I use that version. Then I discovered that Gosling's "
 "Emacs did not have a real Lisp. It had a programming language that was known "
-"as &lsquo;mocklisp&rsquo;, which looks syntactically like Lisp, but didn't "
+"as &ldquo;mocklisp,&rdquo; which looks syntactically like Lisp, but didn't "
 "have the data structures of Lisp.  So programs were not data, and vital "
 "elements of Lisp were missing.  Its data structures were strings, numbers "
 "and a few other specialized things."
@@ -396,7 +683,7 @@
 "хватало жизненно важных элементов Лиспа. 
Его структурами данных были строки, "
 "числа и некоторые другие 
специализированные объекты."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I concluded I couldn't use it and had to replace it all, the first step of "
 "which was to write an actual Lisp interpreter. I gradually adapted every "
@@ -411,13 +698,28 @@
 "вывода внутренних структур данных 
редактора и манипуляций ими в "
 "пользовательских программах на Лиспе."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The one exception was redisplay. For a long time, redisplay was sort of an
+# | alternate world. The editor would enter the world of redisplay and things
+# | would go on with very special data structures that were not safe for
+# | garbage collection, not safe for interruption, and you couldn't run any
+# | Lisp programs during that. We've changed that [-since &mdash; it's-]
+# | {+since&mdash;it's+} now possible to run Lisp code during redisplay. It's
+# | quite a convenient thing.
+#, fuzzy
+#| msgid ""
+#| "The one exception was redisplay. For a long time, redisplay was sort of "
+#| "an alternate world. The editor would enter the world of redisplay and "
+#| "things would go on with very special data structures that were not safe "
+#| "for garbage collection, not safe for interruption, and you couldn't run "
+#| "any Lisp programs during that. We've changed that since &mdash; it's now "
+#| "possible to run Lisp code during redisplay. It's quite a convenient thing."
 msgid ""
 "The one exception was redisplay. For a long time, redisplay was sort of an "
 "alternate world. The editor would enter the world of redisplay and things "
 "would go on with very special data structures that were not safe for garbage "
 "collection, not safe for interruption, and you couldn't run any Lisp "
-"programs during that. We've changed that since &mdash; it's now possible to "
+"programs during that. We've changed that since&mdash;it's now possible to "
 "run Lisp code during redisplay. It's quite a convenient thing."
 msgstr ""
 "Единственным исключением была 
перерисовка. Долгое время перерисовка была 
"
@@ -428,15 +730,37 @@
 "изменили&nbsp;&mdash; сейчас можно выполнять 
программы на Лиспе во время "
 "перерисовки. Это очень удобно."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | This second Emacs program was [-&lsquo;free software&rsquo;-]
+# | {+&ldquo;free software&rdquo;+} in the modern sense of the [-term &mdash;
+# | it-] {+term&mdash;it+} was part of an explicit political campaign to make
+# | software free. The essence of this campaign was that everybody should be
+# | free to do the things we did in the old days at MIT, working together on
+# | software and working with whomever wanted to work with us.  That is the
+# | basis for the free software [-movement &mdash; the-]
+# | {+movement&mdash;the+} experience I had, the life that I've lived at the
+# | MIT AI [-lab &mdash; to-] {+lab&mdash;to+} be working on human knowledge,
+# | and not be standing in the way of anybody's further using and further
+# | disseminating human knowledge.
+#, fuzzy
+#| msgid ""
+#| "This second Emacs program was &lsquo;free software&rsquo; in the modern "
+#| "sense of the term &mdash; it was part of an explicit political campaign "
+#| "to make software free. The essence of this campaign was that everybody "
+#| "should be free to do the things we did in the old days at MIT, working "
+#| "together on software and working with whomever wanted to work with us.  "
+#| "That is the basis for the free software movement &mdash; the experience I "
+#| "had, the life that I've lived at the MIT AI lab &mdash; to be working on "
+#| "human knowledge, and not be standing in the way of anybody's further "
+#| "using and further disseminating human knowledge."
 msgid ""
-"This second Emacs program was &lsquo;free software&rsquo; in the modern "
-"sense of the term &mdash; it was part of an explicit political campaign to "
+"This second Emacs program was &ldquo;free software&rdquo; in the modern "
+"sense of the term&mdash;it was part of an explicit political campaign to "
 "make software free. The essence of this campaign was that everybody should "
 "be free to do the things we did in the old days at MIT, working together on "
 "software and working with whomever wanted to work with us.  That is the "
-"basis for the free software movement &mdash; the experience I had, the life "
-"that I've lived at the MIT AI lab &mdash; to be working on human knowledge, "
+"basis for the free software movement&mdash;the experience I had, the life "
+"that I've lived at the MIT AI lab&mdash;to be working on human knowledge, "
 "and not be standing in the way of anybody's further using and further "
 "disseminating human knowledge."
 msgstr ""
@@ -451,7 +775,7 @@
 "человеческим знанием и не стоять ни у кого 
на пути к дальнейшему применению "
 "и дальнейшему распространению 
человеческого знания."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "At the time, you could make a computer that was about the same price range "
 "as other computers that weren't meant for Lisp, except that it would run "
@@ -471,11 +795,30 @@
 "пытались взять <code>car</code> от числа, это 
приводило к бессмысленным "
 "результатам и в конце концов когда-нибудь 
приводило к сбою."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The Lisp machine was able to execute instructions about as fast as those
+# | other machines, but each [-instruction &mdash; a-] {+instruction&mdash;a+}
+# | <code>car</code> instruction would do data [-typechecking &mdash; so-]
+# | {+typechecking&mdash;so+} when you tried to get the <code>car</code> of a
+# | number in a compiled program, it would give you an immediate error. We
+# | built the machine and had a Lisp operating system for it. It was written
+# | almost entirely in Lisp, the only exceptions being parts written in the
+# | microcode. People became interested in manufacturing them, which meant
+# | they should start a company.
+#, fuzzy
+#| msgid ""
+#| "The Lisp machine was able to execute instructions about as fast as those "
+#| "other machines, but each instruction &mdash; a <code>car</code> "
+#| "instruction would do data typechecking &mdash; so when you tried to get "
+#| "the <code>car</code> of a number in a compiled program, it would give you "
+#| "an immediate error. We built the machine and had a Lisp operating system "
+#| "for it. It was written almost entirely in Lisp, the only exceptions being "
+#| "parts written in the microcode. People became interested in manufacturing "
+#| "them, which meant they should start a company."
 msgid ""
 "The Lisp machine was able to execute instructions about as fast as those "
-"other machines, but each instruction &mdash; a <code>car</code> instruction "
-"would do data typechecking &mdash; so when you tried to get the <code>car</"
+"other machines, but each instruction&mdash;a <code>car</code> instruction "
+"would do data typechecking&mdash;so when you tried to get the <code>car</"
 "code> of a number in a compiled program, it would give you an immediate "
 "error. We built the machine and had a Lisp operating system for it. It was "
 "written almost entirely in Lisp, the only exceptions being parts written in "
@@ -491,15 +834,34 @@
 "микрокоде. Возник интерес к производству 
машин, это означало, что нужно "
 "создать компанию."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | There were two different ideas about what this company should be like. 
+# | Greenblatt wanted to start what he called a &ldquo;hacker&rdquo; company.
+# | This meant it would be a company run by hackers and would operate in a way
+# | conducive to hackers. Another goal was to maintain the AI Lab [-culture <a
+# | href=\"#foot-3\">(3)</a>.-] {+culture&#8239;<a class=\"ftn\"
+# | href=\"#foot-3\">[3]</a>.+}  Unfortunately, Greenblatt didn't have any
+# | business experience, so other people in the Lisp machine group said they
+# | doubted whether he could succeed. They thought that his plan to avoid
+# | outside investment wouldn't work.
+#, fuzzy
+#| msgid ""
+#| "There were two different ideas about what this company should be like.  "
+#| "Greenblatt wanted to start what he called a &ldquo;hacker&rdquo; company. "
+#| "This meant it would be a company run by hackers and would operate in a "
+#| "way conducive to hackers. Another goal was to maintain the AI Lab culture "
+#| "<a href=\"#foot-3\">(3)</a>.  Unfortunately, Greenblatt didn't have any "
+#| "business experience, so other people in the Lisp machine group said they "
+#| "doubted whether he could succeed. They thought that his plan to avoid "
+#| "outside investment wouldn't work."
 msgid ""
 "There were two different ideas about what this company should be like.  "
 "Greenblatt wanted to start what he called a &ldquo;hacker&rdquo; company. "
 "This meant it would be a company run by hackers and would operate in a way "
-"conducive to hackers. Another goal was to maintain the AI Lab culture <a "
-"href=\"#foot-3\">(3)</a>.  Unfortunately, Greenblatt didn't have any "
-"business experience, so other people in the Lisp machine group said they "
-"doubted whether he could succeed. They thought that his plan to avoid "
+"conducive to hackers. Another goal was to maintain the AI Lab culture&#8239;"
+"<a class=\"ftn\" href=\"#foot-3\">[3]</a>.  Unfortunately, Greenblatt didn't "
+"have any business experience, so other people in the Lisp machine group said "
+"they doubted whether he could succeed. They thought that his plan to avoid "
 "outside investment wouldn't work."
 msgstr ""
 "Было два разных представления о том, какой 
должна быть эта компания. "
@@ -512,7 +874,7 @@
 "он сможет это сделать. Они думали, что 
избежать внешних капиталовложений, "
 "как он планировал, не удастся."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Why did he want to avoid outside investment? Because when a company has "
 "outside investors, they take control and they don't let you have any "
@@ -524,7 +886,7 @@
 "позволяют вам быть щепетильным; а если вы 
сколько-нибудь щепетильны, то они "
 "в конце концов поставят на руководящую 
должность кого-нибудь другого."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So Greenblatt had the idea that he would find a customer who would pay in "
 "advance to buy the parts. They would build machines and deliver them; with "
@@ -540,7 +902,7 @@
 "комплектующие для большего числа машин и 
так далее. Другие люди из группы "
 "думали, что так работать не получится."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Greenblatt then recruited Russell Noftsker, the man who had hired me, who "
 "had subsequently left the AI Lab and created a successful company.  Russell "
@@ -561,7 +923,7 @@
 "привлекать внешний капитал, не быть 
щепетильными и делать все возможное, "
 "чтобы победить."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "But Greenblatt didn't give up. He and the few people loyal to him decided to "
 "start Lisp Machines Inc. anyway and go ahead with their plans. And what do "
@@ -583,7 +945,7 @@
 "Лиспы. Когда в Symbolics поняли, что LMI и не 
думает вылетать в трубу, они "
 "стали искать способы разрушить ее."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Thus, the abandonment of our lab was followed by &ldquo;war&rdquo; in our "
 "lab.  The abandonment happened when Symbolics hired away all the hackers, "
@@ -611,13 +973,26 @@
 "которые лицензировали обе компании. Никто 
не предвидел, что группу хакеров "
 "Лаборатории искусственного интеллекта 
разгонят, но так и случилось."
 
-#. type: Content of: <p>
-msgid ""
-"So Symbolics came up with a plan <a href=\"#foot-4\">(4)</a>.  They said to "
-"the lab, &ldquo;We will continue making our changes to the system available "
-"for you to use, but you can't put it into the MIT Lisp machine system. "
-"Instead, we'll give you access to Symbolics' Lisp machine system, and you "
-"can run it, but that's all you can do.&rdquo;"
+#. type: Content of: <div><p>
+# | So Symbolics came up with a [-plan <a href=\"#foot-4\">(4)</a>.-]
+# | {+plan&#8239;<a href=\"#foot-4\">[4]</a>.+}  They said to the lab,
+# | &ldquo;We will continue making our changes to the system available for you
+# | to use, but you can't put it into the MIT Lisp machine system. Instead,
+# | we'll give you access to Symbolics' Lisp machine system, and you can run
+# | it, but that's all you can do.&rdquo;
+#, fuzzy
+#| msgid ""
+#| "So Symbolics came up with a plan <a href=\"#foot-4\">(4)</a>.  They said "
+#| "to the lab, &ldquo;We will continue making our changes to the system "
+#| "available for you to use, but you can't put it into the MIT Lisp machine "
+#| "system. Instead, we'll give you access to Symbolics' Lisp machine system, "
+#| "and you can run it, but that's all you can do.&rdquo;"
+msgid ""
+"So Symbolics came up with a plan&#8239;<a href=\"#foot-4\">[4]</a>.  They "
+"said to the lab, &ldquo;We will continue making our changes to the system "
+"available for you to use, but you can't put it into the MIT Lisp machine "
+"system. Instead, we'll give you access to Symbolics' Lisp machine system, "
+"and you can run it, but that's all you can do.&rdquo;"
 msgstr ""
 "Итак, в Symbolics созрел план&nbsp;<a 
href=\"#foot-4\">(4)</a>. Они сказали "
 "лаборатории: &ldquo;Мы продолжим 
предоставлять в ваше пользование свои "
@@ -625,7 +1000,7 @@
 "института. Вместо этого мы предоставим 
вам доступ к системе машины-Лиспа "
 "Symbolics, и вы сможете работать на ней, но это 
все, что вы можете делать."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This, in effect, meant that they demanded that we had to choose a side, and "
 "use either the MIT version of the system or the Symbolics version.  "
@@ -646,12 +1021,28 @@
 "стороны это было бы поддержкой LMI, потому 
что мы помогали бы им продолжать "
 "существование. Так что нам не позволили 
оставаться нейтральными."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Up until that point, I hadn't taken the side of either company, although
+# | it made me miserable to see what had happened to our community and the
+# | software.  But now, Symbolics had forced the issue.  So, in an effort to
+# | help keep Lisp Machines Inc. [-going <a href=\"#foot-5\">(5)</a> &mdash;
+# | I-] {+going&#8239;<a href=\"#foot-5\">[5]</a>&mdash;I+} began duplicating
+# | all of the improvements Symbolics had made to the Lisp machine system.  I
+# | wrote the equivalent improvements again myself (i.e., the code was my own).
+#, fuzzy
+#| msgid ""
+#| "Up until that point, I hadn't taken the side of either company, although "
+#| "it made me miserable to see what had happened to our community and the "
+#| "software.  But now, Symbolics had forced the issue.  So, in an effort to "
+#| "help keep Lisp Machines Inc. going <a href=\"#foot-5\">(5)</a> &mdash; I "
+#| "began duplicating all of the improvements Symbolics had made to the Lisp "
+#| "machine system.  I wrote the equivalent improvements again myself (i.e., "
+#| "the code was my own)."
 msgid ""
 "Up until that point, I hadn't taken the side of either company, although it "
 "made me miserable to see what had happened to our community and the "
 "software.  But now, Symbolics had forced the issue.  So, in an effort to "
-"help keep Lisp Machines Inc. going <a href=\"#foot-5\">(5)</a> &mdash; I "
+"help keep Lisp Machines Inc. going&#8239;<a href=\"#foot-5\">[5]</a>&mdash;I "
 "began duplicating all of the improvements Symbolics had made to the Lisp "
 "machine system.  I wrote the equivalent improvements again myself (i.e., the "
 "code was my own)."
@@ -664,12 +1055,24 @@
 "делали в Symbolics. Я писал эквивалентные 
улучшения сам (т.е. тексты "
 "программ были моими собственными)."
 
-#. type: Content of: <p>
-msgid ""
-"After a while <a href=\"#foot-6\">(6)</a>, I came to the conclusion that it "
-"would be best if I didn't even look at their code. When they made a beta "
-"announcement that gave the release notes, I would see what the features were "
-"and then implement them. By the time they had a real release, I did too."
+#. type: Content of: <div><p>
+# | After a [-while <a href=\"#foot-6\">(6)</a>,-] {+while&#8239;<a
+# | href=\"#foot-6\">[6]</a>,+} I came to the conclusion that it would be best
+# | if I didn't even look at their code. When they made a beta announcement
+# | that gave the release notes, I would see what the features were and then
+# | implement them. By the time they had a real release, I did too.
+#, fuzzy
+#| msgid ""
+#| "After a while <a href=\"#foot-6\">(6)</a>, I came to the conclusion that "
+#| "it would be best if I didn't even look at their code. When they made a "
+#| "beta announcement that gave the release notes, I would see what the "
+#| "features were and then implement them. By the time they had a real "
+#| "release, I did too."
+msgid ""
+"After a while&#8239;<a href=\"#foot-6\">[6]</a>, I came to the conclusion "
+"that it would be best if I didn't even look at their code. When they made a "
+"beta announcement that gave the release notes, I would see what the features "
+"were and then implement them. By the time they had a real release, I did too."
 msgstr ""
 "Через некоторое время&nbsp;<a href=\"#foot-6\">(6)</a> я 
пришел к "
 "заключению, что было бы лучше всего, если 
бы я даже не заглядывал в их "
@@ -678,15 +1081,33 @@
 "реализовывал их. К тому времени, как они 
выпускали окончательную версию, я "
 "тоже выпускал такую версию."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | In this way, for two years, I prevented them from wiping out Lisp Machines
+# | Incorporated, and the two companies went on. But, I didn't want to spend
+# | years and years punishing someone, just thwarting an evil deed. I figured
+# | they had been punished pretty thoroughly because they were stuck with
+# | competition that was not leaving or going to [-disappear <a
+# | href=\"#foot-7\">(7)</a>.-] {+disappear&#8239;<a
+# | href=\"#foot-7\">[7]</a>.+}  Meanwhile, it was time to start building a
+# | new community to replace the one that their actions and others had wiped
+# | out.
+#, fuzzy
+#| msgid ""
+#| "In this way, for two years, I prevented them from wiping out Lisp "
+#| "Machines Incorporated, and the two companies went on. But, I didn't want "
+#| "to spend years and years punishing someone, just thwarting an evil deed. "
+#| "I figured they had been punished pretty thoroughly because they were "
+#| "stuck with competition that was not leaving or going to disappear <a href="
+#| "\"#foot-7\">(7)</a>. Meanwhile, it was time to start building a new "
+#| "community to replace the one that their actions and others had wiped out."
 msgid ""
 "In this way, for two years, I prevented them from wiping out Lisp Machines "
 "Incorporated, and the two companies went on. But, I didn't want to spend "
 "years and years punishing someone, just thwarting an evil deed. I figured "
 "they had been punished pretty thoroughly because they were stuck with "
-"competition that was not leaving or going to disappear <a href=\"#foot-7\">"
-"(7)</a>. Meanwhile, it was time to start building a new community to replace "
-"the one that their actions and others had wiped out."
+"competition that was not leaving or going to disappear&#8239;<a href="
+"\"#foot-7\">[7]</a>.  Meanwhile, it was time to start building a new "
+"community to replace the one that their actions and others had wiped out."
 msgstr ""
 "Таким образом в течение двух лет я не 
давал им покончить с LMI, и эти две "
 "компании продолжали работу. Но я не хотел 
тратить долгие годы на то, чтобы "
@@ -696,7 +1117,7 @@
 "временем пришла пора начать обустройство 
нового сообщества взамен того, "
 "которое было уничтожено их действиями и 
действиями других."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The Lisp community in the 70s was not limited to the MIT AI Lab, and the "
 "hackers were not all at MIT. The war that Symbolics started was what wiped "
@@ -711,18 +1132,54 @@
 "другие события. Были люди, которые 
прекращали сотрудничество, и все это "
 "вместе опустошило наше сообщество, и от 
него почти ничего не осталось."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Once I stopped punishing Symbolics, I had to figure out what to do next. I
+# | had to make a free operating system, that was [-clear &mdash; the-]
+# | {+clear&mdash;the+} only way that people could work together and share was
+# | with a free operating system.
+#, fuzzy
+#| msgid ""
+#| "Once I stopped punishing Symbolics, I had to figure out what to do next. "
+#| "I had to make a free operating system, that was clear &mdash; the only "
+#| "way that people could work together and share was with a free operating "
+#| "system."
 msgid ""
 "Once I stopped punishing Symbolics, I had to figure out what to do next. I "
-"had to make a free operating system, that was clear &mdash; the only way "
-"that people could work together and share was with a free operating system."
+"had to make a free operating system, that was clear&mdash;the only way that "
+"people could work together and share was with a free operating system."
 msgstr ""
 "Когда я прекратил наказывать Symbolics, мне 
пришлось придумывать, что делать "
 "дальше. Мне нужно было сделать свободную 
операционную систему, это было "
 "ясно&nbsp;&mdash; единственным способом дать 
людям совместно работать и "
 "обмениваться была свободная операционная 
система."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | At first, I thought of making a Lisp-based system, but I realized that
+# | wouldn't be a good idea technically. To have something like the Lisp
+# | machine system, you needed special purpose microcode. That's what made it
+# | possible to run programs as fast as other computers would run their
+# | programs and still get the benefit of typechecking. Without that, you
+# | would be reduced to something like the Lisp compilers for other machines.
+# | The programs would be faster, but unstable. Now that's okay if you're
+# | running one program on a timesharing [-system &mdash; if-]
+# | {+system&mdash;if+} one program crashes, that's not a disaster, that's
+# | something your program occasionally does. But that didn't make it good for
+# | writing the operating system in, so I rejected the idea of making a system
+# | like the Lisp machine.
+#, fuzzy
+#| msgid ""
+#| "At first, I thought of making a Lisp-based system, but I realized that "
+#| "wouldn't be a good idea technically. To have something like the Lisp "
+#| "machine system, you needed special purpose microcode. That's what made it "
+#| "possible to run programs as fast as other computers would run their "
+#| "programs and still get the benefit of typechecking. Without that, you "
+#| "would be reduced to something like the Lisp compilers for other machines. "
+#| "The programs would be faster, but unstable. Now that's okay if you're "
+#| "running one program on a timesharing system &mdash; if one program "
+#| "crashes, that's not a disaster, that's something your program "
+#| "occasionally does. But that didn't make it good for writing the operating "
+#| "system in, so I rejected the idea of making a system like the Lisp "
+#| "machine."
 msgid ""
 "At first, I thought of making a Lisp-based system, but I realized that "
 "wouldn't be a good idea technically. To have something like the Lisp machine "
@@ -731,7 +1188,7 @@
 "still get the benefit of typechecking. Without that, you would be reduced to "
 "something like the Lisp compilers for other machines. The programs would be "
 "faster, but unstable. Now that's okay if you're running one program on a "
-"timesharing system &mdash; if one program crashes, that's not a disaster, "
+"timesharing system&mdash;if one program crashes, that's not a disaster, "
 "that's something your program occasionally does. But that didn't make it "
 "good for writing the operating system in, so I rejected the idea of making a "
 "system like the Lisp machine."
@@ -749,7 +1206,7 @@
 "недостаточно хорошей, чтобы писать на ней 
операционную систему, так что я "
 "отказался от мысли о том, чтобы сделать 
систему наподобие машины-Лиспа."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I decided instead to make a Unix-like operating system that would have Lisp "
 "implementations to run as user programs. The kernel wouldn't be written in "
@@ -766,7 +1223,7 @@
 "минимально возможную реализацию Лиспа. Р
азмер программ имел чрезвычайное "
 "значение."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There were people in those days, in 1985, who had one-megabyte machines "
 "without virtual memory. They wanted to be able to use GNU Emacs. This meant "
@@ -777,15 +1234,34 @@
 "Emacs. Это значило, что мне нужно 
ограничивать программу как можно меньшим "
 "размером."
 
-#. type: Content of: <p>
-msgid ""
-"For instance, at the time the only looping construct was &lsquo;"
-"while&rsquo;, which was extremely simple. There was no way to break out of "
-"the &lsquo;while&rsquo; statement, you just had to do a catch and a throw, "
-"or test a variable that ran the loop. That shows how far I was pushing to "
-"keep things small. We didn't have &lsquo;caar&rsquo; and &lsquo;cadr&rsquo; "
-"and so on; &ldquo;squeeze out everything possible&rdquo; was the spirit of "
-"GNU Emacs, the spirit of Emacs Lisp, from the beginning."
+#. type: Content of: <div><p>
+# | For instance, at the time the only looping construct was
+# | [-&lsquo;while&rsquo;,-] {+<code>while</code>,+} which was extremely
+# | simple. There was no way to break out of the [-&lsquo;while&rsquo;-]
+# | {+<code>while</code>+} statement, you just had to do a catch and a throw,
+# | or test a variable that ran the loop. That shows how far I was pushing to
+# | keep things small. We didn't have [-&lsquo;caar&rsquo;-]
+# | {+<code>caar</code>+} and [-&lsquo;cadr&rsquo;-] {+<code>cadr</code>+} and
+# | so on; &ldquo;squeeze out everything possible&rdquo; was the spirit of GNU
+# | Emacs, the spirit of Emacs Lisp, from the beginning.
+#, fuzzy
+#| msgid ""
+#| "For instance, at the time the only looping construct was &lsquo;"
+#| "while&rsquo;, which was extremely simple. There was no way to break out "
+#| "of the &lsquo;while&rsquo; statement, you just had to do a catch and a "
+#| "throw, or test a variable that ran the loop. That shows how far I was "
+#| "pushing to keep things small. We didn't have &lsquo;caar&rsquo; and "
+#| "&lsquo;cadr&rsquo; and so on; &ldquo;squeeze out everything "
+#| "possible&rdquo; was the spirit of GNU Emacs, the spirit of Emacs Lisp, "
+#| "from the beginning."
+msgid ""
+"For instance, at the time the only looping construct was <code>while</code>, "
+"which was extremely simple. There was no way to break out of the "
+"<code>while</code> statement, you just had to do a catch and a throw, or "
+"test a variable that ran the loop. That shows how far I was pushing to keep "
+"things small. We didn't have <code>caar</code> and <code>cadr</code> and so "
+"on; &ldquo;squeeze out everything possible&rdquo; was the spirit of GNU "
+"Emacs, the spirit of Emacs Lisp, from the beginning."
 msgstr ""
 "Например, в то время единственной 
циклической конструкцией была &ldquo;"
 "while&rdquo;, которая была крайне проста. Не 
было никаких способов "
@@ -796,15 +1272,35 @@
 "возможное&rdquo;&nbsp;&mdash; таким духом был 
пропитан GNU Emacs и его Лисп "
 "с самого начала."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Obviously, machines are bigger now, and we don't do it that way any more.
+# | We put in [-&lsquo;caar&rsquo;-] {+<code>caar</code>+} and
+# | [-&lsquo;cadr&rsquo;-] {+<code>cadr</code>+} and so on, and we might put
+# | in another looping construct one of these days. We're willing to extend it
+# | some now, but we don't want to extend it to the level of common Lisp. I
+# | implemented Common Lisp once on the Lisp machine, and I'm not all that
+# | happy with it. One thing I don't like terribly much is keyword [-arguments
+# | <a href=\"#foot-8\">(8)</a>.-] {+arguments&#8239;<a
+# | href=\"#foot-8\">[8]</a>.+}  They don't seem quite Lispy to me; I'll do it
+# | sometimes but I minimize the times when I do that.
+#, fuzzy
+#| msgid ""
+#| "Obviously, machines are bigger now, and we don't do it that way any more. "
+#| "We put in &lsquo;caar&rsquo; and &lsquo;cadr&rsquo; and so on, and we "
+#| "might put in another looping construct one of these days. We're willing "
+#| "to extend it some now, but we don't want to extend it to the level of "
+#| "common Lisp. I implemented Common Lisp once on the Lisp machine, and I'm "
+#| "not all that happy with it. One thing I don't like terribly much is "
+#| "keyword arguments <a href=\"#foot-8\">(8)</a>.  They don't seem quite "
+#| "Lispy to me; I'll do it sometimes but I minimize the times when I do that."
 msgid ""
 "Obviously, machines are bigger now, and we don't do it that way any more. We "
-"put in &lsquo;caar&rsquo; and &lsquo;cadr&rsquo; and so on, and we might put "
+"put in <code>caar</code> and <code>cadr</code> and so on, and we might put "
 "in another looping construct one of these days. We're willing to extend it "
 "some now, but we don't want to extend it to the level of common Lisp. I "
 "implemented Common Lisp once on the Lisp machine, and I'm not all that happy "
-"with it. One thing I don't like terribly much is keyword arguments <a href="
-"\"#foot-8\">(8)</a>.  They don't seem quite Lispy to me; I'll do it "
+"with it. One thing I don't like terribly much is keyword arguments&#8239;<a "
+"href=\"#foot-8\">[8]</a>.  They don't seem quite Lispy to me; I'll do it "
 "sometimes but I minimize the times when I do that."
 msgstr ""
 "Разумеется, машины сейчас больше, и мы уже 
так не делаем. Мы заложили &ldquo;"
@@ -817,7 +1313,7 @@
 "совсем по-лисповски; иногда я пишу так, но 
я свожу к минимуму число случаев, "
 "когда я это делаю."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "That was not the end of the GNU projects involved with Lisp. Later on around "
 "1995, we were looking into starting a graphical desktop project. It was "
@@ -832,7 +1328,7 @@
 "сделать ее легко расширяемой, как 
редактор. Встал вопрос о том, каким должен "
 "быть язык."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "At the time, <abbr title=\"Tool Command Language\">TCL</abbr> was being "
 "pushed heavily for this purpose. I had a very low opinion of TCL, basically "
@@ -860,7 +1356,7 @@
 "Тогда мы стали бы рекомендовать это как 
предпочтительный пакет расширений "
 "для всех программ GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There's an interesting benefit you can get from using such a powerful "
 "language as a version of Lisp as your primary extensibility language.  You "
@@ -886,18 +1382,50 @@
 "надстраивать его под свой любимый язык, и 
оно работало бы и с другими "
 "надстройками."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | As long as the extensibility languages are weak, the users have to use
+# | only the language you provided them. Which means that people who love any
+# | given language have to compete for the choice of the developers of
+# | [-applications &mdash; saying-] {+applications&mdash;saying+}
+# | &ldquo;Please, application developer, put my language into your
+# | application, not his language.&rdquo; Then the users get no choices at
+# | [-all &mdash; whichever-] {+all&mdash;whichever+} application they're
+# | using comes with one language and they're stuck with [that language]. But
+# | when you have a powerful language that can implement others by translating
+# | into it, then you give the user a choice of language and we don't have to
+# | have a language war anymore. That's what we're hoping
+# | [-&lsquo;Guile&rsquo;,-] {+Guile,+} our scheme interpreter, will do. We
+# | had a person working last summer finishing up a translator from Python to
+# | Scheme. I don't know if it's entirely finished yet, but for anyone
+# | interested in this project, please get in touch. So that's the plan we
+# | have for the future.
+#, fuzzy
+#| msgid ""
+#| "As long as the extensibility languages are weak, the users have to use "
+#| "only the language you provided them. Which means that people who love any "
+#| "given language have to compete for the choice of the developers of "
+#| "applications &mdash; saying &ldquo;Please, application developer, put my "
+#| "language into your application, not his language.&rdquo; Then the users "
+#| "get no choices at all &mdash; whichever application they're using comes "
+#| "with one language and they're stuck with [that language]. But when you "
+#| "have a powerful language that can implement others by translating into "
+#| "it, then you give the user a choice of language and we don't have to have "
+#| "a language war anymore. That's what we're hoping &lsquo;Guile&rsquo;, our "
+#| "scheme interpreter, will do. We had a person working last summer "
+#| "finishing up a translator from Python to Scheme. I don't know if it's "
+#| "entirely finished yet, but for anyone interested in this project, please "
+#| "get in touch. So that's the plan we have for the future."
 msgid ""
 "As long as the extensibility languages are weak, the users have to use only "
 "the language you provided them. Which means that people who love any given "
-"language have to compete for the choice of the developers of applications "
-"&mdash; saying &ldquo;Please, application developer, put my language into "
-"your application, not his language.&rdquo; Then the users get no choices at "
-"all &mdash; whichever application they're using comes with one language and "
-"they're stuck with [that language]. But when you have a powerful language "
-"that can implement others by translating into it, then you give the user a "
-"choice of language and we don't have to have a language war anymore. That's "
-"what we're hoping &lsquo;Guile&rsquo;, our scheme interpreter, will do. We "
+"language have to compete for the choice of the developers of "
+"applications&mdash;saying &ldquo;Please, application developer, put my "
+"language into your application, not his language.&rdquo; Then the users get "
+"no choices at all&mdash;whichever application they're using comes with one "
+"language and they're stuck with [that language]. But when you have a "
+"powerful language that can implement others by translating into it, then you "
+"give the user a choice of language and we don't have to have a language war "
+"anymore. That's what we're hoping Guile, our scheme interpreter, will do. We "
 "had a person working last summer finishing up a translator from Python to "
 "Scheme. I don't know if it's entirely finished yet, but for anyone "
 "interested in this project, please get in touch. So that's the plan we have "
@@ -918,7 +1446,27 @@
 "завершен, но если кто-то заинтересован в 
этом проекте, пусть свяжется. Так "
 "что вот какие у нас планы на будущее."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | I haven't been speaking about free software, but let me briefly tell you a
+# | little bit about what that means. Free software does not refer to price;
+# | it doesn't mean that you get it for free. (You may have paid for a copy,
+# | or gotten a copy gratis.) It means that you have freedom as a user. The
+# | crucial thing is that you are free to run the program, free to study what
+# | it does, free to change it to suit your needs, free to redistribute the
+# | copies of others and free to publish improved, extended versions. This is
+# | what free software means. If you are using a non[---]free program, you
+# | have lost crucial freedom, so don't ever do that.
+#, fuzzy
+#| msgid ""
+#| "I haven't been speaking about free software, but let me briefly tell you "
+#| "a little bit about what that means. Free software does not refer to "
+#| "price; it doesn't mean that you get it for free. (You may have paid for a "
+#| "copy, or gotten a copy gratis.) It means that you have freedom as a user. "
+#| "The crucial thing is that you are free to run the program, free to study "
+#| "what it does, free to change it to suit your needs, free to redistribute "
+#| "the copies of others and free to publish improved, extended versions. "
+#| "This is what free software means. If you are using a non-free program, "
+#| "you have lost crucial freedom, so don't ever do that."
 msgid ""
 "I haven't been speaking about free software, but let me briefly tell you a "
 "little bit about what that means. Free software does not refer to price; it "
@@ -927,7 +1475,7 @@
 "thing is that you are free to run the program, free to study what it does, "
 "free to change it to suit your needs, free to redistribute the copies of "
 "others and free to publish improved, extended versions. This is what free "
-"software means. If you are using a non-free program, you have lost crucial "
+"software means. If you are using a nonfree program, you have lost crucial "
 "freedom, so don't ever do that."
 msgstr ""
 "Я не говорил о свободном программном 
обеспечении, но позвольте мне кратко "
@@ -941,12 +1489,30 @@
 "что значит свободная программа. Если вы 
пользуетесь несвободной программой, "
 "вы утратили жизненно важную свободу, так 
что никогда этого не делайте."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The purpose of the GNU project is to make it easier for people to reject
+# | freedom-trampling, user-dominating, non[---]free software by providing
+# | free software to replace it. For those who don't have the moral courage to
+# | reject the non[---]free software, when that means some practical
+# | inconvenience, what we try to do is give a free alternative so that you
+# | can move to freedom with less of a mess and less of a sacrifice in
+# | practical terms. The less sacrifice the better. We want to make it easier
+# | for you to live in freedom, to cooperate.
+#, fuzzy
+#| msgid ""
+#| "The purpose of the GNU project is to make it easier for people to reject "
+#| "freedom-trampling, user-dominating, non-free software by providing free "
+#| "software to replace it. For those who don't have the moral courage to "
+#| "reject the non-free software, when that means some practical "
+#| "inconvenience, what we try to do is give a free alternative so that you "
+#| "can move to freedom with less of a mess and less of a sacrifice in "
+#| "practical terms. The less sacrifice the better. We want to make it easier "
+#| "for you to live in freedom, to cooperate."
 msgid ""
 "The purpose of the GNU project is to make it easier for people to reject "
-"freedom-trampling, user-dominating, non-free software by providing free "
+"freedom-trampling, user-dominating, nonfree software by providing free "
 "software to replace it. For those who don't have the moral courage to reject "
-"the non-free software, when that means some practical inconvenience, what we "
+"the nonfree software, when that means some practical inconvenience, what we "
 "try to do is give a free alternative so that you can move to freedom with "
 "less of a mess and less of a sacrifice in practical terms. The less "
 "sacrifice the better. We want to make it easier for you to live in freedom, "
@@ -961,16 +1527,34 @@
 "меньшими жертвами в практическом смысле. 
Чем меньше жертвы, тем лучше. Мы "
 "хотим облегчить для вас сотрудничество и 
свободную жизнь."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | This is a matter of the freedom to cooperate. We're used to thinking of
+# | freedom and cooperation with society as if they are opposites. But here
+# | they're on the same side. With free software you are free to cooperate
+# | with other people as well as free to help yourself. With non[---]free
+# | software, somebody is dominating you and keeping people divided. You're
+# | not allowed to share with them, you're not free to cooperate or help
+# | society, anymore than you're free to help yourself.  Divided and helpless
+# | is the state of users using non[---]free software.
+#, fuzzy
+#| msgid ""
+#| "This is a matter of the freedom to cooperate. We're used to thinking of "
+#| "freedom and cooperation with society as if they are opposites. But here "
+#| "they're on the same side. With free software you are free to cooperate "
+#| "with other people as well as free to help yourself. With non-free "
+#| "software, somebody is dominating you and keeping people divided. You're "
+#| "not allowed to share with them, you're not free to cooperate or help "
+#| "society, anymore than you're free to help yourself.  Divided and helpless "
+#| "is the state of users using non-free software."
 msgid ""
 "This is a matter of the freedom to cooperate. We're used to thinking of "
 "freedom and cooperation with society as if they are opposites. But here "
 "they're on the same side. With free software you are free to cooperate with "
-"other people as well as free to help yourself. With non-free software, "
+"other people as well as free to help yourself. With nonfree software, "
 "somebody is dominating you and keeping people divided. You're not allowed to "
 "share with them, you're not free to cooperate or help society, anymore than "
 "you're free to help yourself.  Divided and helpless is the state of users "
-"using non-free software."
+"using nonfree software."
 msgstr ""
 "Сотрудничество&nbsp;&mdash; это вопрос свободы. 
Мы привыкли думать о свободе "
 "и сотрудничестве с обществом как о 
противоположностях. Но в данном случае "
@@ -981,21 +1565,53 @@
 "помочь самим себе. Разобщенность и 
беспомощность&nbsp;&mdash; состояние "
 "пользователей, применяющих несвободные 
программы."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | We've produced a tremendous range of free software. We've done what people
+# | said we could never do; we have two operating systems of free software. We
+# | have many applications and we obviously have a lot farther to go. So we
+# | need your help. I would like to ask you to volunteer for the GNU project;
+# | help us develop free software for more jobs. Take a look at <a
+# | [-href=\"/help/\">http://www.gnu.org/help</a>-]
+# | {+href=\"/help/help.html\">gnu.org/help</a>+} to find suggestions for how
+# | to help. If you want to order things, there's a link to that from the home
+# | page. If you want to read about philosophical issues, look in /philosophy.
+# | If you're looking for free software to use, look in /directory, which
+# | lists about 1900 packages now (which is a fraction of all the free
+# | software out there). Please write more and contribute to us. My book of
+# | essays, &ldquo;Free Software and Free [-Society&rdquo;,-]
+# | {+Society,&rdquo;+} is on sale and can be purchased at [-<a
+# | href=\"http://www.gnu.org/\";>www.gnu.org</a>.-] {+www.gnu.org&#8239;<a
+# | href=\"#foot-9\">[9]</a>.+}  Happy hacking!
+#, fuzzy
+#| msgid ""
+#| "We've produced a tremendous range of free software. We've done what "
+#| "people said we could never do; we have two operating systems of free "
+#| "software. We have many applications and we obviously have a lot farther "
+#| "to go. So we need your help. I would like to ask you to volunteer for the "
+#| "GNU project; help us develop free software for more jobs. Take a look at "
+#| "<a href=\"/help/\">http://www.gnu.org/help</a> to find suggestions for "
+#| "how to help. If you want to order things, there's a link to that from the "
+#| "home page. If you want to read about philosophical issues, look in /"
+#| "philosophy. If you're looking for free software to use, look in /"
+#| "directory, which lists about 1900 packages now (which is a fraction of "
+#| "all the free software out there). Please write more and contribute to us. "
+#| "My book of essays, &ldquo;Free Software and Free Society&rdquo;, is on "
+#| "sale and can be purchased at <a href=\"http://www.gnu.org/\";>www.gnu.org</"
+#| "a>. Happy hacking!"
 msgid ""
 "We've produced a tremendous range of free software. We've done what people "
 "said we could never do; we have two operating systems of free software. We "
 "have many applications and we obviously have a lot farther to go. So we need "
 "your help. I would like to ask you to volunteer for the GNU project; help us "
-"develop free software for more jobs. Take a look at <a href=\"/help/"
-"\">http://www.gnu.org/help</a> to find suggestions for how to help. If you "
-"want to order things, there's a link to that from the home page. If you want "
-"to read about philosophical issues, look in /philosophy. If you're looking "
-"for free software to use, look in /directory, which lists about 1900 "
-"packages now (which is a fraction of all the free software out there). "
-"Please write more and contribute to us. My book of essays, &ldquo;Free "
-"Software and Free Society&rdquo;, is on sale and can be purchased at <a href="
-"\"http://www.gnu.org/\";>www.gnu.org</a>. Happy hacking!"
+"develop free software for more jobs. Take a look at <a href=\"/help/help.html"
+"\">gnu.org/help</a> to find suggestions for how to help. If you want to "
+"order things, there's a link to that from the home page. If you want to read "
+"about philosophical issues, look in /philosophy. If you're looking for free "
+"software to use, look in /directory, which lists about 1900 packages now "
+"(which is a fraction of all the free software out there). Please write more "
+"and contribute to us. My book of essays, &ldquo;Free Software and Free "
+"Society,&rdquo; is on sale and can be purchased at www.gnu.org&#8239;<a href="
+"\"#foot-9\">[9]</a>.  Happy hacking!"
 msgstr ""
 "Мы выработали умопомрачительное 
количество свободных программ. Мы сделали "
 "то, что, как утверждалось, мы никогда не 
сможем сделать; у нас есть две "
@@ -1013,7 +1629,12 @@
 "находится в продаже, и его можно 
приобрести на <a href=\"http://www.gnu.org/";
 "\">www.gnu.org</a>. Всего доброго!"
 
-#. type: Content of: <ol><li>
+# type: Content of: <h4>
+#. type: Content of: <div><h3>
+msgid "Footnotes"
+msgstr "Примечания"
+
+#. type: Content of: <div><ol><li>
 msgid ""
 "Guy Steele designed the original symmetrical Emacs command set; then he and "
 "I began implementing Emacs (on top of TECO), but after one long joint "
@@ -1027,7 +1648,7 @@
 "я. Другие, в частности, Юджин Чиччарелли и 
Майк Мак-Магон, внесли свой вклад "
 "значительно позднее."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Bernie Greenberg says that Dan Weinreb's implementation of Emacs for the "
 "Lisp Machine came before Greenberg's implementation for Multics.  I "
@@ -1037,7 +1658,7 @@
 "Лиспа вышла раньше реализации Гринберга 
для Multics. Я приношу извинения за "
 "эту ошибку."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Greenblatt's plan, as I understood it, was to hire lab people part time, so "
 "that they could continue working at the AI Lab.  Symbolics hired them full "
@@ -1048,13 +1669,26 @@
 "Лаборатории искусственного интеллекта. 
Symbolics вместо этого нанимала их на "
 "полный рабочий день, так что они 
прекращали работать в институте."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+# | The background of this plan, which I did not state explicitly in the talk,
+# | is that during an initial period the ex-AI-Lab hackers, whether at
+# | Symbolics or LMI, continued contributing their changes to the MIT Lisp
+# | Machine [-system &mdash; even-] {+system&mdash;even+} though the contract
+# | did not require this.  Symbolics' plan was to rupture this cooperation
+# | unilaterally.
+#, fuzzy
+#| msgid ""
+#| "The background of this plan, which I did not state explicitly in the "
+#| "talk, is that during an initial period the ex-AI-Lab hackers, whether at "
+#| "Symbolics or LMI, continued contributing their changes to the MIT Lisp "
+#| "Machine system &mdash; even though the contract did not require this.  "
+#| "Symbolics' plan was to rupture this cooperation unilaterally."
 msgid ""
 "The background of this plan, which I did not state explicitly in the talk, "
 "is that during an initial period the ex-AI-Lab hackers, whether at Symbolics "
-"or LMI, continued contributing their changes to the MIT Lisp Machine system "
-"&mdash; even though the contract did not require this.  Symbolics' plan was "
-"to rupture this cooperation unilaterally."
+"or LMI, continued contributing their changes to the MIT Lisp Machine "
+"system&mdash;even though the contract did not require this.  Symbolics' plan "
+"was to rupture this cooperation unilaterally."
 msgstr ""
 "Этот план основывался на том (в той речи я 
этого не сказал явно), что в "
 "начальный период бывшие хакеры 
Лаборатории искусственного интеллекта, 
как в "
@@ -1063,7 +1697,7 @@
 "Symbolics заключался в том, чтобы прервать это 
сотрудничество в "
 "одностороннем порядке."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "It was not that I cared particularly about the fate of LMI, but rather I did "
 "not want to let Symbolics gain through its aggression against the AI Lab."
@@ -1072,7 +1706,7 @@
 "позволить Symbolics нажиться на своей 
агрессии по отношению к Лаборатории "
 "искусственного интеллекта."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "This statement has been misconstrued as saying that I never, ever looked at "
 "Symbolics' code.  Actually it says I did look, at first.  The Symbolics "
@@ -1084,7 +1718,7 @@
 "это делал, поначалу. Исходный текст Symbolics 
был доступен в институте, где "
 "я был вправе его читать, и сначала именно 
так я узнавал об их изменениях."
 
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
 msgid ""
 "But that meant I had to make a special effort to solve each problem "
 "differently, in order to avoid copying Symbolics code.  After a while, I "
@@ -1097,7 +1731,7 @@
 "писать программы каким угодно наилучшим 
образом, не оглядываясь на то, что "
 "могло быть в текстах Symbolics."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Symbolics at one point protested to MIT that my work, by thwarting their "
 "plan, had cost Symbolics a million dollars."
@@ -1105,7 +1739,7 @@
 "Symbolics как-то раз выразила в институте 
протест, в котором говорилось, что "
 "моя работа, помешав их плану, стоила 
компании Symbolics миллион долларов."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "I don't mind if a very complex and heavyweight function takes keyword "
 "arguments.  What bothers me is making simple basic functions such as &ldquo;"
@@ -1115,6 +1749,28 @@
 "кодовые слова. Беспокоит меня случай, 
когда ими пользуются такие простые "
 "функции, как &ldquo;member&rdquo;."
 
+#. type: Content of: <div><ol><li>
+# | [-This essay is published in-]{+In 2021, this book can be purchased from+}
+# | <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>.-]
+# | 
{+href=\"https://shop.fsf.org/books-docs/free-software-free-society-selected-essays-richard-m-stallman-3rd-edition\";>
+# | GNU Press</a>.+}
+#, 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 ""
+"In 2021, this book can be purchased from <a href=\"https://shop.fsf.org/";
+"books-docs/free-software-free-society-selected-essays-richard-m-stallman-3rd-"
+"edition\"> GNU Press</a>."
+msgstr ""
+"Этот очерк публикуется в сборнике <a 
href=\"https://shop.fsf.org/product/";
+"free-software-free-society/\"><cite>Свободные программы, 
свободное общество: "
+"избранные очерки Ричарда М. 
Столмена</cite></a>."
+
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
@@ -1150,14 +1806,20 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Мы старались сделать этот перевод точным 
и качественным, но исключить "
@@ -1169,8 +1831,13 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2003, 2007, 2013, 2014, 2020 Free Software Foundation, Inc."
+# | Copyright &copy; 2003, 2007, 2013, [-2014, 2020-] {+2021+} Free Software
+# | Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2003, 2007, 2013, 2014, 2020 Free Software Foundation, "
+#| "Inc."
+msgid "Copyright &copy; 2003, 2007, 2013, 2021 Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 2003, 2007, 2013, 2014, 2020 Free Software Foundation, Inc."
 
@@ -1201,10 +1868,9 @@
 msgstr "Обновлено:"
 
 # type: Content of: <div><p>
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2003, 2007, 2013, 2014, 2020, 2021 Free Software "
-"Foundation, Inc."
-msgstr ""
-"Copyright &copy; 2003, 2007, 2013, 2014, 2020, 2021 Free Software "
-"Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 2003, 2007, 2013, 2014, 2020, 2021 Free Software "
+#~ "Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2003, 2007, 2013, 2014, 2020, 2021 Free Software "
+#~ "Foundation, Inc."

Index: po/rms-lisp.sq.po
===================================================================
RCS file: /web/www/www/gnu/po/rms-lisp.sq.po,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- po/rms-lisp.sq.po   2 Oct 2020 10:30:07 -0000       1.48
+++ po/rms-lisp.sq.po   2 Nov 2021 14:41:54 -0000       1.49
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2020-09-21 18:55+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2020-10-02 13:00+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-11-02 14:27+0000\n"
 "X-Generator: Poedit 2.4.1\n"
 
 # type: Content of: <title>
@@ -26,21 +27,25 @@
 "Foundation"
 
 # type: Content of: <h2>
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "My Lisp Experiences and the Development of GNU Emacs"
 msgstr "Përvoja ime me Lisp dhe Krijimi i GNU Emacs"
 
 # type: Content of: <h3>
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "(Transcript of Richard Stallman's Speech, 28 Oct 2002, at the "
+#| "International Lisp Conference)."
 msgid ""
-"(Transcript of Richard Stallman's Speech, 28 Oct 2002, at the International "
-"Lisp Conference)."
+"Transcript of Richard Stallman's speech at the International Lisp "
+"Conference, 28 Oct 2002."
 msgstr ""
 "(Transkriptim i Fjalës së Richard Stallman-it, 28 Tetor 2002, në "
 "International Lisp Conference)."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Since none of my usual speeches have anything to do with Lisp, none of them "
 "were appropriate for today. So I'm going to have to wing it.  Since I've "
@@ -53,17 +58,29 @@
 "Lisp-in, do të duhej të isha në gjendje të them diçka interesante."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "My first experience with Lisp was when I read the Lisp 1.5 manual in high "
+#| "school. That's when I had my mind blown by the idea that there could be a "
+#| "computer language like that. The first time I had a chance to do anything "
+#| "with Lisp was when I was a freshman at Harvard and I wrote a Lisp "
+#| "interpreter for the <abbr title=\"Programmed Data Processor\">PDP</"
+#| "abbr>-11. It was a very small machine &mdash; it had something like 8k of "
+#| "memory &mdash; and I managed to write the interpreter in a thousand "
+#| "instructions. This gave me some room for a little bit of data. That was "
+#| "before I got to see what real software was like, that did real system "
+#| "jobs."
 msgid ""
 "My first experience with Lisp was when I read the Lisp 1.5 manual in high "
 "school. That's when I had my mind blown by the idea that there could be a "
 "computer language like that. The first time I had a chance to do anything "
 "with Lisp was when I was a freshman at Harvard and I wrote a Lisp "
 "interpreter for the <abbr title=\"Programmed Data Processor\">PDP</abbr>-11. "
-"It was a very small machine &mdash; it had something like 8k of memory "
-"&mdash; and I managed to write the interpreter in a thousand instructions. "
-"This gave me some room for a little bit of data. That was before I got to "
-"see what real software was like, that did real system jobs."
+"It was a very small machine&mdash;it had something like 8k of memory&mdash;"
+"and I managed to write the interpreter in a thousand instructions. This gave "
+"me some room for a little bit of data. That was before I got to see what "
+"real software was like, that did real system jobs."
 msgstr ""
 "Takimi im i parë me Lisp-in qe leximi i doracakut të Lisp 1.5-s në 
shkollën "
 "e mesme. Kjo qe koha kur më iku mendja nga ideja që mund të kishte një 
gjuhë "
@@ -76,13 +93,20 @@
 "em>, ai që kryente detyra të vërteta në sistem."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "I began doing work on a real Lisp implementation with JonL White once I "
+#| "started working at <abbr title=\"Massachusetts Institute of Technology"
+#| "\">MIT</abbr>. I got hired at the Artificial Intelligence Lab not by "
+#| "JonL, but by Russ Noftsker, which was most ironic considering what was to "
+#| "come &mdash; he must have really regretted that day."
 msgid ""
 "I began doing work on a real Lisp implementation with JonL White once I "
 "started working at <abbr title=\"Massachusetts Institute of Technology"
 "\">MIT</abbr>. I got hired at the Artificial Intelligence Lab not by JonL, "
-"but by Russ Noftsker, which was most ironic considering what was to come "
-"&mdash; he must have really regretted that day."
+"but by Russ Noftsker, which was most ironic considering what was to "
+"come&mdash;he must have really regretted that day."
 msgstr ""
 "Zura të punoj për një sendërtim të njëmendtë Lisp me JonL White-in 
sapo "
 "fillova të punoj në <abbr title=\"Massachusetts Institute of Technology"
@@ -91,7 +115,7 @@
 "&mdash; vërtet duhet të jetë penduar për atë ditë."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "During the 1970s, before my life became politicized by horrible events, I "
 "was just going along making one extension after another for various "
@@ -119,7 +143,7 @@
 "përpunuesi i parë i tillë."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This spirit of building up gigantic, complicated programs to use in your own "
 "editing, and then exchanging them with other people, fueled the spirit of "
@@ -144,19 +168,32 @@
 "shpuri te Emacs dhe e bëri atë që është."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The original Emacs did not have Lisp in it. The lower level language, the "
+#| "non-interpreted language &mdash; was PDP-10 Assembler. The interpreter we "
+#| "wrote in that actually wasn't written for Emacs, it was written for <abbr "
+#| "title=\"Text Editor and COrrector\">TECO</abbr>. It was our text editor, "
+#| "and was an extremely ugly programming language, as ugly as could possibly "
+#| "be. The reason was that it wasn't designed to be a programming language, "
+#| "it was designed to be an editor and command language. There were commands "
+#| "like &lsquo;5l&rsquo;, meaning &lsquo;move five lines&rsquo;, or &lsquo;"
+#| "i&rsquo; and then a string and then an ESC to insert that string. You "
+#| "would type a string that was a series of commands, which was called a "
+#| "command string. You would end it with ESC ESC, and it would get executed."
 msgid ""
 "The original Emacs did not have Lisp in it. The lower level language, the "
-"non-interpreted language &mdash; was PDP-10 Assembler. The interpreter we "
+"non-interpreted language&mdash;was PDP-10 Assembler. The interpreter we "
 "wrote in that actually wasn't written for Emacs, it was written for <abbr "
 "title=\"Text Editor and COrrector\">TECO</abbr>. It was our text editor, and "
 "was an extremely ugly programming language, as ugly as could possibly be. "
 "The reason was that it wasn't designed to be a programming language, it was "
 "designed to be an editor and command language. There were commands like "
-"&lsquo;5l&rsquo;, meaning &lsquo;move five lines&rsquo;, or &lsquo;i&rsquo; "
-"and then a string and then an ESC to insert that string. You would type a "
-"string that was a series of commands, which was called a command string. You "
-"would end it with ESC ESC, and it would get executed."
+"<code>5l</code>, meaning <code>move five lines</code>, or <code>i</code> and "
+"then a string and then an ESC to insert that string. You would type a string "
+"that was a series of commands, which was called a command string. You would "
+"end it with ESC ESC, and it would get executed."
 msgstr ""
 "Emacs-i origjinal s’përmbante Lisp. Gjuha e nivelit të ulët, gjuha e "
 "painterpretueshme &mdash; qe PDP-10 Assembler. Interpretuesi që shkruam, në 
"
@@ -171,18 +208,31 @@
 "përfundonit me ESC ESC, dhe kështu mund të ekzekutohej."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Well, people wanted to extend this language with programming facilities, "
+#| "so they added some. For instance, one of the first was a looping "
+#| "construct, which was &lt; &gt;. You would put those around things and it "
+#| "would loop. There were other cryptic commands that could be used to "
+#| "conditionally exit the loop.  To make Emacs, we <a href=\"#foot-1\">(1)</"
+#| "a> added facilities to have subroutines with names. Before that, it was "
+#| "sort of like Basic, and the subroutines could only have single letters as "
+#| "their names. That was hard to program big programs with, so we added code "
+#| "so they could have longer names. Actually, there were some rather "
+#| "sophisticated facilities; I think that Lisp got its unwind-protect "
+#| "facility from TECO."
 msgid ""
 "Well, people wanted to extend this language with programming facilities, so "
 "they added some. For instance, one of the first was a looping construct, "
-"which was &lt; &gt;. You would put those around things and it would loop. "
-"There were other cryptic commands that could be used to conditionally exit "
-"the loop.  To make Emacs, we <a href=\"#foot-1\">(1)</a> added facilities to "
-"have subroutines with names. Before that, it was sort of like Basic, and the "
-"subroutines could only have single letters as their names. That was hard to "
-"program big programs with, so we added code so they could have longer names. "
-"Actually, there were some rather sophisticated facilities; I think that Lisp "
-"got its unwind-protect facility from TECO."
+"which was <code>&lt;&nbsp;&gt;</code>. You would put those around things and "
+"it would loop. There were other cryptic commands that could be used to "
+"conditionally exit the loop.  To make Emacs, we&#8239;<a href=\"#foot-1\">[1]"
+"</a> added facilities to have subroutines with names. Before that, it was "
+"sort of like Basic, and the subroutines could only have single letters as "
+"their names. That was hard to program big programs with, so we added code so "
+"they could have longer names. Actually, there were some rather sophisticated "
+"facilities; I think that Lisp got its unwind-protect facility from TECO."
 msgstr ""
 "Njerëzit donin ta zgjeronin këtë gjuhë me aftësi programimi, ndaj edhe "
 "shtuan ca syresh. Për shembull, nga të parat qe një mekanizëm 
përsëritjeje, "
@@ -197,10 +247,20 @@
 "se Lisp-i, aftësinë për \"unwind-protect\", e mori nga TECO."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "We started putting in rather sophisticated facilities, all with the "
+#| "ugliest syntax you could ever think of, and it worked &mdash; people were "
+#| "able to write large programs in it anyway. The obvious lesson was that a "
+#| "language like TECO, which wasn't designed to be a programming language, "
+#| "was the wrong way to go. The language that you build your extensions on "
+#| "shouldn't be thought of as a programming language in afterthought; it "
+#| "should be designed as a programming language. In fact, we discovered that "
+#| "the best programming language for that purpose was Lisp."
 msgid ""
 "We started putting in rather sophisticated facilities, all with the ugliest "
-"syntax you could ever think of, and it worked &mdash; people were able to "
+"syntax you could ever think of, and it worked&mdash;people were able to "
 "write large programs in it anyway. The obvious lesson was that a language "
 "like TECO, which wasn't designed to be a programming language, was the wrong "
 "way to go. The language that you build your extensions on shouldn't be "
@@ -218,18 +278,30 @@
 "mirë e programimit për këtë qëllim qe Lisp-i."
 
 # type: Content of: <p>
-#. type: Content of: <p>
-msgid ""
-"It was Bernie Greenberg, who discovered that it was <a href=\"#foot-2\">(2)</"
-"a>.  He wrote a version of Emacs in Multics MacLisp, and he wrote his "
-"commands in MacLisp in a straightforward fashion. The editor itself was "
-"written entirely in Lisp. Multics Emacs proved to be a great success &mdash; "
-"programming new editing commands was so convenient that even the secretaries "
-"in his office started learning how to use it. They used a manual someone had "
-"written which showed how to extend Emacs, but didn't say it was a "
-"programming. So the secretaries, who believed they couldn't do programming, "
-"weren't scared off. They read the manual, discovered they could do useful "
-"things and they learned to program."
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "It was Bernie Greenberg, who discovered that it was <a href=\"#foot-2\">"
+#| "(2)</a>.  He wrote a version of Emacs in Multics MacLisp, and he wrote "
+#| "his commands in MacLisp in a straightforward fashion. The editor itself "
+#| "was written entirely in Lisp. Multics Emacs proved to be a great success "
+#| "&mdash; programming new editing commands was so convenient that even the "
+#| "secretaries in his office started learning how to use it. They used a "
+#| "manual someone had written which showed how to extend Emacs, but didn't "
+#| "say it was a programming. So the secretaries, who believed they couldn't "
+#| "do programming, weren't scared off. They read the manual, discovered they "
+#| "could do useful things and they learned to program."
+msgid ""
+"It was Bernie Greenberg, who discovered that it was&#8239;<a href="
+"\"#foot-2\">[2]</a>.  He wrote a version of Emacs in Multics MacLisp, and he "
+"wrote his commands in MacLisp in a straightforward fashion. The editor "
+"itself was written entirely in Lisp. Multics Emacs proved to be a great "
+"success&mdash;programming new editing commands was so convenient that even "
+"the secretaries in his office started learning how to use it. They used a "
+"manual someone had written which showed how to extend Emacs, but didn't say "
+"it was a programming. So the secretaries, who believed they couldn't do "
+"programming, weren't scared off. They read the manual, discovered they could "
+"do useful things and they learned to program."
 msgstr ""
 "Ai që e zbuloi këtë <a href=\"#foot-2\">(2)</a>, qe Bernie Greenberg.  Ky "
 "shkroi një version të Emacs-it në Multics MacLisp, dhe i shkroi urdhrat e "
@@ -244,16 +316,27 @@
 "programonin."
 
 # type: Content of: <p>
-#. type: Content of: <p>
-msgid ""
-"So Bernie saw that an application &mdash; a program that does something "
-"useful for you &mdash; which has Lisp inside it and which you could extend "
-"by rewriting the Lisp programs, is actually a very good way for people to "
-"learn programming. It gives them a chance to write small programs that are "
-"useful for them, which in most arenas you can't possibly do. They can get "
-"encouragement for their own practical use &mdash; at the stage where it's "
-"the hardest &mdash; where they don't believe they can program, until they "
-"get to the point where they are programmers."
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "So Bernie saw that an application &mdash; a program that does something "
+#| "useful for you &mdash; which has Lisp inside it and which you could "
+#| "extend by rewriting the Lisp programs, is actually a very good way for "
+#| "people to learn programming. It gives them a chance to write small "
+#| "programs that are useful for them, which in most arenas you can't "
+#| "possibly do. They can get encouragement for their own practical use "
+#| "&mdash; at the stage where it's the hardest &mdash; where they don't "
+#| "believe they can program, until they get to the point where they are "
+#| "programmers."
+msgid ""
+"So Bernie saw that an application&mdash;a program that does something useful "
+"for you&mdash;which has Lisp inside it and which you could extend by "
+"rewriting the Lisp programs, is actually a very good way for people to learn "
+"programming. It gives them a chance to write small programs that are useful "
+"for them, which in most arenas you can't possibly do. They can get "
+"encouragement for their own practical use&mdash;at the stage where it's the "
+"hardest&mdash;where they don't believe they can program, until they get to "
+"the point where they are programmers."
 msgstr ""
 "Pra, Bernie pa që një aplikacion &mdash; një program që bën diçka të "
 "dobishme për ju &mdash; që ka brenda Lisp dhe që mund ta zgjeroni duke "
@@ -265,30 +348,55 @@
 "derisa arrijnë në pikën që janë programues."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "At that point, people began to wonder how they could get something like "
+#| "this on a platform where they didn't have full service Lisp "
+#| "implementation. Multics MacLisp had a compiler as well as an interpreter "
+#| "&mdash; it was a full-fledged Lisp system &mdash; but people wanted to "
+#| "implement something like that on other systems where they had not already "
+#| "written a Lisp compiler. Well, if you didn't have the Lisp compiler you "
+#| "couldn't write the whole editor in Lisp &mdash; it would be too slow, "
+#| "especially redisplay, if it had to run interpreted Lisp.  So we developed "
+#| "a hybrid technique. The idea was to write a Lisp interpreter and the "
+#| "lower level parts of the editor together, so that parts of the editor "
+#| "were built-in Lisp facilities. Those would be whatever parts we felt we "
+#| "had to optimize. This was a technique that we had already consciously "
+#| "practiced in the original Emacs, because there were certain fairly high "
+#| "level features which we re-implemented in machine language, making them "
+#| "into TECO primitives. For instance, there was a TECO primitive to fill a "
+#| "paragraph (actually, to do most of the work of filling a paragraph, "
+#| "because some of the less time-consuming parts of the job would be done at "
+#| "the higher level by a TECO program). You could do the whole job by "
+#| "writing a TECO program, but that was too slow, so we optimized it by "
+#| "putting part of it in machine language. We used the same idea here (in "
+#| "the hybrid technique), that most of the editor would be written in Lisp, "
+#| "but certain parts of it that had to run particularly fast would be "
+#| "written at a lower level."
 msgid ""
 "At that point, people began to wonder how they could get something like this "
 "on a platform where they didn't have full service Lisp implementation. "
-"Multics MacLisp had a compiler as well as an interpreter &mdash; it was a "
-"full-fledged Lisp system &mdash; but people wanted to implement something "
-"like that on other systems where they had not already written a Lisp "
-"compiler. Well, if you didn't have the Lisp compiler you couldn't write the "
-"whole editor in Lisp &mdash; it would be too slow, especially redisplay, if "
-"it had to run interpreted Lisp.  So we developed a hybrid technique. The "
-"idea was to write a Lisp interpreter and the lower level parts of the editor "
-"together, so that parts of the editor were built-in Lisp facilities. Those "
-"would be whatever parts we felt we had to optimize. This was a technique "
-"that we had already consciously practiced in the original Emacs, because "
-"there were certain fairly high level features which we re-implemented in "
-"machine language, making them into TECO primitives. For instance, there was "
-"a TECO primitive to fill a paragraph (actually, to do most of the work of "
-"filling a paragraph, because some of the less time-consuming parts of the "
-"job would be done at the higher level by a TECO program). You could do the "
-"whole job by writing a TECO program, but that was too slow, so we optimized "
-"it by putting part of it in machine language. We used the same idea here (in "
-"the hybrid technique), that most of the editor would be written in Lisp, but "
-"certain parts of it that had to run particularly fast would be written at a "
-"lower level."
+"Multics MacLisp had a compiler as well as an interpreter&mdash;it was a full-"
+"fledged Lisp system&mdash;but people wanted to implement something like that "
+"on other systems where they had not already written a Lisp compiler. Well, "
+"if you didn't have the Lisp compiler you couldn't write the whole editor in "
+"Lisp&mdash;it would be too slow, especially redisplay, if it had to run "
+"interpreted Lisp.  So we developed a hybrid technique. The idea was to write "
+"a Lisp interpreter and the lower level parts of the editor together, so that "
+"parts of the editor were built-in Lisp facilities. Those would be whatever "
+"parts we felt we had to optimize. This was a technique that we had already "
+"consciously practiced in the original Emacs, because there were certain "
+"fairly high level features which we re-implemented in machine language, "
+"making them into TECO primitives. For instance, there was a TECO primitive "
+"to fill a paragraph (actually, to do most of the work of filling a "
+"paragraph, because some of the less time-consuming parts of the job would be "
+"done at the higher level by a TECO program). You could do the whole job by "
+"writing a TECO program, but that was too slow, so we optimized it by putting "
+"part of it in machine language. We used the same idea here (in the hybrid "
+"technique), that most of the editor would be written in Lisp, but certain "
+"parts of it that had to run particularly fast would be written at a lower "
+"level."
 msgstr ""
 "Në këtë pikë, njerëzit zunë të mendonin se si mund të kishin diçka 
të tillë "
 "edhe në një platformë tek e cila nuk kishin sendërtim të plotë 
funksional të "
@@ -315,16 +423,25 @@
 "xhironin veçanërisht shpejt, të shkruheshin në nivel më të ulët."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Therefore, when I wrote my second implementation of Emacs, I followed the "
+#| "same kind of design. The low level language was not machine language "
+#| "anymore, it was C. C was a good, efficient language for portable programs "
+#| "to run in a Unix-like operating system. There was a Lisp interpreter, but "
+#| "I implemented facilities for special purpose editing jobs directly in C "
+#| "&mdash; manipulating editor buffers, inserting leading text, reading and "
+#| "writing files, redisplaying the buffer on the screen, managing editor "
+#| "windows."
 msgid ""
 "Therefore, when I wrote my second implementation of Emacs, I followed the "
 "same kind of design. The low level language was not machine language "
 "anymore, it was C. C was a good, efficient language for portable programs to "
 "run in a Unix-like operating system. There was a Lisp interpreter, but I "
-"implemented facilities for special purpose editing jobs directly in C "
-"&mdash; manipulating editor buffers, inserting leading text, reading and "
-"writing files, redisplaying the buffer on the screen, managing editor "
-"windows."
+"implemented facilities for special purpose editing jobs directly in C&mdash;"
+"manipulating editor buffers, inserting leading text, reading and writing "
+"files, redisplaying the buffer on the screen, managing editor windows."
 msgstr ""
 "Kështu që, kur shkrova sendërtimin tim të dytë të Emacs-it, ndoqa të 
njëjtën "
 "lloj skeme. Gjuha e nivelit të ulët nuk qe më gjuha e makinës, qe C-ja. 
C-ja "
@@ -336,20 +453,34 @@
 "një shtytëze, administrim dritaresh përpunuesi."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Now, this was not the first Emacs that was written in C and ran on Unix. "
+#| "The first was written by James Gosling, and was referred to as GosMacs. A "
+#| "strange thing happened with him. In the beginning, he seemed to be "
+#| "influenced by the same spirit of sharing and cooperation of the original "
+#| "Emacs. I first released the original Emacs to people at MIT. Someone "
+#| "wanted to port it to run on Twenex &mdash; it originally only ran on the "
+#| "Incompatible Timesharing System we used at MIT. They ported it to Twenex, "
+#| "which meant that there were a few hundred installations around the world "
+#| "that could potentially use it. We started distributing it to them, with "
+#| "the rule that &ldquo;you had to send back all of your improvements&rdquo; "
+#| "so we could all benefit. No one ever tried to enforce that, but as far as "
+#| "I know people did cooperate."
 msgid ""
 "Now, this was not the first Emacs that was written in C and ran on Unix. The "
 "first was written by James Gosling, and was referred to as GosMacs. A "
 "strange thing happened with him. In the beginning, he seemed to be "
 "influenced by the same spirit of sharing and cooperation of the original "
 "Emacs. I first released the original Emacs to people at MIT. Someone wanted "
-"to port it to run on Twenex &mdash; it originally only ran on the "
-"Incompatible Timesharing System we used at MIT. They ported it to Twenex, "
-"which meant that there were a few hundred installations around the world "
-"that could potentially use it. We started distributing it to them, with the "
-"rule that &ldquo;you had to send back all of your improvements&rdquo; so we "
-"could all benefit. No one ever tried to enforce that, but as far as I know "
-"people did cooperate."
+"to port it to run on Twenex&mdash;it originally only ran on the Incompatible "
+"Timesharing System we used at MIT. They ported it to Twenex, which meant "
+"that there were a few hundred installations around the world that could "
+"potentially use it. We started distributing it to them, with the rule that "
+"&ldquo;you had to send back all of your improvements&rdquo; so we could all "
+"benefit. No one ever tried to enforce that, but as far as I know people did "
+"cooperate."
 msgstr ""
 "Tani, ky s’qe Emacs-i i parë i shkruar në C dhe që xhironte nën Unix. I 
pari "
 "qe shkruar nga James Gosling, dhe i referoheshin si GosMacs. I ndodhi diçka "
@@ -365,12 +496,20 @@
 "bashkëpunuan."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Gosling did, at first, seem to participate in this spirit. He wrote in a "
+#| "manual that he called the program Emacs hoping that others in the "
+#| "community would improve it until it was worthy of that name. That's the "
+#| "right approach to take towards a community &mdash; to ask them to join in "
+#| "and make the program better. But after that he seemed to change the "
+#| "spirit, and sold it to a company."
 msgid ""
 "Gosling did, at first, seem to participate in this spirit. He wrote in a "
 "manual that he called the program Emacs hoping that others in the community "
 "would improve it until it was worthy of that name. That's the right approach "
-"to take towards a community &mdash; to ask them to join in and make the "
+"to take towards a community&mdash;to ask them to join in and make the "
 "program better. But after that he seemed to change the spirit, and sold it "
 "to a company."
 msgstr ""
@@ -382,7 +521,20 @@
 "mendje, dhe ia shiti një shoqërie."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "At that time I was working on the GNU system (a free software Unix-like "
+#| "operating system that many people erroneously call &ldquo;Linux&rdquo;).  "
+#| "There was no free software Emacs editor that ran on Unix. I did, however, "
+#| "have a friend who had participated in developing Gosling's Emacs. Gosling "
+#| "had given him, by email, permission to distribute his own version. He "
+#| "proposed to me that I use that version. Then I discovered that Gosling's "
+#| "Emacs did not have a real Lisp. It had a programming language that was "
+#| "known as &lsquo;mocklisp&rsquo;, which looks syntactically like Lisp, but "
+#| "didn't have the data structures of Lisp.  So programs were not data, and "
+#| "vital elements of Lisp were missing.  Its data structures were strings, "
+#| "numbers and a few other specialized things."
 msgid ""
 "At that time I was working on the GNU system (a free software Unix-like "
 "operating system that many people erroneously call &ldquo;Linux&rdquo;).  "
@@ -391,7 +543,7 @@
 "had given him, by email, permission to distribute his own version. He "
 "proposed to me that I use that version. Then I discovered that Gosling's "
 "Emacs did not have a real Lisp. It had a programming language that was known "
-"as &lsquo;mocklisp&rsquo;, which looks syntactically like Lisp, but didn't "
+"as &ldquo;mocklisp,&rdquo; which looks syntactically like Lisp, but didn't "
 "have the data structures of Lisp.  So programs were not data, and vital "
 "elements of Lisp were missing.  Its data structures were strings, numbers "
 "and a few other specialized things."
@@ -409,7 +561,7 @@
 "dhënave në të qenë vargje, numra dhe pak gjëra të tjera speciale."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I concluded I couldn't use it and had to replace it all, the first step of "
 "which was to write an actual Lisp interpreter. I gradually adapted every "
@@ -426,13 +578,21 @@
 "përdoruesit."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The one exception was redisplay. For a long time, redisplay was sort of "
+#| "an alternate world. The editor would enter the world of redisplay and "
+#| "things would go on with very special data structures that were not safe "
+#| "for garbage collection, not safe for interruption, and you couldn't run "
+#| "any Lisp programs during that. We've changed that since &mdash; it's now "
+#| "possible to run Lisp code during redisplay. It's quite a convenient thing."
 msgid ""
 "The one exception was redisplay. For a long time, redisplay was sort of an "
 "alternate world. The editor would enter the world of redisplay and things "
 "would go on with very special data structures that were not safe for garbage "
 "collection, not safe for interruption, and you couldn't run any Lisp "
-"programs during that. We've changed that since &mdash; it's now possible to "
+"programs during that. We've changed that since&mdash;it's now possible to "
 "run Lisp code during redisplay. It's quite a convenient thing."
 msgstr ""
 "Përjashtim qe rishfaqja. Për shumë kohë, rishfaqja qe njëfarë bote 
tjetër. "
@@ -443,15 +603,26 @@
 "xhirohet kod Lisp gjatë rishfaqjes. Çka vjen jo pak ndoresh."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "This second Emacs program was &lsquo;free software&rsquo; in the modern "
+#| "sense of the term &mdash; it was part of an explicit political campaign "
+#| "to make software free. The essence of this campaign was that everybody "
+#| "should be free to do the things we did in the old days at MIT, working "
+#| "together on software and working with whomever wanted to work with us.  "
+#| "That is the basis for the free software movement &mdash; the experience I "
+#| "had, the life that I've lived at the MIT AI lab &mdash; to be working on "
+#| "human knowledge, and not be standing in the way of anybody's further "
+#| "using and further disseminating human knowledge."
 msgid ""
-"This second Emacs program was &lsquo;free software&rsquo; in the modern "
-"sense of the term &mdash; it was part of an explicit political campaign to "
+"This second Emacs program was &ldquo;free software&rdquo; in the modern "
+"sense of the term&mdash;it was part of an explicit political campaign to "
 "make software free. The essence of this campaign was that everybody should "
 "be free to do the things we did in the old days at MIT, working together on "
 "software and working with whomever wanted to work with us.  That is the "
-"basis for the free software movement &mdash; the experience I had, the life "
-"that I've lived at the MIT AI lab &mdash; to be working on human knowledge, "
+"basis for the free software movement&mdash;the experience I had, the life "
+"that I've lived at the MIT AI lab&mdash;to be working on human knowledge, "
 "and not be standing in the way of anybody's further using and further "
 "disseminating human knowledge."
 msgstr ""
@@ -465,7 +636,7 @@
 "zihej rruga cilitdo që përdorte dhe përhapte më tej dijen njerëzore."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "At the time, you could make a computer that was about the same price range "
 "as other computers that weren't meant for Lisp, except that it would run "
@@ -486,11 +657,21 @@
 "i një targe, arrihej në përfundime pa kuptim dhe tek e fundit në 
vithisje."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The Lisp machine was able to execute instructions about as fast as those "
+#| "other machines, but each instruction &mdash; a <code>car</code> "
+#| "instruction would do data typechecking &mdash; so when you tried to get "
+#| "the <code>car</code> of a number in a compiled program, it would give you "
+#| "an immediate error. We built the machine and had a Lisp operating system "
+#| "for it. It was written almost entirely in Lisp, the only exceptions being "
+#| "parts written in the microcode. People became interested in manufacturing "
+#| "them, which meant they should start a company."
 msgid ""
 "The Lisp machine was able to execute instructions about as fast as those "
-"other machines, but each instruction &mdash; a <code>car</code> instruction "
-"would do data typechecking &mdash; so when you tried to get the <code>car</"
+"other machines, but each instruction&mdash;a <code>car</code> instruction "
+"would do data typechecking&mdash;so when you tried to get the <code>car</"
 "code> of a number in a compiled program, it would give you an immediate "
 "error. We built the machine and had a Lisp operating system for it. It was "
 "written almost entirely in Lisp, the only exceptions being parts written in "
@@ -507,15 +688,25 @@
 "prodhimi i tyre, që do të thoshte se mund të fillonin një biznes."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "There were two different ideas about what this company should be like.  "
+#| "Greenblatt wanted to start what he called a &ldquo;hacker&rdquo; company. "
+#| "This meant it would be a company run by hackers and would operate in a "
+#| "way conducive to hackers. Another goal was to maintain the AI Lab culture "
+#| "<a href=\"#foot-3\">(3)</a>.  Unfortunately, Greenblatt didn't have any "
+#| "business experience, so other people in the Lisp machine group said they "
+#| "doubted whether he could succeed. They thought that his plan to avoid "
+#| "outside investment wouldn't work."
 msgid ""
 "There were two different ideas about what this company should be like.  "
 "Greenblatt wanted to start what he called a &ldquo;hacker&rdquo; company. "
 "This meant it would be a company run by hackers and would operate in a way "
-"conducive to hackers. Another goal was to maintain the AI Lab culture <a "
-"href=\"#foot-3\">(3)</a>.  Unfortunately, Greenblatt didn't have any "
-"business experience, so other people in the Lisp machine group said they "
-"doubted whether he could succeed. They thought that his plan to avoid "
+"conducive to hackers. Another goal was to maintain the AI Lab culture&#8239;"
+"<a class=\"ftn\" href=\"#foot-3\">[3]</a>.  Unfortunately, Greenblatt didn't "
+"have any business experience, so other people in the Lisp machine group said "
+"they doubted whether he could succeed. They thought that his plan to avoid "
 "outside investment wouldn't work."
 msgstr ""
 "Kish dy ide të ndryshme rreth se si mund të ishte shoqëria.  Greenblatt-i "
@@ -529,7 +720,7 @@
 "grupit nuk kish për të funksionuar."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Why did he want to avoid outside investment? Because when a company has "
 "outside investors, they take control and they don't let you have any "
@@ -541,7 +732,7 @@
 "të keni skrupuj. Dhe në fund, po patët skrupuj, ju heqin nga drejtimi."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So Greenblatt had the idea that he would find a customer who would pay in "
 "advance to buy the parts. They would build machines and deliver them; with "
@@ -558,7 +749,7 @@
 "që kjo do të funksiononte."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Greenblatt then recruited Russell Noftsker, the man who had hired me, who "
 "had subsequently left the AI Lab and created a successful company.  Russell "
@@ -579,7 +770,7 @@
 "Me investime nga jashtë, pa skrupuj, dhe të gatshëm për gjithçka për 
fitoren."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "But Greenblatt didn't give up. He and the few people loyal to him decided to "
 "start Lisp Machines Inc. anyway and go ahead with their plans. And what do "
@@ -601,7 +792,7 @@
 "shkërmoqej, filluan të kërkonin për mënyra se si ta shkatërronin."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Thus, the abandonment of our lab was followed by &ldquo;war&rdquo; in our "
 "lab.  The abandonment happened when Symbolics hired away all the hackers, "
@@ -630,13 +821,20 @@
 "ndodhi."
 
 # type: Content of: <p>
-#. type: Content of: <p>
-msgid ""
-"So Symbolics came up with a plan <a href=\"#foot-4\">(4)</a>.  They said to "
-"the lab, &ldquo;We will continue making our changes to the system available "
-"for you to use, but you can't put it into the MIT Lisp machine system. "
-"Instead, we'll give you access to Symbolics' Lisp machine system, and you "
-"can run it, but that's all you can do.&rdquo;"
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "So Symbolics came up with a plan <a href=\"#foot-4\">(4)</a>.  They said "
+#| "to the lab, &ldquo;We will continue making our changes to the system "
+#| "available for you to use, but you can't put it into the MIT Lisp machine "
+#| "system. Instead, we'll give you access to Symbolics' Lisp machine system, "
+#| "and you can run it, but that's all you can do.&rdquo;"
+msgid ""
+"So Symbolics came up with a plan&#8239;<a href=\"#foot-4\">[4]</a>.  They "
+"said to the lab, &ldquo;We will continue making our changes to the system "
+"available for you to use, but you can't put it into the MIT Lisp machine "
+"system. Instead, we'll give you access to Symbolics' Lisp machine system, "
+"and you can run it, but that's all you can do.&rdquo;"
 msgstr ""
 "Kështu që Symbolics hartoi një plan <a href=\"#foot-4\">(4)</a>.  I thanë 
"
 "laboratorit, &ldquo;Do të vazhdojmë t’ju lejojmë përdorimin e 
ndryshimeve "
@@ -645,7 +843,7 @@
 "dhe mund ta xhironi, por kjo është e gjitha çka mund të bëni.&rdquo;"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This, in effect, meant that they demanded that we had to choose a side, and "
 "use either the MIT version of the system or the Symbolics version.  "
@@ -667,12 +865,21 @@
 "asnjanës."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Up until that point, I hadn't taken the side of either company, although "
+#| "it made me miserable to see what had happened to our community and the "
+#| "software.  But now, Symbolics had forced the issue.  So, in an effort to "
+#| "help keep Lisp Machines Inc. going <a href=\"#foot-5\">(5)</a> &mdash; I "
+#| "began duplicating all of the improvements Symbolics had made to the Lisp "
+#| "machine system.  I wrote the equivalent improvements again myself (i.e., "
+#| "the code was my own)."
 msgid ""
 "Up until that point, I hadn't taken the side of either company, although it "
 "made me miserable to see what had happened to our community and the "
 "software.  But now, Symbolics had forced the issue.  So, in an effort to "
-"help keep Lisp Machines Inc. going <a href=\"#foot-5\">(5)</a> &mdash; I "
+"help keep Lisp Machines Inc. going&#8239;<a href=\"#foot-5\">[5]</a>&mdash;I "
 "began duplicating all of the improvements Symbolics had made to the Lisp "
 "machine system.  I wrote the equivalent improvements again myself (i.e., the "
 "code was my own)."
@@ -686,12 +893,19 @@
 "njëvlershme (dmth, kodi qe i imi)."
 
 # type: Content of: <p>
-#. type: Content of: <p>
-msgid ""
-"After a while <a href=\"#foot-6\">(6)</a>, I came to the conclusion that it "
-"would be best if I didn't even look at their code. When they made a beta "
-"announcement that gave the release notes, I would see what the features were "
-"and then implement them. By the time they had a real release, I did too."
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "After a while <a href=\"#foot-6\">(6)</a>, I came to the conclusion that "
+#| "it would be best if I didn't even look at their code. When they made a "
+#| "beta announcement that gave the release notes, I would see what the "
+#| "features were and then implement them. By the time they had a real "
+#| "release, I did too."
+msgid ""
+"After a while&#8239;<a href=\"#foot-6\">[6]</a>, I came to the conclusion "
+"that it would be best if I didn't even look at their code. When they made a "
+"beta announcement that gave the release notes, I would see what the features "
+"were and then implement them. By the time they had a real release, I did too."
 msgstr ""
 "Pas ca kohësh <a href=\"#foot-6\">(6)</a>, mbërrita në përfundimin që e 
mira "
 "e të mirave do të ishte të mos shihja fare në kodin e tyre. Kur njoftonin 
"
@@ -700,15 +914,24 @@
 "hidhnin faktikisht në qarkullim diçka, po atë bëja edhe unë."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "In this way, for two years, I prevented them from wiping out Lisp "
+#| "Machines Incorporated, and the two companies went on. But, I didn't want "
+#| "to spend years and years punishing someone, just thwarting an evil deed. "
+#| "I figured they had been punished pretty thoroughly because they were "
+#| "stuck with competition that was not leaving or going to disappear <a href="
+#| "\"#foot-7\">(7)</a>. Meanwhile, it was time to start building a new "
+#| "community to replace the one that their actions and others had wiped out."
 msgid ""
 "In this way, for two years, I prevented them from wiping out Lisp Machines "
 "Incorporated, and the two companies went on. But, I didn't want to spend "
 "years and years punishing someone, just thwarting an evil deed. I figured "
 "they had been punished pretty thoroughly because they were stuck with "
-"competition that was not leaving or going to disappear <a href=\"#foot-7\">"
-"(7)</a>. Meanwhile, it was time to start building a new community to replace "
-"the one that their actions and others had wiped out."
+"competition that was not leaving or going to disappear&#8239;<a href="
+"\"#foot-7\">[7]</a>.  Meanwhile, it was time to start building a new "
+"community to replace the one that their actions and others had wiped out."
 msgstr ""
 "Në këtë mënyrë, për dy vite, ua pengova ta fshinin nga faqja e dheut 
Lisp "
 "Machines Incorporated, dhe të dy shoqëritë bënë përpara. Por nuk doja 
të "
@@ -719,7 +942,7 @@
 "për të zëvendësuar atë që e zhdukën veprimet e tyre dhe të tjera."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The Lisp community in the 70s was not limited to the MIT AI Lab, and the "
 "hackers were not all at MIT. The war that Symbolics started was what wiped "
@@ -734,11 +957,17 @@
 "kushedi çë."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Once I stopped punishing Symbolics, I had to figure out what to do next. "
+#| "I had to make a free operating system, that was clear &mdash; the only "
+#| "way that people could work together and share was with a free operating "
+#| "system."
 msgid ""
 "Once I stopped punishing Symbolics, I had to figure out what to do next. I "
-"had to make a free operating system, that was clear &mdash; the only way "
-"that people could work together and share was with a free operating system."
+"had to make a free operating system, that was clear&mdash;the only way that "
+"people could work together and share was with a free operating system."
 msgstr ""
 "Pasi reshta së ndëshkuari Symbolics-in, m’u desh të gjeja se ç’të 
bëja më "
 "tej. Duhej të bëja një sistem operativ të lirë, që të qe i kthjellët 
&mdash; "
@@ -746,7 +975,21 @@
 "përmes një sistemi operativ të lirë."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "At first, I thought of making a Lisp-based system, but I realized that "
+#| "wouldn't be a good idea technically. To have something like the Lisp "
+#| "machine system, you needed special purpose microcode. That's what made it "
+#| "possible to run programs as fast as other computers would run their "
+#| "programs and still get the benefit of typechecking. Without that, you "
+#| "would be reduced to something like the Lisp compilers for other machines. "
+#| "The programs would be faster, but unstable. Now that's okay if you're "
+#| "running one program on a timesharing system &mdash; if one program "
+#| "crashes, that's not a disaster, that's something your program "
+#| "occasionally does. But that didn't make it good for writing the operating "
+#| "system in, so I rejected the idea of making a system like the Lisp "
+#| "machine."
 msgid ""
 "At first, I thought of making a Lisp-based system, but I realized that "
 "wouldn't be a good idea technically. To have something like the Lisp machine "
@@ -755,7 +998,7 @@
 "still get the benefit of typechecking. Without that, you would be reduced to "
 "something like the Lisp compilers for other machines. The programs would be "
 "faster, but unstable. Now that's okay if you're running one program on a "
-"timesharing system &mdash; if one program crashes, that's not a disaster, "
+"timesharing system&mdash;if one program crashes, that's not a disaster, "
 "that's something your program occasionally does. But that didn't make it "
 "good for writing the operating system in, so I rejected the idea of making a "
 "system like the Lisp machine."
@@ -774,7 +1017,7 @@
 "krijimit të një sistemi si një makinë Lisp."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I decided instead to make a Unix-like operating system that would have Lisp "
 "implementations to run as user programs. The kernel wouldn't be written in "
@@ -792,7 +1035,7 @@
 "madh."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There were people in those days, in 1985, who had one-megabyte machines "
 "without virtual memory. They wanted to be able to use GNU Emacs. This meant "
@@ -803,15 +1046,25 @@
 "do të thoshte ta mbaja programin sa më të vogël që mundej."
 
 # type: Content of: <p>
-#. type: Content of: <p>
-msgid ""
-"For instance, at the time the only looping construct was &lsquo;"
-"while&rsquo;, which was extremely simple. There was no way to break out of "
-"the &lsquo;while&rsquo; statement, you just had to do a catch and a throw, "
-"or test a variable that ran the loop. That shows how far I was pushing to "
-"keep things small. We didn't have &lsquo;caar&rsquo; and &lsquo;cadr&rsquo; "
-"and so on; &ldquo;squeeze out everything possible&rdquo; was the spirit of "
-"GNU Emacs, the spirit of Emacs Lisp, from the beginning."
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "For instance, at the time the only looping construct was &lsquo;"
+#| "while&rsquo;, which was extremely simple. There was no way to break out "
+#| "of the &lsquo;while&rsquo; statement, you just had to do a catch and a "
+#| "throw, or test a variable that ran the loop. That shows how far I was "
+#| "pushing to keep things small. We didn't have &lsquo;caar&rsquo; and "
+#| "&lsquo;cadr&rsquo; and so on; &ldquo;squeeze out everything "
+#| "possible&rdquo; was the spirit of GNU Emacs, the spirit of Emacs Lisp, "
+#| "from the beginning."
+msgid ""
+"For instance, at the time the only looping construct was <code>while</code>, "
+"which was extremely simple. There was no way to break out of the "
+"<code>while</code> statement, you just had to do a catch and a throw, or "
+"test a variable that ran the loop. That shows how far I was pushing to keep "
+"things small. We didn't have <code>caar</code> and <code>cadr</code> and so "
+"on; &ldquo;squeeze out everything possible&rdquo; was the spirit of GNU "
+"Emacs, the spirit of Emacs Lisp, from the beginning."
 msgstr ""
 "Për shembull, në atë kohë e vetmja strukturë ripërsëritëse qe &lsquo;"
 "while&rsquo;, e cila qe fare e thjeshtë. Nuk kish mënyrë për të dalë 
nga "
@@ -823,15 +1076,25 @@
 "në fillim."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Obviously, machines are bigger now, and we don't do it that way any more. "
+#| "We put in &lsquo;caar&rsquo; and &lsquo;cadr&rsquo; and so on, and we "
+#| "might put in another looping construct one of these days. We're willing "
+#| "to extend it some now, but we don't want to extend it to the level of "
+#| "common Lisp. I implemented Common Lisp once on the Lisp machine, and I'm "
+#| "not all that happy with it. One thing I don't like terribly much is "
+#| "keyword arguments <a href=\"#foot-8\">(8)</a>.  They don't seem quite "
+#| "Lispy to me; I'll do it sometimes but I minimize the times when I do that."
 msgid ""
 "Obviously, machines are bigger now, and we don't do it that way any more. We "
-"put in &lsquo;caar&rsquo; and &lsquo;cadr&rsquo; and so on, and we might put "
+"put in <code>caar</code> and <code>cadr</code> and so on, and we might put "
 "in another looping construct one of these days. We're willing to extend it "
 "some now, but we don't want to extend it to the level of common Lisp. I "
 "implemented Common Lisp once on the Lisp machine, and I'm not all that happy "
-"with it. One thing I don't like terribly much is keyword arguments <a href="
-"\"#foot-8\">(8)</a>.  They don't seem quite Lispy to me; I'll do it "
+"with it. One thing I don't like terribly much is keyword arguments&#8239;<a "
+"href=\"#foot-8\">[8]</a>.  They don't seem quite Lispy to me; I'll do it "
 "sometimes but I minimize the times when I do that."
 msgstr ""
 "E qartë që sot makinat janë më të mëdha, dhe nuk veprojmë më kështu. 
Vëmë "
@@ -844,7 +1107,7 @@
 "Do t’i ndërroj ndonjë ditë, por minimizoj kohët kur bëj kështu."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "That was not the end of the GNU projects involved with Lisp. Later on around "
 "1995, we were looking into starting a graphical desktop project. It was "
@@ -859,7 +1122,7 @@
 "zgjerueshme, njësoj si përpunuesi. Çështja qe se cila duhej zgjedhur."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "At the time, <abbr title=\"Tool Command Language\">TCL</abbr> was being "
 "pushed heavily for this purpose. I had a very low opinion of TCL, basically "
@@ -888,7 +1151,7 @@
 "zgjerime për krejt programet GNU."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There's an interesting benefit you can get from using such a powerful "
 "language as a version of Lisp as your primary extensibility language.  You "
@@ -915,18 +1178,34 @@
 "dhe do të funksiononte edhe me përshtatje të tjera."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "As long as the extensibility languages are weak, the users have to use "
+#| "only the language you provided them. Which means that people who love any "
+#| "given language have to compete for the choice of the developers of "
+#| "applications &mdash; saying &ldquo;Please, application developer, put my "
+#| "language into your application, not his language.&rdquo; Then the users "
+#| "get no choices at all &mdash; whichever application they're using comes "
+#| "with one language and they're stuck with [that language]. But when you "
+#| "have a powerful language that can implement others by translating into "
+#| "it, then you give the user a choice of language and we don't have to have "
+#| "a language war anymore. That's what we're hoping &lsquo;Guile&rsquo;, our "
+#| "scheme interpreter, will do. We had a person working last summer "
+#| "finishing up a translator from Python to Scheme. I don't know if it's "
+#| "entirely finished yet, but for anyone interested in this project, please "
+#| "get in touch. So that's the plan we have for the future."
 msgid ""
 "As long as the extensibility languages are weak, the users have to use only "
 "the language you provided them. Which means that people who love any given "
-"language have to compete for the choice of the developers of applications "
-"&mdash; saying &ldquo;Please, application developer, put my language into "
-"your application, not his language.&rdquo; Then the users get no choices at "
-"all &mdash; whichever application they're using comes with one language and "
-"they're stuck with [that language]. But when you have a powerful language "
-"that can implement others by translating into it, then you give the user a "
-"choice of language and we don't have to have a language war anymore. That's "
-"what we're hoping &lsquo;Guile&rsquo;, our scheme interpreter, will do. We "
+"language have to compete for the choice of the developers of "
+"applications&mdash;saying &ldquo;Please, application developer, put my "
+"language into your application, not his language.&rdquo; Then the users get "
+"no choices at all&mdash;whichever application they're using comes with one "
+"language and they're stuck with [that language]. But when you have a "
+"powerful language that can implement others by translating into it, then you "
+"give the user a choice of language and we don't have to have a language war "
+"anymore. That's what we're hoping Guile, our scheme interpreter, will do. We "
 "had a person working last summer finishing up a translator from Python to "
 "Scheme. I don't know if it's entirely finished yet, but for anyone "
 "interested in this project, please get in touch. So that's the plan we have "
@@ -949,7 +1228,18 @@
 "për të ardhmen."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "I haven't been speaking about free software, but let me briefly tell you "
+#| "a little bit about what that means. Free software does not refer to "
+#| "price; it doesn't mean that you get it for free. (You may have paid for a "
+#| "copy, or gotten a copy gratis.) It means that you have freedom as a user. "
+#| "The crucial thing is that you are free to run the program, free to study "
+#| "what it does, free to change it to suit your needs, free to redistribute "
+#| "the copies of others and free to publish improved, extended versions. "
+#| "This is what free software means. If you are using a non-free program, "
+#| "you have lost crucial freedom, so don't ever do that."
 msgid ""
 "I haven't been speaking about free software, but let me briefly tell you a "
 "little bit about what that means. Free software does not refer to price; it "
@@ -958,7 +1248,7 @@
 "thing is that you are free to run the program, free to study what it does, "
 "free to change it to suit your needs, free to redistribute the copies of "
 "others and free to publish improved, extended versions. This is what free "
-"software means. If you are using a non-free program, you have lost crucial "
+"software means. If you are using a nonfree program, you have lost crucial "
 "freedom, so don't ever do that."
 msgstr ""
 "S’kam folur për software-in e lirë, por më lejoni shkurt t’ju tregoj 
paksa "
@@ -972,12 +1262,22 @@
 "përdorni programe jo të lira, keni humbur liri kyçe, ndaj mos e bëni 
kurrë."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The purpose of the GNU project is to make it easier for people to reject "
+#| "freedom-trampling, user-dominating, non-free software by providing free "
+#| "software to replace it. For those who don't have the moral courage to "
+#| "reject the non-free software, when that means some practical "
+#| "inconvenience, what we try to do is give a free alternative so that you "
+#| "can move to freedom with less of a mess and less of a sacrifice in "
+#| "practical terms. The less sacrifice the better. We want to make it easier "
+#| "for you to live in freedom, to cooperate."
 msgid ""
 "The purpose of the GNU project is to make it easier for people to reject "
-"freedom-trampling, user-dominating, non-free software by providing free "
+"freedom-trampling, user-dominating, nonfree software by providing free "
 "software to replace it. For those who don't have the moral courage to reject "
-"the non-free software, when that means some practical inconvenience, what we "
+"the nonfree software, when that means some practical inconvenience, what we "
 "try to do is give a free alternative so that you can move to freedom with "
 "less of a mess and less of a sacrifice in practical terms. The less "
 "sacrifice the better. We want to make it easier for you to live in freedom, "
@@ -994,16 +1294,26 @@
 "bashkëpunim."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "This is a matter of the freedom to cooperate. We're used to thinking of "
+#| "freedom and cooperation with society as if they are opposites. But here "
+#| "they're on the same side. With free software you are free to cooperate "
+#| "with other people as well as free to help yourself. With non-free "
+#| "software, somebody is dominating you and keeping people divided. You're "
+#| "not allowed to share with them, you're not free to cooperate or help "
+#| "society, anymore than you're free to help yourself.  Divided and helpless "
+#| "is the state of users using non-free software."
 msgid ""
 "This is a matter of the freedom to cooperate. We're used to thinking of "
 "freedom and cooperation with society as if they are opposites. But here "
 "they're on the same side. With free software you are free to cooperate with "
-"other people as well as free to help yourself. With non-free software, "
+"other people as well as free to help yourself. With nonfree software, "
 "somebody is dominating you and keeping people divided. You're not allowed to "
 "share with them, you're not free to cooperate or help society, anymore than "
 "you're free to help yourself.  Divided and helpless is the state of users "
-"using non-free software."
+"using nonfree software."
 msgstr ""
 "Këtu bëhet fjalë për lirinë për të bashkëpunuar. Jemi mësuar t’i 
mendojmë "
 "lirinë dhe bashkëpunimin me shoqërinë si të jenë të kundërta. Por 
këtu janë "
@@ -1015,21 +1325,37 @@
 "përdoruesve që përdorin <em>software</em> jo të lirë."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "We've produced a tremendous range of free software. We've done what "
+#| "people said we could never do; we have two operating systems of free "
+#| "software. We have many applications and we obviously have a lot farther "
+#| "to go. So we need your help. I would like to ask you to volunteer for the "
+#| "GNU project; help us develop free software for more jobs. Take a look at "
+#| "<a href=\"/help/\">http://www.gnu.org/help</a> to find suggestions for "
+#| "how to help. If you want to order things, there's a link to that from the "
+#| "home page. If you want to read about philosophical issues, look in /"
+#| "philosophy. If you're looking for free software to use, look in /"
+#| "directory, which lists about 1900 packages now (which is a fraction of "
+#| "all the free software out there). Please write more and contribute to us. "
+#| "My book of essays, &ldquo;Free Software and Free Society&rdquo;, is on "
+#| "sale and can be purchased at <a href=\"http://www.gnu.org/\";>www.gnu.org</"
+#| "a>. Happy hacking!"
 msgid ""
 "We've produced a tremendous range of free software. We've done what people "
 "said we could never do; we have two operating systems of free software. We "
 "have many applications and we obviously have a lot farther to go. So we need "
 "your help. I would like to ask you to volunteer for the GNU project; help us "
-"develop free software for more jobs. Take a look at <a href=\"/help/"
-"\">http://www.gnu.org/help</a> to find suggestions for how to help. If you "
-"want to order things, there's a link to that from the home page. If you want "
-"to read about philosophical issues, look in /philosophy. If you're looking "
-"for free software to use, look in /directory, which lists about 1900 "
-"packages now (which is a fraction of all the free software out there). "
-"Please write more and contribute to us. My book of essays, &ldquo;Free "
-"Software and Free Society&rdquo;, is on sale and can be purchased at <a href="
-"\"http://www.gnu.org/\";>www.gnu.org</a>. Happy hacking!"
+"develop free software for more jobs. Take a look at <a href=\"/help/help.html"
+"\">gnu.org/help</a> to find suggestions for how to help. If you want to "
+"order things, there's a link to that from the home page. If you want to read "
+"about philosophical issues, look in /philosophy. If you're looking for free "
+"software to use, look in /directory, which lists about 1900 packages now "
+"(which is a fraction of all the free software out there). Please write more "
+"and contribute to us. My book of essays, &ldquo;Free Software and Free "
+"Society,&rdquo; is on sale and can be purchased at www.gnu.org&#8239;<a href="
+"\"#foot-9\">[9]</a>.  Happy hacking!"
 msgstr ""
 "Kemi prodhuar një segment marramendës software-i të lirë. Kemi bërë ato 
që "
 "njerëzit thoshin se nuk do t’ia dilnim t’i bënim kurrë; kemi dy 
sisteme "
@@ -1047,8 +1373,12 @@
 "Society&rdquo;, gjendet në shitje dhe mund të blihet te <a 
href=\"http://www.";
 "gnu.org/\">www.gnu.org</a>. Happy hacking!"
 
+#. type: Content of: <div><h3>
+msgid "Footnotes"
+msgstr "Poshtëshënime"
+
 # type: Content of: <ol><li>
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Guy Steele designed the original symmetrical Emacs command set; then he and "
 "I began implementing Emacs (on top of TECO), but after one long joint "
@@ -1063,7 +1393,7 @@
 "C. Cicciarelli-n dhe Mike McMahon-in, dhanë ndihmesë thelbësore më vonë."
 
 # type: Content of: <ol><li>
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Bernie Greenberg says that Dan Weinreb's implementation of Emacs for the "
 "Lisp Machine came before Greenberg's implementation for Multics.  I "
@@ -1074,7 +1404,7 @@
 "ndjesë për gabimin."
 
 # type: Content of: <ol><li>
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Greenblatt's plan, as I understood it, was to hire lab people part time, so "
 "that they could continue working at the AI Lab.  Symbolics hired them full "
@@ -1086,13 +1416,20 @@
 "këta reshtën së punuari në MIT."
 
 # type: Content of: <ol><li>
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "The background of this plan, which I did not state explicitly in the "
+#| "talk, is that during an initial period the ex-AI-Lab hackers, whether at "
+#| "Symbolics or LMI, continued contributing their changes to the MIT Lisp "
+#| "Machine system &mdash; even though the contract did not require this.  "
+#| "Symbolics' plan was to rupture this cooperation unilaterally."
 msgid ""
 "The background of this plan, which I did not state explicitly in the talk, "
 "is that during an initial period the ex-AI-Lab hackers, whether at Symbolics "
-"or LMI, continued contributing their changes to the MIT Lisp Machine system "
-"&mdash; even though the contract did not require this.  Symbolics' plan was "
-"to rupture this cooperation unilaterally."
+"or LMI, continued contributing their changes to the MIT Lisp Machine "
+"system&mdash;even though the contract did not require this.  Symbolics' plan "
+"was to rupture this cooperation unilaterally."
 msgstr ""
 "Rrethanat e këtij plani, të cilat nuk i deklarova shprehimisht gjatë 
fjalës "
 "sime, qenë që gjatë një periudhe fillestare hacker-at e ish-AI-Lab-it, 
ata "
@@ -1102,7 +1439,7 @@
 "bashkëpunim."
 
 # type: Content of: <ol><li>
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "It was not that I cared particularly about the fate of LMI, but rather I did "
 "not want to let Symbolics gain through its aggression against the AI Lab."
@@ -1111,7 +1448,7 @@
 "lejohej Symbolics të përfitonte në kurriz të AI Lab-it me agresionin e 
vet."
 
 # type: Content of: <ol><li>
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "This statement has been misconstrued as saying that I never, ever looked at "
 "Symbolics' code.  Actually it says I did look, at first.  The Symbolics "
@@ -1124,7 +1461,7 @@
 "kjo qe rruga se nga i mora vesh ndryshimet e tyre."
 
 # type: Content of: <ol><li><p>
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
 msgid ""
 "But that meant I had to make a special effort to solve each problem "
 "differently, in order to avoid copying Symbolics code.  After a while, I "
@@ -1138,7 +1475,7 @@
 "ç’përmbante kodi i Symbolics-it."
 
 # type: Content of: <ol><li>
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Symbolics at one point protested to MIT that my work, by thwarting their "
 "plan, had cost Symbolics a million dollars."
@@ -1146,7 +1483,7 @@
 "Symbolics në një rast protestoi te MIT se puna ime, duke u prishur planin, 
i "
 "kish kushtuar Symbolics-it një milion dollarë."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "I don't mind if a very complex and heavyweight function takes keyword "
 "arguments.  What bothers me is making simple basic functions such as &ldquo;"
@@ -1156,6 +1493,21 @@
 "argumente fjalëkyçe.  Ajo që më bezdis është të bësh funksione të 
thjeshtë "
 "elementarë të tillë si &ldquo;member&rdquo; t’i përdorin ato."
 
+#. type: Content of: <div><ol><li>
+#, 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 ""
+"In 2021, this book can be purchased from <a href=\"https://shop.fsf.org/";
+"books-docs/free-software-free-society-selected-essays-richard-m-stallman-3rd-"
+"edition\"> GNU Press</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>
@@ -1177,6 +1529,7 @@
 "të dërgohen te <a href=\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu."
 "org&gt;</a>."
 
+# TODO: submitting -> contributing.
 #.  TRANSLATORS: Ignore the original text in this paragraph,
 #.         replace it with the translation of these two:
 #.         We work hard and do our best to provide accurate, good quality
@@ -1184,14 +1537,19 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Përpiqemi fort dhe bëjmë sa mundemi për të ofruar përkthime me cilësi 
të "
@@ -1204,8 +1562,11 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2003, 2007, 2013, 2014, 2020 Free Software Foundation, Inc."
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2003, 2007, 2013, 2014, 2020 Free Software Foundation, "
+#| "Inc."
+msgid "Copyright &copy; 2003, 2007, 2013, 2021 Free Software Foundation, Inc."
 msgstr ""
 "Të drejta kopjimi &copy; 2003, 2007, 2013, 2014, 2020 Free Software "
 "Foundation, Inc."

Index: po/rms-lisp.uk.po
===================================================================
RCS file: /web/www/www/gnu/po/rms-lisp.uk.po,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- po/rms-lisp.uk.po   2 Nov 2021 13:56:43 -0000       1.22
+++ po/rms-lisp.uk.po   2 Nov 2021 14:41:54 -0000       1.23
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rms-lisp.html\n"
-"POT-Creation-Date: 2020-09-21 18:55+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2016-08-04 08:20+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-11-02 14:27+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,19 +29,23 @@
 "Мій досвід роботи з Лsспом і розвиток GNU Emacs 
- Проект GNU - Фонд вільного "
 "програмного забезпечення"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "My Lisp Experiences and the Development of GNU Emacs"
 msgstr "Мій досвід роботи з Ліспом і розвиток 
GNU Emacs"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "(Transcript of Richard Stallman's Speech, 28 Oct 2002, at the "
+#| "International Lisp Conference)."
 msgid ""
-"(Transcript of Richard Stallman's Speech, 28 Oct 2002, at the International "
-"Lisp Conference)."
+"Transcript of Richard Stallman's speech at the International Lisp "
+"Conference, 28 Oct 2002."
 msgstr ""
 "(Запис промови Річарда Столмена, 
виголошеної 28&nbsp;жовтня 2002&nbsp;року "
 "на Міжнародній конференції по Ліспу)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Since none of my usual speeches have anything to do with Lisp, none of them "
 "were appropriate for today. So I'm going to have to wing it.  Since I've "
@@ -53,17 +58,29 @@
 "доводилося виконувати досить багато 
роботи, пов'язаної з Ліспом, у мене, "
 "мабуть, є що розказати."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "My first experience with Lisp was when I read the Lisp 1.5 manual in high "
+#| "school. That's when I had my mind blown by the idea that there could be a "
+#| "computer language like that. The first time I had a chance to do anything "
+#| "with Lisp was when I was a freshman at Harvard and I wrote a Lisp "
+#| "interpreter for the <abbr title=\"Programmed Data Processor\">PDP</"
+#| "abbr>-11. It was a very small machine &mdash; it had something like 8k of "
+#| "memory &mdash; and I managed to write the interpreter in a thousand "
+#| "instructions. This gave me some room for a little bit of data. That was "
+#| "before I got to see what real software was like, that did real system "
+#| "jobs."
 msgid ""
 "My first experience with Lisp was when I read the Lisp 1.5 manual in high "
 "school. That's when I had my mind blown by the idea that there could be a "
 "computer language like that. The first time I had a chance to do anything "
 "with Lisp was when I was a freshman at Harvard and I wrote a Lisp "
 "interpreter for the <abbr title=\"Programmed Data Processor\">PDP</abbr>-11. "
-"It was a very small machine &mdash; it had something like 8k of memory "
-"&mdash; and I managed to write the interpreter in a thousand instructions. "
-"This gave me some room for a little bit of data. That was before I got to "
-"see what real software was like, that did real system jobs."
+"It was a very small machine&mdash;it had something like 8k of memory&mdash;"
+"and I managed to write the interpreter in a thousand instructions. This gave "
+"me some room for a little bit of data. That was before I got to see what "
+"real software was like, that did real system jobs."
 msgstr ""
 "Моя перша зустріч з Ліспом сталася, коли я 
прочитав посібник Лісп&nbsp;1.5 у "
 "старших класах. Саме тоді мене вразила 
ідея, що може бути така мова "
@@ -75,13 +92,20 @@
 "дізнався, як виглядають справжні 
програми, які виконують справжні системні "
 "завдання."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "I began doing work on a real Lisp implementation with JonL White once I "
+#| "started working at <abbr title=\"Massachusetts Institute of Technology"
+#| "\">MIT</abbr>. I got hired at the Artificial Intelligence Lab not by "
+#| "JonL, but by Russ Noftsker, which was most ironic considering what was to "
+#| "come &mdash; he must have really regretted that day."
 msgid ""
 "I began doing work on a real Lisp implementation with JonL White once I "
 "started working at <abbr title=\"Massachusetts Institute of Technology"
 "\">MIT</abbr>. I got hired at the Artificial Intelligence Lab not by JonL, "
-"but by Russ Noftsker, which was most ironic considering what was to come "
-"&mdash; he must have really regretted that day."
+"but by Russ Noftsker, which was most ironic considering what was to "
+"come&mdash;he must have really regretted that day."
 msgstr ""
 "Я почав виконувати роботи над справжньою 
реалізацією Ліспа з Джоном-Л Уайтом "
 "відразу, коли мене прийняли у <abbr 
title=\"Massachusetts Institute of "
@@ -89,7 +113,7 @@
 "було вельми іронічно з огляду на те, що 
трапилося згодом&nbsp;&mdash; він, "
 "вірогідно, сильно про це шкодував."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "During the 1970s, before my life became politicized by horrible events, I "
 "was just going along making one extension after another for various "
@@ -115,7 +139,7 @@
 "час користування нею можна було 
програмувати. Я не знаю, чи це була перша "
 "така система, але це точно був перший 
такий редактор."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This spirit of building up gigantic, complicated programs to use in your own "
 "editing, and then exchanging them with other people, fueled the spirit of "
@@ -140,19 +164,32 @@
 "способу життя в Лабораторії штучного 
інтелекту привела до створення Emacs і "
 "зробила його таким, яким він був."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The original Emacs did not have Lisp in it. The lower level language, the "
+#| "non-interpreted language &mdash; was PDP-10 Assembler. The interpreter we "
+#| "wrote in that actually wasn't written for Emacs, it was written for <abbr "
+#| "title=\"Text Editor and COrrector\">TECO</abbr>. It was our text editor, "
+#| "and was an extremely ugly programming language, as ugly as could possibly "
+#| "be. The reason was that it wasn't designed to be a programming language, "
+#| "it was designed to be an editor and command language. There were commands "
+#| "like &lsquo;5l&rsquo;, meaning &lsquo;move five lines&rsquo;, or &lsquo;"
+#| "i&rsquo; and then a string and then an ESC to insert that string. You "
+#| "would type a string that was a series of commands, which was called a "
+#| "command string. You would end it with ESC ESC, and it would get executed."
 msgid ""
 "The original Emacs did not have Lisp in it. The lower level language, the "
-"non-interpreted language &mdash; was PDP-10 Assembler. The interpreter we "
+"non-interpreted language&mdash;was PDP-10 Assembler. The interpreter we "
 "wrote in that actually wasn't written for Emacs, it was written for <abbr "
 "title=\"Text Editor and COrrector\">TECO</abbr>. It was our text editor, and "
 "was an extremely ugly programming language, as ugly as could possibly be. "
 "The reason was that it wasn't designed to be a programming language, it was "
 "designed to be an editor and command language. There were commands like "
-"&lsquo;5l&rsquo;, meaning &lsquo;move five lines&rsquo;, or &lsquo;i&rsquo; "
-"and then a string and then an ESC to insert that string. You would type a "
-"string that was a series of commands, which was called a command string. You "
-"would end it with ESC ESC, and it would get executed."
+"<code>5l</code>, meaning <code>move five lines</code>, or <code>i</code> and "
+"then a string and then an ESC to insert that string. You would type a string "
+"that was a series of commands, which was called a command string. You would "
+"end it with ESC ESC, and it would get executed."
 msgstr ""
 "У первісному Emacs Ліспа не було. Мовою 
низького рівня&nbsp;&mdash; "
 "неітерпретованою мовою&nbsp;&nbsp; був 
асемблер PDP-10. Інтерпретатор, який "
@@ -167,18 +204,31 @@
 "рядком. Він завершувався символами <em>ESC</em> 
<em>ESC</em>, і тоді "
 "послідовність виконувалася."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Well, people wanted to extend this language with programming facilities, "
+#| "so they added some. For instance, one of the first was a looping "
+#| "construct, which was &lt; &gt;. You would put those around things and it "
+#| "would loop. There were other cryptic commands that could be used to "
+#| "conditionally exit the loop.  To make Emacs, we <a href=\"#foot-1\">(1)</"
+#| "a> added facilities to have subroutines with names. Before that, it was "
+#| "sort of like Basic, and the subroutines could only have single letters as "
+#| "their names. That was hard to program big programs with, so we added code "
+#| "so they could have longer names. Actually, there were some rather "
+#| "sophisticated facilities; I think that Lisp got its unwind-protect "
+#| "facility from TECO."
 msgid ""
 "Well, people wanted to extend this language with programming facilities, so "
 "they added some. For instance, one of the first was a looping construct, "
-"which was &lt; &gt;. You would put those around things and it would loop. "
-"There were other cryptic commands that could be used to conditionally exit "
-"the loop.  To make Emacs, we <a href=\"#foot-1\">(1)</a> added facilities to "
-"have subroutines with names. Before that, it was sort of like Basic, and the "
-"subroutines could only have single letters as their names. That was hard to "
-"program big programs with, so we added code so they could have longer names. "
-"Actually, there were some rather sophisticated facilities; I think that Lisp "
-"got its unwind-protect facility from TECO."
+"which was <code>&lt;&nbsp;&gt;</code>. You would put those around things and "
+"it would loop. There were other cryptic commands that could be used to "
+"conditionally exit the loop.  To make Emacs, we&#8239;<a href=\"#foot-1\">[1]"
+"</a> added facilities to have subroutines with names. Before that, it was "
+"sort of like Basic, and the subroutines could only have single letters as "
+"their names. That was hard to program big programs with, so we added code so "
+"they could have longer names. Actually, there were some rather sophisticated "
+"facilities; I think that Lisp got its unwind-protect facility from TECO."
 msgstr ""
 "Втім люди хотіли доповнити цю мову 
засобами програмування, тому вони додали "
 "деякі засоби. Наприклад, однією з перших 
була додана конструкція циклу, це "
@@ -191,10 +241,20 @@
 "назви. Насправді там були доволі х
итромудрі засоби; здається, засіб &ldquo;"
 "unwind-protect&rdquo; Лісп запозичив з TECO."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "We started putting in rather sophisticated facilities, all with the "
+#| "ugliest syntax you could ever think of, and it worked &mdash; people were "
+#| "able to write large programs in it anyway. The obvious lesson was that a "
+#| "language like TECO, which wasn't designed to be a programming language, "
+#| "was the wrong way to go. The language that you build your extensions on "
+#| "shouldn't be thought of as a programming language in afterthought; it "
+#| "should be designed as a programming language. In fact, we discovered that "
+#| "the best programming language for that purpose was Lisp."
 msgid ""
 "We started putting in rather sophisticated facilities, all with the ugliest "
-"syntax you could ever think of, and it worked &mdash; people were able to "
+"syntax you could ever think of, and it worked&mdash;people were able to "
 "write large programs in it anyway. The obvious lesson was that a language "
 "like TECO, which wasn't designed to be a programming language, was the wrong "
 "way to go. The language that you build your extensions on shouldn't be "
@@ -211,18 +271,30 @@
 "проектувати як мову програмування. 
Фактично, ми виявили, що найкращою мовою "
 "програмування для цих цілей був Лісп."
 
-#. type: Content of: <p>
-msgid ""
-"It was Bernie Greenberg, who discovered that it was <a href=\"#foot-2\">(2)</"
-"a>.  He wrote a version of Emacs in Multics MacLisp, and he wrote his "
-"commands in MacLisp in a straightforward fashion. The editor itself was "
-"written entirely in Lisp. Multics Emacs proved to be a great success &mdash; "
-"programming new editing commands was so convenient that even the secretaries "
-"in his office started learning how to use it. They used a manual someone had "
-"written which showed how to extend Emacs, but didn't say it was a "
-"programming. So the secretaries, who believed they couldn't do programming, "
-"weren't scared off. They read the manual, discovered they could do useful "
-"things and they learned to program."
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "It was Bernie Greenberg, who discovered that it was <a href=\"#foot-2\">"
+#| "(2)</a>.  He wrote a version of Emacs in Multics MacLisp, and he wrote "
+#| "his commands in MacLisp in a straightforward fashion. The editor itself "
+#| "was written entirely in Lisp. Multics Emacs proved to be a great success "
+#| "&mdash; programming new editing commands was so convenient that even the "
+#| "secretaries in his office started learning how to use it. They used a "
+#| "manual someone had written which showed how to extend Emacs, but didn't "
+#| "say it was a programming. So the secretaries, who believed they couldn't "
+#| "do programming, weren't scared off. They read the manual, discovered they "
+#| "could do useful things and they learned to program."
+msgid ""
+"It was Bernie Greenberg, who discovered that it was&#8239;<a href="
+"\"#foot-2\">[2]</a>.  He wrote a version of Emacs in Multics MacLisp, and he "
+"wrote his commands in MacLisp in a straightforward fashion. The editor "
+"itself was written entirely in Lisp. Multics Emacs proved to be a great "
+"success&mdash;programming new editing commands was so convenient that even "
+"the secretaries in his office started learning how to use it. They used a "
+"manual someone had written which showed how to extend Emacs, but didn't say "
+"it was a programming. So the secretaries, who believed they couldn't do "
+"programming, weren't scared off. They read the manual, discovered they could "
+"do useful things and they learned to program."
 msgstr ""
 "Це відкрив Берні Грінберг&nbsp;<a 
href=\"#foot-2\">(2)</a>. Він написав "
 "версію Emacs на MacLisp в Multics, і він писав свої 
програми на MacLisp "
@@ -235,16 +307,27 @@
 "відлякувало. Вони читали посібник, 
виявляли, що можуть робити щось корисне, "
 "і вчилися програмувати."
 
-#. type: Content of: <p>
-msgid ""
-"So Bernie saw that an application &mdash; a program that does something "
-"useful for you &mdash; which has Lisp inside it and which you could extend "
-"by rewriting the Lisp programs, is actually a very good way for people to "
-"learn programming. It gives them a chance to write small programs that are "
-"useful for them, which in most arenas you can't possibly do. They can get "
-"encouragement for their own practical use &mdash; at the stage where it's "
-"the hardest &mdash; where they don't believe they can program, until they "
-"get to the point where they are programmers."
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "So Bernie saw that an application &mdash; a program that does something "
+#| "useful for you &mdash; which has Lisp inside it and which you could "
+#| "extend by rewriting the Lisp programs, is actually a very good way for "
+#| "people to learn programming. It gives them a chance to write small "
+#| "programs that are useful for them, which in most arenas you can't "
+#| "possibly do. They can get encouragement for their own practical use "
+#| "&mdash; at the stage where it's the hardest &mdash; where they don't "
+#| "believe they can program, until they get to the point where they are "
+#| "programmers."
+msgid ""
+"So Bernie saw that an application&mdash;a program that does something useful "
+"for you&mdash;which has Lisp inside it and which you could extend by "
+"rewriting the Lisp programs, is actually a very good way for people to learn "
+"programming. It gives them a chance to write small programs that are useful "
+"for them, which in most arenas you can't possibly do. They can get "
+"encouragement for their own practical use&mdash;at the stage where it's the "
+"hardest&mdash;where they don't believe they can program, until they get to "
+"the point where they are programmers."
 msgstr ""
 "Отож, Берні зрозумів, що застосунок &mdash; 
програма, яка робить щось "
 "корисне для вас&nbsp;&nbsp; всередині якої був 
Лісп і яку ви можете "
@@ -256,30 +339,55 @@
 "програмувати,&mdash; поки вони не дійдуть до 
точки, в якої вони вже стали "
 "програмістами."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "At that point, people began to wonder how they could get something like "
+#| "this on a platform where they didn't have full service Lisp "
+#| "implementation. Multics MacLisp had a compiler as well as an interpreter "
+#| "&mdash; it was a full-fledged Lisp system &mdash; but people wanted to "
+#| "implement something like that on other systems where they had not already "
+#| "written a Lisp compiler. Well, if you didn't have the Lisp compiler you "
+#| "couldn't write the whole editor in Lisp &mdash; it would be too slow, "
+#| "especially redisplay, if it had to run interpreted Lisp.  So we developed "
+#| "a hybrid technique. The idea was to write a Lisp interpreter and the "
+#| "lower level parts of the editor together, so that parts of the editor "
+#| "were built-in Lisp facilities. Those would be whatever parts we felt we "
+#| "had to optimize. This was a technique that we had already consciously "
+#| "practiced in the original Emacs, because there were certain fairly high "
+#| "level features which we re-implemented in machine language, making them "
+#| "into TECO primitives. For instance, there was a TECO primitive to fill a "
+#| "paragraph (actually, to do most of the work of filling a paragraph, "
+#| "because some of the less time-consuming parts of the job would be done at "
+#| "the higher level by a TECO program). You could do the whole job by "
+#| "writing a TECO program, but that was too slow, so we optimized it by "
+#| "putting part of it in machine language. We used the same idea here (in "
+#| "the hybrid technique), that most of the editor would be written in Lisp, "
+#| "but certain parts of it that had to run particularly fast would be "
+#| "written at a lower level."
 msgid ""
 "At that point, people began to wonder how they could get something like this "
 "on a platform where they didn't have full service Lisp implementation. "
-"Multics MacLisp had a compiler as well as an interpreter &mdash; it was a "
-"full-fledged Lisp system &mdash; but people wanted to implement something "
-"like that on other systems where they had not already written a Lisp "
-"compiler. Well, if you didn't have the Lisp compiler you couldn't write the "
-"whole editor in Lisp &mdash; it would be too slow, especially redisplay, if "
-"it had to run interpreted Lisp.  So we developed a hybrid technique. The "
-"idea was to write a Lisp interpreter and the lower level parts of the editor "
-"together, so that parts of the editor were built-in Lisp facilities. Those "
-"would be whatever parts we felt we had to optimize. This was a technique "
-"that we had already consciously practiced in the original Emacs, because "
-"there were certain fairly high level features which we re-implemented in "
-"machine language, making them into TECO primitives. For instance, there was "
-"a TECO primitive to fill a paragraph (actually, to do most of the work of "
-"filling a paragraph, because some of the less time-consuming parts of the "
-"job would be done at the higher level by a TECO program). You could do the "
-"whole job by writing a TECO program, but that was too slow, so we optimized "
-"it by putting part of it in machine language. We used the same idea here (in "
-"the hybrid technique), that most of the editor would be written in Lisp, but "
-"certain parts of it that had to run particularly fast would be written at a "
-"lower level."
+"Multics MacLisp had a compiler as well as an interpreter&mdash;it was a full-"
+"fledged Lisp system&mdash;but people wanted to implement something like that "
+"on other systems where they had not already written a Lisp compiler. Well, "
+"if you didn't have the Lisp compiler you couldn't write the whole editor in "
+"Lisp&mdash;it would be too slow, especially redisplay, if it had to run "
+"interpreted Lisp.  So we developed a hybrid technique. The idea was to write "
+"a Lisp interpreter and the lower level parts of the editor together, so that "
+"parts of the editor were built-in Lisp facilities. Those would be whatever "
+"parts we felt we had to optimize. This was a technique that we had already "
+"consciously practiced in the original Emacs, because there were certain "
+"fairly high level features which we re-implemented in machine language, "
+"making them into TECO primitives. For instance, there was a TECO primitive "
+"to fill a paragraph (actually, to do most of the work of filling a "
+"paragraph, because some of the less time-consuming parts of the job would be "
+"done at the higher level by a TECO program). You could do the whole job by "
+"writing a TECO program, but that was too slow, so we optimized it by putting "
+"part of it in machine language. We used the same idea here (in the hybrid "
+"technique), that most of the editor would be written in Lisp, but certain "
+"parts of it that had to run particularly fast would be written at a lower "
+"level."
 msgstr ""
 "У цей момент люди почали міркувати, як 
отримати щось подібне на платформі, "
 "де у них не було повної реалізації Ліспа. У 
MacLisp для Multics був "
@@ -304,16 +412,25 @@
 "буде написана на Ліспі, але певні його 
частини, які потрібно було виконувати "
 "особливо швидко, будуть написані на 
низькому рівні."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Therefore, when I wrote my second implementation of Emacs, I followed the "
+#| "same kind of design. The low level language was not machine language "
+#| "anymore, it was C. C was a good, efficient language for portable programs "
+#| "to run in a Unix-like operating system. There was a Lisp interpreter, but "
+#| "I implemented facilities for special purpose editing jobs directly in C "
+#| "&mdash; manipulating editor buffers, inserting leading text, reading and "
+#| "writing files, redisplaying the buffer on the screen, managing editor "
+#| "windows."
 msgid ""
 "Therefore, when I wrote my second implementation of Emacs, I followed the "
 "same kind of design. The low level language was not machine language "
 "anymore, it was C. C was a good, efficient language for portable programs to "
 "run in a Unix-like operating system. There was a Lisp interpreter, but I "
-"implemented facilities for special purpose editing jobs directly in C "
-"&mdash; manipulating editor buffers, inserting leading text, reading and "
-"writing files, redisplaying the buffer on the screen, managing editor "
-"windows."
+"implemented facilities for special purpose editing jobs directly in C&mdash;"
+"manipulating editor buffers, inserting leading text, reading and writing "
+"files, redisplaying the buffer on the screen, managing editor windows."
 msgstr ""
 "Таким чином, коли я писав свою другу 
реалізацію Emacs, я дотримувався цієї  "
 "схеми. Мова низького рівня більше не була 
машинною мовою, це був Сі. Сі "
@@ -324,20 +441,34 @@
 "вставка тексту на початок, читання і запис 
файлів, оновлення буфера на "
 "екрані, управління вікнами редактора."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Now, this was not the first Emacs that was written in C and ran on Unix. "
+#| "The first was written by James Gosling, and was referred to as GosMacs. A "
+#| "strange thing happened with him. In the beginning, he seemed to be "
+#| "influenced by the same spirit of sharing and cooperation of the original "
+#| "Emacs. I first released the original Emacs to people at MIT. Someone "
+#| "wanted to port it to run on Twenex &mdash; it originally only ran on the "
+#| "Incompatible Timesharing System we used at MIT. They ported it to Twenex, "
+#| "which meant that there were a few hundred installations around the world "
+#| "that could potentially use it. We started distributing it to them, with "
+#| "the rule that &ldquo;you had to send back all of your improvements&rdquo; "
+#| "so we could all benefit. No one ever tried to enforce that, but as far as "
+#| "I know people did cooperate."
 msgid ""
 "Now, this was not the first Emacs that was written in C and ran on Unix. The "
 "first was written by James Gosling, and was referred to as GosMacs. A "
 "strange thing happened with him. In the beginning, he seemed to be "
 "influenced by the same spirit of sharing and cooperation of the original "
 "Emacs. I first released the original Emacs to people at MIT. Someone wanted "
-"to port it to run on Twenex &mdash; it originally only ran on the "
-"Incompatible Timesharing System we used at MIT. They ported it to Twenex, "
-"which meant that there were a few hundred installations around the world "
-"that could potentially use it. We started distributing it to them, with the "
-"rule that &ldquo;you had to send back all of your improvements&rdquo; so we "
-"could all benefit. No one ever tried to enforce that, but as far as I know "
-"people did cooperate."
+"to port it to run on Twenex&mdash;it originally only ran on the Incompatible "
+"Timesharing System we used at MIT. They ported it to Twenex, which meant "
+"that there were a few hundred installations around the world that could "
+"potentially use it. We started distributing it to them, with the rule that "
+"&ldquo;you had to send back all of your improvements&rdquo; so we could all "
+"benefit. No one ever tried to enforce that, but as far as I know people did "
+"cooperate."
 msgstr ""
 "Доречі це був не перший Emacs, написаний на 
Сі і працював в Unix. Перший був "
 "написаний Джеймсом Гослінгом, його 
називали GosMacs. З них вийшла дивна "
@@ -353,12 +484,20 @@
 "користь. Ніхто ніколи не намагався 
стежити за дотриманням цього, але "
 "наскільки я знаю, люди дійсно 
співпрацювали."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Gosling did, at first, seem to participate in this spirit. He wrote in a "
+#| "manual that he called the program Emacs hoping that others in the "
+#| "community would improve it until it was worthy of that name. That's the "
+#| "right approach to take towards a community &mdash; to ask them to join in "
+#| "and make the program better. But after that he seemed to change the "
+#| "spirit, and sold it to a company."
 msgid ""
 "Gosling did, at first, seem to participate in this spirit. He wrote in a "
 "manual that he called the program Emacs hoping that others in the community "
 "would improve it until it was worthy of that name. That's the right approach "
-"to take towards a community &mdash; to ask them to join in and make the "
+"to take towards a community&mdash;to ask them to join in and make the "
 "program better. But after that he seemed to change the spirit, and sold it "
 "to a company."
 msgstr ""
@@ -369,7 +508,20 @@
 "приєднатися і поліпшувати програму. Але 
після цього його ставлення, "
 "здається, змінилося, і він продав програму 
одній компанії."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "At that time I was working on the GNU system (a free software Unix-like "
+#| "operating system that many people erroneously call &ldquo;Linux&rdquo;).  "
+#| "There was no free software Emacs editor that ran on Unix. I did, however, "
+#| "have a friend who had participated in developing Gosling's Emacs. Gosling "
+#| "had given him, by email, permission to distribute his own version. He "
+#| "proposed to me that I use that version. Then I discovered that Gosling's "
+#| "Emacs did not have a real Lisp. It had a programming language that was "
+#| "known as &lsquo;mocklisp&rsquo;, which looks syntactically like Lisp, but "
+#| "didn't have the data structures of Lisp.  So programs were not data, and "
+#| "vital elements of Lisp were missing.  Its data structures were strings, "
+#| "numbers and a few other specialized things."
 msgid ""
 "At that time I was working on the GNU system (a free software Unix-like "
 "operating system that many people erroneously call &ldquo;Linux&rdquo;).  "
@@ -378,7 +530,7 @@
 "had given him, by email, permission to distribute his own version. He "
 "proposed to me that I use that version. Then I discovered that Gosling's "
 "Emacs did not have a real Lisp. It had a programming language that was known "
-"as &lsquo;mocklisp&rsquo;, which looks syntactically like Lisp, but didn't "
+"as &ldquo;mocklisp,&rdquo; which looks syntactically like Lisp, but didn't "
 "have the data structures of Lisp.  So programs were not data, and vital "
 "elements of Lisp were missing.  Its data structures were strings, numbers "
 "and a few other specialized things."
@@ -395,7 +547,7 @@
 "важливих елементів Ліспа. Його 
структурами даних були рядки, числа і деякі 
"
 "інші спеціалізовані об'єкти."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I concluded I couldn't use it and had to replace it all, the first step of "
 "which was to write an actual Lisp interpreter. I gradually adapted every "
@@ -410,13 +562,21 @@
 "виведення внутрішніх структур даних 
редактора і маніпуляцій ними у "
 "користувацьких програмах на Ліспі."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The one exception was redisplay. For a long time, redisplay was sort of "
+#| "an alternate world. The editor would enter the world of redisplay and "
+#| "things would go on with very special data structures that were not safe "
+#| "for garbage collection, not safe for interruption, and you couldn't run "
+#| "any Lisp programs during that. We've changed that since &mdash; it's now "
+#| "possible to run Lisp code during redisplay. It's quite a convenient thing."
 msgid ""
 "The one exception was redisplay. For a long time, redisplay was sort of an "
 "alternate world. The editor would enter the world of redisplay and things "
 "would go on with very special data structures that were not safe for garbage "
 "collection, not safe for interruption, and you couldn't run any Lisp "
-"programs during that. We've changed that since &mdash; it's now possible to "
+"programs during that. We've changed that since&mdash;it's now possible to "
 "run Lisp code during redisplay. It's quite a convenient thing."
 msgstr ""
 "Єдиним винятком було відображення на 
дисплеї. Довгий час оновлення на "
@@ -427,15 +587,26 @@
 "&nbsp; зараз можна виконувати програми на 
Ліспі під час перемальовування. Це "
 "дуже зручно."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "This second Emacs program was &lsquo;free software&rsquo; in the modern "
+#| "sense of the term &mdash; it was part of an explicit political campaign "
+#| "to make software free. The essence of this campaign was that everybody "
+#| "should be free to do the things we did in the old days at MIT, working "
+#| "together on software and working with whomever wanted to work with us.  "
+#| "That is the basis for the free software movement &mdash; the experience I "
+#| "had, the life that I've lived at the MIT AI lab &mdash; to be working on "
+#| "human knowledge, and not be standing in the way of anybody's further "
+#| "using and further disseminating human knowledge."
 msgid ""
-"This second Emacs program was &lsquo;free software&rsquo; in the modern "
-"sense of the term &mdash; it was part of an explicit political campaign to "
+"This second Emacs program was &ldquo;free software&rdquo; in the modern "
+"sense of the term&mdash;it was part of an explicit political campaign to "
 "make software free. The essence of this campaign was that everybody should "
 "be free to do the things we did in the old days at MIT, working together on "
 "software and working with whomever wanted to work with us.  That is the "
-"basis for the free software movement &mdash; the experience I had, the life "
-"that I've lived at the MIT AI lab &mdash; to be working on human knowledge, "
+"basis for the free software movement&mdash;the experience I had, the life "
+"that I've lived at the MIT AI lab&mdash;to be working on human knowledge, "
 "and not be standing in the way of anybody's further using and further "
 "disseminating human knowledge."
 msgstr ""
@@ -450,7 +621,7 @@
 "не стовбичте ні в кого на шляху до 
подальшого застосування та подальшого "
 "поширення людського знання."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "At the time, you could make a computer that was about the same price range "
 "as other computers that weren't meant for Lisp, except that it would run "
@@ -470,11 +641,21 @@
 "взяти <code>car</code> від числа, це призводило до 
безглуздих результатів і "
 "врешті-решт коли-небудь призводило до 
збою."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The Lisp machine was able to execute instructions about as fast as those "
+#| "other machines, but each instruction &mdash; a <code>car</code> "
+#| "instruction would do data typechecking &mdash; so when you tried to get "
+#| "the <code>car</code> of a number in a compiled program, it would give you "
+#| "an immediate error. We built the machine and had a Lisp operating system "
+#| "for it. It was written almost entirely in Lisp, the only exceptions being "
+#| "parts written in the microcode. People became interested in manufacturing "
+#| "them, which meant they should start a company."
 msgid ""
 "The Lisp machine was able to execute instructions about as fast as those "
-"other machines, but each instruction &mdash; a <code>car</code> instruction "
-"would do data typechecking &mdash; so when you tried to get the <code>car</"
+"other machines, but each instruction&mdash;a <code>car</code> instruction "
+"would do data typechecking&mdash;so when you tried to get the <code>car</"
 "code> of a number in a compiled program, it would give you an immediate "
 "error. We built the machine and had a Lisp operating system for it. It was "
 "written almost entirely in Lisp, the only exceptions being parts written in "
@@ -489,15 +670,25 @@
 "була написана на Ліспі, за винятком 
частин, записаних в мікрокоді. Виник "
 "інтерес до виробництва машин, а це 
означало, що потрібно створити компанію."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "There were two different ideas about what this company should be like.  "
+#| "Greenblatt wanted to start what he called a &ldquo;hacker&rdquo; company. "
+#| "This meant it would be a company run by hackers and would operate in a "
+#| "way conducive to hackers. Another goal was to maintain the AI Lab culture "
+#| "<a href=\"#foot-3\">(3)</a>.  Unfortunately, Greenblatt didn't have any "
+#| "business experience, so other people in the Lisp machine group said they "
+#| "doubted whether he could succeed. They thought that his plan to avoid "
+#| "outside investment wouldn't work."
 msgid ""
 "There were two different ideas about what this company should be like.  "
 "Greenblatt wanted to start what he called a &ldquo;hacker&rdquo; company. "
 "This meant it would be a company run by hackers and would operate in a way "
-"conducive to hackers. Another goal was to maintain the AI Lab culture <a "
-"href=\"#foot-3\">(3)</a>.  Unfortunately, Greenblatt didn't have any "
-"business experience, so other people in the Lisp machine group said they "
-"doubted whether he could succeed. They thought that his plan to avoid "
+"conducive to hackers. Another goal was to maintain the AI Lab culture&#8239;"
+"<a class=\"ftn\" href=\"#foot-3\">[3]</a>.  Unfortunately, Greenblatt didn't "
+"have any business experience, so other people in the Lisp machine group said "
+"they doubted whether he could succeed. They thought that his plan to avoid "
 "outside investment wouldn't work."
 msgstr ""
 "Було два різних уявлення про те, якою 
повинна бути ця компанія. Грінблет "
@@ -509,7 +700,7 @@
 "вони сумніваються в його спроможності  це 
зробити. Вони думали, що уникнути "
 "зовнішніх капіталовкладень, як він 
планував, не вдасться."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Why did he want to avoid outside investment? Because when a company has "
 "outside investors, they take control and they don't let you have any "
@@ -521,7 +712,7 @@
 "дозволяють вам бути педантичним; а якщо ви 
скільки-небудь педантичні, то "
 "вони врешті-решт поставлять на керівну 
посаду кого-небудь іншого."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So Greenblatt had the idea that he would find a customer who would pay in "
 "advance to buy the parts. They would build machines and deliver them; with "
@@ -536,7 +727,7 @@
 "для декількох машин, продати їх, а потім 
купити комплектуючі для більшого "
 "числа машин і так далі. Інші люди з групи 
думали, що так працювати не вийде."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Greenblatt then recruited Russell Noftsker, the man who had hired me, who "
 "had subsequently left the AI Lab and created a successful company.  Russell "
@@ -556,7 +747,7 @@
 "&ldquo;Symbolics&rdquo;, залучати зовнішній капітал, 
не бути педантичними і "
 "робити все можливе, щоб перемогти."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "But Greenblatt didn't give up. He and the few people loyal to him decided to "
 "start Lisp Machines Inc. anyway and go ahead with their plans. And what do "
@@ -578,7 +769,7 @@
 "зрозуміли, що LMI не думає вилітати в трубу, 
вони стали шукати способи "
 "зруйнувати її."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Thus, the abandonment of our lab was followed by &ldquo;war&rdquo; in our "
 "lab.  The abandonment happened when Symbolics hired away all the hackers, "
@@ -605,13 +796,20 @@
 "Ліспів, які ліцензували обидві компанії. 
Ніхто не передбачав, що групу "
 "хакерів Лабораторії штучного інтелекту 
розженуть, але так і сталося."
 
-#. type: Content of: <p>
-msgid ""
-"So Symbolics came up with a plan <a href=\"#foot-4\">(4)</a>.  They said to "
-"the lab, &ldquo;We will continue making our changes to the system available "
-"for you to use, but you can't put it into the MIT Lisp machine system. "
-"Instead, we'll give you access to Symbolics' Lisp machine system, and you "
-"can run it, but that's all you can do.&rdquo;"
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "So Symbolics came up with a plan <a href=\"#foot-4\">(4)</a>.  They said "
+#| "to the lab, &ldquo;We will continue making our changes to the system "
+#| "available for you to use, but you can't put it into the MIT Lisp machine "
+#| "system. Instead, we'll give you access to Symbolics' Lisp machine system, "
+#| "and you can run it, but that's all you can do.&rdquo;"
+msgid ""
+"So Symbolics came up with a plan&#8239;<a href=\"#foot-4\">[4]</a>.  They "
+"said to the lab, &ldquo;We will continue making our changes to the system "
+"available for you to use, but you can't put it into the MIT Lisp machine "
+"system. Instead, we'll give you access to Symbolics' Lisp machine system, "
+"and you can run it, but that's all you can do.&rdquo;"
 msgstr ""
 "Отже, в Symbolics дозрів план&nbsp;<a 
href=\"#foot-4\">(4)</a>. Вони сказали "
 "лабораторії: &ldquo;Ми продовжимо надавати у 
ваше користування свої зміни в "
@@ -619,7 +817,7 @@
 "Замість цього ми надамо вам доступ до 
системи машини Ліспа Symbolics, і ви "
 "зможете працювати на ній, але це все, що ви 
можете робити."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This, in effect, meant that they demanded that we had to choose a side, and "
 "use either the MIT version of the system or the Symbolics version.  "
@@ -639,12 +837,21 @@
 "розуміли, що з нашого боку це було б 
підтримкою LMI, тому що ми допомагали б "
 "їм продовжувати існування. Отож, нам не 
дозволили залишатися нейтральними."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Up until that point, I hadn't taken the side of either company, although "
+#| "it made me miserable to see what had happened to our community and the "
+#| "software.  But now, Symbolics had forced the issue.  So, in an effort to "
+#| "help keep Lisp Machines Inc. going <a href=\"#foot-5\">(5)</a> &mdash; I "
+#| "began duplicating all of the improvements Symbolics had made to the Lisp "
+#| "machine system.  I wrote the equivalent improvements again myself (i.e., "
+#| "the code was my own)."
 msgid ""
 "Up until that point, I hadn't taken the side of either company, although it "
 "made me miserable to see what had happened to our community and the "
 "software.  But now, Symbolics had forced the issue.  So, in an effort to "
-"help keep Lisp Machines Inc. going <a href=\"#foot-5\">(5)</a> &mdash; I "
+"help keep Lisp Machines Inc. going&#8239;<a href=\"#foot-5\">[5]</a>&mdash;I "
 "began duplicating all of the improvements Symbolics had made to the Lisp "
 "machine system.  I wrote the equivalent improvements again myself (i.e., the "
 "code was my own)."
@@ -657,12 +864,19 @@
 "Symbolics. Я писав еквівалентні поліпшення сам 
(тобто тексти програм були "
 "моїми власними)."
 
-#. type: Content of: <p>
-msgid ""
-"After a while <a href=\"#foot-6\">(6)</a>, I came to the conclusion that it "
-"would be best if I didn't even look at their code. When they made a beta "
-"announcement that gave the release notes, I would see what the features were "
-"and then implement them. By the time they had a real release, I did too."
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "After a while <a href=\"#foot-6\">(6)</a>, I came to the conclusion that "
+#| "it would be best if I didn't even look at their code. When they made a "
+#| "beta announcement that gave the release notes, I would see what the "
+#| "features were and then implement them. By the time they had a real "
+#| "release, I did too."
+msgid ""
+"After a while&#8239;<a href=\"#foot-6\">[6]</a>, I came to the conclusion "
+"that it would be best if I didn't even look at their code. When they made a "
+"beta announcement that gave the release notes, I would see what the features "
+"were and then implement them. By the time they had a real release, I did too."
 msgstr ""
 "Через деякий час&nbsp;<a href=\"#foot-6\">(6)</a> я 
прийшов до висновку, що "
 "було б найкраще, якби я навіть не заглядав 
у їхні тексти. Коли вони робили "
@@ -670,15 +884,24 @@
 "які там були функції, а потім впроваджував 
їх. До того часу, як вони "
 "випускали остаточну версію, я теж 
випускав таку версію."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "In this way, for two years, I prevented them from wiping out Lisp "
+#| "Machines Incorporated, and the two companies went on. But, I didn't want "
+#| "to spend years and years punishing someone, just thwarting an evil deed. "
+#| "I figured they had been punished pretty thoroughly because they were "
+#| "stuck with competition that was not leaving or going to disappear <a href="
+#| "\"#foot-7\">(7)</a>. Meanwhile, it was time to start building a new "
+#| "community to replace the one that their actions and others had wiped out."
 msgid ""
 "In this way, for two years, I prevented them from wiping out Lisp Machines "
 "Incorporated, and the two companies went on. But, I didn't want to spend "
 "years and years punishing someone, just thwarting an evil deed. I figured "
 "they had been punished pretty thoroughly because they were stuck with "
-"competition that was not leaving or going to disappear <a href=\"#foot-7\">"
-"(7)</a>. Meanwhile, it was time to start building a new community to replace "
-"the one that their actions and others had wiped out."
+"competition that was not leaving or going to disappear&#8239;<a href="
+"\"#foot-7\">[7]</a>.  Meanwhile, it was time to start building a new "
+"community to replace the one that their actions and others had wiped out."
 msgstr ""
 "Таким чином, протягом двох років я не 
давав їм покінчити з LMI, і ці дві "
 "компанії продовжували роботу. Але я не х
отів витрачати довгі роки на те, щоб "
@@ -688,7 +911,7 @@
 "почати облаштування нового 
співтовариства замість того, яке було 
знищено "
 "їхніми діями та діями інших."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The Lisp community in the 70s was not limited to the MIT AI Lab, and the "
 "hackers were not all at MIT. The war that Symbolics started was what wiped "
@@ -703,18 +926,38 @@
 "і інші події. Були люди, які припиняли 
співпрацю, і все це разом спустошило "
 "наше співтовариство, і від нього майже 
нічого не залишилося."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Once I stopped punishing Symbolics, I had to figure out what to do next. "
+#| "I had to make a free operating system, that was clear &mdash; the only "
+#| "way that people could work together and share was with a free operating "
+#| "system."
 msgid ""
 "Once I stopped punishing Symbolics, I had to figure out what to do next. I "
-"had to make a free operating system, that was clear &mdash; the only way "
-"that people could work together and share was with a free operating system."
+"had to make a free operating system, that was clear&mdash;the only way that "
+"people could work together and share was with a free operating system."
 msgstr ""
 "Коли я припинив карати Symbolics, мені 
довелося вигадувати, що робити далі. "
 "Мені потрібно було зробити вільну 
операційну систему, це було ясно&nbsp;"
 "&nbsp; єдиним способом дати людям спільно 
працювати і обмінюватися була "
 "вільна операційна система."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "At first, I thought of making a Lisp-based system, but I realized that "
+#| "wouldn't be a good idea technically. To have something like the Lisp "
+#| "machine system, you needed special purpose microcode. That's what made it "
+#| "possible to run programs as fast as other computers would run their "
+#| "programs and still get the benefit of typechecking. Without that, you "
+#| "would be reduced to something like the Lisp compilers for other machines. "
+#| "The programs would be faster, but unstable. Now that's okay if you're "
+#| "running one program on a timesharing system &mdash; if one program "
+#| "crashes, that's not a disaster, that's something your program "
+#| "occasionally does. But that didn't make it good for writing the operating "
+#| "system in, so I rejected the idea of making a system like the Lisp "
+#| "machine."
 msgid ""
 "At first, I thought of making a Lisp-based system, but I realized that "
 "wouldn't be a good idea technically. To have something like the Lisp machine "
@@ -723,7 +966,7 @@
 "still get the benefit of typechecking. Without that, you would be reduced to "
 "something like the Lisp compilers for other machines. The programs would be "
 "faster, but unstable. Now that's okay if you're running one program on a "
-"timesharing system &mdash; if one program crashes, that's not a disaster, "
+"timesharing system&mdash;if one program crashes, that's not a disaster, "
 "that's something your program occasionally does. But that didn't make it "
 "good for writing the operating system in, so I rejected the idea of making a "
 "system like the Lisp machine."
@@ -741,7 +984,7 @@
 "систему, тому я відмовився від думки про 
те, щоб зробити систему на взірець "
 "машини Ліспа."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I decided instead to make a Unix-like operating system that would have Lisp "
 "implementations to run as user programs. The kernel wouldn't be written in "
@@ -757,7 +1000,7 @@
 "Emacs. В процесі цього я прагнув зробити 
абсолютно мінімально можливу "
 "реалізацію Ліспа. Розмір програм мав 
надзвичайне значення."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There were people in those days, in 1985, who had one-megabyte machines "
 "without virtual memory. They wanted to be able to use GNU Emacs. This meant "
@@ -768,15 +1011,25 @@
 "Emacs. Це означало, що мені потрібно 
обмежувати програму якнайменшим "
 "розміром."
 
-#. type: Content of: <p>
-msgid ""
-"For instance, at the time the only looping construct was &lsquo;"
-"while&rsquo;, which was extremely simple. There was no way to break out of "
-"the &lsquo;while&rsquo; statement, you just had to do a catch and a throw, "
-"or test a variable that ran the loop. That shows how far I was pushing to "
-"keep things small. We didn't have &lsquo;caar&rsquo; and &lsquo;cadr&rsquo; "
-"and so on; &ldquo;squeeze out everything possible&rdquo; was the spirit of "
-"GNU Emacs, the spirit of Emacs Lisp, from the beginning."
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "For instance, at the time the only looping construct was &lsquo;"
+#| "while&rsquo;, which was extremely simple. There was no way to break out "
+#| "of the &lsquo;while&rsquo; statement, you just had to do a catch and a "
+#| "throw, or test a variable that ran the loop. That shows how far I was "
+#| "pushing to keep things small. We didn't have &lsquo;caar&rsquo; and "
+#| "&lsquo;cadr&rsquo; and so on; &ldquo;squeeze out everything "
+#| "possible&rdquo; was the spirit of GNU Emacs, the spirit of Emacs Lisp, "
+#| "from the beginning."
+msgid ""
+"For instance, at the time the only looping construct was <code>while</code>, "
+"which was extremely simple. There was no way to break out of the "
+"<code>while</code> statement, you just had to do a catch and a throw, or "
+"test a variable that ran the loop. That shows how far I was pushing to keep "
+"things small. We didn't have <code>caar</code> and <code>cadr</code> and so "
+"on; &ldquo;squeeze out everything possible&rdquo; was the spirit of GNU "
+"Emacs, the spirit of Emacs Lisp, from the beginning."
 msgstr ""
 "Наприклад, у той час єдиною циклічною 
конструкцією була &ldquo;while&rdquo;, "
 "яка є вкрай простою. Не було ніяких 
способів дострокового виходу з оператора "
@@ -786,15 +1039,25 @@
 "&ldquo;вичавити все можливе&rdquo;&nbsp;&nbsp; таким 
духом був просякнутий "
 "GNU Emacs і його Лісп з самого початку."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Obviously, machines are bigger now, and we don't do it that way any more. "
+#| "We put in &lsquo;caar&rsquo; and &lsquo;cadr&rsquo; and so on, and we "
+#| "might put in another looping construct one of these days. We're willing "
+#| "to extend it some now, but we don't want to extend it to the level of "
+#| "common Lisp. I implemented Common Lisp once on the Lisp machine, and I'm "
+#| "not all that happy with it. One thing I don't like terribly much is "
+#| "keyword arguments <a href=\"#foot-8\">(8)</a>.  They don't seem quite "
+#| "Lispy to me; I'll do it sometimes but I minimize the times when I do that."
 msgid ""
 "Obviously, machines are bigger now, and we don't do it that way any more. We "
-"put in &lsquo;caar&rsquo; and &lsquo;cadr&rsquo; and so on, and we might put "
+"put in <code>caar</code> and <code>cadr</code> and so on, and we might put "
 "in another looping construct one of these days. We're willing to extend it "
 "some now, but we don't want to extend it to the level of common Lisp. I "
 "implemented Common Lisp once on the Lisp machine, and I'm not all that happy "
-"with it. One thing I don't like terribly much is keyword arguments <a href="
-"\"#foot-8\">(8)</a>.  They don't seem quite Lispy to me; I'll do it "
+"with it. One thing I don't like terribly much is keyword arguments&#8239;<a "
+"href=\"#foot-8\">[8]</a>.  They don't seem quite Lispy to me; I'll do it "
 "sometimes but I minimize the times when I do that."
 msgstr ""
 "Зрозуміло, машин зараз більше і ми вже так 
не робимо. Ми заклали &ldquo;"
@@ -807,7 +1070,7 @@
 "виглядає не зовсім по-ліспівськи; іноді я 
пишу так, але зводжу до мінімуму "
 "кількість випадків, коли я це роблю."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "That was not the end of the GNU projects involved with Lisp. Later on around "
 "1995, we were looking into starting a graphical desktop project. It was "
@@ -822,7 +1085,7 @@
 "легко розширюваною, як редактор. Постало 
питання про те, якою повинна бути "
 "мова."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "At the time, <abbr title=\"Tool Command Language\">TCL</abbr> was being "
 "pushed heavily for this purpose. I had a very low opinion of TCL, basically "
@@ -849,7 +1112,7 @@
 "спроектований для компонування у додатки 
так само, як це робили з TCL. Тоді "
 "ми стали б рекомендувати це як бажаний 
пакет розширень для всіх програм GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There's an interesting benefit you can get from using such a powerful "
 "language as a version of Lisp as your primary extensibility language.  You "
@@ -875,18 +1138,34 @@
 "надбудовувати його під свою улюблену мову 
і він працював би і з іншими "
 "надбудовами."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "As long as the extensibility languages are weak, the users have to use "
+#| "only the language you provided them. Which means that people who love any "
+#| "given language have to compete for the choice of the developers of "
+#| "applications &mdash; saying &ldquo;Please, application developer, put my "
+#| "language into your application, not his language.&rdquo; Then the users "
+#| "get no choices at all &mdash; whichever application they're using comes "
+#| "with one language and they're stuck with [that language]. But when you "
+#| "have a powerful language that can implement others by translating into "
+#| "it, then you give the user a choice of language and we don't have to have "
+#| "a language war anymore. That's what we're hoping &lsquo;Guile&rsquo;, our "
+#| "scheme interpreter, will do. We had a person working last summer "
+#| "finishing up a translator from Python to Scheme. I don't know if it's "
+#| "entirely finished yet, but for anyone interested in this project, please "
+#| "get in touch. So that's the plan we have for the future."
 msgid ""
 "As long as the extensibility languages are weak, the users have to use only "
 "the language you provided them. Which means that people who love any given "
-"language have to compete for the choice of the developers of applications "
-"&mdash; saying &ldquo;Please, application developer, put my language into "
-"your application, not his language.&rdquo; Then the users get no choices at "
-"all &mdash; whichever application they're using comes with one language and "
-"they're stuck with [that language]. But when you have a powerful language "
-"that can implement others by translating into it, then you give the user a "
-"choice of language and we don't have to have a language war anymore. That's "
-"what we're hoping &lsquo;Guile&rsquo;, our scheme interpreter, will do. We "
+"language have to compete for the choice of the developers of "
+"applications&mdash;saying &ldquo;Please, application developer, put my "
+"language into your application, not his language.&rdquo; Then the users get "
+"no choices at all&mdash;whichever application they're using comes with one "
+"language and they're stuck with [that language]. But when you have a "
+"powerful language that can implement others by translating into it, then you "
+"give the user a choice of language and we don't have to have a language war "
+"anymore. That's what we're hoping Guile, our scheme interpreter, will do. We "
 "had a person working last summer finishing up a translator from Python to "
 "Scheme. I don't know if it's entirely finished yet, but for anyone "
 "interested in this project, please get in touch. So that's the plan we have "
@@ -907,7 +1186,18 @@
 "якщо хтось зацікавлений у цьому проекті, 
нехай зв'яжеться. Ось такі у нас "
 "плани на майбутнє."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "I haven't been speaking about free software, but let me briefly tell you "
+#| "a little bit about what that means. Free software does not refer to "
+#| "price; it doesn't mean that you get it for free. (You may have paid for a "
+#| "copy, or gotten a copy gratis.) It means that you have freedom as a user. "
+#| "The crucial thing is that you are free to run the program, free to study "
+#| "what it does, free to change it to suit your needs, free to redistribute "
+#| "the copies of others and free to publish improved, extended versions. "
+#| "This is what free software means. If you are using a non-free program, "
+#| "you have lost crucial freedom, so don't ever do that."
 msgid ""
 "I haven't been speaking about free software, but let me briefly tell you a "
 "little bit about what that means. Free software does not refer to price; it "
@@ -916,7 +1206,7 @@
 "thing is that you are free to run the program, free to study what it does, "
 "free to change it to suit your needs, free to redistribute the copies of "
 "others and free to publish improved, extended versions. This is what free "
-"software means. If you are using a non-free program, you have lost crucial "
+"software means. If you are using a nonfree program, you have lost crucial "
 "freedom, so don't ever do that."
 msgstr ""
 "Я не говорив про вільне програмне 
забезпечення, але дозвольте мені коротко "
@@ -930,12 +1220,22 @@
 "означає вільна програма. Якщо ви 
користуєтеся невільною програмою, то ви "
 "втратили життєво важливу свободу, тому 
ніколи цього не робіть."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The purpose of the GNU project is to make it easier for people to reject "
+#| "freedom-trampling, user-dominating, non-free software by providing free "
+#| "software to replace it. For those who don't have the moral courage to "
+#| "reject the non-free software, when that means some practical "
+#| "inconvenience, what we try to do is give a free alternative so that you "
+#| "can move to freedom with less of a mess and less of a sacrifice in "
+#| "practical terms. The less sacrifice the better. We want to make it easier "
+#| "for you to live in freedom, to cooperate."
 msgid ""
 "The purpose of the GNU project is to make it easier for people to reject "
-"freedom-trampling, user-dominating, non-free software by providing free "
+"freedom-trampling, user-dominating, nonfree software by providing free "
 "software to replace it. For those who don't have the moral courage to reject "
-"the non-free software, when that means some practical inconvenience, what we "
+"the nonfree software, when that means some practical inconvenience, what we "
 "try to do is give a free alternative so that you can move to freedom with "
 "less of a mess and less of a sacrifice in practical terms. The less "
 "sacrifice the better. We want to make it easier for you to live in freedom, "
@@ -950,16 +1250,26 @@
 "практичному сенсі. Чим менші жертви, тим 
краще. Ми хочемо полегшити для вас "
 "співпрацю і вільне життя."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "This is a matter of the freedom to cooperate. We're used to thinking of "
+#| "freedom and cooperation with society as if they are opposites. But here "
+#| "they're on the same side. With free software you are free to cooperate "
+#| "with other people as well as free to help yourself. With non-free "
+#| "software, somebody is dominating you and keeping people divided. You're "
+#| "not allowed to share with them, you're not free to cooperate or help "
+#| "society, anymore than you're free to help yourself.  Divided and helpless "
+#| "is the state of users using non-free software."
 msgid ""
 "This is a matter of the freedom to cooperate. We're used to thinking of "
 "freedom and cooperation with society as if they are opposites. But here "
 "they're on the same side. With free software you are free to cooperate with "
-"other people as well as free to help yourself. With non-free software, "
+"other people as well as free to help yourself. With nonfree software, "
 "somebody is dominating you and keeping people divided. You're not allowed to "
 "share with them, you're not free to cooperate or help society, anymore than "
 "you're free to help yourself.  Divided and helpless is the state of users "
-"using non-free software."
+"using nonfree software."
 msgstr ""
 "Співпраця&nbsp;&mdash; це питання свободи. Ми 
звикли думати про свободу і "
 "співпрацю з товариством як про 
протилежності. Але в даному випадку вони на 
"
@@ -970,21 +1280,37 @@
 "допомогти самим собі. Роз'єднаність і 
безпорадність&nbsp;&nbsp; стан "
 "користувачів, які застосовують невільні 
програми."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "We've produced a tremendous range of free software. We've done what "
+#| "people said we could never do; we have two operating systems of free "
+#| "software. We have many applications and we obviously have a lot farther "
+#| "to go. So we need your help. I would like to ask you to volunteer for the "
+#| "GNU project; help us develop free software for more jobs. Take a look at "
+#| "<a href=\"/help/\">http://www.gnu.org/help</a> to find suggestions for "
+#| "how to help. If you want to order things, there's a link to that from the "
+#| "home page. If you want to read about philosophical issues, look in /"
+#| "philosophy. If you're looking for free software to use, look in /"
+#| "directory, which lists about 1900 packages now (which is a fraction of "
+#| "all the free software out there). Please write more and contribute to us. "
+#| "My book of essays, &ldquo;Free Software and Free Society&rdquo;, is on "
+#| "sale and can be purchased at <a href=\"http://www.gnu.org/\";>www.gnu.org</"
+#| "a>. Happy hacking!"
 msgid ""
 "We've produced a tremendous range of free software. We've done what people "
 "said we could never do; we have two operating systems of free software. We "
 "have many applications and we obviously have a lot farther to go. So we need "
 "your help. I would like to ask you to volunteer for the GNU project; help us "
-"develop free software for more jobs. Take a look at <a href=\"/help/"
-"\">http://www.gnu.org/help</a> to find suggestions for how to help. If you "
-"want to order things, there's a link to that from the home page. If you want "
-"to read about philosophical issues, look in /philosophy. If you're looking "
-"for free software to use, look in /directory, which lists about 1900 "
-"packages now (which is a fraction of all the free software out there). "
-"Please write more and contribute to us. My book of essays, &ldquo;Free "
-"Software and Free Society&rdquo;, is on sale and can be purchased at <a href="
-"\"http://www.gnu.org/\";>www.gnu.org</a>. Happy hacking!"
+"develop free software for more jobs. Take a look at <a href=\"/help/help.html"
+"\">gnu.org/help</a> to find suggestions for how to help. If you want to "
+"order things, there's a link to that from the home page. If you want to read "
+"about philosophical issues, look in /philosophy. If you're looking for free "
+"software to use, look in /directory, which lists about 1900 packages now "
+"(which is a fraction of all the free software out there). Please write more "
+"and contribute to us. My book of essays, &ldquo;Free Software and Free "
+"Society,&rdquo; is on sale and can be purchased at www.gnu.org&#8239;<a href="
+"\"#foot-9\">[9]</a>.  Happy hacking!"
 msgstr ""
 "Ми виробили запаморочливе число вільних 
програм. Ми зробили те, що, як "
 "стверджувалося, ми ніколи не зможемо 
зробити; у нас є дві операційні системи "
@@ -1002,7 +1328,13 @@
 "можна придбати на <a 
href=\"http://www.gnu.org/\";>www.gnu.org</a>. Всього "
 "найкращого!"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><h3>
+#, fuzzy
+#| msgid "Footnotes"
+msgid "Footnotes"
+msgstr "Виноски"
+
+#. type: Content of: <div><ol><li>
 msgid ""
 "Guy Steele designed the original symmetrical Emacs command set; then he and "
 "I began implementing Emacs (on top of TECO), but after one long joint "
@@ -1015,7 +1347,7 @@
 "спільної сесії розробки Стіл почав відх
одити, тому Emacs закінчував я. Інші, "
 "зокрема, Юджин Чиччареллі і Майк Мак-Магон 
внесли свій внесок значно пізніше."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Bernie Greenberg says that Dan Weinreb's implementation of Emacs for the "
 "Lisp Machine came before Greenberg's implementation for Multics.  I "
@@ -1025,7 +1357,7 @@
 "вийшла раніше реалізації Грінберга для 
Multics. Я прошу вибачення за цю "
 "помилку."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Greenblatt's plan, as I understood it, was to hire lab people part time, so "
 "that they could continue working at the AI Lab.  Symbolics hired them full "
@@ -1036,13 +1368,20 @@
 "Лабораторії штучного інтелекту. Symbolics 
замість цього наймала їх на повний "
 "робочий день, тому вони припиняли 
працювати в інституті."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "The background of this plan, which I did not state explicitly in the "
+#| "talk, is that during an initial period the ex-AI-Lab hackers, whether at "
+#| "Symbolics or LMI, continued contributing their changes to the MIT Lisp "
+#| "Machine system &mdash; even though the contract did not require this.  "
+#| "Symbolics' plan was to rupture this cooperation unilaterally."
 msgid ""
 "The background of this plan, which I did not state explicitly in the talk, "
 "is that during an initial period the ex-AI-Lab hackers, whether at Symbolics "
-"or LMI, continued contributing their changes to the MIT Lisp Machine system "
-"&mdash; even though the contract did not require this.  Symbolics' plan was "
-"to rupture this cooperation unilaterally."
+"or LMI, continued contributing their changes to the MIT Lisp Machine "
+"system&mdash;even though the contract did not require this.  Symbolics' plan "
+"was to rupture this cooperation unilaterally."
 msgstr ""
 "Цей план базувався на тому (у тій промові я 
цього не сказав явно), що в "
 "початковий період колишні хакери 
Лабораторії штучного інтелекту, як у "
@@ -1051,7 +1390,7 @@
 "Symbolics полягав у тому, щоб перервати цю 
співпрацю у односторонньому "
 "порядку."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "It was not that I cared particularly about the fate of LMI, but rather I did "
 "not want to let Symbolics gain through its aggression against the AI Lab."
@@ -1060,7 +1399,7 @@
 "Symbolics нажитися на своїй агресії по 
відношенню до Лабораторії штучного "
 "інтелекту."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "This statement has been misconstrued as saying that I never, ever looked at "
 "Symbolics' code.  Actually it says I did look, at first.  The Symbolics "
@@ -1072,7 +1411,7 @@
 "спочатку. Вихідний текст Symbolics був 
доступний в інституті, де я мав право "
 "його читати і спочатку саме так я 
дізнавався про їхні зміни."
 
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
 msgid ""
 "But that meant I had to make a special effort to solve each problem "
 "differently, in order to avoid copying Symbolics code.  After a while, I "
@@ -1085,7 +1424,7 @@
 "програми яким завгодно найкращим чином, 
не озираючись на те, що могло бути в "
 "текстах Symbolics."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Symbolics at one point protested to MIT that my work, by thwarting their "
 "plan, had cost Symbolics a million dollars."
@@ -1094,7 +1433,7 @@
 "робота, перешкодивши їхнім планом, 
коштувала компанії Symbolics мільйон "
 "доларів."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "I don't mind if a very complex and heavyweight function takes keyword "
 "arguments.  What bothers me is making simple basic functions such as &ldquo;"
@@ -1104,6 +1443,21 @@
 "кодові слова. Турбує мене випадок, коли 
ними користуються такі прості "
 "функції, як &ldquo;member&rdquo;."
 
+#. type: Content of: <div><ol><li>
+#, 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 ""
+"In 2021, this book can be purchased from <a href=\"https://shop.fsf.org/";
+"books-docs/free-software-free-society-selected-essays-richard-m-stallman-3rd-"
+"edition\"> GNU Press</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*"
@@ -1130,14 +1484,19 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Ми намагалися зробити цей переклад точним 
та якісним, але виключити "
@@ -1148,8 +1507,11 @@
 "translations.html\">&ldquo;Посібнику з 
перекладу&rdquo;</a>."
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2003, 2007, 2013, 2014, 2020 Free Software Foundation, Inc."
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2003, 2007, 2013, 2014, 2020 Free Software Foundation, "
+#| "Inc."
+msgid "Copyright &copy; 2003, 2007, 2013, 2021 Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 2003, 2007, 2013, 2014, 2020 Free Software Foundation, Inc. "
 "(Фонд вільного програмного забезпечення, 
Inc.)"
@@ -1176,10 +1538,22 @@
 msgid "Updated:"
 msgstr "Оновлено:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2003, 2007, 2013, 2014, 2020, 2021 Free Software "
-"Foundation, Inc."
-msgstr ""
-"Copyright &copy; 2003, 2007, 2013, 2014, 2020, 2021 Free Software "
-"Foundation, Inc. (Фонд вільного програмного 
забезпечення, Inc.)"
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "Ми намагалися зробити цей переклад 
точним та якісним, але виключити "
+#~ "можливість помилки ми не можемо. 
Надсилайте, будь ласка, свої зауваження "
+#~ "і пропозиції щодо перекладу за адресою <a 
href=\"mailto:web-";
+#~ "translators@gnu.org\">&lt;web-translators@gnu.org&gt;</a>. </"
+#~ "p><p>Відомості з координації та 
пропозицій перекладів наших статей див. у "
+#~ "<a 
href=\"/server/standards/README.translations.html\">&ldquo;Посібнику 
з "
+#~ "перекладу&rdquo;</a>."
+
+#~ msgid ""
+#~ "Copyright &copy; 2003, 2007, 2013, 2014, 2020, 2021 Free Software "
+#~ "Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2003, 2007, 2013, 2014, 2020, 2021 Free Software "
+#~ "Foundation, Inc. (Фонд вільного програмного 
забезпечення, Inc.)"

Index: po/rms-lisp.zh-cn.po
===================================================================
RCS file: /web/www/www/gnu/po/rms-lisp.zh-cn.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- po/rms-lisp.zh-cn.po        2 Nov 2021 13:56:43 -0000       1.15
+++ po/rms-lisp.zh-cn.po        2 Nov 2021 14:41:54 -0000       1.16
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rms-lisp.html\n"
-"POT-Creation-Date: 2020-09-21 18:55+0000\n"
+"POT-Creation-Date: 2021-11-02 14:27+0000\n"
 "PO-Revision-Date: 2020-10-02 15:23+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-11-02 14:27+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -21,17 +22,21 @@
 "Software Foundation"
 msgstr "我的Lisp经历和GNU Emacs的开发 - GNU工程 - 
自由软件基金会"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "My Lisp Experiences and the Development of GNU Emacs"
 msgstr "我的Lisp经历和GNU Emacs的开发"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "(Transcript of Richard Stallman's Speech, 28 Oct 2002, at the "
+#| "International Lisp Conference)."
 msgid ""
-"(Transcript of Richard Stallman's Speech, 28 Oct 2002, at the International "
-"Lisp Conference)."
+"Transcript of Richard Stallman's speech at the International Lisp "
+"Conference, 28 Oct 2002."
 msgstr "(Richard Stallman在国际
Lisp大会上的谈话记录,2002年10月28日)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Since none of my usual speeches have anything to do with Lisp, none of them "
 "were appropriate for today. So I'm going to have to wing it.  Since I've "
@@ -41,17 +46,29 @@
 "由于我通常的演讲都和Lisp无å…
³ï¼Œæˆ‘今天讲它们不合适。所以我将不得不即兴发挥。我"
 "的职业生涯做了太多Lisp相关的工作,因
此我还是可以讲一些有趣的事情的。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "My first experience with Lisp was when I read the Lisp 1.5 manual in high "
+#| "school. That's when I had my mind blown by the idea that there could be a "
+#| "computer language like that. The first time I had a chance to do anything "
+#| "with Lisp was when I was a freshman at Harvard and I wrote a Lisp "
+#| "interpreter for the <abbr title=\"Programmed Data Processor\">PDP</"
+#| "abbr>-11. It was a very small machine &mdash; it had something like 8k of "
+#| "memory &mdash; and I managed to write the interpreter in a thousand "
+#| "instructions. This gave me some room for a little bit of data. That was "
+#| "before I got to see what real software was like, that did real system "
+#| "jobs."
 msgid ""
 "My first experience with Lisp was when I read the Lisp 1.5 manual in high "
 "school. That's when I had my mind blown by the idea that there could be a "
 "computer language like that. The first time I had a chance to do anything "
 "with Lisp was when I was a freshman at Harvard and I wrote a Lisp "
 "interpreter for the <abbr title=\"Programmed Data Processor\">PDP</abbr>-11. "
-"It was a very small machine &mdash; it had something like 8k of memory "
-"&mdash; and I managed to write the interpreter in a thousand instructions. "
-"This gave me some room for a little bit of data. That was before I got to "
-"see what real software was like, that did real system jobs."
+"It was a very small machine&mdash;it had something like 8k of memory&mdash;"
+"and I managed to write the interpreter in a thousand instructions. This gave "
+"me some room for a little bit of data. That was before I got to see what "
+"real software was like, that did real system jobs."
 msgstr ""
 "我最早关于Lisp的经历是在高中时读了Lisp 1.5的手册。å…
¶ä¸­çš„思想让我脑洞大开:怎"
 "么还有这样的计算机语言!我第一次有机会做Lisp相å…
³çš„工作是在当哈佛新生的时候,"
@@ -60,20 +77,27 @@
 "以内的指令编写了那个解释器。这æ 
·æˆ‘还有一点数据空间。这是在我看到真正做系统工"
 "作的软件之前。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "I began doing work on a real Lisp implementation with JonL White once I "
+#| "started working at <abbr title=\"Massachusetts Institute of Technology"
+#| "\">MIT</abbr>. I got hired at the Artificial Intelligence Lab not by "
+#| "JonL, but by Russ Noftsker, which was most ironic considering what was to "
+#| "come &mdash; he must have really regretted that day."
 msgid ""
 "I began doing work on a real Lisp implementation with JonL White once I "
 "started working at <abbr title=\"Massachusetts Institute of Technology"
 "\">MIT</abbr>. I got hired at the Artificial Intelligence Lab not by JonL, "
-"but by Russ Noftsker, which was most ironic considering what was to come "
-"&mdash; he must have really regretted that day."
+"but by Russ Noftsker, which was most ironic considering what was to "
+"come&mdash;he must have really regretted that day."
 msgstr ""
 "当我在<abbr title=\"Massachusetts Institute of 
Technology,麻省理工学院"
 "\">MIT</abbr>开始工作时,我和JonL 
White一起真正开始实现Lisp语言。我不是被"
 "JonL,而是被Russ 
Noftsker招到人工智能实验室的,这一点最讽刺,想想接下来发生的"
 "事&mdash;他一定真的后悔有那一天了。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "During the 1970s, before my life became politicized by horrible events, I "
 "was just going along making one extension after another for various "
@@ -95,7 +119,7 @@
 "用时还可以对它进行编程。我不知道Emacs是不是第一个这æ 
·çš„工具,但是作为编辑器它"
 "确实是第一个。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This spirit of building up gigantic, complicated programs to use in your own "
 "editing, and then exchanging them with other people, fueled the spirit of "
@@ -115,19 +139,32 @@
 
"联系,也许是不自觉的联系。我认为正是我们在人工智能实验室生活方式的属性导致了"
 "Emacs的诞生并使之发展。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The original Emacs did not have Lisp in it. The lower level language, the "
+#| "non-interpreted language &mdash; was PDP-10 Assembler. The interpreter we "
+#| "wrote in that actually wasn't written for Emacs, it was written for <abbr "
+#| "title=\"Text Editor and COrrector\">TECO</abbr>. It was our text editor, "
+#| "and was an extremely ugly programming language, as ugly as could possibly "
+#| "be. The reason was that it wasn't designed to be a programming language, "
+#| "it was designed to be an editor and command language. There were commands "
+#| "like &lsquo;5l&rsquo;, meaning &lsquo;move five lines&rsquo;, or &lsquo;"
+#| "i&rsquo; and then a string and then an ESC to insert that string. You "
+#| "would type a string that was a series of commands, which was called a "
+#| "command string. You would end it with ESC ESC, and it would get executed."
 msgid ""
 "The original Emacs did not have Lisp in it. The lower level language, the "
-"non-interpreted language &mdash; was PDP-10 Assembler. The interpreter we "
+"non-interpreted language&mdash;was PDP-10 Assembler. The interpreter we "
 "wrote in that actually wasn't written for Emacs, it was written for <abbr "
 "title=\"Text Editor and COrrector\">TECO</abbr>. It was our text editor, and "
 "was an extremely ugly programming language, as ugly as could possibly be. "
 "The reason was that it wasn't designed to be a programming language, it was "
 "designed to be an editor and command language. There were commands like "
-"&lsquo;5l&rsquo;, meaning &lsquo;move five lines&rsquo;, or &lsquo;i&rsquo; "
-"and then a string and then an ESC to insert that string. You would type a "
-"string that was a series of commands, which was called a command string. You "
-"would end it with ESC ESC, and it would get executed."
+"<code>5l</code>, meaning <code>move five lines</code>, or <code>i</code> and "
+"then a string and then an ESC to insert that string. You would type a string "
+"that was a series of commands, which was called a command string. You would "
+"end it with ESC ESC, and it would get executed."
 msgstr ""
 "最初的 Emacs 不带 Lisp。å…
¶åº•å±‚语言、一个非解释性语言&mdash;是 PDP-10 汇编语"
 "言。我们编写的解释器实际上不是为 Emacs 写的,它是为 
<abbr title=\"Text "
@@ -138,18 +175,31 @@
 "字符串。你可以输å…
¥ä»£è¡¨ä¸€ç³»åˆ—命令的字符串,这叫命令字符串。你可以用 ESC 
ESC 做"
 "结尾,这样该串命令就执行了。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Well, people wanted to extend this language with programming facilities, "
+#| "so they added some. For instance, one of the first was a looping "
+#| "construct, which was &lt; &gt;. You would put those around things and it "
+#| "would loop. There were other cryptic commands that could be used to "
+#| "conditionally exit the loop.  To make Emacs, we <a href=\"#foot-1\">(1)</"
+#| "a> added facilities to have subroutines with names. Before that, it was "
+#| "sort of like Basic, and the subroutines could only have single letters as "
+#| "their names. That was hard to program big programs with, so we added code "
+#| "so they could have longer names. Actually, there were some rather "
+#| "sophisticated facilities; I think that Lisp got its unwind-protect "
+#| "facility from TECO."
 msgid ""
 "Well, people wanted to extend this language with programming facilities, so "
 "they added some. For instance, one of the first was a looping construct, "
-"which was &lt; &gt;. You would put those around things and it would loop. "
-"There were other cryptic commands that could be used to conditionally exit "
-"the loop.  To make Emacs, we <a href=\"#foot-1\">(1)</a> added facilities to "
-"have subroutines with names. Before that, it was sort of like Basic, and the "
-"subroutines could only have single letters as their names. That was hard to "
-"program big programs with, so we added code so they could have longer names. "
-"Actually, there were some rather sophisticated facilities; I think that Lisp "
-"got its unwind-protect facility from TECO."
+"which was <code>&lt;&nbsp;&gt;</code>. You would put those around things and "
+"it would loop. There were other cryptic commands that could be used to "
+"conditionally exit the loop.  To make Emacs, we&#8239;<a href=\"#foot-1\">[1]"
+"</a> added facilities to have subroutines with names. Before that, it was "
+"sort of like Basic, and the subroutines could only have single letters as "
+"their names. That was hard to program big programs with, so we added code so "
+"they could have longer names. Actually, there were some rather sophisticated "
+"facilities; I think that Lisp got its unwind-protect facility from TECO."
 msgstr ""
 
"不过,人们想要扩展该语言使之带上编程能力,所以人们就添åŠ
 äº†ä¸€äº›åŠŸèƒ½ã€‚例如,最"
 "早添加的就有循环结构,就是&lt; &gt;。你
把东西放在这两个符号之间,它们就循环"
@@ -159,10 +209,20 @@
 "了长文件名功能。实际
上,还有一些相当复杂的功能;我认为 Lisp 的 unwind-"
 "protect 功能就来自 TECO。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "We started putting in rather sophisticated facilities, all with the "
+#| "ugliest syntax you could ever think of, and it worked &mdash; people were "
+#| "able to write large programs in it anyway. The obvious lesson was that a "
+#| "language like TECO, which wasn't designed to be a programming language, "
+#| "was the wrong way to go. The language that you build your extensions on "
+#| "shouldn't be thought of as a programming language in afterthought; it "
+#| "should be designed as a programming language. In fact, we discovered that "
+#| "the best programming language for that purpose was Lisp."
 msgid ""
 "We started putting in rather sophisticated facilities, all with the ugliest "
-"syntax you could ever think of, and it worked &mdash; people were able to "
+"syntax you could ever think of, and it worked&mdash;people were able to "
 "write large programs in it anyway. The obvious lesson was that a language "
 "like TECO, which wasn't designed to be a programming language, was the wrong "
 "way to go. The language that you build your extensions on shouldn't be "
@@ -176,18 +236,30 @@
 "程语言;它应该按照编程语言来设计。事实上,我们发现 
Lisp 是做这件事的最佳语"
 "言。"
 
-#. type: Content of: <p>
-msgid ""
-"It was Bernie Greenberg, who discovered that it was <a href=\"#foot-2\">(2)</"
-"a>.  He wrote a version of Emacs in Multics MacLisp, and he wrote his "
-"commands in MacLisp in a straightforward fashion. The editor itself was "
-"written entirely in Lisp. Multics Emacs proved to be a great success &mdash; "
-"programming new editing commands was so convenient that even the secretaries "
-"in his office started learning how to use it. They used a manual someone had "
-"written which showed how to extend Emacs, but didn't say it was a "
-"programming. So the secretaries, who believed they couldn't do programming, "
-"weren't scared off. They read the manual, discovered they could do useful "
-"things and they learned to program."
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "It was Bernie Greenberg, who discovered that it was <a href=\"#foot-2\">"
+#| "(2)</a>.  He wrote a version of Emacs in Multics MacLisp, and he wrote "
+#| "his commands in MacLisp in a straightforward fashion. The editor itself "
+#| "was written entirely in Lisp. Multics Emacs proved to be a great success "
+#| "&mdash; programming new editing commands was so convenient that even the "
+#| "secretaries in his office started learning how to use it. They used a "
+#| "manual someone had written which showed how to extend Emacs, but didn't "
+#| "say it was a programming. So the secretaries, who believed they couldn't "
+#| "do programming, weren't scared off. They read the manual, discovered they "
+#| "could do useful things and they learned to program."
+msgid ""
+"It was Bernie Greenberg, who discovered that it was&#8239;<a href="
+"\"#foot-2\">[2]</a>.  He wrote a version of Emacs in Multics MacLisp, and he "
+"wrote his commands in MacLisp in a straightforward fashion. The editor "
+"itself was written entirely in Lisp. Multics Emacs proved to be a great "
+"success&mdash;programming new editing commands was so convenient that even "
+"the secretaries in his office started learning how to use it. They used a "
+"manual someone had written which showed how to extend Emacs, but didn't say "
+"it was a programming. So the secretaries, who believed they couldn't do "
+"programming, weren't scared off. They read the manual, discovered they could "
+"do useful things and they learned to program."
 msgstr ""
 "Bernie Greenberg是此事的发现者<a 
href=\"#foot-2\">(2)</a>。他用Multics "
 
"MacLisp写了一个Emacs,而且他使用MacLisp编写命令的方式直截了当。这个编辑器本身"
@@ -196,16 +268,27 @@
 "何扩展Emacs的手册,手册里没说这就是编程。因
此,秘书们并不认为他们在编程,也就"
 "没被吓跑。他们阅
读手册,发现自己也可以做不少有用的事,他们学会了编程。"
 
-#. type: Content of: <p>
-msgid ""
-"So Bernie saw that an application &mdash; a program that does something "
-"useful for you &mdash; which has Lisp inside it and which you could extend "
-"by rewriting the Lisp programs, is actually a very good way for people to "
-"learn programming. It gives them a chance to write small programs that are "
-"useful for them, which in most arenas you can't possibly do. They can get "
-"encouragement for their own practical use &mdash; at the stage where it's "
-"the hardest &mdash; where they don't believe they can program, until they "
-"get to the point where they are programmers."
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "So Bernie saw that an application &mdash; a program that does something "
+#| "useful for you &mdash; which has Lisp inside it and which you could "
+#| "extend by rewriting the Lisp programs, is actually a very good way for "
+#| "people to learn programming. It gives them a chance to write small "
+#| "programs that are useful for them, which in most arenas you can't "
+#| "possibly do. They can get encouragement for their own practical use "
+#| "&mdash; at the stage where it's the hardest &mdash; where they don't "
+#| "believe they can program, until they get to the point where they are "
+#| "programmers."
+msgid ""
+"So Bernie saw that an application&mdash;a program that does something useful "
+"for you&mdash;which has Lisp inside it and which you could extend by "
+"rewriting the Lisp programs, is actually a very good way for people to learn "
+"programming. It gives them a chance to write small programs that are useful "
+"for them, which in most arenas you can't possibly do. They can get "
+"encouragement for their own practical use&mdash;at the stage where it's the "
+"hardest&mdash;where they don't believe they can program, until they get to "
+"the point where they are programmers."
 msgstr ""
 "这样,Bernie看到一个应用程序&mdash;为你
完成任务的程序&mdash;如果内置了Lisp,"
 "并且人们可以编写Lisp程序来扩展该应用程序,那么它实际
上就是人们学习编程的一个"
@@ -213,30 +296,55 @@
 
"自己的实用程序鼓励着&mdash;就在最困难的阶段&mdash;就在他们不相信自己可以编程"
 "的时候,直到他们最后成为程序员。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "At that point, people began to wonder how they could get something like "
+#| "this on a platform where they didn't have full service Lisp "
+#| "implementation. Multics MacLisp had a compiler as well as an interpreter "
+#| "&mdash; it was a full-fledged Lisp system &mdash; but people wanted to "
+#| "implement something like that on other systems where they had not already "
+#| "written a Lisp compiler. Well, if you didn't have the Lisp compiler you "
+#| "couldn't write the whole editor in Lisp &mdash; it would be too slow, "
+#| "especially redisplay, if it had to run interpreted Lisp.  So we developed "
+#| "a hybrid technique. The idea was to write a Lisp interpreter and the "
+#| "lower level parts of the editor together, so that parts of the editor "
+#| "were built-in Lisp facilities. Those would be whatever parts we felt we "
+#| "had to optimize. This was a technique that we had already consciously "
+#| "practiced in the original Emacs, because there were certain fairly high "
+#| "level features which we re-implemented in machine language, making them "
+#| "into TECO primitives. For instance, there was a TECO primitive to fill a "
+#| "paragraph (actually, to do most of the work of filling a paragraph, "
+#| "because some of the less time-consuming parts of the job would be done at "
+#| "the higher level by a TECO program). You could do the whole job by "
+#| "writing a TECO program, but that was too slow, so we optimized it by "
+#| "putting part of it in machine language. We used the same idea here (in "
+#| "the hybrid technique), that most of the editor would be written in Lisp, "
+#| "but certain parts of it that had to run particularly fast would be "
+#| "written at a lower level."
 msgid ""
 "At that point, people began to wonder how they could get something like this "
 "on a platform where they didn't have full service Lisp implementation. "
-"Multics MacLisp had a compiler as well as an interpreter &mdash; it was a "
-"full-fledged Lisp system &mdash; but people wanted to implement something "
-"like that on other systems where they had not already written a Lisp "
-"compiler. Well, if you didn't have the Lisp compiler you couldn't write the "
-"whole editor in Lisp &mdash; it would be too slow, especially redisplay, if "
-"it had to run interpreted Lisp.  So we developed a hybrid technique. The "
-"idea was to write a Lisp interpreter and the lower level parts of the editor "
-"together, so that parts of the editor were built-in Lisp facilities. Those "
-"would be whatever parts we felt we had to optimize. This was a technique "
-"that we had already consciously practiced in the original Emacs, because "
-"there were certain fairly high level features which we re-implemented in "
-"machine language, making them into TECO primitives. For instance, there was "
-"a TECO primitive to fill a paragraph (actually, to do most of the work of "
-"filling a paragraph, because some of the less time-consuming parts of the "
-"job would be done at the higher level by a TECO program). You could do the "
-"whole job by writing a TECO program, but that was too slow, so we optimized "
-"it by putting part of it in machine language. We used the same idea here (in "
-"the hybrid technique), that most of the editor would be written in Lisp, but "
-"certain parts of it that had to run particularly fast would be written at a "
-"lower level."
+"Multics MacLisp had a compiler as well as an interpreter&mdash;it was a full-"
+"fledged Lisp system&mdash;but people wanted to implement something like that "
+"on other systems where they had not already written a Lisp compiler. Well, "
+"if you didn't have the Lisp compiler you couldn't write the whole editor in "
+"Lisp&mdash;it would be too slow, especially redisplay, if it had to run "
+"interpreted Lisp.  So we developed a hybrid technique. The idea was to write "
+"a Lisp interpreter and the lower level parts of the editor together, so that "
+"parts of the editor were built-in Lisp facilities. Those would be whatever "
+"parts we felt we had to optimize. This was a technique that we had already "
+"consciously practiced in the original Emacs, because there were certain "
+"fairly high level features which we re-implemented in machine language, "
+"making them into TECO primitives. For instance, there was a TECO primitive "
+"to fill a paragraph (actually, to do most of the work of filling a "
+"paragraph, because some of the less time-consuming parts of the job would be "
+"done at the higher level by a TECO program). You could do the whole job by "
+"writing a TECO program, but that was too slow, so we optimized it by putting "
+"part of it in machine language. We used the same idea here (in the hybrid "
+"technique), that most of the editor would be written in Lisp, but certain "
+"parts of it that had to run particularly fast would be written at a lower "
+"level."
 msgstr ""
 "此时,人们开始思考他们要怎样在一个并没有全部 Lisp 
支持的平台上做到这一切。"
 "Multics MacLisp 既有编译器,也有解释器&mdash;它是一个完整的 
Lisp 系统&mdash;"
@@ -252,36 +360,59 @@
 "优化。在此(指混合技术),编辑器的绝大部分是用 Lisp 
编写的,但是那些需要非常"
 "快速运行的部分是用底层语言写的。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Therefore, when I wrote my second implementation of Emacs, I followed the "
+#| "same kind of design. The low level language was not machine language "
+#| "anymore, it was C. C was a good, efficient language for portable programs "
+#| "to run in a Unix-like operating system. There was a Lisp interpreter, but "
+#| "I implemented facilities for special purpose editing jobs directly in C "
+#| "&mdash; manipulating editor buffers, inserting leading text, reading and "
+#| "writing files, redisplaying the buffer on the screen, managing editor "
+#| "windows."
 msgid ""
 "Therefore, when I wrote my second implementation of Emacs, I followed the "
 "same kind of design. The low level language was not machine language "
 "anymore, it was C. C was a good, efficient language for portable programs to "
 "run in a Unix-like operating system. There was a Lisp interpreter, but I "
-"implemented facilities for special purpose editing jobs directly in C "
-"&mdash; manipulating editor buffers, inserting leading text, reading and "
-"writing files, redisplaying the buffer on the screen, managing editor "
-"windows."
+"implemented facilities for special purpose editing jobs directly in C&mdash;"
+"manipulating editor buffers, inserting leading text, reading and writing "
+"files, redisplaying the buffer on the screen, managing editor windows."
 msgstr ""
 "因此,当我编写第二版Emacs时,我采用了同æ 
·çš„设计。底层的语言不再是机器语言,而"
 
"是C。就编写运行在类Unix系统上的可移植程序来说,C是一个优秀的、高效的语言。虽"
 
"然有一个Lisp解释器,但是我直接用C实现了一些特定的编辑功能&mdash;管理编辑器的"
 "缓存、插å…
¥èµ·å§‹æ–‡æœ¬ã€è¯»å†™æ–‡ä»¶ã€åˆ·æ–°å±å¹•æ˜¾ç¤ºä»¥åŠç®¡ç†ç¼–辑窗口。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Now, this was not the first Emacs that was written in C and ran on Unix. "
+#| "The first was written by James Gosling, and was referred to as GosMacs. A "
+#| "strange thing happened with him. In the beginning, he seemed to be "
+#| "influenced by the same spirit of sharing and cooperation of the original "
+#| "Emacs. I first released the original Emacs to people at MIT. Someone "
+#| "wanted to port it to run on Twenex &mdash; it originally only ran on the "
+#| "Incompatible Timesharing System we used at MIT. They ported it to Twenex, "
+#| "which meant that there were a few hundred installations around the world "
+#| "that could potentially use it. We started distributing it to them, with "
+#| "the rule that &ldquo;you had to send back all of your improvements&rdquo; "
+#| "so we could all benefit. No one ever tried to enforce that, but as far as "
+#| "I know people did cooperate."
 msgid ""
 "Now, this was not the first Emacs that was written in C and ran on Unix. The "
 "first was written by James Gosling, and was referred to as GosMacs. A "
 "strange thing happened with him. In the beginning, he seemed to be "
 "influenced by the same spirit of sharing and cooperation of the original "
 "Emacs. I first released the original Emacs to people at MIT. Someone wanted "
-"to port it to run on Twenex &mdash; it originally only ran on the "
-"Incompatible Timesharing System we used at MIT. They ported it to Twenex, "
-"which meant that there were a few hundred installations around the world "
-"that could potentially use it. We started distributing it to them, with the "
-"rule that &ldquo;you had to send back all of your improvements&rdquo; so we "
-"could all benefit. No one ever tried to enforce that, but as far as I know "
-"people did cooperate."
+"to port it to run on Twenex&mdash;it originally only ran on the Incompatible "
+"Timesharing System we used at MIT. They ported it to Twenex, which meant "
+"that there were a few hundred installations around the world that could "
+"potentially use it. We started distributing it to them, with the rule that "
+"&ldquo;you had to send back all of your improvements&rdquo; so we could all "
+"benefit. No one ever tried to enforce that, but as far as I know people did "
+"cooperate."
 msgstr ""
 "当时,它不再是第一个用 C 编写并运行在 Unix 上的 Emacs 
了。第一个是由 James "
 "Gosling 完成的,就是 
GosMacs。他有些奇怪。一开始,他看来还是受到了原始 Emacs "
@@ -291,12 +422,20 @@
 "布该版本,发行遵循的是&ldquo;你必
须发回所有的改进&rdquo;这样大家都受益。没有"
 "人会刻意强调这个规则,但是就我所知人们都是合作的。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Gosling did, at first, seem to participate in this spirit. He wrote in a "
+#| "manual that he called the program Emacs hoping that others in the "
+#| "community would improve it until it was worthy of that name. That's the "
+#| "right approach to take towards a community &mdash; to ask them to join in "
+#| "and make the program better. But after that he seemed to change the "
+#| "spirit, and sold it to a company."
 msgid ""
 "Gosling did, at first, seem to participate in this spirit. He wrote in a "
 "manual that he called the program Emacs hoping that others in the community "
 "would improve it until it was worthy of that name. That's the right approach "
-"to take towards a community &mdash; to ask them to join in and make the "
+"to take towards a community&mdash;to ask them to join in and make the "
 "program better. But after that he seemed to change the spirit, and sold it "
 "to a company."
 msgstr ""
@@ -305,7 +444,20 @@
 
"请大家参与并使程序更好。但是在此之后,他似乎改变了态度,并把程序卖给了一个å
…¬"
 "司。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "At that time I was working on the GNU system (a free software Unix-like "
+#| "operating system that many people erroneously call &ldquo;Linux&rdquo;).  "
+#| "There was no free software Emacs editor that ran on Unix. I did, however, "
+#| "have a friend who had participated in developing Gosling's Emacs. Gosling "
+#| "had given him, by email, permission to distribute his own version. He "
+#| "proposed to me that I use that version. Then I discovered that Gosling's "
+#| "Emacs did not have a real Lisp. It had a programming language that was "
+#| "known as &lsquo;mocklisp&rsquo;, which looks syntactically like Lisp, but "
+#| "didn't have the data structures of Lisp.  So programs were not data, and "
+#| "vital elements of Lisp were missing.  Its data structures were strings, "
+#| "numbers and a few other specialized things."
 msgid ""
 "At that time I was working on the GNU system (a free software Unix-like "
 "operating system that many people erroneously call &ldquo;Linux&rdquo;).  "
@@ -314,7 +466,7 @@
 "had given him, by email, permission to distribute his own version. He "
 "proposed to me that I use that version. Then I discovered that Gosling's "
 "Emacs did not have a real Lisp. It had a programming language that was known "
-"as &lsquo;mocklisp&rsquo;, which looks syntactically like Lisp, but didn't "
+"as &ldquo;mocklisp,&rdquo; which looks syntactically like Lisp, but didn't "
 "have the data structures of Lisp.  So programs were not data, and vital "
 "elements of Lisp were missing.  Its data structures were strings, numbers "
 "and a few other specialized things."
@@ -327,7 +479,7 @@
 "据结构。所以其程序不是数据,而且也缺失Lisp的重要元素
。其数据结构是字符串、数"
 "字和其他一些专门结构。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I concluded I couldn't use it and had to replace it all, the first step of "
 "which was to write an actual Lisp interpreter. I gradually adapted every "
@@ -340,13 +492,21 @@
 "专门的数据结构,并使编辑器的内
部数据结构对用户的Lisp程序开放,使用户程序能够"
 "处理编辑器内部数据。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The one exception was redisplay. For a long time, redisplay was sort of "
+#| "an alternate world. The editor would enter the world of redisplay and "
+#| "things would go on with very special data structures that were not safe "
+#| "for garbage collection, not safe for interruption, and you couldn't run "
+#| "any Lisp programs during that. We've changed that since &mdash; it's now "
+#| "possible to run Lisp code during redisplay. It's quite a convenient thing."
 msgid ""
 "The one exception was redisplay. For a long time, redisplay was sort of an "
 "alternate world. The editor would enter the world of redisplay and things "
 "would go on with very special data structures that were not safe for garbage "
 "collection, not safe for interruption, and you couldn't run any Lisp "
-"programs during that. We've changed that since &mdash; it's now possible to "
+"programs during that. We've changed that since&mdash;it's now possible to "
 "run Lisp code during redisplay. It's quite a convenient thing."
 msgstr ""
 
"显示刷新是个例外。很长时间以来,显示刷新像是一个另类世界。编辑器一旦进å
…¥æ˜¾ç¤º"
@@ -354,15 +514,26 @@
 "理也不安全,而且你在此过程中无
法运行任何Lisp程序。我们已经修改了这部分&mdash;"
 "现在你在显示刷新时也可以运行Lisp代ç 
ã€‚这是一件很便利的事。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "This second Emacs program was &lsquo;free software&rsquo; in the modern "
+#| "sense of the term &mdash; it was part of an explicit political campaign "
+#| "to make software free. The essence of this campaign was that everybody "
+#| "should be free to do the things we did in the old days at MIT, working "
+#| "together on software and working with whomever wanted to work with us.  "
+#| "That is the basis for the free software movement &mdash; the experience I "
+#| "had, the life that I've lived at the MIT AI lab &mdash; to be working on "
+#| "human knowledge, and not be standing in the way of anybody's further "
+#| "using and further disseminating human knowledge."
 msgid ""
-"This second Emacs program was &lsquo;free software&rsquo; in the modern "
-"sense of the term &mdash; it was part of an explicit political campaign to "
+"This second Emacs program was &ldquo;free software&rdquo; in the modern "
+"sense of the term&mdash;it was part of an explicit political campaign to "
 "make software free. The essence of this campaign was that everybody should "
 "be free to do the things we did in the old days at MIT, working together on "
 "software and working with whomever wanted to work with us.  That is the "
-"basis for the free software movement &mdash; the experience I had, the life "
-"that I've lived at the MIT AI lab &mdash; to be working on human knowledge, "
+"basis for the free software movement&mdash;the experience I had, the life "
+"that I've lived at the MIT AI lab&mdash;to be working on human knowledge, "
 "and not be standing in the way of anybody's further using and further "
 "disseminating human knowledge."
 msgstr ""
@@ -372,7 +543,7 @@
 "&mdash;&mdash;也是我的经历,是我在 MIT 
人工智能实验室的生活&mdash;&mdash;为人"
 "类的知识而工作,而不是阻碍其他人使用和传
播人类的知识。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "At the time, you could make a computer that was about the same price range "
 "as other computers that weren't meant for Lisp, except that it would run "
@@ -389,11 +560,21 @@
 "字做 <code>car</code><sup><a href=\"#TransNote1\">1</a></sup> 
时,结果是无效"
 "的,最终导致程序崩溃。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The Lisp machine was able to execute instructions about as fast as those "
+#| "other machines, but each instruction &mdash; a <code>car</code> "
+#| "instruction would do data typechecking &mdash; so when you tried to get "
+#| "the <code>car</code> of a number in a compiled program, it would give you "
+#| "an immediate error. We built the machine and had a Lisp operating system "
+#| "for it. It was written almost entirely in Lisp, the only exceptions being "
+#| "parts written in the microcode. People became interested in manufacturing "
+#| "them, which meant they should start a company."
 msgid ""
 "The Lisp machine was able to execute instructions about as fast as those "
-"other machines, but each instruction &mdash; a <code>car</code> instruction "
-"would do data typechecking &mdash; so when you tried to get the <code>car</"
+"other machines, but each instruction&mdash;a <code>car</code> instruction "
+"would do data typechecking&mdash;so when you tried to get the <code>car</"
 "code> of a number in a compiled program, it would give you an immediate "
 "error. We built the machine and had a Lisp operating system for it. It was "
 "written almost entirely in Lisp, the only exceptions being parts written in "
@@ -407,15 +588,25 @@
 "部分是用 microcode 编写的。人们对大规模造这种机器很感å…
´è¶£ï¼Œè¿™æ„å‘³ç€ä»–们应该开"
 "个公司。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "There were two different ideas about what this company should be like.  "
+#| "Greenblatt wanted to start what he called a &ldquo;hacker&rdquo; company. "
+#| "This meant it would be a company run by hackers and would operate in a "
+#| "way conducive to hackers. Another goal was to maintain the AI Lab culture "
+#| "<a href=\"#foot-3\">(3)</a>.  Unfortunately, Greenblatt didn't have any "
+#| "business experience, so other people in the Lisp machine group said they "
+#| "doubted whether he could succeed. They thought that his plan to avoid "
+#| "outside investment wouldn't work."
 msgid ""
 "There were two different ideas about what this company should be like.  "
 "Greenblatt wanted to start what he called a &ldquo;hacker&rdquo; company. "
 "This meant it would be a company run by hackers and would operate in a way "
-"conducive to hackers. Another goal was to maintain the AI Lab culture <a "
-"href=\"#foot-3\">(3)</a>.  Unfortunately, Greenblatt didn't have any "
-"business experience, so other people in the Lisp machine group said they "
-"doubted whether he could succeed. They thought that his plan to avoid "
+"conducive to hackers. Another goal was to maintain the AI Lab culture&#8239;"
+"<a class=\"ftn\" href=\"#foot-3\">[3]</a>.  Unfortunately, Greenblatt didn't "
+"have any business experience, so other people in the Lisp machine group said "
+"they doubted whether he could succeed. They thought that his plan to avoid "
 "outside investment wouldn't work."
 msgstr ""
 "对开什么样的å…
¬å¸ï¼Œå¤§å®¶æœ‰ä¸¤ç§ä¸åŒçš„想法。Greenblatt想开一个他称之为&ldquo;黑客"
@@ -424,7 +615,7 @@
 "Greenblatt没有任何商业经验,所以Lisp电脑团队的å…
¶ä»–人对Greenblatt会不会成功表"
 "示怀疑。他们认为他拒绝外部资金的做法行不通。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Why did he want to avoid outside investment? Because when a company has "
 "outside investors, they take control and they don't let you have any "
@@ -434,7 +625,7 @@
 "他为什么要避免外部投资呢?因为如果一个公司引å…
¥äº†å¤–部投资者,他们就会掌控公司"
 "并且不会让你有任何道德上的犹豫。最终,如果你
稍有犹豫,他们也会踢开你。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So Greenblatt had the idea that he would find a customer who would pay in "
 "advance to buy the parts. They would build machines and deliver them; with "
@@ -447,7 +638,7 @@
 "这些利润之后,他们就可以再造
更多的电脑,然后再销售,然后再造更多的电脑,如此"
 "进行下去。组内的其他人觉得这样不行。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Greenblatt then recruited Russell Noftsker, the man who had hired me, who "
 "had subsequently left the AI Lab and created a successful company.  Russell "
@@ -464,7 +655,7 @@
 "另一间公司。&rdquo;背后捅
刀子,明显是真正的生意人。这些人决定开一个叫"
 "Symbolics的å…
¬å¸ã€‚他们吸纳外部投资、不会有任何良心不安、竭尽所能获取成功。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "But Greenblatt didn't give up. He and the few people loyal to him decided to "
 "start Lisp Machines Inc. anyway and go ahead with their plans. And what do "
@@ -482,7 +673,7 @@
 "持,他们实际
上还是成功了。Symbolics也成功地启动了,所以你
有两家互相竞争的Lisp"
 "电脑å…
¬å¸ã€‚当Symbolics看到LMI不是走向失败时,他们开始寻机搞ç 
´åã€‚"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Thus, the abandonment of our lab was followed by &ldquo;war&rdquo; in our "
 "lab.  The abandonment happened when Symbolics hired away all the hackers, "
@@ -504,20 +695,27 @@
 "合同没有说 MIT 有权将这些代码放入由两家公司授权的 MIT 
Lisp 电脑系统。没有人预"
 
"见到实验室的黑客小组会被彻底毁灭,但是它就是被毁灭了。"
 
-#. type: Content of: <p>
-msgid ""
-"So Symbolics came up with a plan <a href=\"#foot-4\">(4)</a>.  They said to "
-"the lab, &ldquo;We will continue making our changes to the system available "
-"for you to use, but you can't put it into the MIT Lisp machine system. "
-"Instead, we'll give you access to Symbolics' Lisp machine system, and you "
-"can run it, but that's all you can do.&rdquo;"
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "So Symbolics came up with a plan <a href=\"#foot-4\">(4)</a>.  They said "
+#| "to the lab, &ldquo;We will continue making our changes to the system "
+#| "available for you to use, but you can't put it into the MIT Lisp machine "
+#| "system. Instead, we'll give you access to Symbolics' Lisp machine system, "
+#| "and you can run it, but that's all you can do.&rdquo;"
+msgid ""
+"So Symbolics came up with a plan&#8239;<a href=\"#foot-4\">[4]</a>.  They "
+"said to the lab, &ldquo;We will continue making our changes to the system "
+"available for you to use, but you can't put it into the MIT Lisp machine "
+"system. Instead, we'll give you access to Symbolics' Lisp machine system, "
+"and you can run it, but that's all you can do.&rdquo;"
 msgstr ""
 "于是,Symbolics 启动了一个计划<a 
href=\"#foot-4\">(4)</a>。他们对实验室说,"
 "&ldquo;我们会持续让你们使用我们的系统改进,但是你
们不能把这些改进装到 MIT 的 "
 "Lisp 电脑系统上。不过,我们会让你们使用 Symbolics 的 Lisp 
电脑系统,你们可以"
 "在这些系统上运行改进版,但是仅此而已。&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This, in effect, meant that they demanded that we had to choose a side, and "
 "use either the MIT version of the system or the Symbolics version.  "
@@ -534,12 +732,21 @@
 "系统版本,两个公司都能够得到我们的工作,但是 Symbolics 
认为这是在支持 LMI,因"
 "为这会帮助 LMI 生存下去。因此,我们不被å…
è®¸å†ä¿æŒä¸­ç«‹ã€‚"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Up until that point, I hadn't taken the side of either company, although "
+#| "it made me miserable to see what had happened to our community and the "
+#| "software.  But now, Symbolics had forced the issue.  So, in an effort to "
+#| "help keep Lisp Machines Inc. going <a href=\"#foot-5\">(5)</a> &mdash; I "
+#| "began duplicating all of the improvements Symbolics had made to the Lisp "
+#| "machine system.  I wrote the equivalent improvements again myself (i.e., "
+#| "the code was my own)."
 msgid ""
 "Up until that point, I hadn't taken the side of either company, although it "
 "made me miserable to see what had happened to our community and the "
 "software.  But now, Symbolics had forced the issue.  So, in an effort to "
-"help keep Lisp Machines Inc. going <a href=\"#foot-5\">(5)</a> &mdash; I "
+"help keep Lisp Machines Inc. going&#8239;<a href=\"#foot-5\">[5]</a>&mdash;I "
 "began duplicating all of the improvements Symbolics had made to the Lisp "
 "machine system.  I wrote the equivalent improvements again myself (i.e., the "
 "code was my own)."
@@ -550,26 +757,42 @@
 "所作的全部改进。我把这些改进用自己的想法同æ 
·å®žçŽ°å‡ºæ¥ï¼ˆå°±æ˜¯è¯´ï¼Œä»£ç æ˜¯æˆ‘自己写"
 "的)。"
 
-#. type: Content of: <p>
-msgid ""
-"After a while <a href=\"#foot-6\">(6)</a>, I came to the conclusion that it "
-"would be best if I didn't even look at their code. When they made a beta "
-"announcement that gave the release notes, I would see what the features were "
-"and then implement them. By the time they had a real release, I did too."
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "After a while <a href=\"#foot-6\">(6)</a>, I came to the conclusion that "
+#| "it would be best if I didn't even look at their code. When they made a "
+#| "beta announcement that gave the release notes, I would see what the "
+#| "features were and then implement them. By the time they had a real "
+#| "release, I did too."
+msgid ""
+"After a while&#8239;<a href=\"#foot-6\">[6]</a>, I came to the conclusion "
+"that it would be best if I didn't even look at their code. When they made a "
+"beta announcement that gave the release notes, I would see what the features "
+"were and then implement them. By the time they had a real release, I did too."
 msgstr ""
 "过了一阵,<a 
href=\"#foot-6\">(6)</a>,我得出结论,不看他们的代ç 
å¯èƒ½æ›´å¥½ã€‚当"
 
"他们宣布beta版时,通过看发布声明,我知道了有什么功能,然后自己实现它们。当他"
 "们发行正式版时,我也实现了这些功能。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "In this way, for two years, I prevented them from wiping out Lisp "
+#| "Machines Incorporated, and the two companies went on. But, I didn't want "
+#| "to spend years and years punishing someone, just thwarting an evil deed. "
+#| "I figured they had been punished pretty thoroughly because they were "
+#| "stuck with competition that was not leaving or going to disappear <a href="
+#| "\"#foot-7\">(7)</a>. Meanwhile, it was time to start building a new "
+#| "community to replace the one that their actions and others had wiped out."
 msgid ""
 "In this way, for two years, I prevented them from wiping out Lisp Machines "
 "Incorporated, and the two companies went on. But, I didn't want to spend "
 "years and years punishing someone, just thwarting an evil deed. I figured "
 "they had been punished pretty thoroughly because they were stuck with "
-"competition that was not leaving or going to disappear <a href=\"#foot-7\">"
-"(7)</a>. Meanwhile, it was time to start building a new community to replace "
-"the one that their actions and others had wiped out."
+"competition that was not leaving or going to disappear&#8239;<a href="
+"\"#foot-7\">[7]</a>.  Meanwhile, it was time to start building a new "
+"community to replace the one that their actions and others had wiped out."
 msgstr ""
 "如此这样,有两年的时间,我阻止他们把Lisp Machineså…
¬å¸æ¶ˆç­ï¼›è¿™ä¸¤ä¸ªå…¬å¸åŒæ—¶å­˜"
 "在。但是,我不想这样年复一年地惩罚一个人,仅仅
只是阻挠一桩罪恶。我觉得他们已"
@@ -577,7 +800,7 @@
 
"(7)</a>。与此同时,是时候再开始创建一个新的社区来代替那个被他们以及å
…¶ä»–人毁灭"
 "的社区了。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The Lisp community in the 70s was not limited to the MIT AI Lab, and the "
 "hackers were not all at MIT. The war that Symbolics started was what wiped "
@@ -589,16 +812,36 @@
 "Symbolics 发起的战争毁灭了 MIT 社区,但是同时还有å…
¶ä»–事件在进行。有人放弃了合"
 "作,这些也毁灭着社区,社区所剩寥寥了。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Once I stopped punishing Symbolics, I had to figure out what to do next. "
+#| "I had to make a free operating system, that was clear &mdash; the only "
+#| "way that people could work together and share was with a free operating "
+#| "system."
 msgid ""
 "Once I stopped punishing Symbolics, I had to figure out what to do next. I "
-"had to make a free operating system, that was clear &mdash; the only way "
-"that people could work together and share was with a free operating system."
+"had to make a free operating system, that was clear&mdash;the only way that "
+"people could work together and share was with a free operating system."
 msgstr ""
 
"一旦我不再惩罚Symbolics,我就不得不考虑下一步做什么。我å¿
…须做一个自由的操作系"
 
"统,这很明显&mdash;人们能够一起工作和分享的方法就是有一个自由的操作系统。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "At first, I thought of making a Lisp-based system, but I realized that "
+#| "wouldn't be a good idea technically. To have something like the Lisp "
+#| "machine system, you needed special purpose microcode. That's what made it "
+#| "possible to run programs as fast as other computers would run their "
+#| "programs and still get the benefit of typechecking. Without that, you "
+#| "would be reduced to something like the Lisp compilers for other machines. "
+#| "The programs would be faster, but unstable. Now that's okay if you're "
+#| "running one program on a timesharing system &mdash; if one program "
+#| "crashes, that's not a disaster, that's something your program "
+#| "occasionally does. But that didn't make it good for writing the operating "
+#| "system in, so I rejected the idea of making a system like the Lisp "
+#| "machine."
 msgid ""
 "At first, I thought of making a Lisp-based system, but I realized that "
 "wouldn't be a good idea technically. To have something like the Lisp machine "
@@ -607,7 +850,7 @@
 "still get the benefit of typechecking. Without that, you would be reduced to "
 "something like the Lisp compilers for other machines. The programs would be "
 "faster, but unstable. Now that's okay if you're running one program on a "
-"timesharing system &mdash; if one program crashes, that's not a disaster, "
+"timesharing system&mdash;if one program crashes, that's not a disaster, "
 "that's something your program occasionally does. But that didn't make it "
 "good for writing the operating system in, so I rejected the idea of making a "
 "system like the Lisp machine."
@@ -619,7 +862,7 @@
 
"程序还凑合&mdash;一个程序崩溃并不是灾难,用户程序时不时地都可能会崩溃。但是这"
 "æ 
·ç¼–写操作系统就不行,所以我抛弃了做类似Lisp电脑系统的想法。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I decided instead to make a Unix-like operating system that would have Lisp "
 "implementations to run as user programs. The kernel wouldn't be written in "
@@ -633,7 +876,7 @@
 "发指引我编写了GNU 
Emacs。在编写的过程中,我的目的是做一个尽可能最小的Lisp系"
 "统。该程序的大小是非常重要的考量。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There were people in those days, in 1985, who had one-megabyte machines "
 "without virtual memory. They wanted to be able to use GNU Emacs. This meant "
@@ -642,15 +885,25 @@
 "在1985年,有些人电脑的内存是不带虚拟内存的1å…
†å­—节。他们也想要运行GNU Emacs。"
 "这意味着我必须使该程序尽可能地小。"
 
-#. type: Content of: <p>
-msgid ""
-"For instance, at the time the only looping construct was &lsquo;"
-"while&rsquo;, which was extremely simple. There was no way to break out of "
-"the &lsquo;while&rsquo; statement, you just had to do a catch and a throw, "
-"or test a variable that ran the loop. That shows how far I was pushing to "
-"keep things small. We didn't have &lsquo;caar&rsquo; and &lsquo;cadr&rsquo; "
-"and so on; &ldquo;squeeze out everything possible&rdquo; was the spirit of "
-"GNU Emacs, the spirit of Emacs Lisp, from the beginning."
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "For instance, at the time the only looping construct was &lsquo;"
+#| "while&rsquo;, which was extremely simple. There was no way to break out "
+#| "of the &lsquo;while&rsquo; statement, you just had to do a catch and a "
+#| "throw, or test a variable that ran the loop. That shows how far I was "
+#| "pushing to keep things small. We didn't have &lsquo;caar&rsquo; and "
+#| "&lsquo;cadr&rsquo; and so on; &ldquo;squeeze out everything "
+#| "possible&rdquo; was the spirit of GNU Emacs, the spirit of Emacs Lisp, "
+#| "from the beginning."
+msgid ""
+"For instance, at the time the only looping construct was <code>while</code>, "
+"which was extremely simple. There was no way to break out of the "
+"<code>while</code> statement, you just had to do a catch and a throw, or "
+"test a variable that ran the loop. That shows how far I was pushing to keep "
+"things small. We didn't have <code>caar</code> and <code>cadr</code> and so "
+"on; &ldquo;squeeze out everything possible&rdquo; was the spirit of GNU "
+"Emacs, the spirit of Emacs Lisp, from the beginning."
 msgstr ""
 
"举个例子,当时的循环结构只有&lsquo;while&rsquo;,它简单到极致。ä½
 æ— æ³•ç›´æŽ¥è·³å‡º"
 "&lsquo;while&rsquo;循环,你
只能进行一次异常捕获(catch)和一次异常抛出"
@@ -659,15 +912,25 @@
 "能减少不必要的东西&rdquo;是GNU Emacs的精髓,是Emacs 
Lisp的精髓,从一开始就是"
 "这样。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Obviously, machines are bigger now, and we don't do it that way any more. "
+#| "We put in &lsquo;caar&rsquo; and &lsquo;cadr&rsquo; and so on, and we "
+#| "might put in another looping construct one of these days. We're willing "
+#| "to extend it some now, but we don't want to extend it to the level of "
+#| "common Lisp. I implemented Common Lisp once on the Lisp machine, and I'm "
+#| "not all that happy with it. One thing I don't like terribly much is "
+#| "keyword arguments <a href=\"#foot-8\">(8)</a>.  They don't seem quite "
+#| "Lispy to me; I'll do it sometimes but I minimize the times when I do that."
 msgid ""
 "Obviously, machines are bigger now, and we don't do it that way any more. We "
-"put in &lsquo;caar&rsquo; and &lsquo;cadr&rsquo; and so on, and we might put "
+"put in <code>caar</code> and <code>cadr</code> and so on, and we might put "
 "in another looping construct one of these days. We're willing to extend it "
 "some now, but we don't want to extend it to the level of common Lisp. I "
 "implemented Common Lisp once on the Lisp machine, and I'm not all that happy "
-"with it. One thing I don't like terribly much is keyword arguments <a href="
-"\"#foot-8\">(8)</a>.  They don't seem quite Lispy to me; I'll do it "
+"with it. One thing I don't like terribly much is keyword arguments&#8239;<a "
+"href=\"#foot-8\">[8]</a>.  They don't seem quite Lispy to me; I'll do it "
 "sometimes but I minimize the times when I do that."
 msgstr ""
 "当然,现在的电脑大了,我们也不再追求那æ 
·çš„极致。我们加入了&lsquo;caar&rsquo;"
@@ -677,7 +940,7 @@
 
"\"#foot-8\">(8)</a>。在我看来,它们不算Lispy;虽然我有时也用å
…³é”®å­—,但是我把"
 "我用的次数控制到最小。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "That was not the end of the GNU projects involved with Lisp. Later on around "
 "1995, we were looking into starting a graphical desktop project. It was "
@@ -689,7 +952,7 @@
 "目。我们很清
楚该桌面程序的主要编程语言应该能够便利地扩展该桌面程序,就像我们"
 "的编辑器一样。问题在于这应该是一个什么语言。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "At the time, <abbr title=\"Tool Command Language\">TCL</abbr> was being "
 "pushed heavily for this purpose. I had a very low opinion of TCL, basically "
@@ -712,7 +975,7 @@
 "Lisp,因为它太庞大了。其思想是,我们把 Scheme 
解释器连接到应用程序中,就像 "
 "TCL 那样。然后,我们就可以建议这是所有 GNU 
程序首选的扩展包。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There's an interesting benefit you can get from using such a powerful "
 "language as a version of Lisp as your primary extensibility language.  You "
@@ -733,18 +996,34 @@
 "实现 TCL 或 Python 或 Perl,用来把应用翻译成 
Scheme。之后,你就可以把它加载到"
 
"每个应用,然后就可以用自己最喜爱的语言来定制应用了,å
…¶ä»–定制也类似。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "As long as the extensibility languages are weak, the users have to use "
+#| "only the language you provided them. Which means that people who love any "
+#| "given language have to compete for the choice of the developers of "
+#| "applications &mdash; saying &ldquo;Please, application developer, put my "
+#| "language into your application, not his language.&rdquo; Then the users "
+#| "get no choices at all &mdash; whichever application they're using comes "
+#| "with one language and they're stuck with [that language]. But when you "
+#| "have a powerful language that can implement others by translating into "
+#| "it, then you give the user a choice of language and we don't have to have "
+#| "a language war anymore. That's what we're hoping &lsquo;Guile&rsquo;, our "
+#| "scheme interpreter, will do. We had a person working last summer "
+#| "finishing up a translator from Python to Scheme. I don't know if it's "
+#| "entirely finished yet, but for anyone interested in this project, please "
+#| "get in touch. So that's the plan we have for the future."
 msgid ""
 "As long as the extensibility languages are weak, the users have to use only "
 "the language you provided them. Which means that people who love any given "
-"language have to compete for the choice of the developers of applications "
-"&mdash; saying &ldquo;Please, application developer, put my language into "
-"your application, not his language.&rdquo; Then the users get no choices at "
-"all &mdash; whichever application they're using comes with one language and "
-"they're stuck with [that language]. But when you have a powerful language "
-"that can implement others by translating into it, then you give the user a "
-"choice of language and we don't have to have a language war anymore. That's "
-"what we're hoping &lsquo;Guile&rsquo;, our scheme interpreter, will do. We "
+"language have to compete for the choice of the developers of "
+"applications&mdash;saying &ldquo;Please, application developer, put my "
+"language into your application, not his language.&rdquo; Then the users get "
+"no choices at all&mdash;whichever application they're using comes with one "
+"language and they're stuck with [that language]. But when you have a "
+"powerful language that can implement others by translating into it, then you "
+"give the user a choice of language and we don't have to have a language war "
+"anymore. That's what we're hoping Guile, our scheme interpreter, will do. We "
 "had a person working last summer finishing up a translator from Python to "
 "Scheme. I don't know if it's entirely finished yet, but for anyone "
 "interested in this project, please get in touch. So that's the plan we have "
@@ -760,7 +1039,18 @@
 "个是否已经全部完成,不过如果有人对这个项目感å…
´è¶£ï¼Œè¯·è”系我们。这就是我们未来"
 "的计划。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "I haven't been speaking about free software, but let me briefly tell you "
+#| "a little bit about what that means. Free software does not refer to "
+#| "price; it doesn't mean that you get it for free. (You may have paid for a "
+#| "copy, or gotten a copy gratis.) It means that you have freedom as a user. "
+#| "The crucial thing is that you are free to run the program, free to study "
+#| "what it does, free to change it to suit your needs, free to redistribute "
+#| "the copies of others and free to publish improved, extended versions. "
+#| "This is what free software means. If you are using a non-free program, "
+#| "you have lost crucial freedom, so don't ever do that."
 msgid ""
 "I haven't been speaking about free software, but let me briefly tell you a "
 "little bit about what that means. Free software does not refer to price; it "
@@ -769,7 +1059,7 @@
 "thing is that you are free to run the program, free to study what it does, "
 "free to change it to suit your needs, free to redistribute the copies of "
 "others and free to publish improved, extended versions. This is what free "
-"software means. If you are using a non-free program, you have lost crucial "
+"software means. If you are using a nonfree program, you have lost crucial "
 "freedom, so don't ever do that."
 msgstr ""
 
"我一直没有提自由软件,不过现在让我简单说一下它的意义。自由软件指的不是价æ
 ¼ï¼›"
@@ -779,12 +1069,22 @@
 
"人发布该软件以及发布修改后的软件。这就是自由软件的定义。如果ä½
 ä½¿ç”¨çš„是非自由"
 "软件,你就失去了这些å…
³é”®çš„自由,所以请不要使用非自由软件。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The purpose of the GNU project is to make it easier for people to reject "
+#| "freedom-trampling, user-dominating, non-free software by providing free "
+#| "software to replace it. For those who don't have the moral courage to "
+#| "reject the non-free software, when that means some practical "
+#| "inconvenience, what we try to do is give a free alternative so that you "
+#| "can move to freedom with less of a mess and less of a sacrifice in "
+#| "practical terms. The less sacrifice the better. We want to make it easier "
+#| "for you to live in freedom, to cooperate."
 msgid ""
 "The purpose of the GNU project is to make it easier for people to reject "
-"freedom-trampling, user-dominating, non-free software by providing free "
+"freedom-trampling, user-dominating, nonfree software by providing free "
 "software to replace it. For those who don't have the moral courage to reject "
-"the non-free software, when that means some practical inconvenience, what we "
+"the nonfree software, when that means some practical inconvenience, what we "
 "try to do is give a free alternative so that you can move to freedom with "
 "less of a mess and less of a sacrifice in practical terms. The less "
 "sacrifice the better. We want to make it easier for you to live in freedom, "
@@ -796,16 +1096,26 @@
 "牺牲实用性的情况下,转移到自由软件。你
失去的实用性当然是越少越好。我们希望你"
 "能够更容易地获得自由、并且能够合作互助。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "This is a matter of the freedom to cooperate. We're used to thinking of "
+#| "freedom and cooperation with society as if they are opposites. But here "
+#| "they're on the same side. With free software you are free to cooperate "
+#| "with other people as well as free to help yourself. With non-free "
+#| "software, somebody is dominating you and keeping people divided. You're "
+#| "not allowed to share with them, you're not free to cooperate or help "
+#| "society, anymore than you're free to help yourself.  Divided and helpless "
+#| "is the state of users using non-free software."
 msgid ""
 "This is a matter of the freedom to cooperate. We're used to thinking of "
 "freedom and cooperation with society as if they are opposites. But here "
 "they're on the same side. With free software you are free to cooperate with "
-"other people as well as free to help yourself. With non-free software, "
+"other people as well as free to help yourself. With nonfree software, "
 "somebody is dominating you and keeping people divided. You're not allowed to "
 "share with them, you're not free to cooperate or help society, anymore than "
 "you're free to help yourself.  Divided and helpless is the state of users "
-"using non-free software."
+"using nonfree software."
 msgstr ""
 "合作互助关乎自由。人们习
惯于认为自由和社会合作是对立的。但是,此时我们在同一"
 "条战壕内。使用自由软件,你就有自由和å…
¶ä»–人合作,并且也有自由帮助你自己。使用"
@@ -813,21 +1123,37 @@
 "或帮助社会,正如你没有自由来帮助你
自己。使用非自由软件的用户就是这样孤立和无"
 "助。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "We've produced a tremendous range of free software. We've done what "
+#| "people said we could never do; we have two operating systems of free "
+#| "software. We have many applications and we obviously have a lot farther "
+#| "to go. So we need your help. I would like to ask you to volunteer for the "
+#| "GNU project; help us develop free software for more jobs. Take a look at "
+#| "<a href=\"/help/\">http://www.gnu.org/help</a> to find suggestions for "
+#| "how to help. If you want to order things, there's a link to that from the "
+#| "home page. If you want to read about philosophical issues, look in /"
+#| "philosophy. If you're looking for free software to use, look in /"
+#| "directory, which lists about 1900 packages now (which is a fraction of "
+#| "all the free software out there). Please write more and contribute to us. "
+#| "My book of essays, &ldquo;Free Software and Free Society&rdquo;, is on "
+#| "sale and can be purchased at <a href=\"http://www.gnu.org/\";>www.gnu.org</"
+#| "a>. Happy hacking!"
 msgid ""
 "We've produced a tremendous range of free software. We've done what people "
 "said we could never do; we have two operating systems of free software. We "
 "have many applications and we obviously have a lot farther to go. So we need "
 "your help. I would like to ask you to volunteer for the GNU project; help us "
-"develop free software for more jobs. Take a look at <a href=\"/help/"
-"\">http://www.gnu.org/help</a> to find suggestions for how to help. If you "
-"want to order things, there's a link to that from the home page. If you want "
-"to read about philosophical issues, look in /philosophy. If you're looking "
-"for free software to use, look in /directory, which lists about 1900 "
-"packages now (which is a fraction of all the free software out there). "
-"Please write more and contribute to us. My book of essays, &ldquo;Free "
-"Software and Free Society&rdquo;, is on sale and can be purchased at <a href="
-"\"http://www.gnu.org/\";>www.gnu.org</a>. Happy hacking!"
+"develop free software for more jobs. Take a look at <a href=\"/help/help.html"
+"\">gnu.org/help</a> to find suggestions for how to help. If you want to "
+"order things, there's a link to that from the home page. If you want to read "
+"about philosophical issues, look in /philosophy. If you're looking for free "
+"software to use, look in /directory, which lists about 1900 packages now "
+"(which is a fraction of all the free software out there). Please write more "
+"and contribute to us. My book of essays, &ldquo;Free Software and Free "
+"Society,&rdquo; is on sale and can be purchased at www.gnu.org&#8239;<a href="
+"\"#foot-9\">[9]</a>.  Happy hacking!"
 msgstr ""
 
"我们已经开发了范围庞大的自由软件。我们完成了人们曾经说永远完不成的事;我们有"
 
"两个自由软件操作系统。我们有很多应用,但我们显然还有更多的要做。所以,我们需"
@@ -839,7 +1165,14 @@
 "集,&ldquo;自由软件和自由社会&rdquo;,正在发售,你
可以在<a href=\"http://www.";
 "gnu.org/\">www.gnu.org</a>购买。祝你们开发愉快!"
 
-#. type: Content of: <ol><li>
+# type: Content of: <h4>
+#. type: Content of: <div><h3>
+#, fuzzy
+#| msgid "Footnotes"
+msgid "Footnotes"
+msgstr "脚注"
+
+#. type: Content of: <div><ol><li>
 msgid ""
 "Guy Steele designed the original symmetrical Emacs command set; then he and "
 "I began implementing Emacs (on top of TECO), but after one long joint "
@@ -851,7 +1184,7 @@
 
"上),但是在一段长期的联合开发之后,Steele渐渐离开了,所以我独自完成了Emacs。"
 "其他人,特别是Eugene C. Cicciarelli和Mike 
McMahon后来也做出了显著的贡献。"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Bernie Greenberg says that Dan Weinreb's implementation of Emacs for the "
 "Lisp Machine came before Greenberg's implementation for Multics.  I "
@@ -860,7 +1193,7 @@
 "Bernie Greenberg说Dan 
Weinreb在Lisp电脑上的Emacs要早于Greenberg在Multics的版"
 "本。我在此对我的错误道歉。"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Greenblatt's plan, as I understood it, was to hire lab people part time, so "
 "that they could continue working at the AI Lab.  Symbolics hired them full "
@@ -870,19 +1203,26 @@
 "智能实验室的本职工作。Symbolics采取的是å…
¨èŒé›‡ä½£ï¼Œæ‰€ä»¥å®žéªŒå®¤çš„人员就不能在MIT"
 "工作了。"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "The background of this plan, which I did not state explicitly in the "
+#| "talk, is that during an initial period the ex-AI-Lab hackers, whether at "
+#| "Symbolics or LMI, continued contributing their changes to the MIT Lisp "
+#| "Machine system &mdash; even though the contract did not require this.  "
+#| "Symbolics' plan was to rupture this cooperation unilaterally."
 msgid ""
 "The background of this plan, which I did not state explicitly in the talk, "
 "is that during an initial period the ex-AI-Lab hackers, whether at Symbolics "
-"or LMI, continued contributing their changes to the MIT Lisp Machine system "
-"&mdash; even though the contract did not require this.  Symbolics' plan was "
-"to rupture this cooperation unilaterally."
+"or LMI, continued contributing their changes to the MIT Lisp Machine "
+"system&mdash;even though the contract did not require this.  Symbolics' plan "
+"was to rupture this cooperation unilaterally."
 msgstr ""
 
"该计划的背景,我在演讲里没有明说,是在开始阶段,人工智能实验室的黑客们,不管"
 
"是在Symbolics,还是在LMI,都继续把他们的改进贡献给MIT的Lisp电脑系统&mdash;尽"
 "管合同并没有要求这æ 
·åšã€‚Symbolics的计划却是单方面割裂合作。"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "It was not that I cared particularly about the fate of LMI, but rather I did "
 "not want to let Symbolics gain through its aggression against the AI Lab."
@@ -890,7 +1230,7 @@
 "这并不是说我特别å…
³æ³¨LMI的命运,我只是不想让Symbolics通过攻击人工智能实验室获"
 "益。"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "This statement has been misconstrued as saying that I never, ever looked at "
 "Symbolics' code.  Actually it says I did look, at first.  The Symbolics "
@@ -901,7 +1241,7 @@
 "Symbolics的代码。这些代ç 
å°±åœ¨MIT,我有权看的,而且最初我就是这样了解到他们做"
 "了改动。"
 
-#. type: Content of: <ol><li><p>
+#. type: Content of: <div><ol><li><p>
 msgid ""
 "But that meant I had to make a special effort to solve each problem "
 "differently, in order to avoid copying Symbolics code.  After a while, I "
@@ -912,14 +1252,14 @@
 "码。一段时间之后,我觉得不看这些代码更好。这æ 
·çš„话,我就可以按最好的方法来实"
 "现代码,而不用考虑是否用了Symbolics的代码。"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Symbolics at one point protested to MIT that my work, by thwarting their "
 "plan, had cost Symbolics a million dollars."
 msgstr ""
 "Symbolics曾经向MIT抗议:我的工作阻挠
了他们的计划而使Symbolics损失一百万美元。"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "I don't mind if a very complex and heavyweight function takes keyword "
 "arguments.  What bothers me is making simple basic functions such as &ldquo;"
@@ -928,6 +1268,20 @@
 "我并不介意非常复杂和重量级的函数使用å…
³é”®å­—参数。我讨厌的是连诸如&ldquo;"
 "member&rdquo;这样的简单函数也要使用关键字参数。"
 
+#. type: Content of: <div><ol><li>
+#, 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 ""
+"In 2021, this book can be purchased from <a href=\"https://shop.fsf.org/";
+"books-docs/free-software-free-society-selected-essays-richard-m-stallman-3rd-"
+"edition\"> GNU Press</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*"
@@ -950,9 +1304,7 @@
 "系方法</a>联系自由软件基金会(FSF)。请将无效链接,å…
¶ä»–错误或建议发送给<a href="
 "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>。"
 
-#
-#
-#
+# TODO: submitting -> contributing.
 #.  TRANSLATORS: Ignore the original text in this paragraph,
 #.         replace it with the translation of these two:
 #.         We work hard and do our best to provide accurate, good quality
@@ -960,22 +1312,30 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
-"若您想翻译本文,请参看<a 
href=\"/server/standards/README.translations.html\">"
-"翻译须知</a>。"
+"请参考 <a 
href=\"/server/standards/README.translations.html\">翻译说明</a> 了"
+"解有关协调和提交文章翻译的信息。"
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2003, 2007, 2013, 2014, 2020 Free Software Foundation, Inc."
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2003, 2007, 2013, 2014, 2020 Free Software Foundation, "
+#| "Inc."
+msgid "Copyright &copy; 2003, 2007, 2013, 2021 Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 2003, 2007, 2013, 2014, 2020 Free Software Foundation, Inc."
 
@@ -1003,13 +1363,23 @@
 msgid "Updated:"
 msgstr "最后更新:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2003, 2007, 2013, 2014, 2020, 2021 Free Software "
-"Foundation, Inc."
-msgstr ""
-"Copyright &copy; 2003, 2007, 2013, 2014, 2020, 2021 Free Software "
-"Foundation, Inc."
+#
+#
+#
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "若您想翻译本文,请参看<a 
href=\"/server/standards/README.translations.html"
+#~ "\">翻译须知</a>。"
+
+#~ msgid ""
+#~ "Copyright &copy; 2003, 2007, 2013, 2014, 2020, 2021 Free Software "
+#~ "Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2003, 2007, 2013, 2014, 2020, 2021 Free Software "
+#~ "Foundation, Inc."
 
 #~ msgid ""
 #~ "This page is licensed under a <a rel=\"license\" href=\"http://";

Index: po/why-gnu-linux.ca-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.ca-diff.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- po/why-gnu-linux.ca-diff.html       29 Oct 2021 13:32:43 -0000      1.5
+++ po/why-gnu-linux.ca-diff.html       2 Nov 2021 14:41:54 -0000       1.6
@@ -12,13 +12,18 @@
 <body><pre>
 &lt;!--#include <span 
class="removed"><del><strong>virtual="/server/html5-header.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/header.html"</em></ins></span> --&gt;
 &lt;!-- Parent-Version: 1.96 --&gt;
-<span class="inserted"><ins><em>&lt;!-- This page is derived from 
/server/standards/boilerplate.html --&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;!-- This page is derived from 
/server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="gnulinux" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes" --&gt;</em></ins></span>
 &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 
class="c"&gt;What's</strong></del></span>
-<span class="inserted"><ins><em>&lt;div class="article reduced-width"&gt;
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&lt;div class="article reduced-width"&gt;
 &lt;h2&gt;What's</em></ins></span> in a Name?&lt;/h2&gt;
 
 &lt;address <span class="removed"><del><strong>class="byline 
c"&gt;by</strong></del></span> <span 
class="inserted"><ins><em>class="byline"&gt;by</em></ins></span> &lt;a
@@ -292,7 +297,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/10/29 13:32:43 $
+$Date: 2021/11/02 14:41:54 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: po/why-gnu-linux.cs-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.cs-diff.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- po/why-gnu-linux.cs-diff.html       29 Oct 2021 13:32:43 -0000      1.18
+++ po/why-gnu-linux.cs-diff.html       2 Nov 2021 14:41:54 -0000       1.19
@@ -12,13 +12,18 @@
 <body><pre>
 &lt;!--#include <span 
class="removed"><del><strong>virtual="/server/html5-header.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/header.html"</em></ins></span> --&gt;
 &lt;!-- Parent-Version: 1.96 --&gt;
-<span class="inserted"><ins><em>&lt;!-- This page is derived from 
/server/standards/boilerplate.html --&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;!-- This page is derived from 
/server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="gnulinux" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes" --&gt;</em></ins></span>
 &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 
class="c"&gt;What's</strong></del></span>
-<span class="inserted"><ins><em>&lt;div class="article reduced-width"&gt;
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&lt;div class="article reduced-width"&gt;
 &lt;h2&gt;What's</em></ins></span> in a Name?&lt;/h2&gt;
 
 &lt;address <span class="removed"><del><strong>class="byline 
c"&gt;by</strong></del></span> <span 
class="inserted"><ins><em>class="byline"&gt;by</em></ins></span> &lt;a
@@ -292,7 +297,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/10/29 13:32:43 $
+$Date: 2021/11/02 14:41:54 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: po/why-gnu-linux.de-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.de-diff.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/why-gnu-linux.de-diff.html       29 Oct 2021 13:32:43 -0000      1.1
+++ po/why-gnu-linux.de-diff.html       2 Nov 2021 14:41:54 -0000       1.2
@@ -12,13 +12,18 @@
 <body><pre>
 &lt;!--#include <span 
class="removed"><del><strong>virtual="/server/html5-header.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/header.html"</em></ins></span> --&gt;
 &lt;!-- Parent-Version: 1.96 --&gt;
-<span class="inserted"><ins><em>&lt;!-- This page is derived from 
/server/standards/boilerplate.html --&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;!-- This page is derived from 
/server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="gnulinux" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes" --&gt;</em></ins></span>
 &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 
class="c"&gt;What's</strong></del></span>
-<span class="inserted"><ins><em>&lt;div class="article reduced-width"&gt;
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&lt;div class="article reduced-width"&gt;
 &lt;h2&gt;What's</em></ins></span> in a Name?&lt;/h2&gt;
 
 &lt;address <span class="removed"><del><strong>class="byline 
c"&gt;by</strong></del></span> <span 
class="inserted"><ins><em>class="byline"&gt;by</em></ins></span> &lt;a
@@ -292,7 +297,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/10/29 13:32:43 $
+$Date: 2021/11/02 14:41:54 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: po/why-gnu-linux.el-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.el-diff.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- po/why-gnu-linux.el-diff.html       29 Oct 2021 13:32:43 -0000      1.22
+++ po/why-gnu-linux.el-diff.html       2 Nov 2021 14:41:54 -0000       1.23
@@ -12,13 +12,18 @@
 <body><pre>
 &lt;!--#include <span 
class="removed"><del><strong>virtual="/server/html5-header.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/header.html"</em></ins></span> --&gt;
 &lt;!-- Parent-Version: 1.96 --&gt;
-<span class="inserted"><ins><em>&lt;!-- This page is derived from 
/server/standards/boilerplate.html --&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;!-- This page is derived from 
/server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="gnulinux" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes" --&gt;</em></ins></span>
 &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 
class="c"&gt;What's</strong></del></span>
-<span class="inserted"><ins><em>&lt;div class="article reduced-width"&gt;
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&lt;div class="article reduced-width"&gt;
 &lt;h2&gt;What's</em></ins></span> in a Name?&lt;/h2&gt;
 
 &lt;address <span class="removed"><del><strong>class="byline 
c"&gt;by</strong></del></span> <span 
class="inserted"><ins><em>class="byline"&gt;by</em></ins></span> &lt;a
@@ -292,7 +297,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/10/29 13:32:43 $
+$Date: 2021/11/02 14:41:54 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: po/why-gnu-linux.es-en.html
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.es-en.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- po/why-gnu-linux.es-en.html 31 Aug 2021 11:35:28 -0000      1.31
+++ po/why-gnu-linux.es-en.html 2 Nov 2021 14:41:54 -0000       1.32
@@ -1,10 +1,15 @@
 <!--#include virtual="/server/header.html" -->
 <!-- Parent-Version: 1.96 -->
 <!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="gnulinux" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>Why GNU/Linux?
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/gnu/po/why-gnu-linux.translist" -->
 <!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/gnu/gnu-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
 <div class="article reduced-width">
 <h2>What's in a Name?</h2>
 
@@ -259,7 +264,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/08/31 11:35:28 $
+$Date: 2021/11/02 14:41:54 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/why-gnu-linux.fr-en.html
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.fr-en.html,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- po/why-gnu-linux.fr-en.html 30 Aug 2021 14:04:42 -0000      1.41
+++ po/why-gnu-linux.fr-en.html 2 Nov 2021 14:41:54 -0000       1.42
@@ -1,10 +1,15 @@
 <!--#include virtual="/server/header.html" -->
 <!-- Parent-Version: 1.96 -->
 <!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="gnulinux" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>Why GNU/Linux?
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/gnu/po/why-gnu-linux.translist" -->
 <!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/gnu/gnu-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
 <div class="article reduced-width">
 <h2>What's in a Name?</h2>
 
@@ -259,7 +264,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/08/30 14:04:42 $
+$Date: 2021/11/02 14:41:54 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/why-gnu-linux.hr-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.hr-diff.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- po/why-gnu-linux.hr-diff.html       29 Oct 2021 13:32:43 -0000      1.13
+++ po/why-gnu-linux.hr-diff.html       2 Nov 2021 14:41:54 -0000       1.14
@@ -12,13 +12,18 @@
 <body><pre>
 &lt;!--#include <span 
class="removed"><del><strong>virtual="/server/html5-header.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/header.html"</em></ins></span> --&gt;
 &lt;!-- Parent-Version: 1.96 --&gt;
-<span class="inserted"><ins><em>&lt;!-- This page is derived from 
/server/standards/boilerplate.html --&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;!-- This page is derived from 
/server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="gnulinux" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes" --&gt;</em></ins></span>
 &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 
class="c"&gt;What's</strong></del></span>
-<span class="inserted"><ins><em>&lt;div class="article reduced-width"&gt;
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&lt;div class="article reduced-width"&gt;
 &lt;h2&gt;What's</em></ins></span> in a Name?&lt;/h2&gt;
 
 &lt;address <span class="removed"><del><strong>class="byline 
c"&gt;by</strong></del></span> <span 
class="inserted"><ins><em>class="byline"&gt;by</em></ins></span> &lt;a
@@ -292,7 +297,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/10/29 13:32:43 $
+$Date: 2021/11/02 14:41:54 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: po/why-gnu-linux.it-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.it-diff.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- po/why-gnu-linux.it-diff.html       30 Aug 2021 13:34:55 -0000      1.2
+++ po/why-gnu-linux.it-diff.html       2 Nov 2021 14:41:54 -0000       1.3
@@ -12,23 +12,28 @@
 <body><pre>
 &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;!-- This page is derived from /server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="gnulinux" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</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="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&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"&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;
+<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;
 
 &lt;div class="announcement"&gt;
   &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
+and our page on</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-users-never-heard-of-gnu.html"&gt;GNU
 Users Who Have Never Heard of GNU&lt;/a&gt;.
 
 &lt;/p&gt;&lt;/blockquote&gt;
@@ -286,7 +291,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/08/30 13:34:55 $
+$Date: 2021/11/02 14:41:54 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: po/why-gnu-linux.ja-en.html
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.ja-en.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- po/why-gnu-linux.ja-en.html 31 Aug 2021 03:06:01 -0000      1.29
+++ po/why-gnu-linux.ja-en.html 2 Nov 2021 14:41:54 -0000       1.30
@@ -1,10 +1,15 @@
 <!--#include virtual="/server/header.html" -->
 <!-- Parent-Version: 1.96 -->
 <!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="gnulinux" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>Why GNU/Linux?
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/gnu/po/why-gnu-linux.translist" -->
 <!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/gnu/gnu-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
 <div class="article reduced-width">
 <h2>What's in a Name?</h2>
 
@@ -259,7 +264,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/08/31 03:06:01 $
+$Date: 2021/11/02 14:41:54 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/why-gnu-linux.ko-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.ko-diff.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- po/why-gnu-linux.ko-diff.html       29 Oct 2021 13:32:43 -0000      1.18
+++ po/why-gnu-linux.ko-diff.html       2 Nov 2021 14:41:54 -0000       1.19
@@ -12,13 +12,18 @@
 <body><pre>
 &lt;!--#include <span 
class="removed"><del><strong>virtual="/server/html5-header.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/header.html"</em></ins></span> --&gt;
 &lt;!-- Parent-Version: 1.96 --&gt;
-<span class="inserted"><ins><em>&lt;!-- This page is derived from 
/server/standards/boilerplate.html --&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;!-- This page is derived from 
/server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="gnulinux" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes" --&gt;</em></ins></span>
 &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 
class="c"&gt;What's</strong></del></span>
-<span class="inserted"><ins><em>&lt;div class="article reduced-width"&gt;
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&lt;div class="article reduced-width"&gt;
 &lt;h2&gt;What's</em></ins></span> in a Name?&lt;/h2&gt;
 
 &lt;address <span class="removed"><del><strong>class="byline 
c"&gt;by</strong></del></span> <span 
class="inserted"><ins><em>class="byline"&gt;by</em></ins></span> &lt;a
@@ -292,7 +297,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/10/29 13:32:43 $
+$Date: 2021/11/02 14:41:54 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: po/why-gnu-linux.nl-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.nl-diff.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- po/why-gnu-linux.nl-diff.html       29 Oct 2021 13:32:43 -0000      1.15
+++ po/why-gnu-linux.nl-diff.html       2 Nov 2021 14:41:54 -0000       1.16
@@ -12,13 +12,18 @@
 <body><pre>
 &lt;!--#include <span 
class="removed"><del><strong>virtual="/server/html5-header.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/header.html"</em></ins></span> --&gt;
 &lt;!-- Parent-Version: 1.96 --&gt;
-<span class="inserted"><ins><em>&lt;!-- This page is derived from 
/server/standards/boilerplate.html --&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;!-- This page is derived from 
/server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="gnulinux" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes" --&gt;</em></ins></span>
 &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 
class="c"&gt;What's</strong></del></span>
-<span class="inserted"><ins><em>&lt;div class="article reduced-width"&gt;
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&lt;div class="article reduced-width"&gt;
 &lt;h2&gt;What's</em></ins></span> in a Name?&lt;/h2&gt;
 
 &lt;address <span class="removed"><del><strong>class="byline 
c"&gt;by</strong></del></span> <span 
class="inserted"><ins><em>class="byline"&gt;by</em></ins></span> &lt;a
@@ -292,7 +297,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/10/29 13:32:43 $
+$Date: 2021/11/02 14:41:54 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: po/why-gnu-linux.pl-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.pl-diff.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/why-gnu-linux.pl-diff.html       29 Oct 2021 13:32:43 -0000      1.1
+++ po/why-gnu-linux.pl-diff.html       2 Nov 2021 14:41:54 -0000       1.2
@@ -12,13 +12,18 @@
 <body><pre>
 &lt;!--#include <span 
class="removed"><del><strong>virtual="/server/html5-header.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/header.html"</em></ins></span> --&gt;
 &lt;!-- Parent-Version: 1.96 --&gt;
-<span class="inserted"><ins><em>&lt;!-- This page is derived from 
/server/standards/boilerplate.html --&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;!-- This page is derived from 
/server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="gnulinux" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes" --&gt;</em></ins></span>
 &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 
class="c"&gt;What's</strong></del></span>
-<span class="inserted"><ins><em>&lt;div class="article reduced-width"&gt;
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&lt;div class="article reduced-width"&gt;
 &lt;h2&gt;What's</em></ins></span> in a Name?&lt;/h2&gt;
 
 &lt;address <span class="removed"><del><strong>class="byline 
c"&gt;by</strong></del></span> <span 
class="inserted"><ins><em>class="byline"&gt;by</em></ins></span> &lt;a
@@ -292,7 +297,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/10/29 13:32:43 $
+$Date: 2021/11/02 14:41:54 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: po/why-gnu-linux.pt-br-en.html
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.pt-br-en.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- po/why-gnu-linux.pt-br-en.html      5 Sep 2021 15:33:44 -0000       1.18
+++ po/why-gnu-linux.pt-br-en.html      2 Nov 2021 14:41:54 -0000       1.19
@@ -1,10 +1,15 @@
 <!--#include virtual="/server/header.html" -->
 <!-- Parent-Version: 1.96 -->
 <!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="gnulinux" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>Why GNU/Linux?
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/gnu/po/why-gnu-linux.translist" -->
 <!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/gnu/gnu-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
 <div class="article reduced-width">
 <h2>What's in a Name?</h2>
 
@@ -259,7 +264,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/09/05 15:33:44 $
+$Date: 2021/11/02 14:41:54 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/why-gnu-linux.ru-en.html
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.ru-en.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- po/why-gnu-linux.ru-en.html 30 Aug 2021 14:04:42 -0000      1.34
+++ po/why-gnu-linux.ru-en.html 2 Nov 2021 14:41:54 -0000       1.35
@@ -1,10 +1,15 @@
 <!--#include virtual="/server/header.html" -->
 <!-- Parent-Version: 1.96 -->
 <!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="gnulinux" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>Why GNU/Linux?
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/gnu/po/why-gnu-linux.translist" -->
 <!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/gnu/gnu-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
 <div class="article reduced-width">
 <h2>What's in a Name?</h2>
 
@@ -259,7 +264,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/08/30 14:04:42 $
+$Date: 2021/11/02 14:41:54 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/why-gnu-linux.sq-en.html
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.sq-en.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- po/why-gnu-linux.sq-en.html 7 Sep 2021 12:03:52 -0000       1.26
+++ po/why-gnu-linux.sq-en.html 2 Nov 2021 14:41:54 -0000       1.27
@@ -1,10 +1,15 @@
 <!--#include virtual="/server/header.html" -->
 <!-- Parent-Version: 1.96 -->
 <!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="gnulinux" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>Why GNU/Linux?
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/gnu/po/why-gnu-linux.translist" -->
 <!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/gnu/gnu-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
 <div class="article reduced-width">
 <h2>What's in a Name?</h2>
 
@@ -259,7 +264,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/09/07 12:03:52 $
+$Date: 2021/11/02 14:41:54 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/why-gnu-linux.tr-en.html
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.tr-en.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- po/why-gnu-linux.tr-en.html 12 Sep 2021 07:34:21 -0000      1.5
+++ po/why-gnu-linux.tr-en.html 2 Nov 2021 14:41:54 -0000       1.6
@@ -1,10 +1,15 @@
 <!--#include virtual="/server/header.html" -->
 <!-- Parent-Version: 1.96 -->
 <!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="gnulinux" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>Why GNU/Linux?
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/gnu/po/why-gnu-linux.translist" -->
 <!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/gnu/gnu-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
 <div class="article reduced-width">
 <h2>What's in a Name?</h2>
 
@@ -259,7 +264,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/09/12 07:34:21 $
+$Date: 2021/11/02 14:41:54 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/why-gnu-linux.uk-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.uk-diff.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/why-gnu-linux.uk-diff.html       29 Oct 2021 13:32:43 -0000      1.1
+++ po/why-gnu-linux.uk-diff.html       2 Nov 2021 14:41:54 -0000       1.2
@@ -12,13 +12,18 @@
 <body><pre>
 &lt;!--#include <span 
class="removed"><del><strong>virtual="/server/html5-header.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/header.html"</em></ins></span> --&gt;
 &lt;!-- Parent-Version: 1.96 --&gt;
-<span class="inserted"><ins><em>&lt;!-- This page is derived from 
/server/standards/boilerplate.html --&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;!-- This page is derived from 
/server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="gnulinux" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes" --&gt;</em></ins></span>
 &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 
class="c"&gt;What's</strong></del></span>
-<span class="inserted"><ins><em>&lt;div class="article reduced-width"&gt;
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/gnu/gnu-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&lt;div class="article reduced-width"&gt;
 &lt;h2&gt;What's</em></ins></span> in a Name?&lt;/h2&gt;
 
 &lt;address <span class="removed"><del><strong>class="byline 
c"&gt;by</strong></del></span> <span 
class="inserted"><ins><em>class="byline"&gt;by</em></ins></span> &lt;a
@@ -292,7 +297,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/10/29 13:32:43 $
+$Date: 2021/11/02 14:41:54 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: po/why-gnu-linux.zh-cn-en.html
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.zh-cn-en.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- po/why-gnu-linux.zh-cn-en.html      9 Sep 2021 02:32:37 -0000       1.5
+++ po/why-gnu-linux.zh-cn-en.html      2 Nov 2021 14:41:54 -0000       1.6
@@ -1,10 +1,15 @@
 <!--#include virtual="/server/header.html" -->
 <!-- Parent-Version: 1.96 -->
 <!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="gnulinux" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>Why GNU/Linux?
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/gnu/po/why-gnu-linux.translist" -->
 <!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/gnu/gnu-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
 <div class="article reduced-width">
 <h2>What's in a Name?</h2>
 
@@ -259,7 +264,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/09/09 02:32:37 $
+$Date: 2021/11/02 14:41:54 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/why-gnu-linux.zh-tw-en.html
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.zh-tw-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/why-gnu-linux.zh-tw-en.html      12 Oct 2021 17:32:22 -0000      1.1
+++ po/why-gnu-linux.zh-tw-en.html      2 Nov 2021 14:41:54 -0000       1.2
@@ -1,10 +1,15 @@
 <!--#include virtual="/server/header.html" -->
 <!-- Parent-Version: 1.96 -->
 <!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="gnulinux" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>Why GNU/Linux?
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/gnu/po/why-gnu-linux.translist" -->
 <!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/gnu/gnu-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
 <div class="article reduced-width">
 <h2>What's in a Name?</h2>
 
@@ -259,7 +264,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/10/12 17:32:22 $
+$Date: 2021/11/02 14:41:54 $
 <!-- timestamp end -->
 </p>
 </div>



reply via email to

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