www-commits
[Top][All Lists]
Advanced

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

www home.ru.html philosophy/motif.ru.html philo...


From: GNUN
Subject: www home.ru.html philosophy/motif.ru.html philo...
Date: Wed, 21 Jul 2021 16:34:07 -0400 (EDT)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     21/07/21 16:34:06

Modified files:
        .              : home.ru.html 
        philosophy     : motif.ru.html netscape-npl-old.ru.html 
                         netscape-npl.ru.html plan-nine.ru.html 
                         pragmatic.ru.html rtlinux-patent.ru.html 
                         selling-exceptions.ru.html university.ru.html 
                         using-gfdl.ru.html why-copyleft.ru.html 
                         words-to-avoid.ru.html x.ru.html 
        philosophy/po  : categories.ar.po categories.ca-diff.html 
                         categories.ca.po categories.cs.po 
                         categories.de-diff.html categories.de.po 
                         categories.el.po categories.es.po 
                         categories.fr.po categories.id.po 
                         categories.it.po categories.ja.po 
                         categories.nl-diff.html categories.nl.po 
                         categories.pl.po categories.pot 
                         categories.pt-br.po categories.ro.po 
                         categories.ru.po categories.sr.po 
                         categories.ta.po categories.tr.po 
                         categories.zh-cn.po categories.zh-tw.po 
                         fs-translations.ca.po fs-translations.de.po 
                         fs-translations.es.po fs-translations.fr.po 
                         fs-translations.it-diff.html 
                         fs-translations.it.po fs-translations.ja.po 
                         fs-translations.pl.po fs-translations.pot 
                         fs-translations.pt-br.po fs-translations.ro.po 
                         fs-translations.ru.po fs-translations.sq.po 
                         fs-translations.sr.po fs-translations.zh-cn.po 
                         motif.ru-en.html motif.ru.po 
                         netscape-npl-old.ru-en.html 
                         netscape-npl-old.ru.po netscape-npl.ru-en.html 
                         netscape-npl.ru.po plan-nine.ru-en.html 
                         plan-nine.ru.po pragmatic.ru-en.html 
                         pragmatic.ru.po rtlinux-patent.ru-en.html 
                         rtlinux-patent.ru.po 
                         selling-exceptions.ru-en.html 
                         selling-exceptions.ru.po university.ru-en.html 
                         university.ru.po using-gfdl.ru-en.html 
                         using-gfdl.ru.po why-call-it-the-swindle.es.po 
                         why-call-it-the-swindle.fr.po 
                         why-call-it-the-swindle.pot 
                         why-call-it-the-swindle.pt-br.po 
                         why-call-it-the-swindle.ru.po 
                         why-call-it-the-swindle.zh-tw.po 
                         why-copyleft.ru-en.html why-copyleft.ru.po 
                         wipo-PublicAwarenessOfCopyright-2002.fr.po 
                         wipo-PublicAwarenessOfCopyright-2002.pot 
                         wipo-PublicAwarenessOfCopyright-2002.ru.po 
                         words-to-avoid.ru-en.html words-to-avoid.ru.po 
                         x.ru-en.html x.ru.po 
        po             : home.ru-en.html home.ru.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/home.ru.html?cvsroot=www&r1=1.425&r2=1.426
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/motif.ru.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/netscape-npl-old.ru.html?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/netscape-npl.ru.html?cvsroot=www&r1=1.29&r2=1.30
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/plan-nine.ru.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/pragmatic.ru.html?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/rtlinux-patent.ru.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/selling-exceptions.ru.html?cvsroot=www&r1=1.41&r2=1.42
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/university.ru.html?cvsroot=www&r1=1.29&r2=1.30
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/using-gfdl.ru.html?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/why-copyleft.ru.html?cvsroot=www&r1=1.34&r2=1.35
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/words-to-avoid.ru.html?cvsroot=www&r1=1.109&r2=1.110
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/x.ru.html?cvsroot=www&r1=1.31&r2=1.32
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.ar.po?cvsroot=www&r1=1.51&r2=1.52
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.ca-diff.html?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.ca.po?cvsroot=www&r1=1.61&r2=1.62
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.cs.po?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.de-diff.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.de.po?cvsroot=www&r1=1.55&r2=1.56
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.el.po?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.es.po?cvsroot=www&r1=1.47&r2=1.48
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.fr.po?cvsroot=www&r1=1.89&r2=1.90
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.id.po?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.it.po?cvsroot=www&r1=1.33&r2=1.34
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.ja.po?cvsroot=www&r1=1.31&r2=1.32
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.nl-diff.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.nl.po?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.pl.po?cvsroot=www&r1=1.54&r2=1.55
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.pot?cvsroot=www&r1=1.38&r2=1.39
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.pt-br.po?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.ro.po?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.ru.po?cvsroot=www&r1=1.56&r2=1.57
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.sr.po?cvsroot=www&r1=1.47&r2=1.48
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.ta.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.tr.po?cvsroot=www&r1=1.62&r2=1.63
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.zh-cn.po?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.zh-tw.po?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/fs-translations.ca.po?cvsroot=www&r1=1.138&r2=1.139
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/fs-translations.de.po?cvsroot=www&r1=1.187&r2=1.188
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/fs-translations.es.po?cvsroot=www&r1=1.120&r2=1.121
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/fs-translations.fr.po?cvsroot=www&r1=1.199&r2=1.200
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/fs-translations.it-diff.html?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/fs-translations.it.po?cvsroot=www&r1=1.120&r2=1.121
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/fs-translations.ja.po?cvsroot=www&r1=1.127&r2=1.128
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/fs-translations.pl.po?cvsroot=www&r1=1.33&r2=1.34
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/fs-translations.pot?cvsroot=www&r1=1.97&r2=1.98
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/fs-translations.pt-br.po?cvsroot=www&r1=1.38&r2=1.39
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/fs-translations.ro.po?cvsroot=www&r1=1.65&r2=1.66
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/fs-translations.ru.po?cvsroot=www&r1=1.153&r2=1.154
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/fs-translations.sq.po?cvsroot=www&r1=1.55&r2=1.56
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/fs-translations.sr.po?cvsroot=www&r1=1.99&r2=1.100
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/fs-translations.zh-cn.po?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/motif.ru-en.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/motif.ru.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/netscape-npl-old.ru-en.html?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/netscape-npl-old.ru.po?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/netscape-npl.ru-en.html?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/netscape-npl.ru.po?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/plan-nine.ru-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/plan-nine.ru.po?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/pragmatic.ru-en.html?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/pragmatic.ru.po?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/rtlinux-patent.ru-en.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/rtlinux-patent.ru.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/selling-exceptions.ru-en.html?cvsroot=www&r1=1.30&r2=1.31
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/selling-exceptions.ru.po?cvsroot=www&r1=1.37&r2=1.38
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/university.ru-en.html?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/university.ru.po?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/using-gfdl.ru-en.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/using-gfdl.ru.po?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/why-call-it-the-swindle.es.po?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/why-call-it-the-swindle.fr.po?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/why-call-it-the-swindle.pot?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/why-call-it-the-swindle.pt-br.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/why-call-it-the-swindle.ru.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/why-call-it-the-swindle.zh-tw.po?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/why-copyleft.ru-en.html?cvsroot=www&r1=1.26&r2=1.27
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/why-copyleft.ru.po?cvsroot=www&r1=1.31&r2=1.32
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/wipo-PublicAwarenessOfCopyright-2002.fr.po?cvsroot=www&r1=1.36&r2=1.37
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/wipo-PublicAwarenessOfCopyright-2002.pot?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/wipo-PublicAwarenessOfCopyright-2002.ru.po?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.ru-en.html?cvsroot=www&r1=1.92&r2=1.93
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.ru.po?cvsroot=www&r1=1.249&r2=1.250
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/x.ru-en.html?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/x.ru.po?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/po/home.ru-en.html?cvsroot=www&r1=1.221&r2=1.222
http://web.cvs.savannah.gnu.org/viewcvs/www/po/home.ru.po?cvsroot=www&r1=1.682&r2=1.683

Patches:
Index: home.ru.html
===================================================================
RCS file: /web/www/www/home.ru.html,v
retrieving revision 1.425
retrieving revision 1.426
diff -u -b -r1.425 -r1.426
--- home.ru.html        21 Jul 2021 17:02:47 -0000      1.425
+++ home.ru.html        21 Jul 2021 20:34:04 -0000      1.426
@@ -459,15 +459,16 @@
 <div class="second-column" role="complementary">
 
 <div id="schools" class="emph-box color1">
-<p><strong>UK universities find that <a
-href="https://www.theguardian.com/education/2021/jul/13/covid-has-been-a-big-catalyst-universities-plan-for-post-pandemic-life";>many
-students are fed up with virtual courses and want to attend class
-physically</a>. Others feel the opposite.</strong></p>
-
-<p>If you are a student, or have been admitted, and you are disgusted with
-being forced to use nonfree software for school, now is your chance to make
-a difference &mdash; tell the university you don't want to do that. Be civil
-to the staff, but show how strongly you feel this.</p>
+<p><strong>Британские университеты находят, 
что <a
+href="https://www.theguardian.com/education/2021/jul/13/covid-has-been-a-big-catalyst-universities-plan-for-post-pandemic-life";>многие
+студенты сыты по горло виртуальными 
курсами и хотят посещать занятия
+физически</a>. Другие&nbsp;&mdash; 
наоборот.</strong></p>
+
+<p>Если вы студент или слушатель и вам 
противно, когда вас принуждают
+пользоваться несвободными программами в 
учебном заведении, то вот вам
+возможность изменить положение&nbsp;&mdash; 
скажите учебному заведению, что
+вы этого не хотите. Будьте вежливы с 
персоналом, но покажите, насколько это
+для вас важно.</p>
 </div>
 
 <div id="irc" class="emph-box color2">
@@ -479,18 +480,17 @@
 </div>
 
 <div id="petition" class="emph-box color1">
-<p>The GNU Project supports the Free Software Foundation's petition to call on
-school administrators around the world to stop requiring students to run
-nonfree software. <a
-href="https://my.fsf.org/give-students-userfreedom";>Sign the petition for
-freedom in the classroom</a>.</p>
+<p>Проект GNU поддерживает петицию Фонда 
свободного программного обеспечения,
+призывающую администрацию учебных 
заведений по всему миру прекратить
+требовать от студентов работы с 
несвободными программами. <a
+href="https://my.fsf.org/give-students-userfreedom";>Подпиши 
петицию за
+свободу в классе</a>.</p>
 </div>
 
 <div id="kind-comm" class="emph-box color2">
-<p>The GNU Project strongly urges the community to communicate in ways that are
-friendly, welcoming and kind. See the <a
-href="/philosophy/kind-communication.html"> GNU Kind Communications
-Guidelines</a>.</p>
+<p>Проект GNU настоятельно призывает 
сообщество общаться дружелюбно, приветливо
+и доброжелательно. См. <a 
href="/philosophy/kind-communication.html">
+Рекомендации GNU по общению в проекте</a>.</p>
 </div>
 
 <div id="Flashes" class="emph-box color1">
@@ -667,7 +667,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2021/07/21 17:02:47 $
+$Date: 2021/07/21 20:34:04 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/motif.ru.html
===================================================================
RCS file: /web/www/www/philosophy/motif.ru.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- philosophy/motif.ru.html    21 May 2015 07:18:06 -0000      1.10
+++ philosophy/motif.ru.html    21 Jul 2021 20:34:04 -0000      1.11
@@ -1,17 +1,25 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/motif.en.html" -->
 
 <!--#include virtual="/server/header.ru.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Лицензия Motif - Проект GNU - Фонд 
свободного программного обеспечения</title>
 
 <!--#include virtual="/philosophy/po/motif.translist" -->
 <!--#include virtual="/server/banner.ru.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.ru.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.ru.html" -->
+<div class="reduced-width">
 <h2>Лицензия Motif</h2>
 
-<p><a href="http://www.stallman.org/";><strong>Ричард 
Столмен</strong></a></p>
+<address class="byline"><a href="https://www.stallman.org/";>Ричард 
Столмен</a></address>
 
+<div class="article">
 <p>
 Пару недель назад Open Group изменила лицензию 
Motif, приглашая
 разработчиков свободных программ 
пользоваться им. Однако новая лицензия
@@ -70,12 +78,15 @@
 того, что он отстаивает. Реалии ситуации 
достаточно сложны; путаница в этом
 вопросе не приветствуется.</p>
 
-<h3 id="LaterNote">Более позднее замечание</h3>
+<h3 id="LaterNote" class="footnote">Более позднее 
замечание</h3>
 
 <p>
 <em>В 2012 году <a href="http://motif.sourceforge.net/";> Motif</a> был
 выпущен под Меньшей стандартной 
общественной лицензией GNU
 версии&nbsp;2.1.</em></p>
+</div>
+</div>
+
 <div class="translators-notes">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
@@ -84,7 +95,7 @@
 
 <!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.ru.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Пожалуйста, присылайте общие запросы 
фонду и GNU по адресу <a
@@ -104,7 +115,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>. -->
@@ -117,14 +128,12 @@
 переводам&rdquo;</a>.</p>
 </div>
 
-<p>Copyright &copy; 1997, 1998, 1999, 2007, 2008, 2010, 2012, 2013 Free
-Software Foundation, Inc.</p>
+<p>Copyright &copy; 1997-1999, 2012, 2013, 2021 Free Software Foundation, 
Inc.</p>
 
 <p>Это произведение доступно по <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.ru";>лицензии
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лицензии
 Creative Commons Attribution-NoDerivs (<em>Атрибуция&nbsp;&mdash; 
Без
-производных произведений</em>) 3.0 США</a>.
-</p>
+производных произведений</em>) 4.0 
Всемирная</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.ru.html" -->
 <div class="translators-credits">
@@ -139,11 +148,12 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2015/05/21 07:18:06 $
+$Date: 2021/07/21 20:34:04 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy/netscape-npl-old.ru.html
===================================================================
RCS file: /web/www/www/philosophy/netscape-npl-old.ru.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- philosophy/netscape-npl-old.ru.html 14 Dec 2015 11:00:47 -0000      1.25
+++ philosophy/netscape-npl-old.ru.html 21 Jul 2021 20:34:04 -0000      1.26
@@ -1,25 +1,31 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/netscape-npl-old.en.html" -->
 
 <!--#include virtual="/server/header.ru.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
-<title>Общественная лицензия Netscape - Проект GNU - 
Фонд свободного программного
-обеспечения</title>
+<title>Общественная лицензия Netscape 
(первоначальный вариант) - Проект GNU - Фонд
+свободного программного обеспечения</title>
 
 <!--#include virtual="/philosophy/po/netscape-npl-old.translist" -->
 <!--#include virtual="/server/banner.ru.html" -->
-<h2>Общественная лицензия Netscape 
(Первоначальный вариант)</h2>
+<!--#include virtual="/philosophy/ph-breadcrumb.ru.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.ru.html" -->
+<div class="reduced-width">
+<h2>Общественная лицензия Netscape 
(первоначальный вариант)</h2>
 
-<p>
-<a href="http://www.stallman.org/";><strong>Ричард 
Столмен</strong></a>
-</p>
+<address class="byline"><a href="https://www.stallman.org/";>Ричард 
Столмен</a></address>
 
-<div class="announcement">
-<blockquote><p>Эта статья написана 
10&mdash;12&nbsp;марта 1998&nbsp;года о черновой
-редакции NPL, доступной на тот 
момент.</p></blockquote>
-</div>
+<p>
+<em>Эта статья написана 10&mdash;12&nbsp;марта 
1998&nbsp;года о черновой
+редакции NPL, доступной на тот момент.</em></p>
+<hr class="thin" />
 
+<div class="article">
 <p>
 Общественная лицензия Netscape, или NPL, 
представляет собой серьезную
 попытку составления новых условий 
распространения свободных программ. Эта
@@ -245,6 +251,8 @@
 программ. Компании следует признать, что 
это изменение допустимо, и принять
 его, чтобы не ставить разработчиков 
свободных программ перед серьезной
 дилеммой.</p>
+</div>
+</div>
 
 <div class="translators-notes">
 
@@ -254,7 +262,7 @@
 
 <!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.ru.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Пожалуйста, присылайте общие запросы 
фонду и GNU по адресу <a
@@ -274,7 +282,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>. -->
@@ -303,7 +311,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 1998, 2007, 2011, 2013, 2015 Free Software Foundation, 
Inc.</p>
+<p>Copyright &copy; 1998, 2011, 2021 Free Software Foundation, Inc.</p>
 
 <p>Это произведение доступно по <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лицензии
@@ -323,11 +331,12 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2015/12/14 11:00:47 $
+$Date: 2021/07/21 20:34:04 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy/netscape-npl.ru.html
===================================================================
RCS file: /web/www/www/philosophy/netscape-npl.ru.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- philosophy/netscape-npl.ru.html     14 Dec 2015 11:00:47 -0000      1.29
+++ philosophy/netscape-npl.ru.html     21 Jul 2021 20:34:04 -0000      1.30
@@ -1,7 +1,10 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/netscape-npl.en.html" -->
 
 <!--#include virtual="/server/header.ru.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Общественная лицензия Netscape - Проект GNU - 
Фонд свободного программного
@@ -9,20 +12,23 @@
 
 <!--#include virtual="/philosophy/po/netscape-npl.translist" -->
 <!--#include virtual="/server/banner.ru.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.ru.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.ru.html" -->
+<div class="reduced-width">
 <h2>Общественная лицензия Netscape</h2>
 
-<p>
-<a href="http://www.stallman.org/";><strong>Ричард 
Столмен</strong></a></p>
+<address class="byline"><a href="https://www.stallman.org/";>Ричард 
Столмен</a></address>
 
-<div class="announcement">
-<blockquote><p>
-(<a href="/philosophy/netscape-npl-old.html">Первоначальная 
версия</a> этой
+<p>
+<a href="/philosophy/netscape-npl-old.html">Первоначальная 
версия</a> этой
 статьи была написана в марте 1998&nbsp;года о 
черновой редакции NPL. Нашей
 первой статьей на эту тему была <a
 href="/philosophy/netscape.html">&ldquo;Netscape рассматривает 
возможность
-сделать браузер Netscape свободной 
программой&rdquo;</a>.</p></blockquote>
-</div>
+сделать браузер Netscape свободной 
программой&rdquo;</a>.</p>
+<hr class="thin" />
 
+<div class="article">
 <p>
 Общественная лицензия Netscape, или NPL, в том 
виде, в каком она в конце
 концов была составлена в 1998&nbsp;году, 
является лицензией свободных
@@ -220,6 +226,8 @@
 программ. Компании следует признать, что 
это изменение допустимо, и принять
 его, чтобы не ставить разработчиков 
свободных программ перед серьезной
 дилеммой.</p>
+</div>
+</div>
 
 <div class="translators-notes">
 
@@ -229,7 +237,7 @@
 
 <!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.ru.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Пожалуйста, присылайте общие запросы 
фонду и GNU по адресу <a
@@ -249,7 +257,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>. -->
@@ -278,8 +286,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 1998, 2003, 2007, 2011, 2013, 2015 Free Software
-Foundation, Inc.</p>
+<p>Copyright &copy; 1998, 1999, 2011, 2021 Free Software Foundation, Inc.</p>
 
 <p>Это произведение доступно по <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лицензии
@@ -299,11 +306,12 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2015/12/14 11:00:47 $
+$Date: 2021/07/21 20:34:04 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy/plan-nine.ru.html
===================================================================
RCS file: /web/www/www/philosophy/plan-nine.ru.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/plan-nine.ru.html        30 Oct 2014 09:27:36 -0000      1.1
+++ philosophy/plan-nine.ru.html        21 Jul 2021 20:34:04 -0000      1.2
@@ -1,7 +1,10 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/plan-nine.en.html" -->
 
 <!--#include virtual="/server/header.ru.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Проблемы лицензии Plan 9 - Проект GNU - Фонд 
свободного программного
@@ -9,9 +12,13 @@
 
 <!--#include virtual="/philosophy/po/plan-nine.translist" -->
 <!--#include virtual="/server/banner.ru.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.ru.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.ru.html" -->
+<div class="reduced-width">
 <h2>Проблемы (ранней) лицензии Plan 9</h2>
 
-<p><a href="http://www.stallman.org/";><strong>Ричард 
Столмен</strong></a></p>
+<address class="byline"><a href="https://www.stallman.org/";>Ричард 
Столмен</a></address>
 
 <p><em>Замечание.</em> Это относится к ранней 
лицензии, применявшейся для
 Plan&nbsp;9. Текущая лицензия Plan&nbsp;9 лицензией 
свободных программ
@@ -134,6 +141,7 @@
 ваши изменения. Хотя это само по себе не 
причина, чтобы не считать лицензию
 лицензией свободных программ (если будут 
устранены другие проблемы), но это
 нехорошо.</p>
+</div>
 
 <div class="translators-notes">
 
@@ -143,7 +151,7 @@
 
 <!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.ru.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Пожалуйста, присылайте общие запросы 
фонду и GNU по адресу <a
@@ -163,7 +171,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>. -->
@@ -178,7 +186,7 @@
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
      without talking with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the
      document.  For web pages, it is ok to list just the latest year the
@@ -192,13 +200,13 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2000 Richard Stallman <br />Copyright &copy; 2014 Free
-Software Foundation, Inc. (translation)</p>
+<p>Copyright &copy; 2000, 2021 Richard Stallman <br />Copyright &copy; 2014,
+2021 Free Software Foundation, Inc. (translation)</p>
 
 <p>Это произведение доступно по <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.ru";>лицензии
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лицензии
 Creative Commons Attribution-NoDerivs (<em>Атрибуция&nbsp;&mdash; 
Без
-производных произведений</em>) 3.0 США</a>.</p>
+производных произведений</em>) 4.0 
Всемирная</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.ru.html" -->
 <div class="translators-credits">
@@ -213,11 +221,12 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2014/10/30 09:27:36 $
+$Date: 2021/07/21 20:34:04 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy/pragmatic.ru.html
===================================================================
RCS file: /web/www/www/philosophy/pragmatic.ru.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- philosophy/pragmatic.ru.html        26 Oct 2020 13:59:54 -0000      1.21
+++ philosophy/pragmatic.ru.html        21 Jul 2021 20:34:04 -0000      1.22
@@ -1,7 +1,10 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/pragmatic.en.html" -->
 
 <!--#include virtual="/server/header.ru.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Авторское лево: прагматичная 
принципиальность - Проект GNU - Фонд 
свободного
@@ -9,11 +12,15 @@
 
 <!--#include virtual="/philosophy/po/pragmatic.translist" -->
 <!--#include virtual="/server/banner.ru.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.ru.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.ru.html" -->
+<div class="reduced-width">
 <h2>Авторское лево: прагматичная 
принципиальность</h2>
 
-<p>
-<a href="http://www.stallman.org/";><strong>Ричард 
Столмен</strong></a></p>
+<address class="byline"><a href="https://www.stallman.org/";>Ричард 
Столмен</a></address>
 
+<div class="article">
 <p>
 Каждое решение, которое принимает 
личность, проистекает из ценностей и целей
 этой личности. У людей может быть много 
разных целей и ценностей; слава,
@@ -30,10 +37,10 @@
 <p>
 В этом состоит основная причина, по 
которой Стандартная общественная
 лицензия GNU написана так, как она 
написана&nbsp;&mdash; как реализация <a
-href="/copyleft"> авторского лева</a>. Все исходные 
тексты, добавленные к
-программе под GPL, должны быть свободными 
программами, даже если их
-размещают в отдельном файле. Я делаю так, 
что мои тексты доступны для
-применения в свободных программах, но не 
для применения в несвободных
+href="/licenses/copyleft.html"> авторского лева</a>. Все 
исходные тексты,
+добавленные к программе под GPL, должны быть 
свободными программами, даже
+если их размещают в отдельном файле. Я 
делаю так, что мои тексты доступны
+для применения в свободных программах, но 
не для применения в несвободных
 программах, чтобы поощрять других людей, 
которые пишут программы, тоже
 делать их свободными. Я понимаю, что 
поскольку разработчики несвободных
 программ применяют авторское право, чтобы 
не давать нам обмениваться, то мы,
@@ -160,11 +167,15 @@
 прибыли... просто не обращайте на них 
внимания и все равно пользуйтесь
 авторским левом.</p>
 
-<hr />
-<blockquote id="fsfs"><p>Этот очерк публикуется в 
сборнике <a
-href="http://shop.fsf.org/product/free-software-free-society/";><cite>Свободные
+<hr class="thin" />
+<div id="fsfs" role="complementary">
+<p>Этот очерк публикуется в сборнике <a
+href="https://shop.fsf.org/product/free-software-free-society/";><cite>Свободные
 программы, свободное общество: избранные 
очерки Ричарда
-М. Столмена</cite></a>.</p></blockquote>
+М. Столмена</cite></a>.</p>
+</div>
+</div>
+</div>
 
 <div class="translators-notes">
 
@@ -174,7 +185,7 @@
 
 <!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.ru.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Пожалуйста, присылайте общие запросы 
фонду и GNU по адресу <a
@@ -194,7 +205,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>. -->
@@ -223,7 +234,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 1998, 2003, 2012, 2020 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 1998, 2012, 2021 Free Software Foundation, Inc.</p>
 
 <p>Это произведение доступно по <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лицензии
@@ -243,11 +254,12 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2020/10/26 13:59:54 $
+$Date: 2021/07/21 20:34:04 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy/rtlinux-patent.ru.html
===================================================================
RCS file: /web/www/www/philosophy/rtlinux-patent.ru.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- philosophy/rtlinux-patent.ru.html   23 May 2015 05:09:20 -0000      1.8
+++ philosophy/rtlinux-patent.ru.html   21 Jul 2021 20:34:04 -0000      1.9
@@ -1,7 +1,10 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/rtlinux-patent.en.html" -->
 
 <!--#include virtual="/server/header.ru.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Совместимая с GPL версия Открытой 
патентной лицензии RTLinux - Проект GNU -
@@ -15,12 +18,19 @@
 
 <!--#include virtual="/philosophy/po/rtlinux-patent.translist" -->
 <!--#include virtual="/server/banner.ru.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.ru.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.ru.html" -->
+<div class="reduced-width">
 <h2>Совместимая с GPL версия Открытой 
патентной лицензии RTLinux</h2>
+<div class="thin"></div>
 
+<div class="article">
 <p>
-Вот наше новое объявление по состоянию на 
8&nbsp;октября (в действительности
-его публикация была задержана).</p>
+Вот наше новое объявление по состоянию на 
8&nbsp;октября 2001&nbsp;года (в
+действительности его публикация была 
задержана).</p>
 
+<blockquote>
 <p>
    Сегодня Фонд свободного программного 
обеспечения и Finite State Machine Labs
 Inc. (FSMLabs) объявили о выпуске версии&nbsp;2 
Открытой патентной лицензии
@@ -43,12 +53,16 @@
 FSMLabs за ее все возрастающий вклад в 
сообщество свободного программного
 обеспечения.
 </p>
+</blockquote>
+
+<hr class="column-limit" />
 
 <p>
 Вот предыдущее объявление, которое было 
предметом нашего <a
 href="/press/2001-09-18-RTLinux.html"> коммюнике от 
18&nbsp;сентября</a>.
 </p>
 
+<blockquote>
 <p>
 Фонд свободного программного обеспечения 
и Finite State Machine Labs
 (FSMLabs) пришли к соглашению о полностью 
совместимой с GPL версии Открытой
@@ -65,7 +79,9 @@
 FSMLabs за ее вклад, состоящий в этой 
патентной лицензии, в сообщество
 свободного программного обеспечения и за 
ее долговременную поддержку и
 публикацию свободных программ под GPL.</p>
-
+</blockquote>
+</div>
+</div>
 
 <div class="translators-notes">
 
@@ -75,7 +91,7 @@
 
 <!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.ru.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Пожалуйста, присылайте общие запросы 
фонду и GNU по адресу <a
@@ -95,7 +111,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>. -->
@@ -110,7 +126,7 @@
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
      without talking with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the
      document.  For web pages, it is ok to list just the latest year the
@@ -124,12 +140,12 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2001, 2013 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2001, 2013, 2021 Free Software Foundation, Inc.</p>
 
 <p>Это произведение доступно по <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.ru";>лицензии
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лицензии
 Creative Commons Attribution-NoDerivs (<em>Атрибуция&nbsp;&mdash; 
Без
-производных произведений</em>) 3.0 США</a>.</p>
+производных произведений</em>) 4.0 
Всемирная</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.ru.html" -->
 <div class="translators-credits">
@@ -144,11 +160,12 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2015/05/23 05:09:20 $
+$Date: 2021/07/21 20:34:04 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy/selling-exceptions.ru.html
===================================================================
RCS file: /web/www/www/philosophy/selling-exceptions.ru.html,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- philosophy/selling-exceptions.ru.html       30 Dec 2019 12:08:31 -0000      
1.41
+++ philosophy/selling-exceptions.ru.html       21 Jul 2021 20:34:04 -0000      
1.42
@@ -1,7 +1,10 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/selling-exceptions.en.html" -->
 
 <!--#include virtual="/server/header.ru.html" -->
-<!-- Parent-Version: 1.90 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Платные исключения из GNU GPL - Проект GNU - 
Фонд свободного программного
@@ -10,9 +13,13 @@
 
 <!--#include virtual="/philosophy/po/selling-exceptions.translist" -->
 <!--#include virtual="/server/banner.ru.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.ru.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.ru.html" -->
+<div class="reduced-width">
 <h2>Платные исключения из GNU GPL</h2>
 
-<p><a href="http://www.stallman.org/";>Ричард Столмен</a></p>
+<address class="byline"><a href="https://www.stallman.org/";>Ричард 
Столмен</a></address>
 
 <p>Платные исключения означают, что 
правообладатель программы выпускает ее для
 широкой общественности под 
действительной свободной лицензией и затем
@@ -148,6 +155,7 @@
 следовали этому принципу. Я считаю, что 
платные исключения
 допустимы для предприятий, и я собираюсь 
предлагать это
 в подходящих случаях как метод 
освобождения программ.</p>
+</div>
 
 <div class="translators-notes">
 
@@ -157,7 +165,7 @@
 
 <!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.ru.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Пожалуйста, присылайте общие запросы 
фонду и GNU по адресу <a
@@ -177,7 +185,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>. -->
@@ -190,8 +198,8 @@
 переводам&rdquo;</a>.</p>
 </div>
 
-<p>Copyright &copy; 2009, 2010, 2015, 2016, 2017, 2018, 2019 Richard
-Stallman<br />Copyright &copy; 2013, 2015, 2016, 2017, 2018, 2019 Free
+<p>Copyright &copy; 2009, 2010, 2015, 2016, 2017, 2018, 2019, 2021 Richard
+Stallman<br />Copyright &copy; 2010, 2015, 2016, 2017, 2018, 2019, 2021 Free
 Software Foundation, Inc. (translation)</p>
 
 <p>Это произведение доступно по <a rel="license"
@@ -208,7 +216,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2019/12/30 12:08:31 $
+$Date: 2021/07/21 20:34:04 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/university.ru.html
===================================================================
RCS file: /web/www/www/philosophy/university.ru.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- philosophy/university.ru.html       12 Feb 2021 20:00:49 -0000      1.29
+++ philosophy/university.ru.html       21 Jul 2021 20:34:04 -0000      1.30
@@ -1,7 +1,10 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/university.en.html" -->
 
 <!--#include virtual="/server/header.ru.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Выпуск свободных программ при работе в 
университете - проект GNU - Фонд
@@ -9,8 +12,14 @@
 
 <!--#include virtual="/philosophy/po/university.translist" -->
 <!--#include virtual="/server/banner.ru.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.ru.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.ru.html" -->
+<div class="reduced-width">
 <h2>Выпуск свободных программ при работе в 
университете</h2>
+<div class="thin"></div>
 
+<div class="article">
 <p>
 Мы, участники движения за свободное 
программное обеспечение, убеждены, что у
 пользователей компьютеров должна быть 
свобода изменять и перераспространять
@@ -139,11 +148,15 @@
 Ничто так не усиливает вашу решимость, как 
знание, что свобода сообщества
 зависит, в одном экземпляре, от вас.</p>
 
-<hr />
-<blockquote id="fsfs"><p>Этот очерк опубликован в 
книге <a
-href="http://shop.fsf.org/product/free-software-free-society/";><cite>Свободные
+<hr class="thin" />
+<div id="fsfs" role="complementary">
+<p>Этот очерк опубликован в книге <a
+href="https://shop.fsf.org/product/free-software-free-society/";><cite>Свободные
 программы, свободное общество: Избранные 
очерки
-Ричарда&nbsp;М.&nbsp;Столмена</cite></a></p></blockquote>
+Ричарда&nbsp;М.&nbsp;Столмена</cite></a></p>
+</div>
+</div>
+</div>
 
 <div class="translators-notes">
 
@@ -161,7 +174,7 @@
 
 <!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.ru.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Пожалуйста, присылайте общие запросы 
фонду и GNU по адресу <a
@@ -181,7 +194,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>. -->
@@ -194,8 +207,8 @@
 переводам&rdquo;</a>.</p>
 </div>
 
-<p>Copyright &copy; 2002, 2020 Richard Stallman<br />Copyright &copy; 2012,
-2020, 2021 Free Software Foundation, Inc. (translation)</p>
+<p>Copyright &copy; 2002, 2021 Richard Stallman<br />Copyright &copy; 2011,
+2021 Free Software Foundation, Inc. (translation)</p>
 
 <p>Это произведение доступно по <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лицензии
@@ -215,11 +228,12 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2021/02/12 20:00:49 $
+$Date: 2021/07/21 20:34:04 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy/using-gfdl.ru.html
===================================================================
RCS file: /web/www/www/philosophy/using-gfdl.ru.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- philosophy/using-gfdl.ru.html       23 May 2015 06:11:08 -0000      1.22
+++ philosophy/using-gfdl.ru.html       21 Jul 2021 20:34:04 -0000      1.23
@@ -1,22 +1,30 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/using-gfdl.en.html" -->
 
 <!--#include virtual="/server/header.ru.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Применение GNU FDL - Проект GNU - Фонд 
свободного программного обеспечения</title>
 
 <!--#include virtual="/philosophy/po/using-gfdl.translist" -->
 <!--#include virtual="/server/banner.ru.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.ru.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.ru.html" -->
+<div class="reduced-width">
 <h2>Применение GNU FDL</h2>
 
-<p><a href="http://www.stallman.org";>Ричард Столмен</a></p>
+<address class="byline"><a href="https://www.stallman.org/";>Ричард 
Столмен</a></address>
 
+<div class="article">
 <p>Если вы знаете кого-то, кто пишет 
руководство по свободным программам и
 подумывает о коммерческой публикации, у 
вас есть шанс оказать движению за
 свободное программное обеспечение 
большую помощь, не затратив почти никакого
 труда&nbsp;&mdash; подав идею о публикации 
руководства под <a
-href="/copyleft/fdl.html">Лицензией свободной 
документации GNU</a>.</p>
+href="/licenses/fdl.html">Лицензией свободной 
документации GNU</a>.</p>
 
 <p>До недавнего времени коммерческая 
публикация книги почти всегда
 подразумевала, что книга несвободна. Но 
точно так же, как количество
@@ -61,9 +69,12 @@
 убеждать людей делать покупки). 
Пожалуйста, информируйте нас по адресу <a
 href="mailto:webmasters@gnu.org";> &lt;webmasters@gnu.org&gt;</a> о таких
 страницах.</p>
+</div>
+<hr class="column-limit" />
 
 <p>См. также <a href="/philosophy/free-doc.html">Свободные 
программы и
 свободные руководства</a>.</p>
+</div>
 
 <div class="translators-notes">
 
@@ -73,7 +84,7 @@
 
 <!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.ru.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Пожалуйста, присылайте общие запросы 
фонду и GNU по адресу <a
@@ -93,7 +104,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>. -->
@@ -108,7 +119,7 @@
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
      without talking with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the
      document.  For web pages, it is ok to list just the latest year the
@@ -122,13 +133,13 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 1999 Richard Stallman</p><p>Copyright &copy; 2012 Free
-Software Foundation, Inc. (translation)</p>
+<p>Copyright &copy; 1999, 2021 Richard Stallman</p><p>Copyright &copy; 2011,
+2021 Free Software Foundation, Inc. (translation)</p>
 
 <p>Это произведение доступно по <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.ru";>лицензии
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лицензии
 Creative Commons Attribution-NoDerivs (<em>Атрибуция&nbsp;&mdash; 
Без
-производных произведений</em>) 3.0 США</a>.</p>
+производных произведений</em>) 4.0 
Всемирная</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.ru.html" -->
 <div class="translators-credits">
@@ -143,11 +154,12 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2015/05/23 06:11:08 $
+$Date: 2021/07/21 20:34:04 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy/why-copyleft.ru.html
===================================================================
RCS file: /web/www/www/philosophy/why-copyleft.ru.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- philosophy/why-copyleft.ru.html     1 Jul 2020 17:03:00 -0000       1.34
+++ philosophy/why-copyleft.ru.html     21 Jul 2021 20:34:04 -0000      1.35
@@ -1,24 +1,37 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/why-copyleft.en.html" -->
 
 <!--#include virtual="/server/header.ru.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Зачем авторское лево? - Проект GNU - Фонд 
свободного программного
 обеспечения</title>
+<style type="text/css" media="print,screen"><!--
+.epigraph { text-align: right; color: #404040; }
+.epigraph p { display: inline-block; text-align: left; width: 80%; }
+-->
+</style>
 
 <!--#include virtual="/philosophy/po/why-copyleft.translist" -->
 <!--#include virtual="/server/banner.ru.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.ru.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.ru.html" -->
+<div class="reduced-width">
 <h2>Зачем авторское лево?</h2>
 
-<p>
-<cite>&ldquo;Лечь и ничего не делать, когда речь 
идет защите свободы
-других&nbsp;&mdash; проявление слабости, а не 
смирения&rdquo;.</cite>
-</p>
+<div class="article">
+<div  class="important">
+<p><em>Лечь и ничего не делать, когда речь 
идет защите свободы
+других&nbsp;&mdash; проявление слабости, а не 
смирения.</em></p>
+</div>
 
 <p>
 В проекте GNU мы обычно рекомендуем 
применять такие лицензии с <a
-href="/copyleft/copyleft.html">авторским левом</a>, как GNU 
GPL, а не
+href="/licenses/copyleft.html">авторским левом</a>, как GNU 
GPL, а не
 либеральные лицензии свободных программ 
без авторского лева. Мы не выступаем
 ожесточенно против лицензий без 
авторского лева&nbsp;&mdash; мы даже
 рекомендуем их изредка в особых 
обстоятельствах&nbsp;&mdash; но сторонники
@@ -69,10 +82,12 @@
 останется.</li>
 
 <li>Intel применяет <a
-href="http://www.tomshardware.com/news/google-removing-minix-management-engine-intel,35876.html";>несвободную
+href="https://www.tomshardware.com/news/google-removing-minix-management-engine-intel,35876.html";>несвободную
 версию системы MINIX</a>, которая свободна, но 
без авторского лева, в черном
 ходе управляющего устройства своих 
современных процессоров.</li>
 </ul>
+</div>
+</div>
 
 <div class="translators-notes">
 
@@ -82,7 +97,7 @@
 
 <!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.ru.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Пожалуйста, присылайте общие запросы 
фонду и GNU по адресу <a
@@ -102,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>. -->
@@ -131,8 +146,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2003, 2007, 2008, 2013, 2017, 2018, 2020 Free Software
-Foundation, Inc.</p>
+<p>Copyright &copy; 2003, 2010, 2017, 2021 Free Software Foundation, Inc.</p>
 
 <p>Это произведение доступно по <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лицензии
@@ -148,7 +162,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2020/07/01 17:03:00 $
+$Date: 2021/07/21 20:34:04 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/words-to-avoid.ru.html
===================================================================
RCS file: /web/www/www/philosophy/words-to-avoid.ru.html,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -b -r1.109 -r1.110
--- philosophy/words-to-avoid.ru.html   31 May 2021 09:59:56 -0000      1.109
+++ philosophy/words-to-avoid.ru.html   21 Jul 2021 20:34:04 -0000      1.110
@@ -1,16 +1,29 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/words-to-avoid.en.html" -->
 
 <!--#include virtual="/server/header.ru.html" -->
-<!-- Parent-Version: 1.90 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="term" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Слова, которых следует избегать (или 
употреблять с осторожностью) - Проект
 GNU - Фонд свободного программного 
обеспечения</title>
+<style type="text/css" media="print,screen"><!--
+#word-list a { line-height: 1.8em; text-decoration: none; }
+-->
+
+</style>
 
 <!--#include virtual="/philosophy/po/words-to-avoid.translist" -->
 <!--#include virtual="/server/banner.ru.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.ru.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.ru.html" -->
+<div class="reduced-width">
 <h2>Слова, которых следует избегать (или 
употреблять с осторожностью) из-за их
 нагрузки или неясности</h2>
+<div class="thin"></div>
 
 <p>
 Есть некоторое количество слов и 
выражений<a href="#tf1">[1]</a>, которых мы
@@ -19,13 +32,7 @@
 заранее предполагают точку зрения, с 
которой мы не согласны, и мы надеемся,
 вы тоже с ней не согласны.</p>
 
-<div class="announcement">
-<blockquote><p>См. также <a 
href="/philosophy/categories.html">Категории свободных и
-несвободных программ</a> и <a
-href="/philosophy/why-call-it-the-swindle.html"> Зачем называть 
это
-&ldquo;Swindle&rdquo;?</a></p></blockquote>
-</div>
-
+<div id="word-list" class="emph-box">
 <p> <!-- GNUN-SORT-START -->
 <!--#if expr="$LANGUAGE_SUFFIX = /^.(es)$/" -->
 <!-- TRANSLATORS: translate if this word is used often in your
@@ -148,6 +155,16 @@
 (товаропроизводитель)</a>&rdquo;
 <!-- GNUN-SORT-STOP -->
 </p>
+</div>
+
+<hr class="no-display" />
+<div class="announcement">
+<p>См. также <a href="/philosophy/categories.html">Категории 
свободных и
+несвободных программ</a> и <a
+href="/philosophy/why-call-it-the-swindle.html"> Зачем называть 
это
+&ldquo;Swindle&rdquo;?</a></p>
+</div>
+<hr class="no-display" />
 
 <!-- GNUN-SORT-START -->
 <!--#if expr="$LANGUAGE_SUFFIX = /^.(es)$/" -->
@@ -315,7 +332,7 @@
 Одно из многих значений &ldquo;облачных 
вычислений&rdquo; заключается в
 хранении ваших данных в сетевых службах. В 
большинстве случаев это глупо,
 потому что это подставляет вас <a
-href="http://www.guardian.co.uk/commentisfree/2011/apr/25/hackers-spooks-cloud-antiauthoritarian-dream";>
+href="https://www.guardian.co.uk/commentisfree/2011/apr/25/hackers-spooks-cloud-antiauthoritarian-dream";>
 под слежку</a>.
 </p>
 
@@ -361,7 +378,7 @@
 
 <p>
 Любопытно, что Ларри Эллисон, разработчик 
несвободных программ, также <a
-href="http://www.cnet.com/news/oracles-ellison-nails-cloud-computing/";>
+href="https://www.cnet.com/news/oracles-ellison-nails-cloud-computing/";>
 отмечал бессодержательность выражения 
&ldquo;облачные
 вычисления&rdquo;</a>. Он решил все равно 
пользоваться этим выражением,
 потому что, будучи разработчиком 
несвободных программ, он не мотивируется
@@ -453,7 +470,7 @@
 особенного? Это извращенная точка зрения 
владельца или бухгалтера
 издательской компании. Не удивительно, что 
несвободные программы хотели бы,
 чтобы вы думали о программах как о 
материальном ресурсе. <a
-href="http://www.businessinsider.com/former-google-exec-launches-sourcepoint-with-10-million-series-a-funding-2015-6";>
+href="https://www.businessinsider.com/former-google-exec-launches-sourcepoint-with-10-million-series-a-funding-2015-6";>
 Их извращенные взгляды ясно 
просматриваются в статьях</a>, в которых 
также
 публикации называются &ldquo;<a 
href="#Content">контентом</a>&rdquo;.</p>
 
@@ -461,7 +478,7 @@
 Это узкое мышление, связанное с мыслью, что 
мы &ldquo;потребляем
 контент&rdquo;, прокладывает дорогу таким 
законам, как &ldquo;Закон об
 авторском праве цифрового 
тысячелетия&rdquo;, который запрещает
-пользователям взламывать <a 
href="http://DefectiveByDesign.org/";>цифровое
+пользователям взламывать <a 
href="https://DefectiveByDesign.org/";>цифровое
 управление ограничениями (DRM)</a> в цифровых 
устройствах. Если пользователи
 думают, что они этими устройствами именно 
&ldquo;потребляют&rdquo;, то такие
 ограничения могут показаться им 
естественными.</p>
@@ -529,7 +546,7 @@
 &ldquo;граждане&rdquo;, а не 
&ldquo;потребители&rdquo;.</p>
 <p>
 Эта проблема со словом &ldquo;потребитель&rdquo; 
<a
-href="http://www.theguardian.com/commentisfree/2013/aug/11/capitalism-language-raymond-williams";>
+href="https://www.theguardian.com/commentisfree/2013/aug/11/capitalism-language-raymond-williams";>
 отмечалась и ранее</a>.
 </p>
 
@@ -686,7 +703,7 @@
 владеете несколькими замками, а также 
ключами или кодами к ним; вы можете
 считать их полезными или неудобными, но в 
любом случае они не угнетают вас,
 потому что вы можете отпирать и запирать их
. Подобным образом, <a
-href="http://www.theguardian.com/technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-good-guys-have-keys-to-";>шифрование</a>
+href="https://www.theguardian.com/technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-good-guys-have-keys-to-";>шифрование</a>
 неоценимо для защиты наших файлов. Это 
тоже разновидность цифрового замка,
 над которым у вас есть контроль.</p>
 <p>
@@ -723,7 +740,7 @@
 ограничениями&rdquo; и &ldquo;цифровые 
наручники&rdquo;.</p>
 <p>
 Подпишитесь, пожалуйста, в поддержку нашей 
<a
-href="http://DefectiveByDesign.org/";> кампании за отмену 
цифрового
+href="https://DefectiveByDesign.org/";> кампании за отмену 
цифрового
 управления ограничениями</a>.</p>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
@@ -892,7 +909,7 @@
 <!-- GNUN-SORT-END-KEY -->
 <p>
 Хакер&nbsp;&mdash; это тот, кто <a
-href="http://stallman.org/articles/on-hacking.html";> получает 
удовольствие
+href="https://stallman.org/articles/on-hacking.html";> получает 
удовольствие
 от игривого остроумия</a>&nbsp;&mdash; не 
обязательно связанного с
 компьютерами. Программисты в старом 
сообществе свободных программ
 Массачусетского технического института 
шестидесятых и семидесятых годов
@@ -953,7 +970,7 @@
 &ldquo;Интернет вещей&rdquo;.</p>
 <p>
 Опыт показывает, что эти продукты часто 
действительно <a
-href="http://www.locusmag.com/Perspectives/2015/09/cory-doctorow-what-if-people-were-sensors-not-things-to-be-sensed/";>шпионят
+href="https://www.locusmag.com/Perspectives/2015/09/cory-doctorow-what-if-people-were-sensors-not-things-to-be-sensed/";>шпионят
 за пользователями</a>. Они скроены также, 
чтобы <a
 href="https://archive.ieet.org/articles/rinesi20150806.html";>давать 
людям
 предвзятые советы</a>. Кроме того, 
производитель может <a
@@ -1145,7 +1162,7 @@
 название одной конкретной программы 
редактирования изображений, которой
 следует избегать, поскольку она 
несвободна. Есть множество свободных
 программ для редактирования изображений, 
таких как <a
-href="/software/gimp">GIMP</a>.</p>
+href="https://www.gimp.org/";>GIMP</a>.</p>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
@@ -1174,7 +1191,7 @@
 <p>
 Судья Соединенных Штатов, 
председательствуя на процессе о нарушении
 авторских прав, признала, что <a
-href="http://torrentfreak.com/mpaa-banned-from-using-piracy-and-theft-terms-in-hotfile-trial-131129/";>
+href="https://torrentfreak.com/mpaa-banned-from-using-piracy-and-theft-terms-in-hotfile-trial-131129/";>
 &ldquo;пиратство&rdquo; и &ldquo;кража&rdquo;&nbsp;&mdash; 
грязные
 выражения</a>.</p>
 
@@ -1241,7 +1258,7 @@
 препятствие. Так что мы могли бы назвать 
эту вредную особенность
 &ldquo;препятствием копированию&ldquo;. Чаще это 
называется цифровым
 управлением ограничениями (DRM)&nbsp;&mdash; см. 
сайт кампании &ldquo;<a
-href="http://DefectiveByDesign.org";>Дефект 
гарантирован</a>&rdquo;.</p>
+href="https://DefectiveByDesign.org";>Дефект 
гарантирован</a>&rdquo;.</p>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
@@ -1427,13 +1444,13 @@
 увертка, но они хотели бы, чтобы вы 
принимали это за объективную истину.</p>
 <p>
 В правовой системе США нарушение авторских
 прав не является кражей. <a
-href="http://caselaw.lp.findlaw.com/scripts/getcase.pl?court=us&amp;vol=473&amp;invol=207";>
+href="https://caselaw.lp.findlaw.com/scripts/getcase.pl?court=us&amp;vol=473&amp;invol=207";>
 Законы о воровстве неприменимы к 
нарушению авторских прав</a>. Сторонники
 репрессивного авторского права 
апеллируют к авторитету&nbsp;&mdash; и дают
 искаженное представление о том, что 
авторитет говорит.</p>
 <p>
 В диспутах с ними вы можете привести <a
-href="http://www.guardian.co.uk/books/2013/may/04/harper-lee-kill-mockingbird-copyright";>
+href="https://www.guardian.co.uk/books/2013/may/04/harper-lee-kill-mockingbird-copyright";>
 реальный случай</a>, который показывает, что 
по-настоящему можно назвать
 &ldquo;кражей авторских прав&rdquo;.</p>
 <p>
@@ -1447,7 +1464,7 @@
 <p>
 Судья Соединенных Штатов, 
председательствуя на процессе о нарушении
 авторских прав, признала, что <a
-href="http://torrentfreak.com/mpaa-banned-from-using-piracy-and-theft-terms-in-hotfile-trial-131129/";>
+href="https://torrentfreak.com/mpaa-banned-from-using-piracy-and-theft-terms-in-hotfile-trial-131129/";>
 &ldquo;пиратство&rdquo; и &ldquo;кража&rdquo;&nbsp;&mdash; 
грязные
 выражения</a>.</p>
 
@@ -1485,11 +1502,12 @@
 </p>
 
 <!-- GNUN-SORT-STOP -->
-<hr />
-<blockquote id="fsfs"><p>Этот очерк публикуется в 
сборнике <a
-href="http://shop.fsf.org/product/free-software-free-society/";><cite>Свободные
+<hr class="thin" />
+<p id="fsfs">Этот очерк публикуется в сборнике <a
+href="https://shop.fsf.org/product/free-software-free-society/";><cite>Свободные
 программы, свободное общество: избранные 
очерки Ричарда
-М. Столмена</cite></a>.</p></blockquote>
+М. Столмена</cite></a>.</p>
+</div>
 
 <div class="translators-notes">
 
@@ -1510,7 +1528,7 @@
 
 <!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.ru.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Пожалуйста, присылайте общие запросы 
фонду и GNU по адресу <a
@@ -1530,7 +1548,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>. -->
@@ -1559,9 +1577,7 @@
 
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, 2008,
-2009, 2010, 2011, 2012, 2015, 2016, 2017, 2018, 2020, 2021 Free Software
-Foundation, Inc.</p>
+<p>Copyright &copy; 1996-2018, 2020, 2021 Free Software Foundation, Inc.</p>
 
 <p>Это произведение доступно по <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лицензии
@@ -1581,7 +1597,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2021/05/31 09:59:56 $
+$Date: 2021/07/21 20:34:04 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/x.ru.html
===================================================================
RCS file: /web/www/www/philosophy/x.ru.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- philosophy/x.ru.html        6 Oct 2020 08:42:13 -0000       1.31
+++ philosophy/x.ru.html        21 Jul 2021 20:34:04 -0000      1.32
@@ -1,7 +1,10 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/x.en.html" -->
 
 <!--#include virtual="/server/header.ru.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Западня системы X Window - Проект GNU - Фонд 
свободного программного
@@ -15,11 +18,14 @@
 
 <!--#include virtual="/philosophy/po/x.translist" -->
 <!--#include virtual="/server/banner.ru.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.ru.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.ru.html" -->
 <div class="reduced-width">
 <h2>Западня системы X Window</h2>
 
 <address class="byline">Ричард Столмен</address>
-<hr class="thin" />
+
 <div class="article">
 <p>
 Применять авторское лево или не применять? 
Это одно из важнейших разногласий
@@ -167,6 +173,7 @@
 для всего нашего сообщества.</p>
 </div>
 </div>
+
 <div class="translators-notes">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
@@ -175,7 +182,7 @@
 
 <!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.ru.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Пожалуйста, присылайте общие запросы 
фонду и GNU по адресу <a
@@ -195,7 +202,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>. -->
@@ -224,8 +231,8 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 1998, 1999, 2009, 2015, 2020 Richard M. Stallman<br
-/>Copyright &copy; 2015, 2020 Free Software Foundation, Inc. (translation)</p>
+<p>Copyright &copy; 1998, 2009, 2021 Richard M. Stallman<br />Copyright &copy;
+2010, 2021 Free Software Foundation, Inc. (translation)</p>
 
 <p>Это произведение доступно по <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лицензии
@@ -241,11 +248,12 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2020/10/06 08:42:13 $
+$Date: 2021/07/21 20:34:04 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy/po/categories.ar.po
===================================================================
RCS file: /web/www/www/philosophy/po/categories.ar.po,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- philosophy/po/categories.ar.po      29 May 2021 08:31:45 -0000      1.51
+++ philosophy/po/categories.ar.po      21 Jul 2021 20:34:04 -0000      1.52
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: categories.html\n"
-"POT-Creation-Date: 2019-02-21 01:56+0000\n"
+"POT-Creation-Date: 2021-07-21 20:25+0000\n"
 "PO-Revision-Date: 2014-11-29 19:49+0100\n"
 "Last-Translator: faycal <faycal_alami@hotmail.com>\n"
 "Language-Team: Arabic\n"
@@ -28,11 +28,14 @@
 "Foundation"
 msgstr "تصانيف البرمجيات الحرة وغير الحرة - م
شروع غنو - مؤسسة البرمجيات الحرة"
 
-#. type: Content of: <h2>
-msgid "Categories of free and nonfree software"
+#. type: Content of: <div><h2>
+# | Categories of [-f-]{+F+}ree and [-nonfree software-] {+Nonfree Software+}
+#, fuzzy
+#| msgid "Categories of free and nonfree software"
+msgid "Categories of Free and Nonfree Software"
 msgstr "تصانيف البرمجيات الحرة وغير الحرة"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Also see <a href=\"/philosophy/words-to-avoid.html\">Confusing Words which "
 "You Might Want to Avoid</a>."
@@ -40,11 +43,11 @@
 "انظر أيضاً <a href=\"/philosophy/words-to-avoid.html\">كلمات م
ُشوّشة قد ترغب في "
 "تجاوزها</a>."
 
-#. type: Attribute 'alt' of: <p><img>
+#. type: Attribute 'alt' of: <div><p><img>
 msgid "[Categories of software]"
 msgstr "[تصانيف البرمجيات]"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | This [-diagram-] {+diagram, originally+} by Chao-Kuei {+and updated by
 # | several others since,+} explains the different categories of software.
 # | It's available as [-an <a href=\"/philosophy/category.fig\">XFig file</a>,
@@ -79,11 +82,11 @@
 "غنو إف&#8204;دي&#8204;إل 1.2 أو ما تلاها، أو العموم
يات الخلاقة العزو-"
 "المشاركة بالمثل 2.0 أو ما تلاها."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Free software"
 msgstr "البرمجيات الحرة"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Free software is software that comes with permission for anyone to use,
 # | copy, [-and-] {+and/or+} distribute, either verbatim or with
 # | modifications, either gratis or for a fee. In particular, this means that
@@ -112,7 +115,7 @@
 "برمجيات&ldquo; هذا تعريف مبسط، راجع أيضا <a 
href=\"/philosophy/free-sw.html"
 "\">التعريف الكامل</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If a program is free, then it can potentially be included in a free "
 "operating system such as GNU, or free versions of the <a href=\"/gnu/linux-"
@@ -121,7 +124,7 @@
 "إذا كان البرنامج حراً، حينها يمكن أن يُضم
ّن في نظام تشغيل حر مثل غنو، أو "
 "الإصدارات الحرة من <a 
href=\"/gnu/linux-and-gnu.html\">نظام غنو/لينكس</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There are many different ways to make a program free&mdash;many questions of "
 "detail, which could be decided in more than one way and still make the "
@@ -134,7 +137,7 @@
 "مشروحة أسفله. للحصول على معلومات حول رخصة 
برمجيات محددة، راجع صفحة <a href="
 "\"/licenses/license-list.html\">قائمة الرخص</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is a matter of freedom, not price. But proprietary software "
 "companies typically use the term &ldquo;free software&rdquo; to refer to "
@@ -149,7 +152,7 @@
 "مُضمّنة على الحاسوب الذي تشتريه. هذا لا يم
ت بصلة لما نقصده بالبرمجيات الحرة في "
 "مشروع غنو."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Because of this potential confusion, when a software company says its "
 "product is free software, always check the actual distribution terms to see "
@@ -160,7 +163,7 @@
 "من شروط التوزيع الفعلية لتدرك فيما إذا كان 
المستخدمين حقا يمتلكون كل الحريات "
 "التي تدل عليها البرمجيات الحرة. أحيانا هي 
حقا برمجيات حرة، أحيانا ليست كذلك."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Many languages have two separate words for &ldquo;free&rdquo; as in freedom "
 "and &ldquo;free&rdquo; as in zero price. For example, French has &ldquo;"
@@ -181,7 +184,7 @@
 "philosophy/fs-translations.html\">لترجمات المصطلح &rdquo;free 
software&ldquo;"
 "</a> إلى لغات عديدة أخرى."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is often <a href=\"/software/reliability.html\">more reliable</"
 "a> than nonfree software."
@@ -189,11 +192,11 @@
 "البرمجيات الحرة عادة <a 
href=\"/software/reliability.html\">أكثر وثوقية</a> "
 "من البرمجيات غير الحرة."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Open source software"
 msgstr "برمجيات المصدر المفتوح"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | The term &ldquo;open source&rdquo; software is used by some people to mean
 # | more or less the same category as free software. It is not exactly the
 # | same class of software: they accept some licenses that we consider too
@@ -228,7 +231,7 @@
 "لكن الفرق في سعة التصنيف هو المثل: تقريبا 
كل البرمجيات الحرة مصدر مفتوح، وكل "
 "برمجيات المصدر المفتوح حرة."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | We prefer the term &ldquo;<a href=[-
 # | -]\"/philosophy/open-source-misses-the-point.html\">free
 # | software</a>&rdquo; because it refers to freedom&mdash;something that the
@@ -247,11 +250,11 @@
 "html\">البرمجيات الحرة</a>&ldquo; لأنه يشير إلى 
الحرية&mdash;الشيء الذي لا "
 "يمثله مصطلح &rdquo;المصدر المفتوح&ldquo;."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Public domain software"
 msgstr "برمجيات الملكية العامة"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Public domain software is software that is not copyrighted. If the source "
 "code is in the public domain, that is a special case of <a href=\"#Non-"
@@ -263,7 +266,7 @@
 "CopyleftedFreeSoftware\">البرمجيات الحرة غير متروكة 
الحقوق</a>، التي تعني أن "
 "بعض النسخ أو التعديلات قد لا تكون حرة أصلا."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In some cases, an executable program can be in the public domain but the "
 "source code is not available. This is not free software, because free "
@@ -278,7 +281,7 @@
 "محفوظة الحقوق، ومالكي حقوق النشر أعطوا 
إذنا قانونيا لأي شخص باستعمالها "
 "بحرية، باستخدام رخصة برمجيات حرة."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Sometimes people use the term &ldquo;public domain&rdquo; in a loose fashion "
 "to mean <a href=\"#FreeSoftware\">&ldquo;free&rdquo;</a> or &ldquo;available "
@@ -293,7 +296,7 @@
 "الحقوق&ldquo;. للتوضيح، نوصي باستخدام &rdquo;الم
لكية العامة&ldquo; لذلك "
 "المعنى فقط، واستخدام المصطلحات الأخرى 
لإيصال المعاني الأخرى."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Under the Berne Convention, which most countries have signed, anything "
 "written down is automatically copyrighted. This includes programs. "
@@ -306,11 +309,11 @@
 "يجب أن تتخذ بعض الإجراءات القانونية 
للتنصل عن حقوق النشر عليه؛ خلاف ذلك، "
 "البرنامج محفوظ الحقوق."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Copylefted software"
 msgstr "البرمجيات متروكة الحقوق"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Copylefted software is free software whose distribution terms ensure that
 # | all copies of all versions [-are free software.-] {+carry more or less the
 # | same distribution terms.+}  This means, for instance, that copyleft
@@ -345,7 +348,7 @@
 "متاحة. بعض رخص الحقوق المتروكة، مثل 
جي&#8204;بي&#8204;إل الإصدار 3، تمنع "
 "معاني أخرى لتحويل البرمجيات إلى احتكارية."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Some copyleft licenses, such as GPL version&nbsp;3, block other means of "
 "turning software proprietary, such as <a href=\"/licenses/rms-why-gplv3.html"
@@ -355,7 +358,7 @@
 "الوسائل اﻷخرى التي تسعى لتحويل البرمجيات 
إلى برمجيات احتكارية، كما هو الشأن "
 "بالنسبة لـ <a href=\"/licenses/rms-why-gplv3.html\">tivoization</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the GNU Project, we copyleft almost all the software we write, because "
 "our goal is to give <em>every</em> user the freedoms implied by the term "
@@ -368,7 +371,7 @@
 "راجع <a href= \"/licenses/copyleft.html\">الحقوق الم
تروكة</a> لمزيد من توضيح "
 "كيفية ترك حقوق الأعمال ولماذا نستخدمه."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Copyleft is a general concept; to [-actually-] copyleft [-a-] {+an
 # | actual+} program, you need to use a specific set of distribution terms.
 # | There are many possible ways to write copyleft distribution terms, so in
@@ -410,11 +413,11 @@
 "الشيفرة باستخدام رخصة أخرى؛ لذلك، من 
الجيد للمجتمع إذا استخدم الناس رخصة "
 "حقوق متروكة واحدة."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Noncopylefted free software"
 msgstr "البرمجيات الحرة غير متروكة الحقوق"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Noncopylefted free software comes from the author with permission to "
 "redistribute and modify, and also to add additional restrictions to it."
@@ -422,7 +425,7 @@
 "البرمجيات الحرة غير متروكة الحقوق تأتي من 
المؤلف مع أذونات بإعادة التوزيع "
 "والتعديل، وأيضا إضافة بعض القيود إليها."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If a program is free but not copylefted, then some copies or modified "
 "versions may not be free at all. A software company can compile the program, "
@@ -434,8 +437,9 @@
 "تعديلات، وتوزع الملف التشغيلي كمنتج برم
جيات <a href= \"#ProprietarySoftware"
 "\">احتكارية</a>."
 
-#. type: Content of: <p>
-# | The <a href=\"http://www.x.org\";>X Window System</a> illustrates this. 
+#. type: Content of: <div><p>
+# | The <a [-href=\"http://www.x.org\";>X-]
+# | {+href=\"https://www.x.org/wiki/\";>X+} Window System</a> illustrates this.
 # | The X Consortium release[-s-]{+d+} X11 with distribution terms that
 # | ma[-k-]{+d+}e it noncopylefted free [-software. If you wish, you can get
 # | a-] {+software, and subsequent developers have mostly followed the same
@@ -458,16 +462,16 @@
 #| "hardware, X11 is not free software for you. <a href=\"/philosophy/x.html"
 #| "\">The developers of X11 even made X11 nonfree</a> for a while."
 msgid ""
-"The <a href=\"http://www.x.org\";>X Window System</a> illustrates this.  The "
-"X Consortium released X11 with distribution terms that made it noncopylefted "
-"free software, and subsequent developers have mostly followed the same "
-"practice.  A copy which has those distribution terms is free software.  "
-"However, there are nonfree versions as well, and there are (or at least "
-"were) popular workstations and PC graphics boards for which nonfree versions "
-"are the only ones that work.  If you are using this hardware, X11 is not "
-"free software for you.  <a href=\"/philosophy/x.html\">The developers of X11 "
-"even made X11 nonfree</a> for a while; they were able to do this because "
-"others had contributed their code under the same noncopyleft license."
+"The <a href=\"https://www.x.org/wiki/\";>X Window System</a> illustrates "
+"this.  The X Consortium released X11 with distribution terms that made it "
+"noncopylefted free software, and subsequent developers have mostly followed "
+"the same practice.  A copy which has those distribution terms is free "
+"software.  However, there are nonfree versions as well, and there are (or at "
+"least were) popular workstations and PC graphics boards for which nonfree "
+"versions are the only ones that work.  If you are using this hardware, X11 "
+"is not free software for you.  <a href=\"/philosophy/x.html\">The developers "
+"of X11 even made X11 nonfree</a> for a while; they were able to do this "
+"because others had contributed their code under the same noncopyleft license."
 msgstr ""
 "<a href=\"http://www.x.org\";>نظام النوفذة إكس</a> يوضح 
هذا. جميعة إكس تصدر "
 "إكس11 مع شروط توزيع تجعله برنامجا حرا غير م
تروك الحقوق. إذا أردت، تستطيع "
@@ -477,11 +481,11 @@
 "لك. <a href=\"/philosophy/x.html\">حتى مطوروا إكس11 
أوجدوا إكس 11 غير حر</a> "
 "منذ مدة."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Lax permissive licensed software"
 msgstr "البرمجيات الخاضعة لرخص ليّنة القيود"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Lax permissive licenses include the X11 license and the <a href=\"/licenses/"
 "bsd.html\">two BSD licenses</a>.  These licenses permit almost any use of "
@@ -492,11 +496,11 @@
 "a>. وتوفر هذه الرخص عدداً لامتناهياً 
تقريباً من إمكانيات استخدام الكود، بما في "
 "ذلك توزيع الملفات الثنائية الاحتكارية مع 
تعديل الكود المصدري أو عدم تعديله."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GPL-covered software"
 msgstr "البرمجيات المغطاة بجي&#8204;بي&#8204;إل"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/licenses/gpl.html\">GNU GPL (General Public License)</a> is "
 "one specific set of distribution terms for copylefting a program. The GNU "
@@ -506,18 +510,18 @@
 "مجموعة شروط التوزيع المحددة لترك حقوق 
برنامج. مشروع غنو يستخدمها لمعظم "
 "برمجيات غنو."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To equate free software with GPL-covered software is therefore an error."
 msgstr ""
 "من الخطأ إذاً الخلط بين البرمجيات الحرة 
والبرمجيات الخاضعة لرخصة جي&#8204;"
 "بي&#8204;إل."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "The GNU operating system"
 msgstr "نظام التشغيل غنو"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/gnu/gnu-history.html\">GNU operating system</a> is the Unix-"
 "like operating system, which is entirely free software, that we in the GNU "
@@ -526,7 +530,7 @@
 "<a href=\"/gnu/gnu-history.html\">نظام التشغيل غنو</a> هو 
نظام التشغيل شبيه "
 "يونكس، حر بالكامل، الذي نطوره في مشروع غنو 
منذ عام 1984."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | A Unix-like operating system consists of many programs. The GNU system
 # | includes all {+of+} the <a [-href=\"#GNUsoftware\">GNU software</a>, as
 # | well as-] {+href=\"#GNUsoftware\">official GNU packages</a>.  It also
@@ -548,7 +552,7 @@
 "\"#GNUsoftware\">برمجيات غنو</a>، بالإضافة إلى 
الكثير من الحزم الآخرى مثل "
 "نظام النوفذة إكس وتخ الذيْن ليسا من برم
جيات غنو."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | The first test release of the complete GNU system was in 1996.  This
 # | includes the GNU Hurd, our kernel, developed since 1990.  In 2001 the GNU
 # | system (including the GNU Hurd) began working fairly reliably, but the
@@ -587,7 +591,7 @@
 "لينكس</a>، فرع لنظام غنو يستخدم لينكس كنواة 
بدلا من غنو هرد، حقق نجاحا كبيرا "
 "منذ التسعينيات."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Since the purpose of GNU is to be free, every single component in the GNU
 # | {+operating+} system [-has to be-] {+is+} free software.  They don't all
 # | have to be copylefted, however; any kind of free software is legally
@@ -608,11 +612,11 @@
 "أن يكونوا جميعا متروكي الحقوق، لكن، أي نوع 
من البرمجيات الحرة مناسب قانونيا "
 "ليُضمن إذا ساعد في ملاقاة الأهداف التقنية."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GNU programs"
 msgstr "برامج غنو"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;GNU programs&rdquo; is equivalent to <a href=\"#GNUsoftware\">GNU "
 "software.</a> A program Foo is a GNU program if it is GNU software.  We also "
@@ -622,14 +626,29 @@
 "البرنامج الفلاني برنامج غنو إذا كان من برم
جيات غنو. نحن أيضا أحيانا نسميه "
 "&rdquo;حزمة غنو&ldquo;."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GNU software"
 msgstr "برمجيات غنو"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | <a href=\"/software/software.html\">GNU software</a> is software that is
+# | released under the auspices of the <a href=[-
+# | -]\"/gnu/gnu-history.html\">GNU Project</a>. If a program is GNU software,
+# | we also say that it is a GNU program or a GNU package.  The README or
+# | manual of a GNU package should say it is one; also, the <a
+# | href=\"/directory\">Free Software Directory</a> identifies all GNU
+# | packages.
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/software/software.html\">GNU software</a> is software that is "
+#| "released under the auspices of the <a href= \"/gnu/gnu-history.html\">GNU "
+#| "Project</a>. If a program is GNU software, we also say that it is a GNU "
+#| "program or a GNU package.  The README or manual of a GNU package should "
+#| "say it is one; also, the <a href=\"/directory\">Free Software Directory</"
+#| "a> identifies all GNU packages."
 msgid ""
 "<a href=\"/software/software.html\">GNU software</a> is software that is "
-"released under the auspices of the <a href= \"/gnu/gnu-history.html\">GNU "
+"released under the auspices of the <a href=\"/gnu/gnu-history.html\">GNU "
 "Project</a>. If a program is GNU software, we also say that it is a GNU "
 "program or a GNU package.  The README or manual of a GNU package should say "
 "it is one; also, the <a href=\"/directory\">Free Software Directory</a> "
@@ -641,7 +660,7 @@
 "يجب أن يذكر أنه واحد؛ <a href=\"/directory\">دليل 
البرمجيات الحرة</a> يحدد "
 "كل حزم غنو."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Most GNU software is <a href= \"/licenses/copyleft.html\">copylefted</a>, "
 "but not all; however, all GNU software must be <a href=\"/philosophy/free-sw."
@@ -651,11 +670,12 @@
 "ليس كلها؛ لكن كل برمجيات غنو يجب أن تكون <a 
href=\"/philosophy/free-sw.html"
 "\">برمجيات حرة</a>."
 
-#. type: Content of: <p>
-# | Some GNU software [-is-] {+was+} written by <a href=
-# | \"http://www.fsf.org/about/staff/\";>staff</a> of the <a
-# | href=\"http://www.fsf.org/\";>Free Software Foundation</a>, but most GNU
-# | software [-is contributed by-] {+comes from many+} <a
+#. type: Content of: <div><p>
+# | Some GNU software [-is-] {+was+} written by <a [-href=
+# | \"http://www.fsf.org/about/staff/\";>staff</a>-]
+# | {+href=\"https://www.fsf.org/about/staff/\";>staff</a>+} of the <a
+# | href=\"http{+s+}://www.fsf.org/\">Free Software Foundation</a>, but most
+# | GNU software [-is contributed by-] {+comes from many+} <a
 # | href=\"/people/people.html\">volunteers</a>.  {+(Some of these volunteers
 # | are paid by companies or universities, but they are volunteers for us.)+} 
 # | Some contributed software is copyrighted by the Free Software Foundation;
@@ -669,8 +689,8 @@
 #| "the Free Software Foundation; some is copyrighted by the contributors who "
 #| "wrote it."
 msgid ""
-"Some GNU software was written by <a href= \"http://www.fsf.org/about/staff/";
-"\">staff</a> of the <a href=\"http://www.fsf.org/\";>Free Software "
+"Some GNU software was written by <a href=\"https://www.fsf.org/about/staff/";
+"\">staff</a> of the <a href=\"https://www.fsf.org/\";>Free Software "
 "Foundation</a>, but most GNU software comes from many <a href=\"/people/"
 "people.html\">volunteers</a>.  (Some of these volunteers are paid by "
 "companies or universities, but they are volunteers for us.)  Some "
@@ -683,12 +703,12 @@
 "بعض البرمجيات المُساهمة محفوظة الحقوق 
بواسطة مؤسسة البرمجيات الحرة، البعض "
 "محفوظ الحقوق بواسطة المساهمين الذين 
كتبوه."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "FSF-copyrighted GNU software"
 msgstr ""
 "برمجيات غنو المحمية بموجب حقوق الملكية 
الفكرية لمؤسسة &rdquo;إف إس إف&ldquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The developers of GNU packages can transfer the copyright to the FSF, or "
 "they can keep it.  The choice is theirs."
@@ -696,7 +716,7 @@
 "بإمكان مطوري حزم غنو أن ينقلوا حقوق الم
لكية الفكرية لمؤسسة &rdquo;إف إس "
 "إف&ldquo; أو الاحتفاظ بها. والخيار هنا بأيديهم
."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | If they have transfer{+r+}ed the copyright to the FSF, the program is
 # | FSF-copyrighted GNU software, and the FSF can enforce its license.  If
 # | they have kept the copyright, enforcing the license is their
@@ -716,7 +736,7 @@
 "والتي سوف تسهر على تطبيق أحكام الرخصة. أما 
في حالة احتفاظهم بحقوق الملكية "
 "الفكرية، فإن هذه المسؤولية ستقع على عاتقهم
."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The FSF does not accept copyright assignments of software that is not an "
 "official GNU package, as a rule."
@@ -724,11 +744,11 @@
 "كقاعدة أساسية، فإن مؤسسة &rdquo;إف إس إف&ldquo; 
لا تقبل تعيينات حقوق الملكية "
 "الفكرية للبرامج التي ليست حزماً رسمية 
لغنو."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Nonfree software"
 msgstr "البرمجيات غير الحرة"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Nonfree software is any software that is not free.  Its use, redistribution "
 "or modification is prohibited, or requires you to ask for permission, or is "
@@ -738,11 +758,11 @@
 "تعديلها محظور، أو يتطلب أن تطلب الإذن، أو م
ُقيد مشكل كبير جدا بحيث لا تستطيع "
 "استخدامها بحرية."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Proprietary software"
 msgstr "البرمجيات الاحتكارية"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Proprietary software is another name for nonfree software.  In the past we
 # | subdivided nonfree software into &ldquo;semifree software&rdquo;, which
 # | could be modified and redistributed noncommercially, and &ldquo;[-
@@ -771,7 +791,7 @@
 "وتوزيعها لأغراض غير تجارية. لكننا ألغينا 
هذا التمييز فيما بعد وعوضناه بمصطلح "
 "&rdquo;البرمجيات الاحتكارية&ldquo;، كمرادف 
للبرمجيات الغير حرة."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The Free Software Foundation follows the rule that we cannot install any "
 "proprietary program on our computers except temporarily for the specific "
@@ -783,7 +803,7 @@
 "حواسيبنا إلا بشكل مؤقت لغرض محدد لكتابة 
بديل حر لهذا البرنامج. جانب من هذا، "
 "أننا لا نشعر بوجود أي مبرر لتثبيت برنامج 
احتكاري."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | For example, we felt justified in installing Unix on our computer in the
 # | 1980s, because we were using it to write a free replacement for Unix.
 # | Nowadays, since free operating systems are available, the excuse is no
@@ -810,7 +830,7 @@
 "لم يعد ملائما، تخلصنا من كل أنظمة التشغيل 
غير الحرة، وأي حاسوب جديد نثتبه "
 "يجب أن يشغل نظام حر بالكامل."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | We don't insist that users of GNU, or contributors to GNU, have to live by
 # | this rule. It is a rule we made for ourselves. But we hope you will
 # | [-decide to-] follow it [-too.-] {+too, for your freedom's sake.+}
@@ -827,11 +847,11 @@
 "نحن لا نلح على مستخدمي غنو، أو المساهمين 
لغنو، بأن عليهم العيش بهذه القاعدة. "
 "هي قاعدة قطعناها على أنفسنا، لكن نأمل أن 
تقرر اتباعها أيضا."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Freeware"
 msgstr "البرمجيات المجانية"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;freeware&rdquo; has no clear accepted definition, but it is "
 "commonly used for packages which permit redistribution but not modification "
@@ -844,11 +864,11 @@
 "متوفرة). هذه الحزم <em>ليست</em> برمجيات حرة، 
لذا من فضلك لا تستخدم &rdquo;"
 "برمجيات مجانية&ldquo; للإشارة إلى البرمجيات 
الحرة."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Shareware"
 msgstr "البرمجيات النصيبية"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Shareware is software which comes with permission for people to redistribute "
 "copies, but says that anyone who continues to use a copy is <em>required</"
@@ -857,13 +877,13 @@
 "البرمجيات النصيبية هي برمجيات تأتي مع إذن 
للناس بإعادة توزيع نسخ، لكنها تقول "
 "أن أي شخص يستمر في استخدام نسخة <em>مطالب</em> 
بدفع رسوم رخصة."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Shareware is not free software, or even semifree. There are two reasons it "
 "is not:"
 msgstr "البرمجيات النصيبية ليست حرة أو حتى شبه 
حرة. يوجد سببين لعدم كونها:"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "For most shareware, source code is not available; thus, you cannot modify "
 "the program at all."
@@ -871,7 +891,7 @@
 "لمعظم البرمجيات النصيبية، الشيفرة غير م
تاحة؛ لذلك، لا يمكن تعديل البرنامج "
 "أصلا."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Shareware does not come with permission to make a copy and install it "
 "without paying a license fee, not even for individuals engaging in nonprofit "
@@ -882,11 +902,11 @@
 "أو حتى للاستخدام الخاص في نشاط غير هادف 
للربح. (في الواقع، الناس يتجاهلون "
 "شروط التوزيع ويفعلون ذلك على كل حال، لكن 
الشروط لا تجيزه.)"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Private software"
 msgstr "البرمجيات الخاصة"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Private or custom software is software developed for one user (typically an "
 "organization or company). That user keeps it and uses it, and does not "
@@ -896,7 +916,7 @@
 "شركة). هذا المستخدم يحتفظ به ويستخدمه، ولا 
يصدره للعموم سواءً كشيفرة مصدرية "
 "أو ثنائية."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | A private program is free software {+(+}in a {+somewhat+} trivial
 # | sense{+)+} if its [-unique-] {+sole user has the four freedoms.  In
 # | particular, if the+} user has full rights to [-it.-] {+the private
@@ -922,7 +942,7 @@
 "الحقوق الكاملة عليه. لكن من منطق أعمق، من 
غير المنطقي بالفعل طرح السؤال فيما "
 "إذا كان برنامج شبيه حر أو لا."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | {+Free software is a matter of freedom, not access.+}  In general we do
 # | not believe it is wrong to develop a program and not release it. There are
 # | occasions when a program is so [-useful-] {+important that one might
@@ -956,7 +976,7 @@
 "البرامج ليست تلك المذهلة، وحبسها ليس ضارا 
بشكل واضح. لذلك، لا يوجد تضارب بين "
 "تطوير برمجيات خاصة أو مُخصصة وأولويات 
حركة البرمجيات الحرة."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Nearly all employment for programmers is in development of custom software; "
 "therefore most programming jobs are, or could be, done in a way compatible "
@@ -965,11 +985,11 @@
 "تقريبا كل وظائف المبرمجين في تطوير برم
جيات مخصصة؛ لذلك معظم مهام المبرمجين، "
 "أو تكاد تكون، تتم بطريقة منسجمة مع حركة 
البرمجيات الحرة."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Commercial software"
 msgstr "البرمجيات التجارية"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;Commercial&rdquo; and &ldquo;proprietary&rdquo; are not the same! "
 "Commercial software is software developed by a business as part of its "
@@ -982,7 +1002,7 @@
 "معظم البرمجيات التجارية <a 
href=\"#ProprietarySoftware\">احتكارية</a>، لكن "
 "يوجد برمجيات تجارية حرة، ويوجد برمجيات 
غير تجارية غير حرة."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | For example, GNU Ada is {+developed by a company.  It is+} always
 # | distributed under the terms of the GNU GPL, and every copy is free
 # | software; but its developers sell support contracts. When their salesmen
@@ -1011,7 +1031,7 @@
 "زبائنه المتوقعين، أحيانا الزبائن يقولون 
&rdquo;سنشعر بأمان أكثر من مترجم "
 "تجاري&ldquo;. يرد البائع، &rdquo;غنو أدا مترجم 
تجاري، قُدّر أن يكون حرا&ldquo;."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For the GNU Project, the priorities are in the other order: the important "
 "thing is that GNU Ada is free software; that it is commercial is just a "
@@ -1022,7 +1042,7 @@
 "برنامج حر؛ فيما إذا كان تجاريا ليس السؤال 
الحاسم. لكن التطوير الإضافي لغنو "
 "أدا ناتج من كونه تجاريا هو المفيد حتما."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please help spread the awareness that free commercial software is possible. "
 "You can do this by making an effort not to say &ldquo;commercial&rdquo; when "
@@ -1050,6 +1070,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
@@ -1057,14 +1078,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 ""
 "رغم بذلنا قصارى جهدنا لتوفير ترجمات دقيقة 
ذات جودة عالية، فإننا لا ندعي كمال "
@@ -1075,15 +1102,16 @@
 "href=\"/server/standards/README.translations.html\">دليل الترجم
Ø©</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, [-2010-]
-# | {+2010, 2014, 2015, 2016, 2017, 2018, 2019+} Free Software Foundation, Inc.
+# | Copyright &copy; [-1996, 1997, 1998, 2001, 2006,-] {+1996-1998,
+# | 2001-2005,+} 2007, [-2009, 2010-] {+2009-2012, 2015, 2019, 2021+} Free
+# | Software Foundation, Inc.
 #, fuzzy
 #| msgid ""
 #| "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010 Free "
 #| "Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
-"2016, 2017, 2018, 2019 Free Software Foundation, Inc."
+"Copyright &copy; 1996-1998, 2001-2005, 2007, 2009-2012, 2015, 2019, 2021 "
+"Free Software Foundation, Inc."
 msgstr ""
 "حقوق النشر:</p><p style=\"direction: ltr\">\n"
 "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010 Free "
@@ -1108,3 +1136,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: philosophy/po/categories.ca-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/categories.ca-diff.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- philosophy/po/categories.ca-diff.html       30 May 2021 19:03:20 -0000      
1.21
+++ philosophy/po/categories.ca-diff.html       21 Jul 2021 20:34:04 -0000      
1.22
@@ -11,7 +11,10 @@
 </style></head>
 <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.86</em></ins></span> --&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 --&gt;
+&lt;!--#set var="TAGS" value="term" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</em></ins></span> --&gt;
 &lt;title&gt;Categories of Free and Nonfree Software
 - GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;style type="text/css" media="screen"&gt;
@@ -22,7 +25,11 @@
 &lt;/style&gt;
 &lt;!--#include virtual="/philosophy/po/categories.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
-&lt;h2&gt;Categories of free and nonfree software&lt;/h2&gt;
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/philosophy/ph-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&lt;div class="reduced-width"&gt;</em></ins></span>
+&lt;h2&gt;Categories of <span 
class="removed"><del><strong>free</strong></del></span> <span 
class="inserted"><ins><em>Free</em></ins></span> and <span 
class="removed"><del><strong>nonfree software&lt;/h2&gt;</strong></del></span> 
<span class="inserted"><ins><em>Nonfree Software&lt;/h2&gt;</em></ins></span>
 
 &lt;p&gt;Also see &lt;a href="/philosophy/words-to-avoid.html"&gt;Confusing
        Words which You Might Want to Avoid&lt;/a&gt;.&lt;/p&gt;
@@ -196,7 +203,7 @@
        a &lt;a href="#ProprietarySoftware"&gt;proprietary&lt;/a&gt; software
        product.&lt;/p&gt;
 
-       &lt;p&gt;The &lt;a href="http://www.x.org"&gt;X Window System&lt;/a&gt;
+       &lt;p&gt;The &lt;a <span 
class="removed"><del><strong>href="http://www.x.org"&gt;X</strong></del></span> 
<span 
class="inserted"><ins><em>href="https://www.x.org/wiki/"&gt;X</em></ins></span> 
Window System&lt;/a&gt;
        illustrates this.  The X Consortium released X11 with
        distribution terms that made it noncopylefted free
        software, and subsequent developers have mostly followed the
@@ -268,8 +275,9 @@
 &lt;h3 id="GNUsoftware"&gt;GNU software&lt;/h3&gt;
 
        &lt;p&gt;&lt;a href="/software/software.html"&gt;GNU software&lt;/a&gt; 
is
-       software that is released under the auspices of the &lt;a href=
-       "/gnu/gnu-history.html"&gt;GNU Project&lt;/a&gt;. If a program is GNU
+       software that is released under the auspices of the &lt;a <span 
class="removed"><del><strong>href=
+       "/gnu/gnu-history.html"&gt;GNU</strong></del></span>
+       <span 
class="inserted"><ins><em>href="/gnu/gnu-history.html"&gt;GNU</em></ins></span> 
Project&lt;/a&gt;. If a program is GNU
        software, we also say that it is a GNU program or a GNU
        package.  The README or manual of a GNU package should say it
        is one; also, the &lt;a href="/directory"&gt;Free Software
@@ -281,9 +289,10 @@
        all GNU software must be &lt;a href="/philosophy/free-sw.html"&gt;free
        software&lt;/a&gt;.&lt;/p&gt;
 
-       &lt;p&gt;Some GNU software was written by &lt;a href=
-       "http://www.fsf.org/about/staff/"&gt;staff&lt;/a&gt; of
-       the &lt;a href="http://www.fsf.org/"&gt;Free Software
+       &lt;p&gt;Some GNU software was written by &lt;a <span 
class="removed"><del><strong>href=
+       
"http://www.fsf.org/about/staff/"&gt;staff&lt;/a&gt;</strong></del></span>
+       <span 
class="inserted"><ins><em>href="https://www.fsf.org/about/staff/"&gt;staff&lt;/a&gt;</em></ins></span>
 of
+       the &lt;a <span 
class="removed"><del><strong>href="http://www.fsf.org/"&gt;Free</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://www.fsf.org/"&gt;Free</em></ins></span> 
Software
        Foundation&lt;/a&gt;, but most GNU software comes from many
        &lt;a href="/people/people.html"&gt;volunteers&lt;/a&gt;.  (Some of 
these
        volunteers are paid by companies or universities, but they are
@@ -420,15 +429,17 @@
        to say &ldquo;commercial&rdquo; when you mean
        &ldquo;proprietary.&rdquo;&lt;/p&gt;
 
-&lt;!-- If needed, change the copyright block at the bottom. In general, --&gt;
+<span class="removed"><del><strong>&lt;!-- If needed, change the copyright 
block at the bottom. In general, --&gt;
 &lt;!-- all pages on the GNU web server should have the section about    --&gt;
 &lt;!-- verbatim copying.  Please do NOT remove this without talking     --&gt;
 &lt;!-- with the webmasters first. --&gt; 
 &lt;!-- Please make sure the copyright date is consistent with the document 
--&gt;
-&lt;!-- and that it is like this "2001, 2002" not this "2001-2002." --&gt;
+&lt;!-- and that it is like this "2001, 2002" not this "2001-2002." 
--&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/div&gt;</em></ins></span>
+
 &lt;/div&gt;&lt;!-- for id="content", starts in the include above --&gt;
 &lt;!--#include virtual="/server/footer.html" --&gt;
-&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 &lt;a
@@ -446,16 +457,16 @@
         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 of this 
article.&lt;/p&gt;
+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;
 
-&lt;p&gt;Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 
2014, 2015, <span class="removed"><del><strong>2016</strong></del></span> <span 
class="inserted"><ins><em>2016, 2017, 2018, 2019</em></ins></span> Free
+&lt;p&gt;Copyright &copy; <span class="removed"><del><strong>1996, 1997, 1998, 
2001, 2006,</strong></del></span> <span class="inserted"><ins><em>1996-1998, 
2001-2005,</em></ins></span> 2007, <span class="removed"><del><strong>2009, 
2010, 2014,</strong></del></span> <span 
class="inserted"><ins><em>2009-2012,</em></ins></span> 2015, <span 
class="removed"><del><strong>2016</strong></del></span> <span 
class="inserted"><ins><em>2019, 2021</em></ins></span> Free
 Software Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
@@ -466,7 +477,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/05/30 19:03:20 $
+$Date: 2021/07/21 20:34:04 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: philosophy/po/categories.ca.po
===================================================================
RCS file: /web/www/www/philosophy/po/categories.ca.po,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- philosophy/po/categories.ca.po      30 May 2021 19:03:20 -0000      1.61
+++ philosophy/po/categories.ca.po      21 Jul 2021 20:34:04 -0000      1.62
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: categories.html\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-21 01:56+0000\n"
+"POT-Creation-Date: 2021-07-21 20:25+0000\n"
 "PO-Revision-Date: 2016-09-17 10:04+0200\n"
 "Last-Translator: Miquel Puigpelat <mpuigpe1@xtec.cat>\n"
 "Language-Team: Catalan <mpuigpe1@xtec.cat>\n"
@@ -26,11 +26,14 @@
 "Categories de programari lliure i no lliure - Projecte GNU - Free Software "
 "Foundation"
 
-#. type: Content of: <h2>
-msgid "Categories of free and nonfree software"
+#. type: Content of: <div><h2>
+# | Categories of [-f-]{+F+}ree and [-nonfree software-] {+Nonfree Software+}
+#, fuzzy
+#| msgid "Categories of free and nonfree software"
+msgid "Categories of Free and Nonfree Software"
 msgstr "Categories de programari lliure i no lliure"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Also see <a href=\"/philosophy/words-to-avoid.html\">Confusing Words which "
 "You Might Want to Avoid</a>."
@@ -38,11 +41,11 @@
 "Vegeu també <a href=\"/philosophy/words-to-avoid.html\">Paraules confuses "
 "que convé evitar</a>."
 
-#. type: Attribute 'alt' of: <p><img>
+#. type: Attribute 'alt' of: <div><p><img>
 msgid "[Categories of software]"
 msgstr "[Categories de programari]"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This diagram, originally by Chao-Kuei and updated by several others since, "
 "explains the different categories of software. It's available as a <a href="
@@ -58,11 +61,11 @@
 "de les llicències GNU GPL v2 o posterior, GNU FDL v1.2 o posterior i "
 "Creative Commons Attribution-Share Alike v2.0 o posterior."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Free software"
 msgstr "Programari lliure"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is software that comes with permission for anyone to use, "
 "copy, and/or distribute, either verbatim or with modifications, either "
@@ -78,7 +81,7 @@
 "és una definició simplificada; vegeu també una <a 
href=\"/philosophy/free-sw."
 "html\">definició completa</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If a program is free, then it can potentially be included in a free "
 "operating system such as GNU, or free versions of the <a href=\"/gnu/linux-"
@@ -88,7 +91,7 @@
 "GNU o les versions lliures del <a href=\"/gnu/linux-and-gnu.html\">sistema "
 "GNU/Linux</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There are many different ways to make a program free&mdash;many questions of "
 "detail, which could be decided in more than one way and still make the "
@@ -102,7 +105,7 @@
 "informar-vos específicament sobre les llicències de programari lliure, 
vegeu "
 "la <a href=\"/licenses/license-list.html\">llista de llicències</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is a matter of freedom, not price. But proprietary software "
 "companies typically use the term &ldquo;free software&rdquo; to refer to "
@@ -118,7 +121,7 @@
 "còpia a l'ordinador que esteu comprant. Tot això no té res a veure amb el "
 "que entenem per programari lliure al projecte GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Because of this potential confusion, when a software company says its "
 "product is free software, always check the actual distribution terms to see "
@@ -131,7 +134,7 @@
 "els drets que comporta el programari lliure. De vegades és realment "
 "programari lliure; d'altres, no."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Many languages have two separate words for &ldquo;free&rdquo; as in freedom "
 "and &ldquo;free&rdquo; as in zero price. For example, French has &ldquo;"
@@ -153,7 +156,7 @@
 "\"/philosophy/fs-translations.html\">traduccions de l'expressió <cite>free "
 "software</cite></a> a altres idiomes."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is often <a href=\"/software/reliability.html\">more reliable</"
 "a> than nonfree software."
@@ -161,11 +164,11 @@
 "El programari lliure és sovint <a href=\"/software/reliability.html\">més "
 "fiable</a> que el que no ho és."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Open source software"
 msgstr "Programari de codi obert"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | The term &ldquo;open source&rdquo; software is used by some people to mean
 # | more or less the same category as free software. It is not exactly the
 # | same class of software: they accept some licenses that we consider too
@@ -202,7 +205,7 @@
 "dues categories són semblants: gairebé tot el programari lliure és de codi 
"
 "obert, i gairebé tot el programari de codi obert és lliure."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We prefer the term &ldquo;<a href=\"/philosophy/open-source-misses-the-point."
 "html\">free software</a>&rdquo; because it refers to freedom&mdash;something "
@@ -212,11 +215,11 @@
 "the-point.html\">programari lliure</a>» perquè fa referència a la 
llibertat, "
 "cosa que no fa «codi obert»."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Public domain software"
 msgstr "Programari de domini públic"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Public domain software is software that is not copyrighted. If the source "
 "code is in the public domain, that is a special case of <a href=\"#Non-"
@@ -229,7 +232,7 @@
 "qual cosa implica que algunes còpies o versions modificades poden no ser "
 "lliures."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In some cases, an executable program can be in the public domain but the "
 "source code is not available. This is not free software, because free "
@@ -246,7 +249,7 @@
 "mitjançant un llicència de programari lliure, han donat legalment permís a 
"
 "tothom per utilitzar-lo lliurement."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Sometimes people use the term &ldquo;public domain&rdquo; in a loose fashion "
 "to mean <a href=\"#FreeSoftware\">&ldquo;free&rdquo;</a> or &ldquo;available "
@@ -262,7 +265,7 @@
 "«de domini públic» només en el seu sentit estricte i utilitzar altres 
termes "
 "per expressar altres significats."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Under the Berne Convention, which most countries have signed, anything "
 "written down is automatically copyrighted. This includes programs. "
@@ -277,11 +280,11 @@
 "vostres drets d'autor; si no ho feu, el programa continuarà tenint un "
 "copyright."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Copylefted software"
 msgstr "Programari amb copyleft"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copylefted software is free software whose distribution terms ensure that "
 "all copies of all versions carry more or less the same distribution terms.  "
@@ -301,7 +304,7 @@
 "versions modificades de algunes de les maneres habituals de convertir un "
 "programa en propietari."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Some copyleft licenses, such as GPL version&nbsp;3, block other means of "
 "turning software proprietary, such as <a href=\"/licenses/rms-why-gplv3.html"
@@ -311,7 +314,7 @@
 "altres maneres de convertir el programa en propietari, com ara la <a href=\"/"
 "licenses/rms-why-gplv3.html\">tivoització</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the GNU Project, we copyleft almost all the software we write, because "
 "our goal is to give <em>every</em> user the freedoms implied by the term "
@@ -325,7 +328,7 @@
 "licenses/copyleft.html\">Què és el copyleft?</a> per a una explicació més 
"
 "detallada sobre com funciona i per què el fem servir."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copyleft is a general concept; to copyleft an actual program, you need to "
 "use a specific set of distribution terms. There are many possible ways to "
@@ -349,11 +352,11 @@
 "aquesta raó, és bo per a la comunitat que tothom utilitzi la mateixa "
 "llicència de copyleft."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Noncopylefted free software"
 msgstr "Programari lliure sense copyleft"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Noncopylefted free software comes from the author with permission to "
 "redistribute and modify, and also to add additional restrictions to it."
@@ -362,7 +365,7 @@
 "modificar-lo i distribuir-lo, però també amb el permís d'afegir-hi "
 "restriccions addicionals."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If a program is free but not copylefted, then some copies or modified "
 "versions may not be free at all. A software company can compile the program, "
@@ -375,18 +378,43 @@
 "executable com un producte de programari <a href= \"#ProprietarySoftware"
 "\">privatiu</a>."
 
-#. type: Content of: <p>
-msgid ""
-"The <a href=\"http://www.x.org\";>X Window System</a> illustrates this.  The "
-"X Consortium released X11 with distribution terms that made it noncopylefted "
-"free software, and subsequent developers have mostly followed the same "
-"practice.  A copy which has those distribution terms is free software.  "
-"However, there are nonfree versions as well, and there are (or at least "
-"were) popular workstations and PC graphics boards for which nonfree versions "
-"are the only ones that work.  If you are using this hardware, X11 is not "
-"free software for you.  <a href=\"/philosophy/x.html\">The developers of X11 "
-"even made X11 nonfree</a> for a while; they were able to do this because "
-"others had contributed their code under the same noncopyleft license."
+#. type: Content of: <div><p>
+# | The <a [-href=\"http://www.x.org\";>X-]
+# | {+href=\"https://www.x.org/wiki/\";>X+} Window System</a> illustrates this.
+# |  The X Consortium released X11 with distribution terms that made it
+# | noncopylefted free software, and subsequent developers have mostly
+# | followed the same practice.  A copy which has those distribution terms is
+# | free software.  However, there are nonfree versions as well, and there are
+# | (or at least were) popular workstations and PC graphics boards for which
+# | nonfree versions are the only ones that work.  If you are using this
+# | hardware, X11 is not free software for you.  <a
+# | href=\"/philosophy/x.html\">The developers of X11 even made X11
+# | nonfree</a> for a while; they were able to do this because others had
+# | contributed their code under the same noncopyleft license.
+#, fuzzy
+#| msgid ""
+#| "The <a href=\"http://www.x.org\";>X Window System</a> illustrates this.  "
+#| "The X Consortium released X11 with distribution terms that made it "
+#| "noncopylefted free software, and subsequent developers have mostly "
+#| "followed the same practice.  A copy which has those distribution terms is "
+#| "free software.  However, there are nonfree versions as well, and there "
+#| "are (or at least were) popular workstations and PC graphics boards for "
+#| "which nonfree versions are the only ones that work.  If you are using "
+#| "this hardware, X11 is not free software for you.  <a href=\"/philosophy/x."
+#| "html\">The developers of X11 even made X11 nonfree</a> for a while; they "
+#| "were able to do this because others had contributed their code under the "
+#| "same noncopyleft license."
+msgid ""
+"The <a href=\"https://www.x.org/wiki/\";>X Window System</a> illustrates "
+"this.  The X Consortium released X11 with distribution terms that made it "
+"noncopylefted free software, and subsequent developers have mostly followed "
+"the same practice.  A copy which has those distribution terms is free "
+"software.  However, there are nonfree versions as well, and there are (or at "
+"least were) popular workstations and PC graphics boards for which nonfree "
+"versions are the only ones that work.  If you are using this hardware, X11 "
+"is not free software for you.  <a href=\"/philosophy/x.html\">The developers "
+"of X11 even made X11 nonfree</a> for a while; they were able to do this "
+"because others had contributed their code under the same noncopyleft license."
 msgstr ""
 "El <a href=\"http://www.x.org\";>Sistema X Window</a> il·lustra aquest fet. "
 "El X Consortium va publicar el X11 amb uns termes de distribució que en "
@@ -399,11 +427,11 @@
 "no lliure</a> en cert moment; van poder fer-ho perquè altres havien "
 "contribuït amb el seu codi sota la mateixa llicència sense copyleft."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Lax permissive licensed software"
 msgstr "Programari amb llicències àmpliament permissives"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Lax permissive licenses include the X11 license and the <a href=\"/licenses/"
 "bsd.html\">two BSD licenses</a>.  These licenses permit almost any use of "
@@ -415,11 +443,11 @@
 "permeten gairebé qualsevol ús del codi, incloent la distribució "
 "d'executables propietaris canviant o sense canviar el codi font."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GPL-covered software"
 msgstr "Programari cobert per la GPL"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/licenses/gpl.html\">GNU GPL (General Public License)</a> is "
 "one specific set of distribution terms for copylefting a program. The GNU "
@@ -430,18 +458,18 @@
 "copyleft. El Projecte GNU utilitza aquests termes de distribució a la major "
 "part del programari GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To equate free software with GPL-covered software is therefore an error."
 msgstr ""
 "Identificar el programari lliure amb el programari cobert per la llicència "
 "GPL és per tant un error."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "The GNU operating system"
 msgstr "El sistema operatiu GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/gnu/gnu-history.html\">GNU operating system</a> is the Unix-"
 "like operating system, which is entirely free software, that we in the GNU "
@@ -451,7 +479,7 @@
 "a l'estil de Unix completament lliure. L'hem estat desenvolupant al Projecte "
 "GNU des de 1984."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A Unix-like operating system consists of many programs. The GNU system "
 "includes all of the <a href=\"#GNUsoftware\">official GNU packages</a>.  It "
@@ -463,7 +491,7 @@
 "Inclou a més molts altres paquets que no són programari GNU, com el sistema 
"
 "X Window i TeX."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The first test release of the complete GNU system was in 1996.  This "
 "includes the GNU Hurd, our kernel, developed since 1990.  In 2001 the GNU "
@@ -488,7 +516,7 @@
 "seves necessitats i desitjos. El resultat encara és una variant del sistema "
 "GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Since the purpose of GNU is to be free, every single component in the GNU "
 "operating system is free software.  They don't all have to be copylefted, "
@@ -500,11 +528,11 @@
 "tinguin copyleft. S'hi pot incloure qualsevol tipus de programari lliure des "
 "del punt de vista legal si ajuda a assolir els objectius tècnics."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GNU programs"
 msgstr "Programes GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;GNU programs&rdquo; is equivalent to <a href=\"#GNUsoftware\">GNU "
 "software.</a> A program Foo is a GNU program if it is GNU software.  We also "
@@ -514,14 +542,29 @@
 "a>. El programa Nothifixis és un programa GNU si és programari GNU. De "
 "vegades també diem que és un «paquet GNU»."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GNU software"
 msgstr "Programari GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | <a href=\"/software/software.html\">GNU software</a> is software that is
+# | released under the auspices of the <a href=[-
+# | -]\"/gnu/gnu-history.html\">GNU Project</a>. If a program is GNU software,
+# | we also say that it is a GNU program or a GNU package.  The README or
+# | manual of a GNU package should say it is one; also, the <a
+# | href=\"/directory\">Free Software Directory</a> identifies all GNU
+# | packages.
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/software/software.html\">GNU software</a> is software that is "
+#| "released under the auspices of the <a href= \"/gnu/gnu-history.html\">GNU "
+#| "Project</a>. If a program is GNU software, we also say that it is a GNU "
+#| "program or a GNU package.  The README or manual of a GNU package should "
+#| "say it is one; also, the <a href=\"/directory\">Free Software Directory</"
+#| "a> identifies all GNU packages."
 msgid ""
 "<a href=\"/software/software.html\">GNU software</a> is software that is "
-"released under the auspices of the <a href= \"/gnu/gnu-history.html\">GNU "
+"released under the auspices of the <a href=\"/gnu/gnu-history.html\">GNU "
 "Project</a>. If a program is GNU software, we also say that it is a GNU "
 "program or a GNU package.  The README or manual of a GNU package should say "
 "it is one; also, the <a href=\"/directory\">Free Software Directory</a> "
@@ -534,7 +577,7 @@
 "és; per altra banda, el <a href=\"/directory\">Directori de Programari "
 "Lliure</a> identifica tots els paquets GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Most GNU software is <a href= \"/licenses/copyleft.html\">copylefted</a>, "
 "but not all; however, all GNU software must be <a href=\"/philosophy/free-sw."
@@ -544,10 +587,28 @@
 "\">copyleft</a>, però no tots el tenen. Malgrat això, tot el programari GNU 
"
 "ha de ser <a href=\"/philosophy/free-sw.html\">programari lliure</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Some GNU software was written by <a [-href=
+# | \"http://www.fsf.org/about/staff/\";>staff</a>-]
+# | {+href=\"https://www.fsf.org/about/staff/\";>staff</a>+} of the <a
+# | href=\"http{+s+}://www.fsf.org/\">Free Software Foundation</a>, but most
+# | GNU software comes from many <a
+# | href=\"/people/people.html\">volunteers</a>.  (Some of these volunteers
+# | are paid by companies or universities, but they are volunteers for us.) 
+# | Some contributed software is copyrighted by the Free Software Foundation;
+# | some is copyrighted by the contributors who wrote it.
+#, fuzzy
+#| msgid ""
+#| "Some GNU software was written by <a href= \"http://www.fsf.org/about/";
+#| "staff/\">staff</a> of the <a href=\"http://www.fsf.org/\";>Free Software "
+#| "Foundation</a>, but most GNU software comes from many <a href=\"/people/"
+#| "people.html\">volunteers</a>.  (Some of these volunteers are paid by "
+#| "companies or universities, but they are volunteers for us.)  Some "
+#| "contributed software is copyrighted by the Free Software Foundation; some "
+#| "is copyrighted by the contributors who wrote it."
 msgid ""
-"Some GNU software was written by <a href= \"http://www.fsf.org/about/staff/";
-"\">staff</a> of the <a href=\"http://www.fsf.org/\";>Free Software "
+"Some GNU software was written by <a href=\"https://www.fsf.org/about/staff/";
+"\">staff</a> of the <a href=\"https://www.fsf.org/\";>Free Software "
 "Foundation</a>, but most GNU software comes from many <a href=\"/people/"
 "people.html\">volunteers</a>.  (Some of these volunteers are paid by "
 "companies or universities, but they are volunteers for us.)  Some "
@@ -562,11 +623,11 @@
 "voluntaris.)  De vegades el titular del copyright d'aquest programari és la "
 "Free Software Foundation i de vegades els col·laboradors que el van 
escriure."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "FSF-copyrighted GNU software"
 msgstr "Programari GNU amb copyright de la FSF"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The developers of GNU packages can transfer the copyright to the FSF, or "
 "they can keep it.  The choice is theirs."
@@ -574,7 +635,7 @@
 "Els desenvolupadors del paquets GNU poden transferir el copyright a la FSF o "
 "retenir-lo. L'elecció és seva."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If they have transferred the copyright to the FSF, the program is FSF-"
 "copyrighted GNU software, and the FSF can enforce its license.  If they have "
@@ -584,7 +645,7 @@
 "GNU amb copyright de la FSF, i la FSF pot fer complir la llicència. Si han "
 "retingut el copyright, fer complir la llicència és la seva responsabilitat."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The FSF does not accept copyright assignments of software that is not an "
 "official GNU package, as a rule."
@@ -592,11 +653,11 @@
 "Com a norma, la FSF no accepta cessions de copyright de programes que no són 
"
 "paquets oficials de GNU."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Nonfree software"
 msgstr "Programari no lliure"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Nonfree software is any software that is not free.  Its use, redistribution "
 "or modification is prohibited, or requires you to ask for permission, or is "
@@ -606,11 +667,11 @@
 "distribució o modificació està prohibit, o requereix que demaneu permís, 
o "
 "conté tals restriccions que no es pot distribuir o modificar lliurement."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Proprietary software"
 msgstr "Programari privatiu (propietari)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Proprietary software is another name for nonfree software.  In the past we "
 "subdivided nonfree software into &ldquo;semifree software&rdquo;, which "
@@ -626,7 +687,7 @@
 "prescindit d'aquesta distinció i ara utilitzem «programari propietari» com 
a "
 "sinònim de programari no lliure."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The Free Software Foundation follows the rule that we cannot install any "
 "proprietary program on our computers except temporarily for the specific "
@@ -640,7 +701,7 @@
 "d'escriure'n un substitut lliure. Fora d'aquest cas pensem que no hi ha cap "
 "excusa per instal·lar un programa privatiu."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For example, we felt justified in installing Unix on our computer in the "
 "1980s, because we were using it to write a free replacement for Unix. "
@@ -654,7 +715,7 @@
 "no val; hem eliminat tots els sistemes operatius no lliures, i cada "
 "ordinador nou ha de funcionar amb un sistema operatiu completament lliure."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We don't insist that users of GNU, or contributors to GNU, have to live by "
 "this rule. It is a rule we made for ourselves. But we hope you will follow "
@@ -664,11 +725,11 @@
 "és una norma que vàrem crear per a nosaltres. Però tenim l'esperança que "
 "també decidiu seguir-la, pel bé de la vostra llibertat."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Freeware"
 msgstr "Freeware"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;freeware&rdquo; has no clear accepted definition, but it is "
 "commonly used for packages which permit redistribution but not modification "
@@ -682,11 +743,11 @@
 "paquets <em>no</em> són programari lliure; per tant, si us plau, no feu "
 "servir la paraula «freeware» per referir-vos al programari lliure."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Shareware"
 msgstr "Shareware"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Shareware is software which comes with permission for people to redistribute "
 "copies, but says that anyone who continues to use a copy is <em>required</"
@@ -696,13 +757,13 @@
 "però que adverteix que per fer-ne un ús continuat <em>cal</em> pagar una "
 "llicència d'ús."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Shareware is not free software, or even semifree. There are two reasons it "
 "is not:"
 msgstr "El shareware no és programari lliure ni semilliure, per dues raons:"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "For most shareware, source code is not available; thus, you cannot modify "
 "the program at all."
@@ -710,7 +771,7 @@
 "A la major part del shareware, el codi font no està disponible, i per tant "
 "no es pot modificar el programa."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Shareware does not come with permission to make a copy and install it "
 "without paying a license fee, not even for individuals engaging in nonprofit "
@@ -722,11 +783,11 @@
 "pràctica, la gent sovint no fa cas dels termes de distribució i el fan "
 "servir igualment, tot i no estar permès)."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Private software"
 msgstr "Programari privat"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Private or custom software is software developed for one user (typically an "
 "organization or company). That user keeps it and uses it, and does not "
@@ -737,7 +798,7 @@
 "l'utilitza i el custodia, sense fer-ne públic ni l'executable ni el codi "
 "font."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A private program is free software (in a somewhat trivial sense) if its sole "
 "user has the four freedoms.  In particular, if the user has full rights to "
@@ -751,7 +812,7 @@
 "l'usuari distribueix còpies a altres i no els proporciona els quatre drets "
 "sobre aquestes còpies, les còpies no seran programari lliure."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is a matter of freedom, not access.  In general we do not "
 "believe it is wrong to develop a program and not release it. There are "
@@ -771,7 +832,7 @@
 "entre el desenvolupament de programari privat o personalitzat i els "
 "principis del moviment per al programari lliure."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Nearly all employment for programmers is in development of custom software; "
 "therefore most programming jobs are, or could be, done in a way compatible "
@@ -782,11 +843,11 @@
 "programació es fan o es podrien fer d'una manera compatible amb els "
 "principis del moviment per al programari lliure."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Commercial software"
 msgstr "Programari comercial"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;Commercial&rdquo; and &ldquo;proprietary&rdquo; are not the same! "
 "Commercial software is software developed by a business as part of its "
@@ -800,7 +861,7 @@
 "\">privatiu</a>, però hi ha programari comercial que és lliure, i hi ha "
 "programari no comercial que no és lliure."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For example, GNU Ada is developed by a company.  It is always distributed "
 "under the terms of the GNU GPL, and every copy is free software; but its "
@@ -817,7 +878,7 @@
 "resposta dels comercials és: «GNU Ada <em>és</em> un compilador comercial, 
"
 "però alhora és lliure.»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For the GNU Project, the priorities are in the other order: the important "
 "thing is that GNU Ada is free software; that it is commercial is just a "
@@ -829,7 +890,7 @@
 "detall. Malgrat això, el desenvolupament addicional del GNU Ada que prové "
 "del fet de ser comercial és clarament beneficiós."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please help spread the awareness that free commercial software is possible. "
 "You can do this by making an effort not to say &ldquo;commercial&rdquo; when "
@@ -865,14 +926,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 "
@@ -882,15 +949,16 @@
 "traducció al català del web de GNU."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014,
-# | 2015, [-2016-] {+2016, 2017, 2018, 2019+} Free Software Foundation, Inc.
+# | Copyright &copy; [-1996, 1997, 1998, 2001, 2006,-] {+1996-1998,
+# | 2001-2005,+} 2007, [-2009, 2010, 2014,-] {+2009-2012,+} 2015, [-2016-]
+# | {+2019, 2021+} Free Software Foundation, Inc.
 #, fuzzy
 #| msgid ""
 #| "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, "
 #| "2015, 2016 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
-"2016, 2017, 2018, 2019 Free Software Foundation, Inc."
+"Copyright &copy; 1996-1998, 2001-2005, 2007, 2009-2012, 2015, 2019, 2021 "
+"Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
 "2016, 2017, 2018 Free Software Foundation, Inc."
@@ -918,6 +986,17 @@
 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."
+
+#~ msgid ""
 #~ "A private program is free software in a trivial sense if its sole user "
 #~ "has full rights to it."
 #~ msgstr ""

Index: philosophy/po/categories.cs.po
===================================================================
RCS file: /web/www/www/philosophy/po/categories.cs.po,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- philosophy/po/categories.cs.po      21 Jul 2021 20:25:37 -0000      1.24
+++ philosophy/po/categories.cs.po      21 Jul 2021 20:34:05 -0000      1.25
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: categories.html\n"
-"POT-Creation-Date: 2019-02-21 01:56+0000\n"
+"POT-Creation-Date: 2021-07-21 20:25+0000\n"
 "PO-Revision-Date: 2020-07-13 21:05+0100\n"
 "Last-Translator: František Kučera <franta-gnu AT 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-07-21 20:25+0000\n"
 "X-Generator: Lokalize 2.0\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
@@ -27,11 +28,14 @@
 "Kategorie svobodného a nesvobodného softwaru – Projekt GNU – Nadace pro 
"
 "svobodný software"
 
-#. type: Content of: <h2>
-msgid "Categories of free and nonfree software"
+#. type: Content of: <div><h2>
+# | Categories of [-f-]{+F+}ree and [-nonfree software-] {+Nonfree Software+}
+#, fuzzy
+#| msgid "Categories of free and nonfree software"
+msgid "Categories of Free and Nonfree Software"
 msgstr "Kategorie svobodného a nesvobodného softwaru"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Also see <a href=\"/philosophy/words-to-avoid.html\">Confusing Words which "
 "You Might Want to Avoid</a>."
@@ -39,11 +43,11 @@
 "Také si přečtěte <a href=\"/philosophy/words-to-avoid.html\">Matoucí 
slova, "
 "kterým je lépe se vyhnout </a>."
 
-#. type: Attribute 'alt' of: <p><img>
+#. type: Attribute 'alt' of: <div><p><img>
 msgid "[Categories of software]"
 msgstr " [Kategorie softwaru] "
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This diagram, originally by Chao-Kuei and updated by several others since, "
 "explains the different categories of software. It's available as a <a href="
@@ -59,11 +63,11 @@
 "kterékoli z těchto licencí: GNU GPL v2 nebo novější, GNU FDL v1.2 nebo "
 "novější a Creative Commons Attribution-Share Alike v2.0 nebo novější."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Free software"
 msgstr "Svobodný software"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is software that comes with permission for anyone to use, "
 "copy, and/or distribute, either verbatim or with modifications, either "
@@ -78,7 +82,7 @@
 "kód, není to svobodný software.“ To je zjednodušený popis; viz také 
<a href="
 "\"/philosophy/free-sw.html\">plná definice</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If a program is free, then it can potentially be included in a free "
 "operating system such as GNU, or free versions of the <a href=\"/gnu/linux-"
@@ -88,7 +92,7 @@
 "systému jako je GNU nebo do svobodné verze systému <a 
href=\"/gnu/linux-and-"
 "gnu.html\">GNU/Linux</a>. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There are many different ways to make a program free&mdash;many questions of "
 "detail, which could be decided in more than one way and still make the "
@@ -102,7 +106,7 @@
 "licencích naleznete na stránce  <a href=\"/licenses/license-list.html"
 "\">seznam licencí</a> ."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is a matter of freedom, not price. But proprietary software "
 "companies typically use the term &ldquo;free software&rdquo; to refer to "
@@ -117,7 +121,7 @@
 "přibalena k počítači, který kupujete, a je v ceně. Tak jako tak to ale 
nemá "
 "nic společného s tím, co nazýváme svobodným softwarem v projektu GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Because of this potential confusion, when a software company says its "
 "product is free software, always check the actual distribution terms to see "
@@ -129,7 +133,7 @@
 "mají uživatelé opravdu všechna práva, která svobodný software 
zahrnuje. "
 "Někdy to svobodný software skutečně je, někdy ne. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Many languages have two separate words for &ldquo;free&rdquo; as in freedom "
 "and &ldquo;free&rdquo; as in zero price. For example, French has &ldquo;"
@@ -149,7 +153,7 @@
 "to bylo jednoznačnější. Podívejte se na náš seznam <a 
href=\"/philosophy/fs-"
 "translations.html\">překladů slova „free“</a> do různých jazyků."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is often <a href=\"/software/reliability.html\">more reliable</"
 "a> than nonfree software."
@@ -157,11 +161,11 @@
 "Svobodný software je často <a href=\"/software/reliability.html"
 "\">spolehlivější</a> než proprietární software."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Open source software"
 msgstr "Otevřený software (open source)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;open source&rdquo; software is used by some people to mean "
 "more or less the same category as free software. It is not exactly the same "
@@ -181,7 +185,7 @@
 "případ, že nějaký svobodný program nebude přijat jako open source, ale 
"
 "nevíme o tom, že by se to kdy stalo."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We prefer the term &ldquo;<a href=\"/philosophy/open-source-misses-the-point."
 "html\">free software</a>&rdquo; because it refers to freedom&mdash;something "
@@ -191,11 +195,11 @@
 "html\">svobodný software</a>“, protože odkazuje na svobodu – což 
termín "
 "„otevřený software“ nedělá."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Public domain software"
 msgstr "Public domain software"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Public domain software is software that is not copyrighted. If the source "
 "code is in the public domain, that is a special case of <a href=\"#Non-"
@@ -207,7 +211,7 @@
 "\">necopyleftového svobodného softwaru</a>, což znamená, že některé 
kopie "
 "nebo upravené verze nemusí být vůbec svobodné."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In some cases, an executable program can be in the public domain but the "
 "source code is not available. This is not free software, because free "
@@ -223,7 +227,7 @@
 "autorských práv dali všem licenci dílo užívat svobodně – užívat 
jako "
 "svobodný software."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Sometimes people use the term &ldquo;public domain&rdquo; in a loose fashion "
 "to mean <a href=\"#FreeSoftware\">&ldquo;free&rdquo;</a> or &ldquo;available "
@@ -238,7 +242,7 @@
 "právem“. Abychom předešli nedorozuměním, doporučujeme používat 
„public "
 "domain“ pouze v tomto významu a v ostatních případech používat 
jiné termíny."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Under the Berne Convention, which most countries have signed, anything "
 "written down is automatically copyrighted. This includes programs. "
@@ -252,11 +256,11 @@
 "učinit jisté právní kroky ke zřeknutí se copyrightu na dané dílo, 
jinak je "
 "program chráněn autorským právem."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Copylefted software"
 msgstr "Copyleftovaný software"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copylefted software is free software whose distribution terms ensure that "
 "all copies of all versions carry more or less the same distribution terms.  "
@@ -274,7 +278,7 @@
 "zdrojový kód byl k dispozici. Toto chrání program a jeho upravené verze 
před "
 "některými běžnými způsoby, kterými lze učinit program 
proprietárním."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Some copyleft licenses, such as GPL version&nbsp;3, block other means of "
 "turning software proprietary, such as <a href=\"/licenses/rms-why-gplv3.html"
@@ -284,7 +288,7 @@
 "dalšími způsoby, jako je <a 
href=\"/licenses/rms-why-gplv3.html\">tivoizace</"
 "a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the GNU Project, we copyleft almost all the software we write, because "
 "our goal is to give <em>every</em> user the freedoms implied by the term "
@@ -298,7 +302,7 @@
 "\">článek o copyleftu</a> pro více informací o tom, jak copyleft funguje "
 "a proč ho používáme."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copyleft is a general concept; to copyleft an actual program, you need to "
 "use a specific set of distribution terms. There are many possible ways to "
@@ -320,11 +324,11 @@
 "s kódem používající druhou; pro komunitu je tedy dobré, když lidé 
používají "
 "jednu copyleftovou licenci."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Noncopylefted free software"
 msgstr "Necopyleftovaný svobodný software"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Noncopylefted free software comes from the author with permission to "
 "redistribute and modify, and also to add additional restrictions to it."
@@ -332,7 +336,7 @@
 "U necopyleftovaného svobodného softwaru jeho autor povolil ho šířit a "
 "upravovat a také přidávat dodatečná omezení."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If a program is free but not copylefted, then some copies or modified "
 "versions may not be free at all. A software company can compile the program, "
@@ -344,18 +348,43 @@
 "program zkompilovat – se změnami nebo bez – a šířit ho ve 
spustitelném tvaru "
 "jako <a href=\"#ProprietarySoftware\">proprietární</a> softwarový produkt."
 
-#. type: Content of: <p>
-msgid ""
-"The <a href=\"http://www.x.org\";>X Window System</a> illustrates this.  The "
-"X Consortium released X11 with distribution terms that made it noncopylefted "
-"free software, and subsequent developers have mostly followed the same "
-"practice.  A copy which has those distribution terms is free software.  "
-"However, there are nonfree versions as well, and there are (or at least "
-"were) popular workstations and PC graphics boards for which nonfree versions "
-"are the only ones that work.  If you are using this hardware, X11 is not "
-"free software for you.  <a href=\"/philosophy/x.html\">The developers of X11 "
-"even made X11 nonfree</a> for a while; they were able to do this because "
-"others had contributed their code under the same noncopyleft license."
+#. type: Content of: <div><p>
+# | The <a [-href=\"http://www.x.org\";>X-]
+# | {+href=\"https://www.x.org/wiki/\";>X+} Window System</a> illustrates this.
+# |  The X Consortium released X11 with distribution terms that made it
+# | noncopylefted free software, and subsequent developers have mostly
+# | followed the same practice.  A copy which has those distribution terms is
+# | free software.  However, there are nonfree versions as well, and there are
+# | (or at least were) popular workstations and PC graphics boards for which
+# | nonfree versions are the only ones that work.  If you are using this
+# | hardware, X11 is not free software for you.  <a
+# | href=\"/philosophy/x.html\">The developers of X11 even made X11
+# | nonfree</a> for a while; they were able to do this because others had
+# | contributed their code under the same noncopyleft license.
+#, fuzzy
+#| msgid ""
+#| "The <a href=\"http://www.x.org\";>X Window System</a> illustrates this.  "
+#| "The X Consortium released X11 with distribution terms that made it "
+#| "noncopylefted free software, and subsequent developers have mostly "
+#| "followed the same practice.  A copy which has those distribution terms is "
+#| "free software.  However, there are nonfree versions as well, and there "
+#| "are (or at least were) popular workstations and PC graphics boards for "
+#| "which nonfree versions are the only ones that work.  If you are using "
+#| "this hardware, X11 is not free software for you.  <a href=\"/philosophy/x."
+#| "html\">The developers of X11 even made X11 nonfree</a> for a while; they "
+#| "were able to do this because others had contributed their code under the "
+#| "same noncopyleft license."
+msgid ""
+"The <a href=\"https://www.x.org/wiki/\";>X Window System</a> illustrates "
+"this.  The X Consortium released X11 with distribution terms that made it "
+"noncopylefted free software, and subsequent developers have mostly followed "
+"the same practice.  A copy which has those distribution terms is free "
+"software.  However, there are nonfree versions as well, and there are (or at "
+"least were) popular workstations and PC graphics boards for which nonfree "
+"versions are the only ones that work.  If you are using this hardware, X11 "
+"is not free software for you.  <a href=\"/philosophy/x.html\">The developers "
+"of X11 even made X11 nonfree</a> for a while; they were able to do this "
+"because others had contributed their code under the same noncopyleft license."
 msgstr ""
 "To dokládá např. <a href=\"http://www.x.org\";>X Window System</a>. 
Sdružení "
 "„The X Consortium“ vydalo X11 s distribučními podmínkami, které z 
něj "
@@ -368,11 +397,11 @@
 "nesvobodným</a> na nějakou dobu; což mohli, protože ostatní, kteří 
přispěli "
 "svým kódem, ho vydali pod stejnou necopyleftovou licencí."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Lax permissive licensed software"
 msgstr "Software s laxně permisivní licencí"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Lax permissive licenses include the X11 license and the <a href=\"/licenses/"
 "bsd.html\">two BSD licenses</a>.  These licenses permit almost any use of "
@@ -384,11 +413,11 @@
 "včetně distribuce proprietárních binárek vzniklých z upraveného nebo "
 "neupraveného zdrojového kódu."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GPL-covered software"
 msgstr "Software s GPL licencí"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/licenses/gpl.html\">GNU GPL (General Public License)</a> is "
 "one specific set of distribution terms for copylefting a program. The GNU "
@@ -399,18 +428,18 @@
 "počítačového programu. Projekt GNU ji používá jako distribuční 
podmínky pro "
 "většinu GNU softwaru."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To equate free software with GPL-covered software is therefore an error."
 msgstr ""
 "Je tedy chybou považovat svobodný software a software pod GPL licencí za "
 "ekvivalentní."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "The GNU operating system"
 msgstr "Operační systém GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/gnu/gnu-history.html\">GNU operating system</a> is the Unix-"
 "like operating system, which is entirely free software, that we in the GNU "
@@ -420,7 +449,7 @@
 "unixového typu, který je kompletně svobodným softwarem a který v rámci 
"
 "projektu GNU vyvíjíme od roku 1984."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A Unix-like operating system consists of many programs. The GNU system "
 "includes all of the <a href=\"#GNUsoftware\">official GNU packages</a>.  It "
@@ -432,7 +461,7 @@
 "dalších balíčků, jako je X Window System nebo TeX, které nejsou GNU "
 "softwarem."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The first test release of the complete GNU system was in 1996.  This "
 "includes the GNU Hurd, our kernel, developed since 1990.  In 2001 the GNU "
@@ -455,7 +484,7 @@
 "sadou programů; uživatelé a distributoři si můžou vybrat různé 
balíčky podle "
 "svých potřeb a přání. Výsledek je stále variantou systému GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Since the purpose of GNU is to be free, every single component in the GNU "
 "operating system is free software.  They don't all have to be copylefted, "
@@ -467,11 +496,11 @@
 "jakýkoli druh svobodného softwaru je právně způsobilý k zařazení, 
pokud to "
 "pomůže splnit technické cíle."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GNU programs"
 msgstr "GNU programy"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;GNU programs&rdquo; is equivalent to <a href=\"#GNUsoftware\">GNU "
 "software.</a> A program Foo is a GNU program if it is GNU software.  We also "
@@ -481,14 +510,29 @@
 "Např. program Foo je GNU programem, pokud je GNU softwarem. Také někdy "
 "říkáme, že je to „balíček GNU“."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GNU software"
 msgstr "GNU software"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | <a href=\"/software/software.html\">GNU software</a> is software that is
+# | released under the auspices of the <a href=[-
+# | -]\"/gnu/gnu-history.html\">GNU Project</a>. If a program is GNU software,
+# | we also say that it is a GNU program or a GNU package.  The README or
+# | manual of a GNU package should say it is one; also, the <a
+# | href=\"/directory\">Free Software Directory</a> identifies all GNU
+# | packages.
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/software/software.html\">GNU software</a> is software that is "
+#| "released under the auspices of the <a href= \"/gnu/gnu-history.html\">GNU "
+#| "Project</a>. If a program is GNU software, we also say that it is a GNU "
+#| "program or a GNU package.  The README or manual of a GNU package should "
+#| "say it is one; also, the <a href=\"/directory\">Free Software Directory</"
+#| "a> identifies all GNU packages."
 msgid ""
 "<a href=\"/software/software.html\">GNU software</a> is software that is "
-"released under the auspices of the <a href= \"/gnu/gnu-history.html\">GNU "
+"released under the auspices of the <a href=\"/gnu/gnu-history.html\">GNU "
 "Project</a>. If a program is GNU software, we also say that it is a GNU "
 "program or a GNU package.  The README or manual of a GNU package should say "
 "it is one; also, the <a href=\"/directory\">Free Software Directory</a> "
@@ -501,7 +545,7 @@
 "jím je; Také adresář <a href=\"/directory\">Free Software Directory</a> "
 "identifikuje všechny balíčky GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Most GNU software is <a href= \"/licenses/copyleft.html\">copylefted</a>, "
 "but not all; however, all GNU software must be <a href=\"/philosophy/free-sw."
@@ -511,10 +555,28 @@
 "a>, i když ne všechen; nicméně všechen GNU software musí být <a 
href=\"/"
 "philosophy/free-sw.html\">svobodným softwarem</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Some GNU software was written by <a [-href=
+# | \"http://www.fsf.org/about/staff/\";>staff</a>-]
+# | {+href=\"https://www.fsf.org/about/staff/\";>staff</a>+} of the <a
+# | href=\"http{+s+}://www.fsf.org/\">Free Software Foundation</a>, but most
+# | GNU software comes from many <a
+# | href=\"/people/people.html\">volunteers</a>.  (Some of these volunteers
+# | are paid by companies or universities, but they are volunteers for us.) 
+# | Some contributed software is copyrighted by the Free Software Foundation;
+# | some is copyrighted by the contributors who wrote it.
+#, fuzzy
+#| msgid ""
+#| "Some GNU software was written by <a href= \"http://www.fsf.org/about/";
+#| "staff/\">staff</a> of the <a href=\"http://www.fsf.org/\";>Free Software "
+#| "Foundation</a>, but most GNU software comes from many <a href=\"/people/"
+#| "people.html\">volunteers</a>.  (Some of these volunteers are paid by "
+#| "companies or universities, but they are volunteers for us.)  Some "
+#| "contributed software is copyrighted by the Free Software Foundation; some "
+#| "is copyrighted by the contributors who wrote it."
 msgid ""
-"Some GNU software was written by <a href= \"http://www.fsf.org/about/staff/";
-"\">staff</a> of the <a href=\"http://www.fsf.org/\";>Free Software "
+"Some GNU software was written by <a href=\"https://www.fsf.org/about/staff/";
+"\">staff</a> of the <a href=\"https://www.fsf.org/\";>Free Software "
 "Foundation</a>, but most GNU software comes from many <a href=\"/people/"
 "people.html\">volunteers</a>.  (Some of these volunteers are paid by "
 "companies or universities, but they are volunteers for us.)  Some "
@@ -529,11 +591,11 @@
 "dobrovolně pro nás.) K některému přijatému softwaru má autorská 
práva Nadace "
 "pro svobodný software; k některému přispěvatelé, kteří ho napsali."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "FSF-copyrighted GNU software"
 msgstr "GNU software s autorskými právy FSF"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The developers of GNU packages can transfer the copyright to the FSF, or "
 "they can keep it.  The choice is theirs."
@@ -541,7 +603,7 @@
 "Vývojáři GNU balíčků můžou převést autorské právo (copyright) na 
FSF nebo si "
 "ho můžou nechat. Je to jejich volba."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If they have transferred the copyright to the FSF, the program is FSF-"
 "copyrighted GNU software, and the FSF can enforce its license.  If they have "
@@ -551,7 +613,7 @@
 "copyrightem a FSF může vynucovat dodržování jeho licence. Pokud si 
autorská "
 "práva nechali, vynucovat dodržování dané licence je jejich 
zodpovědnost."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The FSF does not accept copyright assignments of software that is not an "
 "official GNU package, as a rule."
@@ -559,11 +621,11 @@
 "FSF na sebe zpravidla nenechá převádět autorská práva k softwaru, 
který není "
 "oficiálním GNU balíčkem."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Nonfree software"
 msgstr "Nesvobodný software"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Nonfree software is any software that is not free.  Its use, redistribution "
 "or modification is prohibited, or requires you to ask for permission, or is "
@@ -573,11 +635,11 @@
 "šíření nebo úpravy jsou zakázané nebo vyžadují, abyste žádali o 
povolení, "
 "nebo jsou omezené natolik, že to efektivně nemůžete dělat svobodně."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Proprietary software"
 msgstr "Proprietární software"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Proprietary software is another name for nonfree software.  In the past we "
 "subdivided nonfree software into &ldquo;semifree software&rdquo;, which "
@@ -593,7 +655,7 @@
 "používáme označení „proprietární software“ jako synonymum k 
nesvobodnému "
 "softwaru."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The Free Software Foundation follows the rule that we cannot install any "
 "proprietary program on our computers except temporarily for the specific "
@@ -606,7 +668,7 @@
 "instalací za účelem napsání svobodné náhrady daného programu. Mimo 
tyto "
 "případy nevidíme žádnou možnou omluvu pro instalaci proprietárních 
programů."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For example, we felt justified in installing Unix on our computer in the "
 "1980s, because we were using it to write a free replacement for Unix. "
@@ -620,7 +682,7 @@
 "nesvobodné operační systémy a každý nový počítač, který 
instalujeme, musí "
 "být vybaven plně svobodným operačním systémem."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We don't insist that users of GNU, or contributors to GNU, have to live by "
 "this rule. It is a rule we made for ourselves. But we hope you will follow "
@@ -631,11 +693,11 @@
 "samotné. Ale doufáme, že ho budete dodržovat také, v zájmu své 
vlastní "
 "svobody."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Freeware"
 msgstr "Freeware"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;freeware&rdquo; has no clear accepted definition, but it is "
 "commonly used for packages which permit redistribution but not modification "
@@ -648,11 +710,11 @@
 "není dostupný). Tyto balíčky <em>nejsou</em> svobodným softwarem, "
 "nepoužívejte proto tedy slovo „freeware“ ve vztahu ke svobodnému 
softwaru."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Shareware"
 msgstr "Shareware"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Shareware is software which comes with permission for people to redistribute "
 "copies, but says that anyone who continues to use a copy is <em>required</"
@@ -661,19 +723,19 @@
 "Shareware je software s povolením šířit kopie, ale každý, kdo se 
rozhodne "
 "jej trvale používat, <em>má povinnost</em> zaplatit licenční poplatek."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Shareware is not free software, or even semifree. There are two reasons it "
 "is not:"
 msgstr "Shareware není svobodný ani částečně svobodný software ze dvou 
důvodů:"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "For most shareware, source code is not available; thus, you cannot modify "
 "the program at all."
 msgstr "Většinou není dostupný zdrojový kód, takže nemůžete program 
měnit."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Shareware does not come with permission to make a copy and install it "
 "without paying a license fee, not even for individuals engaging in nonprofit "
@@ -684,11 +746,11 @@
 "poplatku a to ani těm, kteří se zabývají nevýdělečnou činností. (V 
praxi to "
 "lidé často porušují, ale podmínky to nedovolují.)"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Private software"
 msgstr "Soukromý software"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Private or custom software is software developed for one user (typically an "
 "organization or company). That user keeps it and uses it, and does not "
@@ -699,7 +761,7 @@
 "a používá a nešíří ho veřejně a to ani ve tvaru zdrojového kódu, 
ani "
 "spustitelných binárek."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A private program is free software (in a somewhat trivial sense) if its sole "
 "user has the four freedoms.  In particular, if the user has full rights to "
@@ -713,7 +775,7 @@
 "když uživatel šíří kopie ostatním a neposkytuje jim ty čtyři 
svobody, tyto "
 "kopie už nejsou svobodným softwarem."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is a matter of freedom, not access.  In general we do not "
 "believe it is wrong to develop a program and not release it. There are "
@@ -732,7 +794,7 @@
 "rozpor mezi vývojem soukromého či zakázkového softwaru a principy 
hnutí "
 "svobodného softwaru."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Nearly all employment for programmers is in development of custom software; "
 "therefore most programming jobs are, or could be, done in a way compatible "
@@ -742,11 +804,11 @@
 "softwaru; proto většina programátorských prací může být činěna 
způsobem "
 "slučitelným s hnutím svobodného softwaru."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Commercial software"
 msgstr "Komerční software"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;Commercial&rdquo; and &ldquo;proprietary&rdquo; are not the same! "
 "Commercial software is software developed by a business as part of its "
@@ -759,7 +821,7 @@
 "\"#ProprietarySoftware\">proprietárním</a>, ale existuje i komerční 
svobodný "
 "software. Samozřejmě existuje i nekomerční proprietární software."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For example, GNU Ada is developed by a company.  It is always distributed "
 "under the terms of the GNU GPL, and every copy is free software; but its "
@@ -775,7 +837,7 @@
 "odpovídá: „GNU Ada <em>je</em> komerční kompilátor;  mimochodem je 
také "
 "svobodný.“"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For the GNU Project, the priorities are in the other order: the important "
 "thing is that GNU Ada is free software; that it is commercial is just a "
@@ -786,7 +848,7 @@
 "svobodný software; zatímco jeho komerčnost je pouhý detail. Nicméně 
další "
 "vývoj GNU Ada, který pramení této komerčnosti, je jednoznačně 
prospěšný."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please help spread the awareness that free commercial software is possible. "
 "You can do this by making an effort not to say &ldquo;commercial&rdquo; when "
@@ -822,14 +884,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í "
@@ -840,9 +908,16 @@
 "se dozvíte, jak koordinovat svoji práci a posílat překlady tohoto 
článku."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; [-1996, 1997, 1998, 2001, 2006,-] {+1996-1998,
+# | 2001-2005,+} 2007, [-2009, 2010, 2014,-] {+2009-2012,+} 2015, [-2016,
+# | 2017, 2018, 2019-] {+2019, 2021+} Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, "
+#| "2015, 2016, 2017, 2018, 2019 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
-"2016, 2017, 2018, 2019 Free Software Foundation, Inc."
+"Copyright &copy; 1996-1998, 2001-2005, 2007, 2009-2012, 2015, 2019, 2021 "
+"Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
 "2016, 2017, 2018, 2019 Free Software Foundation, Inc."
@@ -867,10 +942,22 @@
 msgid "Updated:"
 msgstr "Aktualizováno:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
-"2016, 2017, 2018, 2019, 2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
-"2016, 2017, 2018, 2019, 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, 2001, 2006, 2007, 2009, 2010, 2014, "
+#~ "2015, 2016, 2017, 2018, 2019, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, "
+#~ "2015, 2016, 2017, 2018, 2019, 2021 Free Software Foundation, Inc."

Index: philosophy/po/categories.de-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/categories.de-diff.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- philosophy/po/categories.de-diff.html       8 Jun 2021 08:44:41 -0000       
1.8
+++ philosophy/po/categories.de-diff.html       21 Jul 2021 20:34:05 -0000      
1.9
@@ -11,7 +11,10 @@
 </style></head>
 <body><pre>
 &lt;!--#include virtual="/server/header.html" --&gt;
-&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.84</strong></del></span> <span 
class="inserted"><ins><em>1.86</em></ins></span> --&gt;
+&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.84</strong></del></span> <span 
class="inserted"><ins><em>1.96 --&gt;
+&lt;!-- This page is derived from /server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="term" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</em></ins></span> --&gt;
 &lt;title&gt;Categories of Free and Nonfree Software
 - GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;style type="text/css" media="screen"&gt;
@@ -22,7 +25,11 @@
 &lt;/style&gt;
 &lt;!--#include virtual="/philosophy/po/categories.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
-&lt;h2&gt;Categories of free and nonfree software&lt;/h2&gt;
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/philosophy/ph-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&lt;div class="reduced-width"&gt;</em></ins></span>
+&lt;h2&gt;Categories of <span 
class="removed"><del><strong>free</strong></del></span> <span 
class="inserted"><ins><em>Free</em></ins></span> and <span 
class="removed"><del><strong>nonfree software&lt;/h2&gt;</strong></del></span> 
<span class="inserted"><ins><em>Nonfree Software&lt;/h2&gt;</em></ins></span>
 
 &lt;p&gt;Also see &lt;a href="/philosophy/words-to-avoid.html"&gt;Confusing
        Words which You Might Want to Avoid&lt;/a&gt;.&lt;/p&gt;
@@ -193,7 +200,7 @@
        a &lt;a href="#ProprietarySoftware"&gt;proprietary&lt;/a&gt; software
        product.&lt;/p&gt;
 
-       &lt;p&gt;The &lt;a href="http://www.x.org"&gt;X Window System&lt;/a&gt;
+       &lt;p&gt;The &lt;a <span 
class="removed"><del><strong>href="http://www.x.org"&gt;X</strong></del></span> 
<span 
class="inserted"><ins><em>href="https://www.x.org/wiki/"&gt;X</em></ins></span> 
Window System&lt;/a&gt;
        illustrates this.  The X Consortium released X11 with
        distribution terms that made it noncopylefted free
        software, and subsequent developers have mostly followed the
@@ -265,8 +272,9 @@
 &lt;h3 id="GNUsoftware"&gt;GNU software&lt;/h3&gt;
 
        &lt;p&gt;&lt;a href="/software/software.html"&gt;GNU software&lt;/a&gt; 
is
-       software that is released under the auspices of the &lt;a href=
-       "/gnu/gnu-history.html"&gt;GNU Project&lt;/a&gt;. If a program is GNU
+       software that is released under the auspices of the &lt;a <span 
class="removed"><del><strong>href=
+       "/gnu/gnu-history.html"&gt;GNU</strong></del></span>
+       <span 
class="inserted"><ins><em>href="/gnu/gnu-history.html"&gt;GNU</em></ins></span> 
Project&lt;/a&gt;. If a program is GNU
        software, we also say that it is a GNU program or a GNU
        package.  The README or manual of a GNU package should say it
        is one; also, the &lt;a href="/directory"&gt;Free Software
@@ -277,9 +285,10 @@
        all GNU software must be &lt;a href="/philosophy/free-sw.html"&gt;free
        software&lt;/a&gt;.&lt;/p&gt;
 
-       &lt;p&gt;Some GNU software was written by &lt;a href=
-       "http://www.fsf.org/about/staff/"&gt;staff&lt;/a&gt; of
-       the &lt;a href="http://www.fsf.org/"&gt;Free Software
+       &lt;p&gt;Some GNU software was written by &lt;a <span 
class="removed"><del><strong>href=
+       
"http://www.fsf.org/about/staff/"&gt;staff&lt;/a&gt;</strong></del></span>
+       <span 
class="inserted"><ins><em>href="https://www.fsf.org/about/staff/"&gt;staff&lt;/a&gt;</em></ins></span>
 of
+       the &lt;a <span 
class="removed"><del><strong>href="http://www.fsf.org/"&gt;Free</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://www.fsf.org/"&gt;Free</em></ins></span> 
Software
        Foundation&lt;/a&gt;, but most GNU software comes from many
        &lt;a href="/people/people.html"&gt;volunteers&lt;/a&gt;.  (Some of 
these
        volunteers are paid by companies or universities, but they are
@@ -416,15 +425,17 @@
        to say &ldquo;commercial&rdquo; when you mean
        &ldquo;proprietary.&rdquo;&lt;/p&gt;
 
-&lt;!-- If needed, change the copyright block at the bottom. In general, --&gt;
+<span class="removed"><del><strong>&lt;!-- If needed, change the copyright 
block at the bottom. In general, --&gt;
 &lt;!-- all pages on the GNU web server should have the section about    --&gt;
 &lt;!-- verbatim copying.  Please do NOT remove this without talking     --&gt;
 &lt;!-- with the webmasters first. --&gt; 
 &lt;!-- Please make sure the copyright date is consistent with the document 
--&gt;
-&lt;!-- and that it is like this "2001, 2002" not this "2001-2002." --&gt;
+&lt;!-- and that it is like this "2001, 2002" not this "2001-2002." 
--&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/div&gt;</em></ins></span>
+
 &lt;/div&gt;&lt;!-- for id="content", starts in the include above --&gt;
 &lt;!--#include virtual="/server/footer.html" --&gt;
-&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 &lt;a
@@ -442,16 +453,16 @@
         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 of this 
article.&lt;/p&gt;
+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;
 
-&lt;p&gt;Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 
2014, 2015, 2016, <span class="removed"><del><strong>2017</strong></del></span> 
<span class="inserted"><ins><em>2017, 2018, 2019</em></ins></span> Free
+&lt;p&gt;Copyright &copy; <span class="removed"><del><strong>1996, 1997, 1998, 
2001, 2006,</strong></del></span> <span class="inserted"><ins><em>1996-1998, 
2001-2005,</em></ins></span> 2007, <span class="removed"><del><strong>2009, 
2010, 2014,</strong></del></span> <span 
class="inserted"><ins><em>2009-2012,</em></ins></span> 2015, <span 
class="removed"><del><strong>2016, 2017</strong></del></span> <span 
class="inserted"><ins><em>2019, 2021</em></ins></span> Free
 Software Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
@@ -462,7 +473,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/06/08 08:44:41 $
+$Date: 2021/07/21 20:34:05 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: philosophy/po/categories.de.po
===================================================================
RCS file: /web/www/www/philosophy/po/categories.de.po,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- philosophy/po/categories.de.po      31 May 2021 13:39:53 -0000      1.55
+++ philosophy/po/categories.de.po      21 Jul 2021 20:34:05 -0000      1.56
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: categories.html\n"
 "Report-Msgid-Bugs-To: Webmasters <webmasters@gnu.org>\n"
-"POT-Creation-Date: 2019-02-21 01:56+0000\n"
+"POT-Creation-Date: 2021-07-21 20:25+0000\n"
 "PO-Revision-Date: 2017-05-09 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"
@@ -26,11 +26,14 @@
 "Kategorien freier und unfreier Software - GNU-Projekt - Free Software "
 "Foundation"
 
-#. type: Content of: <h2>
-msgid "Categories of free and nonfree software"
+#. type: Content of: <div><h2>
+# | Categories of [-f-]{+F+}ree and [-nonfree software-] {+Nonfree Software+}
+#, fuzzy
+#| msgid "Categories of free and nonfree software"
+msgid "Categories of Free and Nonfree Software"
 msgstr "Kategorien freier und unfreier Software"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Also see <a href=\"/philosophy/words-to-avoid.html\">Confusing Words which "
 "You Might Want to Avoid</a>."
@@ -38,11 +41,11 @@
 "Siehe auch <cite><a href=\"/philosophy/words-to-avoid\">Zu vermeidende "
 "Wörter</a></cite>."
 
-#. type: Attribute 'alt' of: <p><img>
+#. type: Attribute 'alt' of: <div><p><img>
 msgid "[Categories of software]"
 msgstr "Kategorien freier und unfreier Software"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This diagram, originally by Chao-Kuei and updated by several others since, "
 "explains the different categories of software. It's available as a <a href="
@@ -59,11 +62,11 @@
 "GNU GPLv2 oder neuer, der GNU FDLv1.2 oder neuer oder der CC BY-SA 2.0 oder "
 "neuer abrufbar)."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Free software"
 msgstr "Freie Software"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is software that comes with permission for anyone to use, "
 "copy, and/or distribute, either verbatim or with modifications, either "
@@ -80,7 +83,7 @@
 "die vollständige <a href=\"/philosophy/free-sw\">Freie-Software-Definition</"
 "a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If a program is free, then it can potentially be included in a free "
 "operating system such as GNU, or free versions of the <a href=\"/gnu/linux-"
@@ -91,7 +94,7 @@
 "\">GNU/Linux-Systems</a> aufgenommen werden."
 
 # to translate
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There are many different ways to make a program free&mdash;many questions of "
 "detail, which could be decided in more than one way and still make the "
@@ -106,7 +109,7 @@
 "Softwarelizenzen finden Sie unter <cite><a href=\"/licenses/license-list"
 "\">Verschiedene Lizenzen und Kommentare</a></cite>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is a matter of freedom, not price. But proprietary software "
 "companies typically use the term &ldquo;free software&rdquo; to refer to "
@@ -125,7 +128,7 @@
 "so, es hat nichts mit dem zu tun, was beim GNU-Projekt unter Freie Software "
 "verstanden wird."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Because of this potential confusion, when a software company says its "
 "product is free software, always check the actual distribution terms to see "
@@ -137,7 +140,7 @@
 "zugestanden werden, die Freie Software impliziert. Manchmal ist es wirklich "
 "<em>freie</em> Software; manchmal ist es das nicht."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Many languages have two separate words for &ldquo;free&rdquo; as in freedom "
 "and &ldquo;free&rdquo; as in zero price. For example, French has &ldquo;"
@@ -161,7 +164,7 @@
 "verdeutlichen. Siehe <a href=\"/philosophy/fs-translations\">Übersetzungen "
 "des Begriffs <em>Freie Software</em></a> in verschiedene andere Sprachen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is often <a href=\"/software/reliability.html\">more reliable</"
 "a> than nonfree software."
@@ -169,7 +172,7 @@
 "<a href=\"/software/reliability\">Freie Software ist zuverlässiger!</a> als "
 "unfreie Software."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Open source software"
 msgstr ""
 "Open-Source-Software<a href=\"#tn2\" id=\"tn2-ref\" class=\"transnote\">2</a>"
@@ -177,7 +180,7 @@
 # ##For clarification (is ambiguous)##
 # Should '_nearly_ all free software ...' -> 'all free software...'
 # because it's otherwise non-free software?
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | The term &ldquo;open source&rdquo; software is used by some people to mean
 # | more or less the same category as free software. It is not exactly the
 # | same class of software: they accept some licenses that we consider too
@@ -215,7 +218,7 @@
 "öffentlich zugänglicher Quellcode und sämtliche Open-Source-Software ist "
 "beinahe frei."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We prefer the term &ldquo;<a href=\"/philosophy/open-source-misses-the-point."
 "html\">free software</a>&rdquo; because it refers to freedom&mdash;something "
@@ -225,13 +228,13 @@
 "\"><em>Freie Software</em></a>, weil er sich auf Freiheit bezieht&#160;"
 "&#8209;&#160;etwas, dass der Begriff <em>„Open Source“</em> nicht macht."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Public domain software"
 msgstr ""
 "Public-Domain-Software<a href=\"#tn3\" id=\"tn3-ref\" class=\"transnote\">3</"
 "a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Public domain software is software that is not copyrighted. If the source "
 "code is in the public domain, that is a special case of <a href=\"#Non-"
@@ -244,7 +247,7 @@
 "\">Freie Software ohne Copyleft</a>, was bedeutet, dass einige Kopien oder "
 "modifizierte Versionen überhaupt nicht frei sein können."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In some cases, an executable program can be in the public domain but the "
 "source code is not available. This is not free software, because free "
@@ -263,7 +266,7 @@
 
 # 'nicht urheberrechtlich geschützt' statt 'unterliegt nicht dem Urheberrecht;
 # siehe'auch A. d. Ü. Nr. 3
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Sometimes people use the term &ldquo;public domain&rdquo; in a loose fashion "
 "to mean <a href=\"#FreeSoftware\">&ldquo;free&rdquo;</a> or &ldquo;available "
@@ -280,7 +283,7 @@
 "Domain</em> lediglich für diese Bedeutung und andere Begriffe, um andere "
 "Bedeutungen zu vermitteln."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Under the Berne Convention, which most countries have signed, anything "
 "written down is automatically copyrighted. This includes programs. "
@@ -295,11 +298,11 @@
 "werden, um auf das darauf befindliche Copyright zu verzichten; andernfalls "
 "unterliegt das Programm dem Urheberrecht."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Copylefted software"
 msgstr "Software mit Copyleft"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copylefted software is free software whose distribution terms ensure that "
 "all copies of all versions carry more or less the same distribution terms.  "
@@ -319,7 +322,7 @@
 "Versionen vor einigen der allgemeinen Möglichkeiten ab, ein Programm "
 "proprietär zu machen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Some copyleft licenses, such as GPL version&nbsp;3, block other means of "
 "turning software proprietary, such as <a href=\"/licenses/rms-why-gplv3.html"
@@ -329,7 +332,7 @@
 "andere Wege der Umwandlung in proprietäre Software, wie z.&#160;B. <a href="
 "\"/licenses/rms-why-gplv3\">Tivoisierung</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the GNU Project, we copyleft almost all the software we write, because "
 "our goal is to give <em>every</em> user the freedoms implied by the term "
@@ -343,7 +346,7 @@
 "Informationen hierzu, der Funktionsweise und warum wir es verwenden, im "
 "Artikel <cite><a href=\"/licenses/copyleft\">Copyleft</a></cite>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copyleft is a general concept; to copyleft an actual program, you need to "
 "use a specific set of distribution terms. There are many possible ways to "
@@ -366,11 +369,11 @@
 "einer anderen Lizenz zusammenzuführen; deshalb ist es für die Gemeinschaft "
 "vorteilhaft, wenn eine einzige Lizenz mit Copyleft verwendet wird."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Noncopylefted free software"
 msgstr "Freie Software ohne Copyleft"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Noncopylefted free software comes from the author with permission to "
 "redistribute and modify, and also to add additional restrictions to it."
@@ -379,7 +382,7 @@
 "Weiterverbreitung und Modifizierung, und auch, um zusätzliche 
Beschränkungen "
 "hinzuzufügen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If a program is free but not copylefted, then some copies or modified "
 "versions may not be free at all. A software company can compile the program, "
@@ -392,18 +395,43 @@
 "kompilieren und die ausführbare Datei als <a href=\"#ProprietarySoftware"
 "\">proprietäres</a> Softwareprodukt vertreiben."
 
-#. type: Content of: <p>
-msgid ""
-"The <a href=\"http://www.x.org\";>X Window System</a> illustrates this.  The "
-"X Consortium released X11 with distribution terms that made it noncopylefted "
-"free software, and subsequent developers have mostly followed the same "
-"practice.  A copy which has those distribution terms is free software.  "
-"However, there are nonfree versions as well, and there are (or at least "
-"were) popular workstations and PC graphics boards for which nonfree versions "
-"are the only ones that work.  If you are using this hardware, X11 is not "
-"free software for you.  <a href=\"/philosophy/x.html\">The developers of X11 "
-"even made X11 nonfree</a> for a while; they were able to do this because "
-"others had contributed their code under the same noncopyleft license."
+#. type: Content of: <div><p>
+# | The <a [-href=\"http://www.x.org\";>X-]
+# | {+href=\"https://www.x.org/wiki/\";>X+} Window System</a> illustrates this.
+# |  The X Consortium released X11 with distribution terms that made it
+# | noncopylefted free software, and subsequent developers have mostly
+# | followed the same practice.  A copy which has those distribution terms is
+# | free software.  However, there are nonfree versions as well, and there are
+# | (or at least were) popular workstations and PC graphics boards for which
+# | nonfree versions are the only ones that work.  If you are using this
+# | hardware, X11 is not free software for you.  <a
+# | href=\"/philosophy/x.html\">The developers of X11 even made X11
+# | nonfree</a> for a while; they were able to do this because others had
+# | contributed their code under the same noncopyleft license.
+#, fuzzy
+#| msgid ""
+#| "The <a href=\"http://www.x.org\";>X Window System</a> illustrates this.  "
+#| "The X Consortium released X11 with distribution terms that made it "
+#| "noncopylefted free software, and subsequent developers have mostly "
+#| "followed the same practice.  A copy which has those distribution terms is "
+#| "free software.  However, there are nonfree versions as well, and there "
+#| "are (or at least were) popular workstations and PC graphics boards for "
+#| "which nonfree versions are the only ones that work.  If you are using "
+#| "this hardware, X11 is not free software for you.  <a href=\"/philosophy/x."
+#| "html\">The developers of X11 even made X11 nonfree</a> for a while; they "
+#| "were able to do this because others had contributed their code under the "
+#| "same noncopyleft license."
+msgid ""
+"The <a href=\"https://www.x.org/wiki/\";>X Window System</a> illustrates "
+"this.  The X Consortium released X11 with distribution terms that made it "
+"noncopylefted free software, and subsequent developers have mostly followed "
+"the same practice.  A copy which has those distribution terms is free "
+"software.  However, there are nonfree versions as well, and there are (or at "
+"least were) popular workstations and PC graphics boards for which nonfree "
+"versions are the only ones that work.  If you are using this hardware, X11 "
+"is not free software for you.  <a href=\"/philosophy/x.html\">The developers "
+"of X11 even made X11 nonfree</a> for a while; they were able to do this "
+"because others had contributed their code under the same noncopyleft license."
 msgstr ""
 "Das <a href=\"http://www.x.org\";>X&#160;Window&#160;System (X11)</a> "
 "veranschaulicht dies. Das X&#160;Consortium hat X11 mit Vertriebsbedingungen "
@@ -418,11 +446,11 @@
 "sie in der Lage, weil andere ihren Quellcode unter derselben Lizenz ohne "
 "Copyleft beigetragen hatten."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Lax permissive licensed software"
 msgstr "Nicht besonders streng, freizügig lizenzierte Software"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Lax permissive licenses include the X11 license and the <a href=\"/licenses/"
 "bsd.html\">two BSD licenses</a>.  These licenses permit almost any use of "
@@ -434,11 +462,11 @@
 "erlauben fast jede Nutzung des Quellcodes, einschließlich der Distribution "
 "von proprietären Binärdateien (mit oder ohne Änderung des Quellcodes)."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GPL-covered software"
 msgstr "GPL-lizenzierte Software"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/licenses/gpl.html\">GNU GPL (General Public License)</a> is "
 "one specific set of distribution terms for copylefting a program. The GNU "
@@ -448,18 +476,18 @@
 "Vertriebsbedingungen um ein Programm mit Copyleft zu versehen. Das GNU-"
 "Projekt nutzt sie für die meisten GNU-Pakete als Vertriebsbedingung."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To equate free software with GPL-covered software is therefore an error."
 msgstr ""
 "Freie Software mit GPL-gedeckter Software gleichzusetzen, ist somit ein "
 "Fehler."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "The GNU operating system"
 msgstr "GNU-Betriebssystem"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/gnu/gnu-history.html\">GNU operating system</a> is the Unix-"
 "like operating system, which is entirely free software, that we in the GNU "
@@ -469,7 +497,7 @@
 "Betriebssystem, das vollständig <em>freie</em> Software ist, die wir im GNU-"
 "Projekt seit 1984 entwickelten."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A Unix-like operating system consists of many programs. The GNU system "
 "includes all of the <a href=\"#GNUsoftware\">official GNU packages</a>.  It "
@@ -481,7 +509,7 @@
 "auch viele andere Pakete wie das X Window System und TeX, die keine GNU-"
 "Software sind, enthalten."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The first test release of the complete GNU system was in 1996.  This "
 "includes the GNU Hurd, our kernel, developed since 1990.  In 2001 the GNU "
@@ -507,7 +535,7 @@
 "entsprechend ihren Bedürfnissen und Wünschen auswählen. Das Ergebnis ist "
 "immer noch eine Variante des GNU-Systems."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Since the purpose of GNU is to be free, every single component in the GNU "
 "operating system is free software.  They don't all have to be copylefted, "
@@ -520,11 +548,11 @@
 "rechtmäßig geeignet aufgenommen zu werden, wenn es hilft, technischen 
Zielen "
 "zu entsprechen."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GNU programs"
 msgstr "GNU-Programm"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;GNU programs&rdquo; is equivalent to <a href=\"#GNUsoftware\">GNU "
 "software.</a> A program Foo is a GNU program if it is GNU software.  We also "
@@ -534,14 +562,29 @@
 "Programm <em>Fu</em> ist ein GNU-Programm, wenn es GNU-Software ist. Darüber 
"
 "hinaus heißt es auch manchmal <em>GNU-Paket</em>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GNU software"
 msgstr "GNU-Software"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | <a href=\"/software/software.html\">GNU software</a> is software that is
+# | released under the auspices of the <a href=[-
+# | -]\"/gnu/gnu-history.html\">GNU Project</a>. If a program is GNU software,
+# | we also say that it is a GNU program or a GNU package.  The README or
+# | manual of a GNU package should say it is one; also, the <a
+# | href=\"/directory\">Free Software Directory</a> identifies all GNU
+# | packages.
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/software/software.html\">GNU software</a> is software that is "
+#| "released under the auspices of the <a href= \"/gnu/gnu-history.html\">GNU "
+#| "Project</a>. If a program is GNU software, we also say that it is a GNU "
+#| "program or a GNU package.  The README or manual of a GNU package should "
+#| "say it is one; also, the <a href=\"/directory\">Free Software Directory</"
+#| "a> identifies all GNU packages."
 msgid ""
 "<a href=\"/software/software.html\">GNU software</a> is software that is "
-"released under the auspices of the <a href= \"/gnu/gnu-history.html\">GNU "
+"released under the auspices of the <a href=\"/gnu/gnu-history.html\">GNU "
 "Project</a>. If a program is GNU software, we also say that it is a GNU "
 "program or a GNU package.  The README or manual of a GNU package should say "
 "it is one; also, the <a href=\"/directory\">Free Software Directory</a> "
@@ -554,7 +597,7 @@
 "Pakets sollte darauf hinweisen; ebenfalls nennt das <a href=\"/directory"
 "\">Freie-Software-Verzeichnis</a> alle GNU-Pakete."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Most GNU software is <a href= \"/licenses/copyleft.html\">copylefted</a>, "
 "but not all; however, all GNU software must be <a href=\"/philosophy/free-sw."
@@ -564,10 +607,28 @@
 "\">Copyleft</a></cite>, jedoch nicht jede. Jede GNU-Software muss jedoch "
 "<cite><a href=\"/philosophy/free-sw\">Freie Software</a></cite> sein."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Some GNU software was written by <a [-href=
+# | \"http://www.fsf.org/about/staff/\";>staff</a>-]
+# | {+href=\"https://www.fsf.org/about/staff/\";>staff</a>+} of the <a
+# | href=\"http{+s+}://www.fsf.org/\">Free Software Foundation</a>, but most
+# | GNU software comes from many <a
+# | href=\"/people/people.html\">volunteers</a>.  (Some of these volunteers
+# | are paid by companies or universities, but they are volunteers for us.) 
+# | Some contributed software is copyrighted by the Free Software Foundation;
+# | some is copyrighted by the contributors who wrote it.
+#, fuzzy
+#| msgid ""
+#| "Some GNU software was written by <a href= \"http://www.fsf.org/about/";
+#| "staff/\">staff</a> of the <a href=\"http://www.fsf.org/\";>Free Software "
+#| "Foundation</a>, but most GNU software comes from many <a href=\"/people/"
+#| "people.html\">volunteers</a>.  (Some of these volunteers are paid by "
+#| "companies or universities, but they are volunteers for us.)  Some "
+#| "contributed software is copyrighted by the Free Software Foundation; some "
+#| "is copyrighted by the contributors who wrote it."
 msgid ""
-"Some GNU software was written by <a href= \"http://www.fsf.org/about/staff/";
-"\">staff</a> of the <a href=\"http://www.fsf.org/\";>Free Software "
+"Some GNU software was written by <a href=\"https://www.fsf.org/about/staff/";
+"\">staff</a> of the <a href=\"https://www.fsf.org/\";>Free Software "
 "Foundation</a>, but most GNU software comes from many <a href=\"/people/"
 "people.html\">volunteers</a>.  (Some of these volunteers are paid by "
 "companies or universities, but they are volunteers for us.)  Some "
@@ -583,11 +644,11 @@
 "unterliegt dem Urheberrecht der Free Software Foundation; einige unterliegt "
 "dem Urheberrecht der Mitwirkenden, die sie geschrieben haben."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "FSF-copyrighted GNU software"
 msgstr "GNU-Software unter Copyright der FSF"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The developers of GNU packages can transfer the copyright to the FSF, or "
 "they can keep it.  The choice is theirs."
@@ -595,7 +656,7 @@
 "Die Entwickler der GNU-Pakete können das Copyright an die FSF übertragen "
 "oder es behalten. Die Entscheidung liegt bei ihnen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If they have transferred the copyright to the FSF, the program is FSF-"
 "copyrighted GNU software, and the FSF can enforce its license.  If they have "
@@ -606,7 +667,7 @@
 "das Copyright behalten haben, obliegt deren Durchsetzung ihrer 
Zuständigkeit."
 "<a href=\"#tn4\" id=\"tn4-ref\" class=\"transnote\">4</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The FSF does not accept copyright assignments of software that is not an "
 "official GNU package, as a rule."
@@ -614,11 +675,11 @@
 "Die FSF akzeptiert grundsätzlich keine Copyright-Zuordnungen von Software, "
 "die kein offizielles GNU-Paket ist."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Nonfree software"
 msgstr "Unfreie Software"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Nonfree software is any software that is not free.  Its use, redistribution "
 "or modification is prohibited, or requires you to ask for permission, or is "
@@ -629,11 +690,11 @@
 "Erlaubnis gebeten werden muss, oder ist so sehr eingeschränkt, dass man es "
 "wirksam nicht frei tun kann."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Proprietary software"
 msgstr "Proprietäre Software"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Proprietary software is another name for nonfree software.  In the past we "
 "subdivided nonfree software into &ldquo;semifree software&rdquo;, which "
@@ -649,7 +710,7 @@
 "werden konnte. Allerdings haben wir diese Unterscheidung fallen lassen und "
 "verwenden nun <em>proprietäre Software</em> als Synonym für unfreie 
Software."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The Free Software Foundation follows the rule that we cannot install any "
 "proprietary program on our computers except temporarily for the specific "
@@ -663,7 +724,7 @@
 "schreiben. Abgesehen davon meinen wir, dass es keine Entschuldigung für die "
 "Installation eines proprietären Programms gibt."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For example, we felt justified in installing Unix on our computer in the "
 "1980s, because we were using it to write a free replacement for Unix. "
@@ -678,7 +739,7 @@
 "Betriebssysteme und jeder neue Rechner, den wir installieren, muss ein "
 "völlig freies Betriebssystem ausführen können."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We don't insist that users of GNU, or contributors to GNU, have to live by "
 "this rule. It is a rule we made for ourselves. But we hope you will follow "
@@ -689,11 +750,11 @@
 "wir hoffen, dass Sie&#160;&#8209;&#160;um Ihrer Freiheit Willen&#160;&#8209;"
 "&#160;ihr auch folgen werden."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Freeware"
 msgstr "Freeware"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;freeware&rdquo; has no clear accepted definition, but it is "
 "commonly used for packages which permit redistribution but not modification "
@@ -708,11 +769,11 @@
 "den Begriff <em>Freeware</em>, um auf <strong>Freie Software</strong> zu "
 "verweisen."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Shareware"
 msgstr "Shareware"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Shareware is software which comes with permission for people to redistribute "
 "copies, but says that anyone who continues to use a copy is <em>required</"
@@ -724,7 +785,7 @@
 "<em>muss</em>."
 
 # semifree = propritary
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Shareware is not free software, or even semifree. There are two reasons it "
 "is not:"
@@ -732,7 +793,7 @@
 "Shareware ist keine freie oder gar halbfreie Software. Dafür gibt es zwei "
 "Gründe:"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "For most shareware, source code is not available; thus, you cannot modify "
 "the program at all."
@@ -740,7 +801,7 @@
 "Für die meiste Shareware ist der Quellcode nicht verfügbar; daher können 
Sie "
 "das Programm überhaupt nicht modifizieren."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Shareware does not come with permission to make a copy and install it "
 "without paying a license fee, not even for individuals engaging in nonprofit "
@@ -753,11 +814,11 @@
 "Praxis werden oft die Vertriebsbedingungen missachtet und trotzdem Kopien "
 "angefertigt und installiert, aber die Bedingungen erlauben es nicht)."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Private software"
 msgstr "Private Software"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Private or custom software is software developed for one user (typically an "
 "organization or company). That user keeps it and uses it, and does not "
@@ -768,7 +829,7 @@
 "Benutzer behält und verwendet sie und gibt sie der Öffentlichkeit weder als 
"
 "Quellcode noch Binärdatei frei."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A private program is free software (in a somewhat trivial sense) if its sole "
 "user has the four freedoms.  In particular, if the user has full rights to "
@@ -783,7 +844,7 @@
 "und die vier Freiheiten nicht mit jenen Kopien versieht, sind jene Kopien "
 "unfreie Software."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is a matter of freedom, not access.  In general we do not "
 "believe it is wrong to develop a program and not release it. There are "
@@ -804,7 +865,7 @@
 "benutzerdefinierter Software und den Prinzipien der Freie-Software-Bewegung "
 "keinen Konflikt."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Nearly all employment for programmers is in development of custom software; "
 "therefore most programming jobs are, or could be, done in a way compatible "
@@ -815,11 +876,11 @@
 "Programmieraufträge auf eine Weise mit der Freie-Software-Bewegung "
 "vereinbar&#160;&#8209;&#160;oder könnten es."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Commercial software"
 msgstr "Kommerzielle Software"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;Commercial&rdquo; and &ldquo;proprietary&rdquo; are not the same! "
 "Commercial software is software developed by a business as part of its "
@@ -833,7 +894,7 @@
 "\"#ProprietarySoftware\">proprietär</a>, aber es gibt kommerzielle freie "
 "Software und unkommerzielle unfreie Software."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For example, GNU Ada is developed by a company.  It is always distributed "
 "under the terms of the GNU GPL, and every copy is free software; but its "
@@ -849,7 +910,7 @@
 "sicherer fühlen.“ „GNU Ada ist ein kommerzieller Compiler; 
zufälligerweise "
 "ist er auch freie Software.“, antworten die Verkäufer."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For the GNU Project, the priorities are in the other order: the important "
 "thing is that GNU Ada is free software; that it is commercial is just a "
@@ -862,7 +923,7 @@
 "Entwicklung von GNU Ada, die sich aus dem Kommerz ergibt, definitiv "
 "vorteilhaft."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please help spread the awareness that free commercial software is possible. "
 "You can do this by making an effort not to say &ldquo;commercial&rdquo; when "
@@ -933,14 +994,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. "
@@ -954,18 +1021,19 @@
 "standards/README.translations\">LIESMICH für Übersetzungen</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014,
-# | 2015, 2016, [-2017-] {+2017, 2018, 2019+} Free Software Foundation, Inc.
+# | Copyright &copy; [-1996, 1997, 1998, 2001, 2006,-] {+1996-1998,
+# | 2001-2005,+} 2007, [-2009, 2010, 2014,-] {+2009-2012,+} 2015, [-2016-]
+# | {+2019, 2021+} Free Software Foundation, Inc.
 #, fuzzy
 #| msgid ""
 #| "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, "
-#| "2015, 2016, 2017 Free Software Foundation, Inc."
+#| "2015, 2016 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
-"2016, 2017, 2018, 2019 Free Software Foundation, Inc."
+"Copyright &copy; 1996-1998, 2001-2005, 2007, 2009-2012, 2015, 2019, 2021 "
+"Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010<ins>, 2011, "
-"2012</ins>, 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+"2012</ins>, 2014, 2015, 2016 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -990,6 +1058,17 @@
 msgid "Updated:"
 msgstr "Letzte Änderung:"
 
+#, fuzzy
+#~| msgid ""
+#~| "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, "
+#~| "2015, 2016, 2017 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, "
+#~ "2015, 2016, 2017, 2018, 2019 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010<ins>, "
+#~ "2011, 2012</ins>, 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+
 #~ msgid ""
 #~ "If they have transfered the copyright to the FSF, the program is FSF-"
 #~ "copyrighted GNU software, and the FSF can enforce its license.  If they "
@@ -1103,13 +1182,6 @@
 #~ "für unfreie Software."
 
 #~ msgid ""
-#~ "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, "
-#~ "2015, 2016 Free Software Foundation, Inc."
-#~ msgstr ""
-#~ "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010<ins>, "
-#~ "2011, 2012</ins>, 2014, 2015, 2016 Free Software Foundation, Inc."
-
-#~ msgid ""
 #~ "A Unix-like operating system consists of many programs. The GNU system "
 #~ "includes all of the <a href=\"#GNUsoftware\">offical GNU packages</a>.  "
 #~ "It also includes many other packages, such as the X Window System and "

Index: philosophy/po/categories.el.po
===================================================================
RCS file: /web/www/www/philosophy/po/categories.el.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- philosophy/po/categories.el.po      27 May 2021 18:46:16 -0000      1.16
+++ philosophy/po/categories.el.po      21 Jul 2021 20:34:05 -0000      1.17
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: categories.html\n"
-"POT-Creation-Date: 2019-02-21 01:56+0000\n"
+"POT-Creation-Date: 2021-07-21 20:25+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: web-translators <web-translators@gnu.org>\n"
@@ -29,11 +29,14 @@
 "Κατηγορίες Ελεύθερου και Μη-Ελεύθερου 
Λογισμικού - Έργο GNU - Ίδρυμα "
 "Ελεύθερου Λογισμικού"
 
-#. type: Content of: <h2>
-msgid "Categories of free and nonfree software"
+#. type: Content of: <div><h2>
+# | Categories of [-f-]{+F+}ree and [-nonfree software-] {+Nonfree Software+}
+#, fuzzy
+#| msgid "Categories of free and nonfree software"
+msgid "Categories of Free and Nonfree Software"
 msgstr "Κατηγορίες Ελεύθερου και Μη-Ελεύθερου 
Λογισμικού"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Also [-note-] {+see+} <a
 # | href=\"/philosophy/words-to-avoid.html\">Confusing Words which You Might
 # | Want to Avoid</a>.
@@ -48,11 +51,11 @@
 "Δείτε επίσης το <a 
href=\"/philosophy/words-to-avoid.html\">Λέξεις που "
 "προκαλούν σύγχυση και είναι καλό να 
αποφεύγετε</a>."
 
-#. type: Attribute 'alt' of: <p><img>
+#. type: Attribute 'alt' of: <div><p><img>
 msgid "[Categories of software]"
 msgstr "[Κατηγορίες Λογισμικού]"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | This [-<a id=\"diagram\" name=\"diagram\">diagram</a>-] {+diagram,
 # | originally+} by Chao-Kuei {+and updated by several others since,+}
 # | explains the different categories of software. It's available as [-an <a
@@ -84,11 +87,11 @@
 "JPEG</a> όπως επίσης και ως <a 
href=\"/philosophy/category.png\">εικόνα PNG "
 "μεγεθυμένη σε κλίμακα 1.5</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Free software"
 msgstr "Ελεύθερο Λογισμικό"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Free software is software that comes with permission for anyone to use,
 # | copy, [-and-] {+and/or+} distribute, either verbatim or with
 # | modifications, either gratis or for a fee. In particular, this means that
@@ -119,7 +122,7 @@
 "λογισμικό&rdquo; Αυτό είναι ένας 
απλοποιημένος ορισμός. Δείτε επίσης τον <a "
 "href=\"/philosophy/free-sw.html\">πλήρη ορισμό</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If a program is free, then it can potentially be included in a free "
 "operating system such as GNU, or free versions of the <a href=\"/gnu/linux-"
@@ -129,7 +132,7 @@
 "ελεύθερο λειτουργικό σύστημα, όπως το GNU, ή 
ελεύθερες εκδόσεις του <a href="
 "\"/gnu/linux-and-gnu.html\">συστήματος GNU/Linux</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There are many different ways to make a program free&mdash;many questions of "
 "detail, which could be decided in more than one way and still make the "
@@ -144,7 +147,7 @@
 "με συγκεκριμένες άδειες ελεύθερου 
λογισμικού, δείτε την σελίδα με την <a "
 "href=\"/licenses/license-list.html\">λίστα των αδειών</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Free software is a matter of freedom, not price. But proprietary software
 # | companies [-sometimes-] {+typically+} use the term &ldquo;free
 # | software&rdquo; to refer to price. Sometimes they mean that you can obtain
@@ -176,7 +179,7 @@
 "στον υπολογιστή τον οποίο αγοράζετε. Αυτό 
δεν έχει καμία σχέση με αυτό που "
 "εμείς εννοούμε ελεύθερο λογισμικό στο 
έργο GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Because of this potential confusion, when a software company says its "
 "product is free software, always check the actual distribution terms to see "
@@ -189,7 +192,7 @@
 "ελευθερίες τις οποίες το ελεύθερο 
λογισμικό παρέχει. Μερικές φορές το "
 "λογισμικό που παρέχουν είναι όντως 
ελεύθερο. Άλλες φορές όμως, δεν είναι."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Many languages have two separate words for &ldquo;free&rdquo; as in freedom "
 "and &ldquo;free&rdquo; as in zero price. For example, French has &ldquo;"
@@ -212,7 +215,7 @@
 "href=\"/philosophy/fs-translations.html\"> μεταφράσεις του 
όρου &ldquo;"
 "ελεύθερο λογισμικό&rdquo;</a> σε μερικές 
άλλες γλώσσες."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is often <a href=\"/software/reliability.html\">more reliable</"
 "a> than nonfree software."
@@ -220,11 +223,11 @@
 "Το ελεύθερο λογισμικό είναι συχνά <a 
href=\"/software/reliability.html\"> "
 "πιο αξιόπιστο</a> από το μη-ελεύθερο 
λογισμικό."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Open source software"
 msgstr "Λογισμικό Ανοιχτού Κώδικα"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | The term &ldquo;open source&rdquo; software is used by some people to mean
 # | more or less the same category as free software. It is not exactly the
 # | same class of software: they accept some licenses that we consider too
@@ -262,7 +265,7 @@
 "κατηγορίας είναι μικρές: σχεδόν όλο το 
ελεύθερο λογισμικό είναι ανοιχτού "
 "κώδικα και σχεδόν όλο το λογισμικό 
ανοιχτού κώδικα είναι ελεύθερο."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We prefer the term &ldquo;<a href=\"/philosophy/open-source-misses-the-point."
 "html\">free software</a>&rdquo; because it refers to freedom&mdash;something "
@@ -272,14 +275,14 @@
 "html\">ελεύθερο λογισμικό</a>&rdquo; επειδή 
αναφέρεται στην ελευθερία&mdash;"
 "κάτι το οποίο ο όρος &ldquo;ανοιχτός 
κώδικας&rdquo; δεν κάνει."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Public domain software"
 msgstr ""
 "<a href=\"http://el.wikipedia.org/wiki/%CE%9A%CE%BF%CE%B9%CE%BD%CF%8C_%CE%BA";
 "%CF%84%CE%AE%CE%BC%CE%B1\" title=\"Κοινό κτήμα - 
Βικιπαίδεια\">Λογισμικό "
 "κοινής ιδιοκτησίας/κτήματος</a> (Public domain 
software)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Public domain software is software that is not copyrighted. If the source "
 "code is in the public domain, that is a special case of <a href=\"#Non-"
@@ -293,7 +296,7 @@
 "ορισμένα αντίγραφα ή διαμορφωμένες 
εκδόσεις του λογισμικού να μην είναι "
 "ελεύθερες."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In some cases, an executable program can be in the public domain but the "
 "source code is not available. This is not free software, because free "
@@ -311,7 +314,7 @@
 "σε όλους ώστε να το χρησιμοποιήσουν 
ελεύθερα, χρησιμοποιώντας μία άδεια "
 "ελεύθερου λογισμικού."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Sometimes people use the term &ldquo;public domain&rdquo; in a loose fashion "
 "to mean <a href=\"#FreeSoftware\">&ldquo;free&rdquo;</a> or &ldquo;available "
@@ -329,7 +332,7 @@
 "ιδιοκτησίας&rdquo; με αυτή την έννοια μόνο, 
και να χρησιμοποιούνται οι "
 "κατάλληλοι όροι για να γίνει αναφορά στις 
άλλες έννοιες."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Under the Berne Convention, which most countries have signed, anything "
 "written down is automatically copyrighted. This includes programs. "
@@ -344,13 +347,13 @@
 "βήματα για να αποποιηθείτε τα πνευματικά 
δικαιώματα σε αυτό. Ειδάλλως, το "
 "πρόγραμμα είναι κατοχυρωμένο."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Copylefted software"
 msgstr ""
 "Κατοχυρωμένο Λογισμικό (<a 
href=\"http://el.wikipedia.org/wiki/Copyleft\"; "
 "title=\"Copyleft - Βικιπαίδεια\">Copylefted</a> software)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copylefted software is free software whose distribution terms ensure that "
 "all copies of all versions carry more or less the same distribution terms.  "
@@ -365,14 +368,14 @@
 "περιορισμούς. Αυτό σημαίνει ότι κάθε 
αντίγραφο του λογισμικού, ακόμα κι αν "
 "έχει τροποποιηθεί, πρέπει να είναι 
ελεύθερο λογισμικό."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Some copyleft licenses, such as GPL version&nbsp;3, block other means of "
 "turning software proprietary, such as <a href=\"/licenses/rms-why-gplv3.html"
 "\">tivoization</a>."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the GNU Project, we copyleft almost all the software we write, because "
 "our goal is to give <em>every</em> user the freedoms implied by the term "
@@ -387,7 +390,7 @@
 "περισσότερες εξηγήσεις σχετικά με το πώς 
λειτουργεί το κατοχυρωμένο "
 "λογισμικό και γιατί το χρησιμοποιούμε."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copyleft is a general concept; to copyleft an actual program, you need to "
 "use a specific set of distribution terms. There are many possible ways to "
@@ -410,11 +413,11 @@
 "χρησιμοποιεί κάποια άλλη άδεια. Έτσι, 
είναι καλό για την κοινότητα να "
 "χρησιμοποιεί ο κόσμος μόνο μία άδεια 
κατοχύρωσης."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Noncopylefted free software"
 msgstr "Μη-κατοχυρωμένο ελεύθερο Λογισμικό 
(Noncopylefted free software)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Noncopylefted free software comes from the author with permission to "
 "redistribute and modify, and also to add additional restrictions to it."
@@ -423,7 +426,7 @@
 "να διανεμηθεί και να τροποποιηθεί, και 
επίσης να προστεθούν περιορισμοί σε "
 "αυτό."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If a program is free but not copylefted, then some copies or modified "
 "versions may not be free at all. A software company can compile the program, "
@@ -436,8 +439,9 @@
 "τροποποιήσεις, και να διανείμει το 
εκτελέσιμο αρχείο σαν <a href="
 "\"#ProprietarySoftware\">ιδιόκτητο</a> προϊόν 
λογισμικού."
 
-#. type: Content of: <p>
-# | The <a href=\"http://www.x.org\";>X Window System</a> illustrates this. 
+#. type: Content of: <div><p>
+# | The <a [-href=\"http://www.x.org\";>X-]
+# | {+href=\"https://www.x.org/wiki/\";>X+} Window System</a> illustrates this.
 # | The X Consortium release[-s-]{+d+} X11 with distribution terms that
 # | ma[-k-]{+d+}e it noncopylefted free [-software. If you wish, you can get
 # | a-] {+software, and subsequent developers have mostly followed the same
@@ -460,16 +464,16 @@
 #| "hardware, X11 is not free software for you. <a href=\"/philosophy/x.html"
 #| "\">The developers of X11 even made X11 nonfree</a> for a while."
 msgid ""
-"The <a href=\"http://www.x.org\";>X Window System</a> illustrates this.  The "
-"X Consortium released X11 with distribution terms that made it noncopylefted "
-"free software, and subsequent developers have mostly followed the same "
-"practice.  A copy which has those distribution terms is free software.  "
-"However, there are nonfree versions as well, and there are (or at least "
-"were) popular workstations and PC graphics boards for which nonfree versions "
-"are the only ones that work.  If you are using this hardware, X11 is not "
-"free software for you.  <a href=\"/philosophy/x.html\">The developers of X11 "
-"even made X11 nonfree</a> for a while; they were able to do this because "
-"others had contributed their code under the same noncopyleft license."
+"The <a href=\"https://www.x.org/wiki/\";>X Window System</a> illustrates "
+"this.  The X Consortium released X11 with distribution terms that made it "
+"noncopylefted free software, and subsequent developers have mostly followed "
+"the same practice.  A copy which has those distribution terms is free "
+"software.  However, there are nonfree versions as well, and there are (or at "
+"least were) popular workstations and PC graphics boards for which nonfree "
+"versions are the only ones that work.  If you are using this hardware, X11 "
+"is not free software for you.  <a href=\"/philosophy/x.html\">The developers "
+"of X11 even made X11 nonfree</a> for a while; they were able to do this "
+"because others had contributed their code under the same noncopyleft license."
 msgstr ""
 "Το <a href=\"http://www.x.org\";>Παραθυρικό Σύστημα X</a> 
παρουσιάζει αυτή "
 "την περίπτωση. Η κοινοπραξία του Χ θέτει 
σε κυκλοφορία το Χ11 με όρους "
@@ -482,11 +486,11 @@
 "λογισμικό για σας. <a href=\"/philosophy/x.html\">Ακόμη 
και οι ίδιοι οι "
 "δημιουργοί του Χ11 το μετέτρεψαν σε μη 
ελεύθερο</a> για λίγο καιρό."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Lax permissive licensed software"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Lax permissive licenses include the X11 license and the <a href=\"/licenses/"
 "bsd.html\">two BSD licenses</a>.  These licenses permit almost any use of "
@@ -494,13 +498,13 @@
 "changing the source code."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GPL-covered software"
 msgstr ""
 "Λογισμικό επικαλυμμένο από τη <abbr 
title=\"Γενική Άδεια Δημόσιας Χρήσης GNU"
 "\">ΓΑΔΧ</abbr> (GPL-covered software)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/licenses/gpl.html\">GNU GPL (General Public License)</a> is "
 "one specific set of distribution terms for copylefting a program. The GNU "
@@ -511,16 +515,16 @@
 "προγράμματος. Το έργο GNU την χρησιμοποιεί 
σαν τους όρους διανομής για τα "
 "περισσότερα τμήματα λογισμικού GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To equate free software with GPL-covered software is therefore an error."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "The GNU operating system"
 msgstr "Το λειτουργικό σύστημα GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/gnu/gnu-history.html\">GNU operating system</a> is the Unix-"
 "like operating system, which is entirely free software, that we in the GNU "
@@ -530,7 +534,7 @@
 "οειδές λειτουργικό σύστημα, το οποίο 
είναι ολόκληρο ελεύθερο λογισμικό, και "
 "το οποίο εμείς στο έργο GNU έχουμε 
αναπτύξει από το 1984."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | A Unix-like operating system consists of many programs. The GNU system
 # | includes all {+of+} the <a [-href=\"#GNUsoftware\">GNU software</a>, as
 # | well as-] {+href=\"#GNUsoftware\">official GNU packages</a>.  It also
@@ -553,7 +557,7 @@
 "καθώς επίσης και πολλά άλλα πακέτα όπως το 
Παραθυρικό Σύστημα Χ και TeX τα "
 "οποία δεν είναι λογισμικό GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | The first test release of the complete GNU system was in 1996.  This
 # | includes the GNU Hurd, our kernel, developed since 1990.  In 2001 the GNU
 # | system (including the GNU Hurd) began working fairly reliably, but the
@@ -594,7 +598,7 @@
 "συστήματος GNU το οποίο χρησιμοποιεί τον 
Linux ως πυρήνα αντί για τον GNU "
 "Hurd, έχει κάνει μεγάλη επιτυχία από την 
δεκαετία του 90."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Since the purpose of GNU is to be free, every single component in the GNU
 # | {+operating+} system [-has to be-] {+is+} free software.  They don't all
 # | have to be copylefted, however; any kind of free software is legally
@@ -620,11 +624,11 @@
 "Αφού ο σκοπός του GNU είναι να είναι 
ελεύθερο, κάθε τμήμα στο σύστημα GNU "
 "πρέπει να είναι ελεύθερο λογισμικό. Δεν 
χρειάζεται να είναι όλα κατοχυρωμένα."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GNU programs"
 msgstr "Προγράμματα GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;GNU programs&rdquo; is equivalent to <a href=\"#GNUsoftware\">GNU "
 "software.</a> A program Foo is a GNU program if it is GNU software.  We also "
@@ -634,14 +638,29 @@
 "\">λογισμικό GNU</a>. Ένα πρόγραμμα Foo είναι 
ένα πρόγραμμα GNU εάν είναι "
 "λογισμικό GNU. Επίσης λέμε μερικές φορές 
πως είναι &ldquo;πακέτο GNU&rdquo;."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GNU software"
 msgstr "Λογισμικό GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | <a href=\"/software/software.html\">GNU software</a> is software that is
+# | released under the auspices of the <a href=[-
+# | -]\"/gnu/gnu-history.html\">GNU Project</a>. If a program is GNU software,
+# | we also say that it is a GNU program or a GNU package.  The README or
+# | manual of a GNU package should say it is one; also, the <a
+# | href=\"/directory\">Free Software Directory</a> identifies all GNU
+# | packages.
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/software/software.html\">GNU software</a> is software that is "
+#| "released under the auspices of the <a href= \"/gnu/gnu-history.html\">GNU "
+#| "Project</a>. If a program is GNU software, we also say that it is a GNU "
+#| "program or a GNU package.  The README or manual of a GNU package should "
+#| "say it is one; also, the <a href=\"/directory\">Free Software Directory</"
+#| "a> identifies all GNU packages."
 msgid ""
 "<a href=\"/software/software.html\">GNU software</a> is software that is "
-"released under the auspices of the <a href= \"/gnu/gnu-history.html\">GNU "
+"released under the auspices of the <a href=\"/gnu/gnu-history.html\">GNU "
 "Project</a>. If a program is GNU software, we also say that it is a GNU "
 "program or a GNU package.  The README or manual of a GNU package should say "
 "it is one; also, the <a href=\"/directory\">Free Software Directory</a> "
@@ -655,7 +674,7 @@
 "ο <a href=\"/directory\">Κατάλογος Ελεύθερου 
Λογισμικού</a> πιστοποιεί όλα "
 "τα πακέτα GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Most GNU software is <a href= \"/licenses/copyleft.html\">copylefted</a>, "
 "but not all; however, all GNU software must be <a href=\"/philosophy/free-sw."
@@ -665,11 +684,12 @@
 "\">κατοχυρωμένο</a>, αλλά όχι όλο. Παρ'όλα αυ
τά, όλο το λογισμικό GNU πρέπει "
 "να είναι <a href=\"/philosophy/free-sw.html\">ελεύθερο 
λογισμικό</a>."
 
-#. type: Content of: <p>
-# | Some GNU software [-is-] {+was+} written by <a href=
-# | \"http://www.fsf.org/about/staff/\";>staff</a> of the <a
-# | href=\"http://www.fsf.org/\";>Free Software Foundation</a>, but most GNU
-# | software [-is contributed by-] {+comes from many+} <a
+#. type: Content of: <div><p>
+# | Some GNU software [-is-] {+was+} written by <a [-href=
+# | \"http://www.fsf.org/about/staff/\";>staff</a>-]
+# | {+href=\"https://www.fsf.org/about/staff/\";>staff</a>+} of the <a
+# | href=\"http{+s+}://www.fsf.org/\">Free Software Foundation</a>, but most
+# | GNU software [-is contributed by-] {+comes from many+} <a
 # | href=\"/people/people.html\">volunteers</a>.  {+(Some of these volunteers
 # | are paid by companies or universities, but they are volunteers for us.)+} 
 # | Some contributed software is copyrighted by the Free Software Foundation;
@@ -683,8 +703,8 @@
 #| "the Free Software Foundation; some is copyrighted by the contributors who "
 #| "wrote it."
 msgid ""
-"Some GNU software was written by <a href= \"http://www.fsf.org/about/staff/";
-"\">staff</a> of the <a href=\"http://www.fsf.org/\";>Free Software "
+"Some GNU software was written by <a href=\"https://www.fsf.org/about/staff/";
+"\">staff</a> of the <a href=\"https://www.fsf.org/\";>Free Software "
 "Foundation</a>, but most GNU software comes from many <a href=\"/people/"
 "people.html\">volunteers</a>.  (Some of these volunteers are paid by "
 "companies or universities, but they are volunteers for us.)  Some "
@@ -698,34 +718,34 @@
 "έχουν προσφερθεί είναι κατοχυρωμένα από 
το Ίδρυμα Ελεύθερου Λογισμικού. Άλλα "
 "είναι κατοχυρωμένα από τα άτομα που τα 
έγραψαν και τα προσέφεραν."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "FSF-copyrighted GNU software"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The developers of GNU packages can transfer the copyright to the FSF, or "
 "they can keep it.  The choice is theirs."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If they have transferred the copyright to the FSF, the program is FSF-"
 "copyrighted GNU software, and the FSF can enforce its license.  If they have "
 "kept the copyright, enforcing the license is their responsibility."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The FSF does not accept copyright assignments of software that is not an "
 "official GNU package, as a rule."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Nonfree software"
 msgstr "Μη ελεύθερο λογισμικό (Nonfree software)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Nonfree software is any software that is not free.  Its use, redistribution "
 "or modification is prohibited, or requires you to ask for permission, or is "
@@ -736,11 +756,11 @@
 "εσάς να ζητήσετε την άδεια, ή είναι τόσο 
περιορισμένο που δεν μπορείτε να το "
 "χειριστείτε ελεύθερα."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Proprietary software"
 msgstr "Ιδιόκτητο λογισμικό (Proprietary software)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Proprietary software is another name for nonfree software.  In the past we "
 "subdivided nonfree software into &ldquo;semifree software&rdquo;, which "
@@ -750,7 +770,7 @@
 "software."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The Free Software Foundation follows the rule that we cannot install any "
 "proprietary program on our computers except temporarily for the specific "
@@ -765,7 +785,7 @@
 "πως δεν υπάρχει πιθανή δικαιολογία για 
την εγκατάσταση ενός ιδιόκτητου "
 "προγράμματος."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | For example, we felt justified in installing Unix on our computer in the
 # | 1980s, because we were using it to write a free replacement for Unix.
 # | Nowadays, since free operating systems are available, the excuse is no
@@ -794,7 +814,7 @@
 "τα μη ελεύθερα κομμάτια του λειτουργικού 
μας, και κάθε νέος υπολογιστής που "
 "εγκαθιστούμε πρέπει να τρέχει ένα εντελώς 
ελεύθερο λειτουργικό σύστημα."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | We don't insist that users of GNU, or contributors to GNU, have to live by
 # | this rule. It is a rule we made for ourselves. But we hope you will
 # | [-decide to-] follow it [-too.-] {+too, for your freedom's sake.+}
@@ -812,11 +832,11 @@
 "ζουν με αυτόν τον κανόνα. Είναι ένας 
κανόνας που φτιάχτηκε για μας. Αλλά "
 "ελπίζουμε πως θα αποφασίσετε να τον ακολου
θήσετε κι εσείς."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Freeware"
 msgstr "Δωρεάν λογισμικό (Freeware)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;freeware&rdquo; has no clear accepted definition, but it is "
 "commonly used for packages which permit redistribution but not modification "
@@ -831,11 +851,11 @@
 "χρησιμοποιείτε το &ldquo;δωρεάν&rdquo; για να 
αναφερθείτε στο ελεύθερο "
 "λογισμικό."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Shareware"
 msgstr "Μοιρασμένο λογισμικό (Shareware)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Shareware is software which comes with permission for people to redistribute "
 "copies, but says that anyone who continues to use a copy is <em>required</"
@@ -846,7 +866,7 @@
 "αντίγραφο (πχ έπειτα από κάποιο χρονικό 
διάστημα) <em>απαιτείται</em> να "
 "πληρώσει ένα αντίτιμο για την άδεια."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Shareware is not free software, or even semifree. There are two reasons it "
 "is not:"
@@ -854,7 +874,7 @@
 "Το μοιρασμένο δεν είναι ελεύθερο 
λογισμικό, ή ακόμα και ημι-ελευθέρο. "
 "Υπάρχουν δύο λόγοι που δεν είναι:"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "For most shareware, source code is not available; thus, you cannot modify "
 "the program at all."
@@ -863,7 +883,7 @@
 "διαθέσιμος. Κατά αυτόν τον τρόπο δεν 
μπορεί κάποιος να τροποποιήσει το "
 "πρόγραμμα καθόλου."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Shareware does not come with permission to make a copy and install it "
 "without paying a license fee, not even for individuals engaging in nonprofit "
@@ -876,11 +896,11 @@
 "δραστηριότητες. (Στην πράξη, ο κόσμος συ
χνά αψηφά τους όρους διανομής και το "
 "κάνει έτσι κι αλλιώς, αλλά ουσιαστικά οι 
όροι δεν το επιτρέπουν.)"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Private software"
 msgstr "Ιδιωτικό λογισμικό (Private Software)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Private or custom software is software developed for one user (typically an "
 "organization or company). That user keeps it and uses it, and does not "
@@ -891,7 +911,7 @@
 "οποίο ο χρήστης κρατά και χρησιμοποιεί, 
και δεν το δημοσιεύει στο κοινό είτε "
 "σαν πηγαίο κώδικα, είτε σαν εκτελέσιμο."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | A private program is free software {+(+}in a {+somewhat+} trivial
 # | sense{+)+} if its [-unique-] {+sole user has the four freedoms.  In
 # | particular, if the+} user has full rights to [-it.-] {+the private
@@ -918,7 +938,7 @@
 "έχει καμία λογική το να τίθεται η ερώτηση 
για το εάν ένα τέτοιο πρόγραμμα "
 "είναι ελεύθερο λογισμικό ή όχι."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | {+Free software is a matter of freedom, not access.+}  In general we do
 # | not believe it is wrong to develop a program and not release it. There are
 # | occasions when a program is so [-useful-] {+important that one might
@@ -956,7 +976,7 @@
 "ανάπτυξης ιδιωτικού ή κατά παραγγελία 
λογισμικού και των αρχών του κινήματος "
 "του ελεύθερου λογισμικού."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Nearly all employment for programmers is in development of custom software; "
 "therefore most programming jobs are, or could be, done in a way compatible "
@@ -967,11 +987,11 @@
 "δουλειές είναι, ή, θα μπορούσαν να είναι με 
έναν τρόπο συμβατό με το κίνημα "
 "ελεύθερου λογισμικού."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Commercial software"
 msgstr "Εμπορικό λογισμικό (Commercial Software)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | &ldquo;Commercial&rdquo; and &ldquo;proprietary&rdquo; are not the [-same
 # | thing!-] {+same!+} Commercial software is software [-being-] developed by
 # | a business [-which aims to make money from the use-] {+as part+} of [-the
@@ -999,7 +1019,7 @@
 "\"#ProprietarySoftware\">ιδιόκτητο</a>, αλλά υπάρχει 
εμπορικό ελεύθερο "
 "λογισμικό, και υπάρχει μη εμπορικό μη 
ελεύθερο λογισμικό."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | For example, GNU Ada is {+developed by a company.  It is+} always
 # | distributed under the terms of the GNU GPL, and every copy is free
 # | software; but its developers sell support contracts. When their salesmen
@@ -1031,7 +1051,7 @@
 "είναι, &ldquo;Ο GNU Ada <em>είναι</em> ένας εμπορικός 
μεταγλωττιστής. Είναι "
 "επίσης ελεύθερο λογισμικό.&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | For the GNU Project, the [-emphasis is-] {+priorities are+} in the other
 # | order: the important thing is that GNU Ada is free software; [-whether-]
 # | {+that+} it is commercial is [-not-] {+just+} a [-crucial question.-]
@@ -1054,7 +1074,7 @@
 "όχι είναι δεν είναι σημαντικό. Παρ'όλα αυ
τά, η επιπρόσθετη ανάπτυξη του GNU "
 "Ada η οποία τον βοηθάει να είναι εμπορικός 
είναι αναμφισβήτητα θετική."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Please help spread the awareness that [-commercial-] free {+commercial+}
 # | software is possible. You can do this by making an effort not to say
 # | &ldquo;commercial&rdquo; when you mean &ldquo;proprietary.&rdquo;
@@ -1091,6 +1111,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
@@ -1098,14 +1119,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 ""
 "Εργαζόμαστε σκληρά και κάνουμε ό,τι 
καλύτερο μπορούμε για να παρέχουμε "
@@ -1119,8 +1146,8 @@
 #. type: Content of: <div><p>
 #, fuzzy
 msgid ""
-"Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
-"2016, 2017, 2018, 2019 Free Software Foundation, Inc."
+"Copyright &copy; 1996-1998, 2001-2005, 2007, 2009-2012, 2015, 2019, 2021 "
+"Free Software Foundation, Inc."
 msgstr ""
 "Πνευματικά δικαιώματα:<br />\n"
 "Copyright &copy; 1996, 1997, 1998, 2001, 2006 Free Software Foundation, Inc."

Index: philosophy/po/categories.es.po
===================================================================
RCS file: /web/www/www/philosophy/po/categories.es.po,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- philosophy/po/categories.es.po      21 Jul 2021 20:25:37 -0000      1.47
+++ philosophy/po/categories.es.po      21 Jul 2021 20:34:05 -0000      1.48
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: categories.html\n"
-"POT-Creation-Date: 2019-02-21 01:56+0000\n"
+"POT-Creation-Date: 2021-07-21 20:25+0000\n"
 "PO-Revision-Date: 2019-02-24 13:40+0100\n"
 "Last-Translator: Javier Fdez. Retenaga <jfrtnaga@gnu.org>\n"
 "Language-Team: Spanish <www-es-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-07-21 20:25+0000\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: Poedit 1.8.11\n"
 
@@ -27,11 +28,14 @@
 "Categorías de software libre y software que no es libre - Proyecto GNU - "
 "Free Software Foundation "
 
-#. type: Content of: <h2>
-msgid "Categories of free and nonfree software"
+#. type: Content of: <div><h2>
+# | Categories of [-f-]{+F+}ree and [-nonfree software-] {+Nonfree Software+}
+#, fuzzy
+#| msgid "Categories of free and nonfree software"
+msgid "Categories of Free and Nonfree Software"
 msgstr "Categorías de software libre y software que no es libre"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Also see <a href=\"/philosophy/words-to-avoid.html\">Confusing Words which "
 "You Might Want to Avoid</a>."
@@ -39,11 +43,11 @@
 "Véase también el artículo <a href=\"/philosophy/words-to-avoid.html"
 "\">Palabras y frases confusas que vale la pena evitar</a>."
 
-#. type: Attribute 'alt' of: <p><img>
+#. type: Attribute 'alt' of: <div><p><img>
 msgid "[Categories of software]"
 msgstr "[Categorías de software]"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This diagram, originally by Chao-Kuei and updated by several others since, "
 "explains the different categories of software. It's available as a <a href="
@@ -60,11 +64,11 @@
 "GPL v2 o posterior, GNU FDL v1.2 o posterior, o Creative Commons Attribution-"
 "Share Alike v2.0 o posterior."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Free software"
 msgstr "Software libre"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is software that comes with permission for anyone to use, "
 "copy, and/or distribute, either verbatim or with modifications, either "
@@ -80,7 +84,7 @@
 "software». Esta es una definición simplificada; véase también la <a 
href=\"/"
 "philosophy/free-sw.html\">definición completa</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If a program is free, then it can potentially be included in a free "
 "operating system such as GNU, or free versions of the <a href=\"/gnu/linux-"
@@ -90,7 +94,7 @@
 "operativo libre como GNU, o en versiones libres del <a href=\"/gnu/linux-and-"
 "gnu.html\">sistema operativo GNU/Linux</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There are many different ways to make a program free&mdash;many questions of "
 "detail, which could be decided in more than one way and still make the "
@@ -105,7 +109,7 @@
 "software libre en particular, consulte el <a href=\"/licenses/license-list."
 "html\">listado de licencias</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is a matter of freedom, not price. But proprietary software "
 "companies typically use the term &ldquo;free software&rdquo; to refer to "
@@ -123,7 +127,7 @@
 "paga un solo precio por ambas cosas. De cualquier manera, no tiene nada que "
 "ver con lo que se entiende por software libre en el proyecto GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Because of this potential confusion, when a software company says its "
 "product is free software, always check the actual distribution terms to see "
@@ -136,7 +140,7 @@
 "se esté otorgando a los usuarios todas las libertades que el software libre "
 "implica. A veces el software realmente es libre, a veces no lo es."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Many languages have two separate words for &ldquo;free&rdquo; as in freedom "
 "and &ldquo;free&rdquo; as in zero price. For example, French has &ldquo;"
@@ -160,7 +164,7 @@
 "fs-translations.html\">traducciones de la expresión «<cite>free software</"
 "cite>»</a> a otros idiomas."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is often <a href=\"/software/reliability.html\">more reliable</"
 "a> than nonfree software."
@@ -168,11 +172,11 @@
 "El software libre es a menudo <a href=\"/software/reliability.html\">más "
 "fiable</a> que el software que no es libre."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Open source software"
 msgstr "Software de código abierto («<cite>Open Source</cite>»)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;open source&rdquo; software is used by some people to mean "
 "more or less the same category as free software. It is not exactly the same "
@@ -193,7 +197,7 @@
 "podría suceder que algún programa libre fuera rechazado como de código "
 "abierto, pero no sabemos si eso ha sucedido alguna vez."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We prefer the term &ldquo;<a href=\"/philosophy/open-source-misses-the-point."
 "html\">free software</a>&rdquo; because it refers to freedom&mdash;something "
@@ -203,11 +207,11 @@
 "the-point.html\">software libre</a>» porque se refiere a libertad, cosa que "
 "no sucede con la expresión «código abierto»."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Public domain software"
 msgstr "Software de dominio público"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Public domain software is software that is not copyrighted. If the source "
 "code is in the public domain, that is a special case of <a href=\"#Non-"
@@ -220,7 +224,7 @@
 "significa que algunas copias o versiones modificadas pueden no ser libres en "
 "absoluto. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In some cases, an executable program can be in the public domain but the "
 "source code is not available. This is not free software, because free "
@@ -237,7 +241,7 @@
 "legal para que todos puedan utilizarlo en libertad, usando una licencia de "
 "software libre."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Sometimes people use the term &ldquo;public domain&rdquo; in a loose fashion "
 "to mean <a href=\"#FreeSoftware\">&ldquo;free&rdquo;</a> or &ldquo;available "
@@ -254,7 +258,7 @@
 "y el uso de las otras expresiones para transmitir sus significados "
 "correspondientes."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Under the Berne Convention, which most countries have signed, anything "
 "written down is automatically copyrighted. This includes programs. "
@@ -269,11 +273,11 @@
 "debe tomar algunas medidas legales para renunciar a esos derechos; de lo "
 "contrario el programa quedará sujeto a los derechos de autor."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Copylefted software"
 msgstr "Software con copyleft"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copylefted software is free software whose distribution terms ensure that "
 "all copies of all versions carry more or less the same distribution terms.  "
@@ -293,7 +297,7 @@
 "versiones modificadas contra algunas de las formas más comunes de "
 "convertirlo en software privativo."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Some copyleft licenses, such as GPL version&nbsp;3, block other means of "
 "turning software proprietary, such as <a href=\"/licenses/rms-why-gplv3.html"
@@ -303,7 +307,7 @@
 "de convertir en privativo el software, tales como la <a href=\"/licenses/rms-"
 "why-gplv3.html\"><em>«tivoización»</em></a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the GNU Project, we copyleft almost all the software we write, because "
 "our goal is to give <em>every</em> user the freedoms implied by the term "
@@ -318,7 +322,7 @@
 "donde se explica más detalladamente cómo funciona el copyleft y por qué lo 
"
 "usamos."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copyleft is a general concept; to copyleft an actual program, you need to "
 "use a specific set of distribution terms. There are many possible ways to "
@@ -342,11 +346,11 @@
 "tipo de licencia; por eso es bueno para la comunidad usar una sola licencia "
 "con copyleft."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Noncopylefted free software"
 msgstr "Software libre sin copyleft"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Noncopylefted free software comes from the author with permission to "
 "redistribute and modify, and also to add additional restrictions to it."
@@ -354,7 +358,7 @@
 "Los programas publicados sin copyleft vienen con permiso de redistribución y 
"
 "modificación, como así también con el permiso de agregarle restricciones."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If a program is free but not copylefted, then some copies or modified "
 "versions may not be free at all. A software company can compile the program, "
@@ -367,18 +371,43 @@
 "archivo ejecutable como software <a href=\"#ProprietarySoftware\">privativo</"
 "a>."
 
-#. type: Content of: <p>
-msgid ""
-"The <a href=\"http://www.x.org\";>X Window System</a> illustrates this.  The "
-"X Consortium released X11 with distribution terms that made it noncopylefted "
-"free software, and subsequent developers have mostly followed the same "
-"practice.  A copy which has those distribution terms is free software.  "
-"However, there are nonfree versions as well, and there are (or at least "
-"were) popular workstations and PC graphics boards for which nonfree versions "
-"are the only ones that work.  If you are using this hardware, X11 is not "
-"free software for you.  <a href=\"/philosophy/x.html\">The developers of X11 "
-"even made X11 nonfree</a> for a while; they were able to do this because "
-"others had contributed their code under the same noncopyleft license."
+#. type: Content of: <div><p>
+# | The <a [-href=\"http://www.x.org\";>X-]
+# | {+href=\"https://www.x.org/wiki/\";>X+} Window System</a> illustrates this.
+# |  The X Consortium released X11 with distribution terms that made it
+# | noncopylefted free software, and subsequent developers have mostly
+# | followed the same practice.  A copy which has those distribution terms is
+# | free software.  However, there are nonfree versions as well, and there are
+# | (or at least were) popular workstations and PC graphics boards for which
+# | nonfree versions are the only ones that work.  If you are using this
+# | hardware, X11 is not free software for you.  <a
+# | href=\"/philosophy/x.html\">The developers of X11 even made X11
+# | nonfree</a> for a while; they were able to do this because others had
+# | contributed their code under the same noncopyleft license.
+#, fuzzy
+#| msgid ""
+#| "The <a href=\"http://www.x.org\";>X Window System</a> illustrates this.  "
+#| "The X Consortium released X11 with distribution terms that made it "
+#| "noncopylefted free software, and subsequent developers have mostly "
+#| "followed the same practice.  A copy which has those distribution terms is "
+#| "free software.  However, there are nonfree versions as well, and there "
+#| "are (or at least were) popular workstations and PC graphics boards for "
+#| "which nonfree versions are the only ones that work.  If you are using "
+#| "this hardware, X11 is not free software for you.  <a href=\"/philosophy/x."
+#| "html\">The developers of X11 even made X11 nonfree</a> for a while; they "
+#| "were able to do this because others had contributed their code under the "
+#| "same noncopyleft license."
+msgid ""
+"The <a href=\"https://www.x.org/wiki/\";>X Window System</a> illustrates "
+"this.  The X Consortium released X11 with distribution terms that made it "
+"noncopylefted free software, and subsequent developers have mostly followed "
+"the same practice.  A copy which has those distribution terms is free "
+"software.  However, there are nonfree versions as well, and there are (or at "
+"least were) popular workstations and PC graphics boards for which nonfree "
+"versions are the only ones that work.  If you are using this hardware, X11 "
+"is not free software for you.  <a href=\"/philosophy/x.html\">The developers "
+"of X11 even made X11 nonfree</a> for a while; they were able to do this "
+"because others had contributed their code under the same noncopyleft license."
 msgstr ""
 "El <a href=\"http://www.x.org\";>sistema X Window</a> es un ejemplo de ello. "
 "Los términos de distribución que usó el <cite>X Consortium</cite> para "
@@ -394,11 +423,11 @@
 "porque otros programadores habían aportado código bajo la misma licencia 
sin "
 "copyleft."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Lax permissive licensed software"
 msgstr "Software con licencia permisiva, laxa"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Lax permissive licenses include the X11 license and the <a href=\"/licenses/"
 "bsd.html\">two BSD licenses</a>.  These licenses permit almost any use of "
@@ -410,11 +439,11 @@
 "utilizar el código de cualquier manera, inclusive la distribución de "
 "binarios privativos con o sin modificaciones del código."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GPL-covered software"
 msgstr "Software con licencia GPL"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/licenses/gpl.html\">GNU GPL (General Public License)</a> is "
 "one specific set of distribution terms for copylefting a program. The GNU "
@@ -425,18 +454,18 @@
 "cláusulas de distribución para publicar programas con copyleft. El Proyecto 
"
 "GNU la usa para la mayoría de los programas que distribuye."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To equate free software with GPL-covered software is therefore an error."
 msgstr ""
 "Equiparar el software libre con software cubierto por la licencia GPL es por "
 "lo tanto un error."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "The GNU operating system"
 msgstr "El sistema operativo GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/gnu/gnu-history.html\">GNU operating system</a> is the Unix-"
 "like operating system, which is entirely free software, that we in the GNU "
@@ -446,7 +475,7 @@
 "completamente libre de tipo Unix, que el Proyecto GNU comenzó a desarrollar "
 "en 1984."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A Unix-like operating system consists of many programs. The GNU system "
 "includes all of the <a href=\"#GNUsoftware\">official GNU packages</a>.  It "
@@ -458,7 +487,7 @@
 "GNU</a>. También incluye muchos otros paquetes, como el sistema X Window y "
 "TeX, que non son software de GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The first test release of the complete GNU system was in 1996.  This "
 "includes the GNU Hurd, our kernel, developed since 1990.  In 2001 the GNU "
@@ -483,7 +512,7 @@
 "distribuidores pueden seleccionar diversos paquetes según sus necesidades e "
 "intereses. El resultado es una variante del sistema GNU. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Since the purpose of GNU is to be free, every single component in the GNU "
 "operating system is free software.  They don't all have to be copylefted, "
@@ -495,11 +524,11 @@
 "que tener copyleft, cualquier tipo de software libre se puede incluir "
 "legalmente siempre que ayude a alcanzar los objetivos técnicos. "
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GNU programs"
 msgstr "Programas de GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;GNU programs&rdquo; is equivalent to <a href=\"#GNUsoftware\">GNU "
 "software.</a> A program Foo is a GNU program if it is GNU software.  We also "
@@ -509,14 +538,29 @@
 "\">software GNU</a>. Un programa Foo es un programa de GNU si es software "
 "GNU. A veces también decimos que es un «paquete de GNU»."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GNU software"
 msgstr "Software GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | <a href=\"/software/software.html\">GNU software</a> is software that is
+# | released under the auspices of the <a href=[-
+# | -]\"/gnu/gnu-history.html\">GNU Project</a>. If a program is GNU software,
+# | we also say that it is a GNU program or a GNU package.  The README or
+# | manual of a GNU package should say it is one; also, the <a
+# | href=\"/directory\">Free Software Directory</a> identifies all GNU
+# | packages.
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/software/software.html\">GNU software</a> is software that is "
+#| "released under the auspices of the <a href= \"/gnu/gnu-history.html\">GNU "
+#| "Project</a>. If a program is GNU software, we also say that it is a GNU "
+#| "program or a GNU package.  The README or manual of a GNU package should "
+#| "say it is one; also, the <a href=\"/directory\">Free Software Directory</"
+#| "a> identifies all GNU packages."
 msgid ""
 "<a href=\"/software/software.html\">GNU software</a> is software that is "
-"released under the auspices of the <a href= \"/gnu/gnu-history.html\">GNU "
+"released under the auspices of the <a href=\"/gnu/gnu-history.html\">GNU "
 "Project</a>. If a program is GNU software, we also say that it is a GNU "
 "program or a GNU package.  The README or manual of a GNU package should say "
 "it is one; also, the <a href=\"/directory\">Free Software Directory</a> "
@@ -530,7 +574,7 @@
 "\">Directorio de Software Libre</a> están identificados todos los paquetes "
 "de GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Most GNU software is <a href= \"/licenses/copyleft.html\">copylefted</a>, "
 "but not all; however, all GNU software must be <a href=\"/philosophy/free-sw."
@@ -540,10 +584,28 @@
 "\">copyleft</a>, pero no todo; no obstante, todo el software GNU debe ser <a "
 "href=\"/philosophy/free-sw.html\">software libre</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Some GNU software was written by <a [-href=
+# | \"http://www.fsf.org/about/staff/\";>staff</a>-]
+# | {+href=\"https://www.fsf.org/about/staff/\";>staff</a>+} of the <a
+# | href=\"http{+s+}://www.fsf.org/\">Free Software Foundation</a>, but most
+# | GNU software comes from many <a
+# | href=\"/people/people.html\">volunteers</a>.  (Some of these volunteers
+# | are paid by companies or universities, but they are volunteers for us.) 
+# | Some contributed software is copyrighted by the Free Software Foundation;
+# | some is copyrighted by the contributors who wrote it.
+#, fuzzy
+#| msgid ""
+#| "Some GNU software was written by <a href= \"http://www.fsf.org/about/";
+#| "staff/\">staff</a> of the <a href=\"http://www.fsf.org/\";>Free Software "
+#| "Foundation</a>, but most GNU software comes from many <a href=\"/people/"
+#| "people.html\">volunteers</a>.  (Some of these volunteers are paid by "
+#| "companies or universities, but they are volunteers for us.)  Some "
+#| "contributed software is copyrighted by the Free Software Foundation; some "
+#| "is copyrighted by the contributors who wrote it."
 msgid ""
-"Some GNU software was written by <a href= \"http://www.fsf.org/about/staff/";
-"\">staff</a> of the <a href=\"http://www.fsf.org/\";>Free Software "
+"Some GNU software was written by <a href=\"https://www.fsf.org/about/staff/";
+"\">staff</a> of the <a href=\"https://www.fsf.org/\";>Free Software "
 "Foundation</a>, but most GNU software comes from many <a href=\"/people/"
 "people.html\">volunteers</a>.  (Some of these volunteers are paid by "
 "companies or universities, but they are volunteers for us.)  Some "
@@ -558,11 +620,11 @@
 "Free Software Foundation es titular del copyright de parte de ese software, "
 "otra parte está bajo el copyright de sus autores."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "FSF-copyrighted GNU software"
 msgstr "Software GNU bajo copyright de la FSF"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The developers of GNU packages can transfer the copyright to the FSF, or "
 "they can keep it.  The choice is theirs."
@@ -570,7 +632,7 @@
 "Los desarrolladores de paquetes de GNU pueden transferir los derechos de "
 "autor a la FSF, o pueden quedárselos. La elección es suya."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If they have transferred the copyright to the FSF, the program is FSF-"
 "copyrighted GNU software, and the FSF can enforce its license.  If they have "
@@ -581,7 +643,7 @@
 "cumplir la licencia del programa. Si han conservado los derechos de autor, "
 "hacer cumplir la licencia es su responsabilidad."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The FSF does not accept copyright assignments of software that is not an "
 "official GNU package, as a rule."
@@ -589,11 +651,11 @@
 "Como regla, la FSF no acepta asignaciones de copyright para software que no "
 "sea un paquete oficial de GNU."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Nonfree software"
 msgstr "Software que no es libre"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Nonfree software is any software that is not free.  Its use, redistribution "
 "or modification is prohibited, or requires you to ask for permission, or is "
@@ -604,11 +666,11 @@
 "modificación, o requiere que se solicite permiso, o tiene tantas "
 "restricciones que de hecho no se puede hacer libremente."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Proprietary software"
 msgstr "Software Privativo"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Proprietary software is another name for nonfree software.  In the past we "
 "subdivided nonfree software into &ldquo;semifree software&rdquo;, which "
@@ -624,7 +686,7 @@
 "redistribuido. Pero hemos abandonado esta distinción y ahora utilizamos el "
 "término «software privativo» como sinónimo de software que no es libre."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The Free Software Foundation follows the rule that we cannot install any "
 "proprietary program on our computers except temporarily for the specific "
@@ -637,7 +699,7 @@
 "específico de escribir un reemplazo libre para ese mismo programa. Aparte de 
"
 "eso, creemos que no hay excusa posible para instalar un programa privativo."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For example, we felt justified in installing Unix on our computer in the "
 "1980s, because we were using it to write a free replacement for Unix. "
@@ -652,7 +714,7 @@
 "libre, y en todo nuevo ordenador que instalamos debe ejecutarse únicamente "
 "un sistema operativo completamente libre."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We don't insist that users of GNU, or contributors to GNU, have to live by "
 "this rule. It is a rule we made for ourselves. But we hope you will follow "
@@ -662,11 +724,11 @@
 "GNU cumplan esta regla. Es una regla que hicimos para nosotros mismos. Pero "
 "esperamos que usted también la adopte, por el bien de su libertad."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Freeware"
 msgstr "<cite>Freeware</cite>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;freeware&rdquo; has no clear accepted definition, but it is "
 "commonly used for packages which permit redistribution but not modification "
@@ -681,11 +743,11 @@
 "lo tanto instamos a no usar el término «freeware» para referirse al 
software "
 "libre."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Shareware"
 msgstr "<cite>Shareware</cite>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Shareware is software which comes with permission for people to redistribute "
 "copies, but says that anyone who continues to use a copy is <em>required</"
@@ -695,7 +757,7 @@
 "redistribuir copias, pero quien continúa a utilizar una copia <strong>debe</"
 "strong> pagar para obtener la licencia."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Shareware is not free software, or even semifree. There are two reasons it "
 "is not:"
@@ -703,7 +765,7 @@
 "El software <cite>shareware</cite> no es software libre, ni siquiera "
 "semilibre, por dos razones:"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "For most shareware, source code is not available; thus, you cannot modify "
 "the program at all."
@@ -711,7 +773,7 @@
 "Para la mayoría de los programas <cite>shareware</cite>, el código fuente 
no "
 "está disponible, por lo tanto no se pueden modificar."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Shareware does not come with permission to make a copy and install it "
 "without paying a license fee, not even for individuals engaging in nonprofit "
@@ -724,11 +786,11 @@
 "suelen ignorar los términos de distribución y lo hacen de todos modos, "
 "aunque las condiciones no lo permiten."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Private software"
 msgstr "Software privado"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Private or custom software is software developed for one user (typically an "
 "organization or company). That user keeps it and uses it, and does not "
@@ -739,7 +801,7 @@
 "El usuario lo mantiene y utiliza, y no lo publica, ni como código fuente ni "
 "como binarios."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A private program is free software (in a somewhat trivial sense) if its sole "
 "user has the four freedoms.  In particular, if the user has full rights to "
@@ -753,7 +815,7 @@
 "embargo, si el usuario distribuye copias sin otorgar las cuatro libertades "
 "para las mismas, esas copias no son libres."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is a matter of freedom, not access.  In general we do not "
 "believe it is wrong to develop a program and not release it. There are "
@@ -774,7 +836,7 @@
 "desarrollo de software privado o personalizado y los principios del "
 "movimiento del software libre."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Nearly all employment for programmers is in development of custom software; "
 "therefore most programming jobs are, or could be, done in a way compatible "
@@ -785,11 +847,11 @@
 "programación son, o podrían ser, hechos de un modo compatible con el "
 "movimiento del software libre."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Commercial software"
 msgstr "Software comercial"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;Commercial&rdquo; and &ldquo;proprietary&rdquo; are not the same! "
 "Commercial software is software developed by a business as part of its "
@@ -803,7 +865,7 @@
 "\">privativo</a>, pero también existe software libre que es comercial, y "
 "software privativo que no es comercial."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For example, GNU Ada is developed by a company.  It is always distributed "
 "under the terms of the GNU GPL, and every copy is free software; but its "
@@ -820,7 +882,7 @@
 "responden, «GNU Ada <strong>es</strong> un compilador comercial, aunque sea "
 "software libre»."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For the GNU Project, the priorities are in the other order: the important "
 "thing is that GNU Ada is free software; that it is commercial is just a "
@@ -832,7 +894,7 @@
 "embargo, el desarrollo adicional de GNU Ada que resulta de su naturaleza "
 "comercial es definitivamente beneficioso."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please help spread the awareness that free commercial software is possible. "
 "You can do this by making an effort not to say &ldquo;commercial&rdquo; when "
@@ -866,7 +928,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
@@ -874,14 +935,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 "
@@ -893,9 +954,16 @@
 "coordinación y el envío de traducciones de las páginas de este sitio web."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; [-1996, 1997, 1998, 2001, 2006,-] {+1996-1998,
+# | 2001-2005,+} 2007, [-2009, 2010, 2014,-] {+2009-2012,+} 2015, [-2016,
+# | 2017, 2018, 2019-] {+2019, 2021+} Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, "
+#| "2015, 2016, 2017, 2018, 2019 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
-"2016, 2017, 2018, 2019 Free Software Foundation, Inc."
+"Copyright &copy; 1996-1998, 2001-2005, 2007, 2009-2012, 2015, 2019, 2021 "
+"Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
 "2016, 2017, 2018, 2019 Free Software Foundation, Inc."
@@ -921,10 +989,9 @@
 msgid "Updated:"
 msgstr "Última actualización:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
-"2016, 2017, 2018, 2019, 2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
-"2016, 2017, 2018, 2019, 2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, "
+#~ "2015, 2016, 2017, 2018, 2019, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, "
+#~ "2015, 2016, 2017, 2018, 2019, 2021 Free Software Foundation, Inc."

Index: philosophy/po/categories.fr.po
===================================================================
RCS file: /web/www/www/philosophy/po/categories.fr.po,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- philosophy/po/categories.fr.po      21 Jul 2021 20:25:37 -0000      1.89
+++ philosophy/po/categories.fr.po      21 Jul 2021 20:34:05 -0000      1.90
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: categories.html\n"
-"POT-Creation-Date: 2019-02-21 01:56+0000\n"
+"POT-Creation-Date: 2021-07-21 20:25+0000\n"
 "PO-Revision-Date: 2020-12-06 17:35+0100\n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\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-07-21 20:25+0000\n"
 "Plural-Forms: \n"
 "X-Generator: Gtranslator 2.91.5\n"
 
@@ -29,11 +30,14 @@
 "Catégories de logiciels libres et non libres - Projet GNU - Free Software "
 "Foundation"
 
-#. type: Content of: <h2>
-msgid "Categories of free and nonfree software"
+#. type: Content of: <div><h2>
+# | Categories of [-f-]{+F+}ree and [-nonfree software-] {+Nonfree Software+}
+#, fuzzy
+#| msgid "Categories of free and nonfree software"
+msgid "Categories of Free and Nonfree Software"
 msgstr "Catégories de logiciels libres et non libres"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Also see <a href=\"/philosophy/words-to-avoid.html\">Confusing Words which "
 "You Might Want to Avoid</a>."
@@ -41,11 +45,11 @@
 "À lire également : <a href=\"/philosophy/words-to-avoid.html\">Mots à 
éviter "
 "(ou à utiliser avec précaution), car connotés ou prêtant à 
confusion</a>."
 
-#. type: Attribute 'alt' of: <p><img>
+#. type: Attribute 'alt' of: <div><p><img>
 msgid "[Categories of software]"
 msgstr " [Catégories de logiciels]"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This diagram, originally by Chao-Kuei and updated by several others since, "
 "explains the different categories of software. It's available as a <a href="
@@ -62,11 +66,11 @@
 "ou de la Creative Commons attribution, partage dans les mêmes conditions (CC 
"
 "BY-SA), v2.0 ou supérieure."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Free software"
 msgstr "Logiciel libre"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is software that comes with permission for anyone to use, "
 "copy, and/or distribute, either verbatim or with modifications, either "
@@ -83,7 +87,7 @@
 "est une définition simplifiée ; voir aussi la <a 
href=\"/philosophy/free-sw."
 "html\">définition complète</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If a program is free, then it can potentially be included in a free "
 "operating system such as GNU, or free versions of the <a href=\"/gnu/linux-"
@@ -93,7 +97,7 @@
 "système d'exploitation libre, tel que GNU ou les versions libres du <a href="
 "\"/gnu/linux-and-gnu.html\">système GNU/Linux</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There are many different ways to make a program free&mdash;many questions of "
 "detail, which could be decided in more than one way and still make the "
@@ -108,7 +112,7 @@
 "spécifiques dans la <a href=\"/licenses/license-list.html\">liste des "
 "licences</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is a matter of freedom, not price. But proprietary software "
 "companies typically use the term &ldquo;free software&rdquo; to refer to "
@@ -127,7 +131,7 @@
 "Ceci n'a rien à voir avec le « logiciel libre », tel que nous le 
définissons "
 "au projet GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Because of this potential confusion, when a software company says its "
 "product is free software, always check the actual distribution terms to see "
@@ -140,7 +144,7 @@
 "disposent de toutes les libertés associées au logiciel libre. Parfois il "
 "s'agit effectivement d'un logiciel libre, parfois non."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Many languages have two separate words for &ldquo;free&rdquo; as in freedom "
 "and &ldquo;free&rdquo; as in zero price. For example, French has &ldquo;"
@@ -161,7 +165,7 @@
 "Consultez notre liste de <a href=\"/philosophy/fs-translations.html"
 "\">traductions du terme <i>free software</i></a> dans diverses langues."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is often <a href=\"/software/reliability.html\">more reliable</"
 "a> than nonfree software."
@@ -169,11 +173,11 @@
 "Le logiciel libre est souvent <a href=\"/software/reliability.html\">plus "
 "fiable</a> que le logiciel non libre."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Open source software"
 msgstr "Logiciel open source"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;open source&rdquo; software is used by some people to mean "
 "more or less the same category as free software. It is not exactly the same "
@@ -195,7 +199,7 @@
 "critères de l'open source, mais nous ne savons pas si cela s'est déjà "
 "produit."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We prefer the term &ldquo;<a href=\"/philosophy/open-source-misses-the-point."
 "html\">free software</a>&rdquo; because it refers to freedom&mdash;something "
@@ -205,11 +209,11 @@
 "html\">logiciel libre</a> » car il se réfère à la liberté, ce que ne 
fait "
 "pas le terme « open source »."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Public domain software"
 msgstr "Logiciel du domaine public"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Public domain software is software that is not copyrighted. If the source "
 "code is in the public domain, that is a special case of <a href=\"#Non-"
@@ -222,7 +226,7 @@
 "copylefté »</a>, ce qui veut dire que certaines copies, ou certaines "
 "versions modifiées, peuvent ne pas être du tout libres."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In some cases, an executable program can be in the public domain but the "
 "source code is not available. This is not free software, because free "
@@ -239,7 +243,7 @@
 "permission légale de les utiliser en toute liberté en se servant d'une "
 "licence de logiciel libre."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Sometimes people use the term &ldquo;public domain&rdquo; in a loose fashion "
 "to mean <a href=\"#FreeSoftware\">&ldquo;free&rdquo;</a> or &ldquo;available "
@@ -255,7 +259,7 @@
 "Pour plus de clarté, nous conseillons de ne l'employer que dans ce cas et "
 "d'utiliser d'autres termes dans les autres cas."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Under the Berne Convention, which most countries have signed, anything "
 "written down is automatically copyrighted. This includes programs. "
@@ -269,11 +273,11 @@
 "écrit soit dans le domaine public, vous devez faire des démarches 
juridiques "
 "pour renoncer au copyright ; sinon le programme demeure sous copyright."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Copylefted software"
 msgstr "Logiciel « copylefté » (sous « gauche d'auteur »)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copylefted software is free software whose distribution terms ensure that "
 "all copies of all versions carry more or less the same distribution terms.  "
@@ -293,7 +297,7 @@
 "Ceci protège le programme et ses versions modifiées de quelques-uns des "
 "moyens courants de rendre le logiciel privateur."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Some copyleft licenses, such as GPL version&nbsp;3, block other means of "
 "turning software proprietary, such as <a href=\"/licenses/rms-why-gplv3.html"
@@ -304,7 +308,7 @@
 "d'autres moyens de rendre les logiciels privateurs tels que la <a href=\"/"
 "licenses/rms-why-gplv3.html\">tivoïsation</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the GNU Project, we copyleft almost all the software we write, because "
 "our goal is to give <em>every</em> user the freedoms implied by the term "
@@ -319,7 +323,7 @@
 "supplémentaires sur le fonctionnement du copyleft et nos raisons de "
 "l'utiliser."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copyleft is a general concept; to copyleft an actual program, you need to "
 "use a specific set of distribution terms. There are many possible ways to "
@@ -342,11 +346,11 @@
 "l'autre ; donc, il est bon pour la communauté de n'utiliser qu'une seule "
 "licence avec copyleft."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Noncopylefted free software"
 msgstr "Logiciel libre non copylefté"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Noncopylefted free software comes from the author with permission to "
 "redistribute and modify, and also to add additional restrictions to it."
@@ -355,7 +359,7 @@
 "permission de le redistribuer et de le modifier, mais aussi d'y ajouter des "
 "restrictions."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If a program is free but not copylefted, then some copies or modified "
 "versions may not be free at all. A software company can compile the program, "
@@ -368,18 +372,43 @@
 "distribuer le fichier exécutable sous forme de logiciel <a href="
 "\"#ProprietarySoftware\">privateur</a>."
 
-#. type: Content of: <p>
-msgid ""
-"The <a href=\"http://www.x.org\";>X Window System</a> illustrates this.  The "
-"X Consortium released X11 with distribution terms that made it noncopylefted "
-"free software, and subsequent developers have mostly followed the same "
-"practice.  A copy which has those distribution terms is free software.  "
-"However, there are nonfree versions as well, and there are (or at least "
-"were) popular workstations and PC graphics boards for which nonfree versions "
-"are the only ones that work.  If you are using this hardware, X11 is not "
-"free software for you.  <a href=\"/philosophy/x.html\">The developers of X11 "
-"even made X11 nonfree</a> for a while; they were able to do this because "
-"others had contributed their code under the same noncopyleft license."
+#. type: Content of: <div><p>
+# | The <a [-href=\"http://www.x.org\";>X-]
+# | {+href=\"https://www.x.org/wiki/\";>X+} Window System</a> illustrates this.
+# |  The X Consortium released X11 with distribution terms that made it
+# | noncopylefted free software, and subsequent developers have mostly
+# | followed the same practice.  A copy which has those distribution terms is
+# | free software.  However, there are nonfree versions as well, and there are
+# | (or at least were) popular workstations and PC graphics boards for which
+# | nonfree versions are the only ones that work.  If you are using this
+# | hardware, X11 is not free software for you.  <a
+# | href=\"/philosophy/x.html\">The developers of X11 even made X11
+# | nonfree</a> for a while; they were able to do this because others had
+# | contributed their code under the same noncopyleft license.
+#, fuzzy
+#| msgid ""
+#| "The <a href=\"http://www.x.org\";>X Window System</a> illustrates this.  "
+#| "The X Consortium released X11 with distribution terms that made it "
+#| "noncopylefted free software, and subsequent developers have mostly "
+#| "followed the same practice.  A copy which has those distribution terms is "
+#| "free software.  However, there are nonfree versions as well, and there "
+#| "are (or at least were) popular workstations and PC graphics boards for "
+#| "which nonfree versions are the only ones that work.  If you are using "
+#| "this hardware, X11 is not free software for you.  <a href=\"/philosophy/x."
+#| "html\">The developers of X11 even made X11 nonfree</a> for a while; they "
+#| "were able to do this because others had contributed their code under the "
+#| "same noncopyleft license."
+msgid ""
+"The <a href=\"https://www.x.org/wiki/\";>X Window System</a> illustrates "
+"this.  The X Consortium released X11 with distribution terms that made it "
+"noncopylefted free software, and subsequent developers have mostly followed "
+"the same practice.  A copy which has those distribution terms is free "
+"software.  However, there are nonfree versions as well, and there are (or at "
+"least were) popular workstations and PC graphics boards for which nonfree "
+"versions are the only ones that work.  If you are using this hardware, X11 "
+"is not free software for you.  <a href=\"/philosophy/x.html\">The developers "
+"of X11 even made X11 nonfree</a> for a while; they were able to do this "
+"because others had contributed their code under the same noncopyleft license."
 msgstr ""
 "Le <a href=\"http://www.x.org\";>système X Window</a> [en] illustre bien ce "
 "cas. Le Consortium X distribuait X11 avec des conditions de distribution qui "
@@ -394,11 +423,11 @@
 "ils ont pu faire cela car d'autres développeurs avaient apporté leur code "
 "sous la même licence sans copyleft."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Lax permissive licensed software"
 msgstr "Logiciel sous licence permissive (voire laxiste)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Lax permissive licenses include the X11 license and the <a href=\"/licenses/"
 "bsd.html\">two BSD licenses</a>.  These licenses permit almost any use of "
@@ -410,11 +439,11 @@
 "permettent presque n'importe quel usage du code, y compris de distribuer des "
 "versions binaires privatrices avec ou sans changement du code source."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GPL-covered software"
 msgstr "Logiciel couvert par la GPL"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/licenses/gpl.html\">GNU GPL (General Public License)</a> is "
 "one specific set of distribution terms for copylefting a program. The GNU "
@@ -424,18 +453,18 @@
 "clauses de distribution pour placer un programme sous copyleft. Le projet "
 "GNU l'utilise pour distribuer la plupart des logiciels GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To equate free software with GPL-covered software is therefore an error."
 msgstr ""
 "Faire l'équivalence entre un logiciel libre et un logiciel couvert par la "
 "GPL est donc une erreur."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "The GNU operating system"
 msgstr "Le système d'exploitation GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/gnu/gnu-history.html\">GNU operating system</a> is the Unix-"
 "like operating system, which is entirely free software, that we in the GNU "
@@ -445,7 +474,7 @@
 "système d'exploitation de type Unix qui est entièrement libre et que nous "
 "développons au sein du projet GNU depuis 1984."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A Unix-like operating system consists of many programs. The GNU system "
 "includes all of the <a href=\"#GNUsoftware\">official GNU packages</a>.  It "
@@ -457,7 +486,7 @@
 "officiels</a>, ainsi que bien d'autres paquets tels que le système X Window "
 "et TeX, qui ne sont pas des logiciels GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The first test release of the complete GNU system was in 1996.  This "
 "includes the GNU Hurd, our kernel, developed since 1990.  In 2001 the GNU "
@@ -482,7 +511,7 @@
 "peuvent choisir différents paquets selon leurs besoins et leurs souhaits. "
 "Dans tous les cas, le résultat est une variante du système GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Since the purpose of GNU is to be free, every single component in the GNU "
 "operating system is free software.  They don't all have to be copylefted, "
@@ -494,11 +523,11 @@
 "tous copyleftés ; n'importe quel type de logiciel libre a le droit d'y "
 "figurer s'il aide à remplir des objectifs techniques."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GNU programs"
 msgstr "Programmes GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;GNU programs&rdquo; is equivalent to <a href=\"#GNUsoftware\">GNU "
 "software.</a> A program Foo is a GNU program if it is GNU software.  We also "
@@ -508,14 +537,29 @@
 "Un programme Toto est un programme GNU si c'est un logiciel GNU. Nous "
 "l'appelons aussi parfois « paquet GNU »."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GNU software"
 msgstr "Logiciel GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | <a href=\"/software/software.html\">GNU software</a> is software that is
+# | released under the auspices of the <a href=[-
+# | -]\"/gnu/gnu-history.html\">GNU Project</a>. If a program is GNU software,
+# | we also say that it is a GNU program or a GNU package.  The README or
+# | manual of a GNU package should say it is one; also, the <a
+# | href=\"/directory\">Free Software Directory</a> identifies all GNU
+# | packages.
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/software/software.html\">GNU software</a> is software that is "
+#| "released under the auspices of the <a href= \"/gnu/gnu-history.html\">GNU "
+#| "Project</a>. If a program is GNU software, we also say that it is a GNU "
+#| "program or a GNU package.  The README or manual of a GNU package should "
+#| "say it is one; also, the <a href=\"/directory\">Free Software Directory</"
+#| "a> identifies all GNU packages."
 msgid ""
 "<a href=\"/software/software.html\">GNU software</a> is software that is "
-"released under the auspices of the <a href= \"/gnu/gnu-history.html\">GNU "
+"released under the auspices of the <a href=\"/gnu/gnu-history.html\">GNU "
 "Project</a>. If a program is GNU software, we also say that it is a GNU "
 "program or a GNU package.  The README or manual of a GNU package should say "
 "it is one; also, the <a href=\"/directory\">Free Software Directory</a> "
@@ -528,7 +572,7 @@
 "le spécifier. Par ailleurs, le <a href=\"/directory\">répertoire du 
logiciel "
 "libre</a> [en] identifie tous les paquets GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Most GNU software is <a href= \"/licenses/copyleft.html\">copylefted</a>, "
 "but not all; however, all GNU software must be <a href=\"/philosophy/free-sw."
@@ -538,10 +582,28 @@
 "html\">copyleft</a>, mais pas tous ; cependant, tous les logiciels GNU "
 "doivent être des <a href=\"/philosophy/free-sw.html\">logiciels libres</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Some GNU software was written by <a [-href=
+# | \"http://www.fsf.org/about/staff/\";>staff</a>-]
+# | {+href=\"https://www.fsf.org/about/staff/\";>staff</a>+} of the <a
+# | href=\"http{+s+}://www.fsf.org/\">Free Software Foundation</a>, but most
+# | GNU software comes from many <a
+# | href=\"/people/people.html\">volunteers</a>.  (Some of these volunteers
+# | are paid by companies or universities, but they are volunteers for us.) 
+# | Some contributed software is copyrighted by the Free Software Foundation;
+# | some is copyrighted by the contributors who wrote it.
+#, fuzzy
+#| msgid ""
+#| "Some GNU software was written by <a href= \"http://www.fsf.org/about/";
+#| "staff/\">staff</a> of the <a href=\"http://www.fsf.org/\";>Free Software "
+#| "Foundation</a>, but most GNU software comes from many <a href=\"/people/"
+#| "people.html\">volunteers</a>.  (Some of these volunteers are paid by "
+#| "companies or universities, but they are volunteers for us.)  Some "
+#| "contributed software is copyrighted by the Free Software Foundation; some "
+#| "is copyrighted by the contributors who wrote it."
 msgid ""
-"Some GNU software was written by <a href= \"http://www.fsf.org/about/staff/";
-"\">staff</a> of the <a href=\"http://www.fsf.org/\";>Free Software "
+"Some GNU software was written by <a href=\"https://www.fsf.org/about/staff/";
+"\">staff</a> of the <a href=\"https://www.fsf.org/\";>Free Software "
 "Foundation</a>, but most GNU software comes from many <a href=\"/people/"
 "people.html\">volunteers</a>.  (Some of these volunteers are paid by "
 "companies or universities, but they are volunteers for us.)  Some "
@@ -556,11 +618,11 @@
 "bénévoles). Certaines contributions sont sous copyright de la <i>Free "
 "Software Foundation</i>, d'autres sous copyright de leurs auteurs."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "FSF-copyrighted GNU software"
 msgstr "Logiciel GNU sous copyright de la FSF"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The developers of GNU packages can transfer the copyright to the FSF, or "
 "they can keep it.  The choice is theirs."
@@ -568,7 +630,7 @@
 "Les développeurs de paquets GNU peuvent en transférer le copyright à la 
FSF, "
 "ou bien le garder. C'est leur choix."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If they have transferred the copyright to the FSF, the program is FSF-"
 "copyrighted GNU software, and the FSF can enforce its license.  If they have "
@@ -579,7 +641,7 @@
 "S'ils ont gardé le copyright, faire appliquer la licence est de leur "
 "responsabilité."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The FSF does not accept copyright assignments of software that is not an "
 "official GNU package, as a rule."
@@ -587,11 +649,11 @@
 "En règle générale, la FSF n'accepte pas les cessions de copyright sur des "
 "logiciels qui ne sont pas des paquets officiels GNU."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Nonfree software"
 msgstr "Logiciel non libre"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Nonfree software is any software that is not free.  Its use, redistribution "
 "or modification is prohibited, or requires you to ask for permission, or is "
@@ -602,11 +664,11 @@
 "exigent une autorisation spécifique, ou sont tellement restreintes qu'en "
 "pratique vous ne pouvez pas le faire librement."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Proprietary software"
 msgstr "Logiciel privateur"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Proprietary software is another name for nonfree software.  In the past we "
 "subdivided nonfree software into &ldquo;semifree software&rdquo;, which "
@@ -623,7 +685,7 @@
 "maintenant les termes « logiciel privateur » et « logiciel non libre 
» "
 "indifféremment."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The Free Software Foundation follows the rule that we cannot install any "
 "proprietary program on our computers except temporarily for the specific "
@@ -637,7 +699,7 @@
 "logiciel. Exception faite de ce cas, nous pensons qu'il n'existe aucune "
 "excuse à l'installation d'un programme privateur."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For example, we felt justified in installing Unix on our computer in the "
 "1980s, because we were using it to write a free replacement for Unix. "
@@ -653,7 +715,7 @@
 "ordinateur que nous installons doit fonctionner avec un système "
 "d'exploitation complètement libre."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We don't insist that users of GNU, or contributors to GNU, have to live by "
 "this rule. It is a rule we made for ourselves. But we hope you will follow "
@@ -664,11 +726,11 @@
 "Mais nous espérons que vous déciderez de la suivre également, pour votre "
 "liberté."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Freeware"
 msgstr "Graticiel (ou freeware)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;freeware&rdquo; has no clear accepted definition, but it is "
 "commonly used for packages which permit redistribution but not modification "
@@ -683,11 +745,11 @@
 "vous plaît, les termes « graticiel » ou « freeware » pour parler de 
logiciel "
 "libre."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Shareware"
 msgstr "Partagiciel (ou shareware)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Shareware is software which comes with permission for people to redistribute "
 "copies, but says that anyone who continues to use a copy is <em>required</"
@@ -697,7 +759,7 @@
 "redistribuer des copies, mais mentionne que toute personne qui continue à en 
"
 "utiliser une copie est <em>obligée</em> de payer des royalties."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Shareware is not free software, or even semifree. There are two reasons it "
 "is not:"
@@ -705,7 +767,7 @@
 "Un partagiciel (ou shareware) n'est pas un logiciel libre, ni même semi-"
 "libre, et ceci pour deux raisons :"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "For most shareware, source code is not available; thus, you cannot modify "
 "the program at all."
@@ -713,7 +775,7 @@
 "dans la plupart des cas, le code source n'est pas disponible, et donc on ne "
 "peut pas du tout modifier le programme ;"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Shareware does not come with permission to make a copy and install it "
 "without paying a license fee, not even for individuals engaging in nonprofit "
@@ -725,11 +787,11 @@
 "lucratives (en pratique, les gens ne tiennent souvent pas compte des clauses "
 "de distribution et le font de toute façon, bien que ce ne soit pas permis)."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Private software"
 msgstr "Logiciel privé"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Private or custom software is software developed for one user (typically an "
 "organization or company). That user keeps it and uses it, and does not "
@@ -739,7 +801,7 @@
 "(typiquement pour une organisation ou une société). Cet utilisateur le 
garde "
 "et ne publie ni les fichiers sources ni les fichiers binaires."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A private program is free software (in a somewhat trivial sense) if its sole "
 "user has the four freedoms.  In particular, if the user has full rights to "
@@ -753,7 +815,7 @@
 "si l'utilisateur distribue des copies aux autres et ne leur donne pas les "
 "quatre libertés avec ces copies, ces copies ne sont pas du logiciel libre."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is a matter of freedom, not access.  In general we do not "
 "believe it is wrong to develop a program and not release it. There are "
@@ -774,7 +836,7 @@
 "logiciel pour un usage privé ou personnalisé et les principes du mouvement "
 "du logiciel libre."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Nearly all employment for programmers is in development of custom software; "
 "therefore most programming jobs are, or could be, done in a way compatible "
@@ -785,11 +847,11 @@
 "programmation sont, ou pourraient être effectués d'une manière compatible "
 "avec le mouvement du logiciel libre."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Commercial software"
 msgstr "Logiciel commercial"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;Commercial&rdquo; and &ldquo;proprietary&rdquo; are not the same! "
 "Commercial software is software developed by a business as part of its "
@@ -803,7 +865,7 @@
 "\">privateurs</a>, mais il y a des logiciels libres commerciaux, et il y a "
 "des logiciels non commerciaux non libres."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For example, GNU Ada is developed by a company.  It is always distributed "
 "under the terms of the GNU GPL, and every copy is free software; but its "
@@ -820,7 +882,7 @@
 "représentant répond : « GNU Ada <em>est</em> un compilateur commercial 
; il "
 "se trouve que c'est un logiciel libre. »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For the GNU Project, the priorities are in the other order: the important "
 "thing is that GNU Ada is free software; that it is commercial is just a "
@@ -832,7 +894,7 @@
 "détail. Cependant, le développement supplémentaire de GNU Ada qui résulte 
de "
 "ce commerce est certainement bénéfique."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please help spread the awareness that free commercial software is possible. "
 "You can do this by making an effort not to say &ldquo;commercial&rdquo; when "
@@ -879,14 +941,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="
@@ -897,9 +959,16 @@
 "traduction</a> les infos nécessaires."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; [-1996, 1997, 1998, 2001, 2006,-] {+1996-1998,
+# | 2001-2005,+} 2007, [-2009, 2010, 2014,-] {+2009-2012,+} 2015, [-2016,
+# | 2017, 2018, 2019-] {+2019, 2021+} Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, "
+#| "2015, 2016, 2017, 2018, 2019 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
-"2016, 2017, 2018, 2019 Free Software Foundation, Inc."
+"Copyright &copy; 1996-1998, 2001-2005, 2007, 2009-2012, 2015, 2019, 2021 "
+"Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
 "2016, 2017, 2018, 2019 Free Software Foundation, Inc."
@@ -928,10 +997,9 @@
 msgid "Updated:"
 msgstr "Dernière mise à jour :"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
-"2016, 2017, 2018, 2019, 2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
-"2016, 2017, 2018, 2019, 2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, "
+#~ "2015, 2016, 2017, 2018, 2019, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, "
+#~ "2015, 2016, 2017, 2018, 2019, 2021 Free Software Foundation, Inc."

Index: philosophy/po/categories.id.po
===================================================================
RCS file: /web/www/www/philosophy/po/categories.id.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- philosophy/po/categories.id.po      8 Dec 2020 17:31:10 -0000       1.7
+++ philosophy/po/categories.id.po      21 Jul 2021 20:34:05 -0000      1.8
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: philosophy/categories.html\n"
-"POT-Creation-Date: 2019-02-21 01:56+0000\n"
+"POT-Creation-Date: 2021-07-21 20:25+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: web-translators <web-translators@gnu.org>\n"
@@ -28,11 +28,14 @@
 "Kategori Perangkat Lunak Bebas dan Tidak Bebas - Proyek GNU - Free Software "
 "Foundation"
 
-#. type: Content of: <h2>
-msgid "Categories of free and nonfree software"
+#. type: Content of: <div><h2>
+# | Categories of [-f-]{+F+}ree and [-nonfree software-] {+Nonfree Software+}
+#, fuzzy
+#| msgid "Categories of free and nonfree software"
+msgid "Categories of Free and Nonfree Software"
 msgstr "Kategori Perangkat Lunak Bebas dan Tidak Bebas"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Also see <a href=\"/philosophy/words-to-avoid.html\">Confusing Words which "
 "You Might Want to Avoid</a>."
@@ -40,11 +43,11 @@
 "Lihat juga  <a href=\"/philosophy/words-to-avoid.html\">kata-kata "
 "membingungkan yang mungkin ingin anda hindari</a>."
 
-#. type: Attribute 'alt' of: <p><img>
+#. type: Attribute 'alt' of: <div><p><img>
 msgid "[Categories of software]"
 msgstr "[Kategori Perangkat Lunak]"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | This [-diagram-] {+diagram, originally+} by Chao-Kuei {+and updated by
 # | several others since,+} explains the different categories of software.
 # | It's available as a <a href=\"/philosophy/category.svg\">Scalable Vector
@@ -70,11 +73,11 @@
 "a> (<cite>Scalable Vector Graphic</cite>), dan sebagai <a href=\"/philosophy/"
 "category.fig\">berkas XFig</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Free software"
 msgstr "Perangkat Lunak Bebas"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Free software is software that comes with permission for anyone to use,
 # | copy, [-and-] {+and/or+} distribute, either verbatim or with
 # | modifications, either gratis or for a fee. In particular, this means that
@@ -105,7 +108,7 @@
 "definisi sederhananya; lihat juga <a href=\"/philosophy/free-sw.html"
 "\">definisi lengkapnya</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If a program is free, then it can potentially be included in a free "
 "operating system such as GNU, or free versions of the <a href=\"/gnu/linux-"
@@ -115,7 +118,7 @@
 "bebas seperti GNU, atau versi bebas dari <a href=\"/gnu/linux-and-gnu.html"
 "\">sistem GNU/Linux</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | There are many different ways to make a program free&mdash;many questions
 # | of detail, which could be decided in more than one way and still make the
 # | program free. Some of the possible variations are described below. {+For
@@ -138,7 +141,7 @@
 "menjadikan program tersebut bebas. Beberapa kemungkinan variasi akan "
 "dijelaskan di bawah ini."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Free software is a matter of freedom, not price. But proprietary software
 # | companies [-sometimes-] {+typically+} use the term &ldquo;free
 # | software&rdquo; to refer to price. Sometimes they mean that you can obtain
@@ -170,7 +173,7 @@
 "tidak ada hubungannya sama sekali dengan apa yang kami maksud dengan "
 "perangkat lunak bebas pada proyek GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Because of this potential confusion, when a software company says its "
 "product is free software, always check the actual distribution terms to see "
@@ -183,7 +186,7 @@
 "yang dimaksudkan oleh istilah perangkat lunak bebas. Terkadang memang benar-"
 "benar perangkat lunak bebas; namun terkadang tidak."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Many languages have two separate words for &ldquo;free&rdquo; as in
 # | freedom and &ldquo;free&rdquo; as in zero price. For example, French has
 # | &ldquo;libre&rdquo; and &ldquo;gratuit&rdquo;.  [-English has-] {+Not so
@@ -227,7 +230,7 @@
 "juga memiliki daftar <a href=\"/philosophy/fs-translations.html\">terjemahan "
 "istilah “perangkat lunak bebas”</a> dalam berbagai bahasa lain."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is often <a href=\"/software/reliability.html\">more reliable</"
 "a> than nonfree software."
@@ -235,11 +238,11 @@
 "Perangkat lunak bebas seringkali <a href=\"/software/reliability.html"
 "\">lebih handal</a> daripada perangkat lunak tidak bebas."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Open source software"
 msgstr "Perangkat Lunak <em>Open Source</em>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | The term [-“open source”-] {+&ldquo;open source&rdquo;+} software is 
used
 # | by some people to mean more or less the same [-thing-] {+category+} as
 # | free software.  [-We prefer-] {+It is not exactly+} the [-term “<a
@@ -272,18 +275,18 @@
 "untuk menggunakan istilah “<a href=\"/philosophy/open-source-misses-the-"
 "point.html\">perangkat lunak bebas</a>”; ikuti link untuk melihat 
alasannya."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We prefer the term &ldquo;<a href=\"/philosophy/open-source-misses-the-point."
 "html\">free software</a>&rdquo; because it refers to freedom&mdash;something "
 "that the term &ldquo;open source&ldquo; does not do."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Public domain software"
 msgstr "Perangkat Lunak <em>Public domain</em>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Public domain software is software that is not copyrighted.  [-It-] {+If
 # | the source code is in the public domain, that+} is a special case of <a
 # | href=\"#Non-CopyleftedFreeSoftware\">noncopylefted free software</a>,
@@ -306,7 +309,7 @@
 "beberapa salinan atau versi yang telah dimodifikasi bisa jadi tidak bebas "
 "sama sekali."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In some cases, an executable program can be in the public domain but the "
 "source code is not available. This is not free software, because free "
@@ -316,7 +319,7 @@
 "using a free software license."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Sometimes people use the term &ldquo;public domain&rdquo; in a loose fashion "
 "to mean <a href=\"#FreeSoftware\">&ldquo;free&rdquo;</a> or &ldquo;available "
@@ -332,7 +335,7 @@
 "menggunakan istilah “<em>public domain</em>” dalam arti tersebut, serta "
 "menggunakan istilah lain untuk mengartikan pengertian yang lain."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Under the Berne Convention, which most countries have signed, anything "
 "written down is automatically copyrighted. This includes programs. "
@@ -341,11 +344,11 @@
 "otherwise, the program is copyrighted."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Copylefted software"
 msgstr "Perangkat Lunak <em>Copylefted</em>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Copylefted software is free software whose distribution terms [-do not let
 # | redistributors add any additional restrictions when they redistribute-]
 # | {+ensure that all copies of all versions carry more+} or [-modify-]
@@ -378,14 +381,14 @@
 "tersebut. Artinya, setiap salinan dari perangkat lunak, walaupun telah "
 "dimodifikasi, haruslah merupakan perangkat lunak bebas."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Some copyleft licenses, such as GPL version&nbsp;3, block other means of "
 "turning software proprietary, such as <a href=\"/licenses/rms-why-gplv3.html"
 "\">tivoization</a>."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | In the GNU Project, we copyleft almost all the software we write, because
 # | our goal is to give <em>every</em> user the freedoms implied by the term
 # | &ldquo;free software.&rdquo; See {+our+} <a
@@ -413,7 +416,7 @@
 "\"><em>Copyleft</em></a> untuk penjelasan lebih jauh mengenai bagaimana cara "
 "kerjanya <em>copyleft</em> dan bagaimana kita menggunakannya."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Copyleft is a general concept; to [-actually-] copyleft [-a-] {+an
 # | actual+} program, you need to use a specific set of distribution terms.
 # | There are many possible ways to write copyleft distribution [-terms.-]
@@ -445,11 +448,11 @@
 "tertentu. Terdapat berbagai cara untuk menulis perjanjian distribusi program "
 "<em>copyleft</em>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Noncopylefted free software"
 msgstr "Perangkat Lunak Bebas <em>Non-copylefted</em>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Noncopylefted free software comes from the author with permission to "
 "redistribute and modify, and also to add additional restrictions to it."
@@ -458,7 +461,7 @@
 "mengizinkan kita untuk mendistribusikan dan memodifikasi, dan untuk "
 "menambahkan batasan-batasan tambahan dalamnya."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If a program is free but not copylefted, then some copies or modified "
 "versions may not be free at all. A software company can compile the program, "
@@ -471,8 +474,9 @@
 "modifikasi, dan mendistribusikan file tereksekusi sebagai produk perangkat "
 "lunak yang <a href=\"#ProprietarySoftware\">berpemilik</a>."
 
-#. type: Content of: <p>
-# | The <a href=\"http://www.x.org\";>X Window System</a> illustrates this. 
+#. type: Content of: <div><p>
+# | The <a [-href=\"http://www.x.org\";>X-]
+# | {+href=\"https://www.x.org/wiki/\";>X+} Window System</a> illustrates this.
 # | The X Consortium release[-s-]{+d+} X11 with distribution terms that
 # | ma[-k-]{+d+}e it non[---]copylefted free [-software.  If you wish, you can
 # | get a-] {+software, and subsequent developers have mostly followed the
@@ -494,16 +498,16 @@
 #| "boards for which non-free versions are the only ones that work.  If you "
 #| "are using this hardware, X11 is not free software for you."
 msgid ""
-"The <a href=\"http://www.x.org\";>X Window System</a> illustrates this.  The "
-"X Consortium released X11 with distribution terms that made it noncopylefted "
-"free software, and subsequent developers have mostly followed the same "
-"practice.  A copy which has those distribution terms is free software.  "
-"However, there are nonfree versions as well, and there are (or at least "
-"were) popular workstations and PC graphics boards for which nonfree versions "
-"are the only ones that work.  If you are using this hardware, X11 is not "
-"free software for you.  <a href=\"/philosophy/x.html\">The developers of X11 "
-"even made X11 nonfree</a> for a while; they were able to do this because "
-"others had contributed their code under the same noncopyleft license."
+"The <a href=\"https://www.x.org/wiki/\";>X Window System</a> illustrates "
+"this.  The X Consortium released X11 with distribution terms that made it "
+"noncopylefted free software, and subsequent developers have mostly followed "
+"the same practice.  A copy which has those distribution terms is free "
+"software.  However, there are nonfree versions as well, and there are (or at "
+"least were) popular workstations and PC graphics boards for which nonfree "
+"versions are the only ones that work.  If you are using this hardware, X11 "
+"is not free software for you.  <a href=\"/philosophy/x.html\">The developers "
+"of X11 even made X11 nonfree</a> for a while; they were able to do this "
+"because others had contributed their code under the same noncopyleft license."
 msgstr ""
 "<a href=\"http://www.x.org\";><em>Sistem X Window</em></a> menggambarkan hal "
 "ini. Konsorsium X mengeluarkan X11 dengan ketentuan distribusi yang "
@@ -515,11 +519,11 @@
 "menggunakan perangkat keras tersebut, X11 bukanlah perangkat lunak bebas "
 "bagi anda."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Lax permissive licensed software"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Lax permissive licenses include the X11 license and the <a href=\"/licenses/"
 "bsd.html\">two BSD licenses</a>.  These licenses permit almost any use of "
@@ -527,11 +531,11 @@
 "changing the source code."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GPL-covered software"
 msgstr "Perangkat Lunak <em>GPL-covered</em>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | The <a [-href=\"/copyleft/gpl.html\">GNU-]
 # | {+href=\"/licenses/gpl.html\">GNU+} GPL (General Public License)</a> is
 # | one specific set of distribution terms for copylefting a program. The GNU
@@ -551,16 +555,16 @@
 "<em>copyleft</em>-kan sebuah program.  Proyek GNU menggunakannya sebagai "
 "perjanjian distribusi untuk sebagian besar perangkat lunak GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To equate free software with GPL-covered software is therefore an error."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "The GNU operating system"
 msgstr "Sistem Operasi GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | The <a href=\"/gnu/gnu-history.html\">GNU {+operating+} system</a> is [-a
 # | complete free-] {+the+} Unix-like operating [-system.-] {+system, which is
 # | entirely free software, that we in the GNU Project have developed since
@@ -577,7 +581,7 @@
 "<a href=\"/gnu/gnu-history.html\">Sistem GNU</a> merupakan sistem serupa "
 "Unix yang seutuhnya bebas."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | A Unix-like operating system consists of many programs. The GNU system
 # | includes all {+of+} the {+<a href=\"#GNUsoftware\">official+} GNU
 # | [-software, as well as-] {+packages</a>.  It also includes+} many other
@@ -598,7 +602,7 @@
 "mencakup seluruh perangkat lunak GNU, dan juga paket program lain, seperti "
 "sistem X Windows dam TeX yang bukan perangkat lunak GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | [-We have been developing and accumulating components for the GNU system
 # | since 1984; the-]{+The+} first test release of [-a &ldquo;complete-] {+the
 # | complete+} GNU [-system&rdquo;-] {+system+} was in 1996.  [-Today, in
@@ -642,7 +646,7 @@
 "GNU/Linux</a>, merupakan sebuah terobosan dari sistem GNU yang menggunakan "
 "Linux sebagai kernel dan mengalami sukses luar biasa."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Since the purpose of GNU is to be free, every single component in the GNU
 # | {+operating+} system [-has to be-] {+is+} free software.  They don't all
 # | have to be copylefted, however; any kind of free software is legally
@@ -667,11 +671,11 @@
 "sah-sah saja jika menolong memenuhi tujuan teknis. Kita dapat menggunakan "
 "perangkat lunak <em>non-copylefted</em> seperti sistem X Window."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GNU programs"
 msgstr "Program GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | &ldquo;GNU programs&rdquo; is equivalent to <a [-href=#GNUsoftware\">GNU-]
 # | {+href=\"#GNUsoftware\">GNU+} software.</a> A program Foo is a GNU program
 # | if it is GNU software.  {+We also sometimes say it is a &ldquo;GNU
@@ -688,18 +692,17 @@
 "“Program GNU” setara dengan <a href=\"#GNUsoftware\">perangkat lunak 
GNU</"
 "a>.  Program Anu adalah program GNU jika ia merupakan perangkat lunak GNU."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GNU software"
 msgstr "Perangkat Lunak GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | <a href=\"/software/software.html\">GNU software</a> is software that is
-# | released under the auspices of the <a href={+
-# | +}\"/gnu/gnu-history.html\">GNU Project</a>. If a program is GNU software,
-# | we also say that it is a GNU [-program.-] {+program or a GNU package.  The
-# | README or manual of a GNU package should say it is one; also, the <a
-# | href=\"/directory\">Free Software Directory</a> identifies all GNU
-# | packages.+}
+# | released under the auspices of the <a href=\"/gnu/gnu-history.html\">GNU
+# | Project</a>. If a program is GNU software, we also say that it is a GNU
+# | [-program.-] {+program or a GNU package.  The README or manual of a GNU
+# | package should say it is one; also, the <a href=\"/directory\">Free
+# | Software Directory</a> identifies all GNU packages.+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"/software/software.html\">GNU software</a> is software that is "
@@ -708,7 +711,7 @@
 #| "program."
 msgid ""
 "<a href=\"/software/software.html\">GNU software</a> is software that is "
-"released under the auspices of the <a href= \"/gnu/gnu-history.html\">GNU "
+"released under the auspices of the <a href=\"/gnu/gnu-history.html\">GNU "
 "Project</a>. If a program is GNU software, we also say that it is a GNU "
 "program or a GNU package.  The README or manual of a GNU package should say "
 "it is one; also, the <a href=\"/directory\">Free Software Directory</a> "
@@ -719,7 +722,7 @@
 "\">proyek GNU</a>. Jika suatu program adalah perangkat lunak GNU, kita juga "
 "menyebutnya sebagai program GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Most GNU software is <a href= \"/licenses/copyleft.html\">copylefted</a>, "
 "but not all; however, all GNU software must be <a href=\"/philosophy/free-sw."
@@ -730,11 +733,12 @@
 "lunak GNU harus merupakan <a href=\"/philosophy/free-sw.html\">perangkat "
 "lunak bebas</a>."
 
-#. type: Content of: <p>
-# | Some GNU software [-is-] {+was+} written by <a href=
-# | \"http://www.fsf.org/about/staff/\";>staff</a> of the <a
-# | href=\"http://www.fsf.org/\";>Free Software Foundation</a>, but most GNU
-# | software [-is contributed by-] {+comes from many+} <a
+#. type: Content of: <div><p>
+# | Some GNU software [-is-] {+was+} written by <a [-href=
+# | \"http://www.fsf.org/about/staff/\";>staff</a>-]
+# | {+href=\"https://www.fsf.org/about/staff/\";>staff</a>+} of the <a
+# | href=\"http{+s+}://www.fsf.org/\">Free Software Foundation</a>, but most
+# | GNU software [-is contributed by-] {+comes from many+} <a
 # | href=\"/people/people.html\">volunteers</a>.  {+(Some of these volunteers
 # | are paid by companies or universities, but they are volunteers for us.)+} 
 # | Some contributed software is copyrighted by the Free Software Foundation;
@@ -748,8 +752,8 @@
 #| "by the Free Software Foundation; some is copyrighted by the contributors "
 #| "who wrote it."
 msgid ""
-"Some GNU software was written by <a href= \"http://www.fsf.org/about/staff/";
-"\">staff</a> of the <a href=\"http://www.fsf.org/\";>Free Software "
+"Some GNU software was written by <a href=\"https://www.fsf.org/about/staff/";
+"\">staff</a> of the <a href=\"https://www.fsf.org/\";>Free Software "
 "Foundation</a>, but most GNU software comes from many <a href=\"/people/"
 "people.html\">volunteers</a>.  (Some of these volunteers are paid by "
 "companies or universities, but they are volunteers for us.)  Some "
@@ -764,34 +768,34 @@
 "dikontribusikan merupakan hak cipta dari <em>Free Software Foundation</em>; "
 "beberapa merupakan hak cipta dari kontributor yang menulisnya."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "FSF-copyrighted GNU software"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The developers of GNU packages can transfer the copyright to the FSF, or "
 "they can keep it.  The choice is theirs."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If they have transferred the copyright to the FSF, the program is FSF-"
 "copyrighted GNU software, and the FSF can enforce its license.  If they have "
 "kept the copyright, enforcing the license is their responsibility."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The FSF does not accept copyright assignments of software that is not an "
 "official GNU package, as a rule."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Nonfree software"
 msgstr "Perangkat Lunak Tidak Bebas (atau Berpemilik)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | [-Proprietary-]{+Nonfree+} software is {+any+} software that is not free. 
 # | Its use, redistribution or modification is prohibited, or requires you to
 # | ask for permission, or is restricted so much that you effectively can't do
@@ -812,11 +816,11 @@
 "dikenakan pembatasan lainnya sehingga menyulitkan--jika menggunakan, "
 "mengedarkan, atau memodifikasinya."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Proprietary software"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Proprietary software is another name for nonfree software.  In the past we "
 "subdivided nonfree software into &ldquo;semifree software&rdquo;, which "
@@ -826,7 +830,7 @@
 "software."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The Free Software Foundation follows the rule that we cannot install any "
 "proprietary program on our computers except temporarily for the specific "
@@ -840,7 +844,7 @@
 "Disamping itu, kami merasa tidak; ada alasan untuk memasang sebuah program "
 "berpemilik."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | For example, we felt justified in installing Unix on our computer in the
 # | 1980s, because we were using it to write a free replacement for Unix.
 # | Nowadays, since free operating systems are available, the excuse is no
@@ -869,7 +873,7 @@
 "kami, dan setiap komputer yang kami pasang harus berjalan pada sistem "
 "operasi yang benar-benar bebas."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | We don't insist that users of GNU, or contributors to GNU, have to live by
 # | this rule. It is a rule we made for ourselves. But we hope you will
 # | [-decide to-] follow it [-too.-] {+too, for your freedom's sake.+}
@@ -887,11 +891,11 @@
 "mengikuti aturan ini. Ini adalah aturan yang kami buat untuk diri kami "
 "sendiri. Tapi kami berharap agar anda memutuskan untuk mengikutinya juga."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Freeware"
 msgstr "Freeware"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;freeware&rdquo; has no clear accepted definition, but it is "
 "commonly used for packages which permit redistribution but not modification "
@@ -905,11 +909,11 @@
 "perangkat lunak bebas, jadi <em>jangan</em> menggunakan istilah "
 "“<em>freeware</em>” untuk merujuk ke perangkat lunak bebas."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Shareware"
 msgstr "Shareware"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Shareware is software which comes with permission for people to redistribute "
 "copies, but says that anyone who continues to use a copy is <em>required</"
@@ -919,7 +923,7 @@
 "meredistribusikan salinannya, tetapi mereka yang terus menggunakannya "
 "<em>diminta</em> untuk membayar biaya lisensi."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Shareware is not free software, or even semifree. There are two reasons it "
 "is not:"
@@ -927,7 +931,7 @@
 "Shareware bukan perangkat lunak bebas ataupun semi-bebas. Ada dua alasan "
 "untuk hal ini, yakni:"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "For most shareware, source code is not available; thus, you cannot modify "
 "the program at all."
@@ -935,7 +939,7 @@
 "Sebagian besar <em>shareware</em>, kode programnya tidak tersedia; jadi anda "
 "tidak dapat memodifikasi program tersebut sama sekali."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Shareware does not come with permission to make a copy and install it "
 "without paying a license fee, not even for individuals engaging in nonprofit "
@@ -948,18 +952,18 @@
 "mempedulikan perjanjian distribusi dan tetap melakukan hal tersebut, tapi "
 "sebenarnya perjanjian tidak mengizinkannya)."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Private software"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Private or custom software is software developed for one user (typically an "
 "organization or company). That user keeps it and uses it, and does not "
 "release it to the public either as source code or as binaries."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A private program is free software (in a somewhat trivial sense) if its sole "
 "user has the four freedoms.  In particular, if the user has full rights to "
@@ -968,7 +972,7 @@
 "those copies are not free software."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is a matter of freedom, not access.  In general we do not "
 "believe it is wrong to develop a program and not release it. There are "
@@ -980,18 +984,18 @@
 "software movement."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Nearly all employment for programmers is in development of custom software; "
 "therefore most programming jobs are, or could be, done in a way compatible "
 "with the free software movement."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Commercial software"
 msgstr "Perangkat Lunak Komersial"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | &ldquo;Commercial&rdquo; and &ldquo;proprietary&rdquo; are not the [-same
 # | thing!-] {+same!+} Commercial software is software [-being-] developed by
 # | a business [-which aims to make money from the use-] {+as part+} of [-the
@@ -1019,7 +1023,7 @@
 "perangkat lunak bebas komersial, dan ada perangkat lunak tidak bebas dan "
 "tidak komersial."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | For example, GNU Ada is {+developed by a company.  It is+} always
 # | distributed under the terms of the GNU GPL, and every copy is free
 # | software; but its developers sell support contracts. When their salesmen
@@ -1050,7 +1054,7 @@
 "kompilator komersial.” Si penjual menjawab, “GNU Ada <em>ialah</em> "
 "kompilator komersial; hanya saja ia merupakan perangkat lunak bebas.”"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | For the GNU Project, the [-emphasis is-] {+priorities are+} in the other
 # | order: the important thing is that GNU Ada is free software; [-whether-]
 # | {+that+} it is commercial is [-not-] {+just+} a [-crucial question.-]
@@ -1073,7 +1077,7 @@
 "bukan, itu bukan hal yang penting. Namun perkembangan tambahan GNU Ada yang "
 "dihasilkan dari komersialismenya adalah menguntungkan."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Please help spread the awareness that [-commercial-] free {+commercial+}
 # | software is possible. You can do this by making an effort not to say
 # | &ldquo;commercial&rdquo; when you mean &ldquo;proprietary.&rdquo;
@@ -1118,14 +1122,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 "
@@ -1138,8 +1151,8 @@
 #. type: Content of: <div><p>
 #, fuzzy
 msgid ""
-"Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
-"2016, 2017, 2018, 2019 Free Software Foundation, Inc."
+"Copyright &copy; 1996-1998, 2001-2005, 2007, 2009-2012, 2015, 2019, 2021 "
+"Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1996, 1997, 1998, 2001, Free Software Foundation, Inc."
 
@@ -1169,6 +1182,18 @@
 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."
+
+#~ msgid ""
 #~ "Here is a glossary of various categories of software that are often "
 #~ "mentioned in discussions of free software.  It explains which categories "
 #~ "overlap or are part of other categories."

Index: philosophy/po/categories.it.po
===================================================================
RCS file: /web/www/www/philosophy/po/categories.it.po,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- philosophy/po/categories.it.po      21 Jul 2021 20:25:38 -0000      1.33
+++ philosophy/po/categories.it.po      21 Jul 2021 20:34:05 -0000      1.34
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: categories.html\n"
-"POT-Creation-Date: 2019-02-21 01:56+0000\n"
+"POT-Creation-Date: 2021-07-21 20:25+0000\n"
 "PO-Revision-Date: 2019-04-18 22:26+0200\n"
 "Last-Translator: Andrea Pescetti <pescetti@gnu.org>\n"
 "Language-Team: Italian\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-07-21 20:25+0000\n"
 "X-Generator: Poedit 2.0.3\n"
 
 #. type: Content of: <title>
@@ -29,11 +30,14 @@
 "Classificazione del Software Libero e non libero - Progetto GNU - Free "
 "Software Foundation"
 
-#. type: Content of: <h2>
-msgid "Categories of free and nonfree software"
+#. type: Content of: <div><h2>
+# | Categories of [-f-]{+F+}ree and [-nonfree software-] {+Nonfree Software+}
+#, fuzzy
+#| msgid "Categories of free and nonfree software"
+msgid "Categories of Free and Nonfree Software"
 msgstr "Classificazione del Software Libero e non libero"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Also see <a href=\"/philosophy/words-to-avoid.html\">Confusing Words which "
 "You Might Want to Avoid</a>."
@@ -41,11 +45,11 @@
 "Vedere anche <a href=\"/philosophy/words-to-avoid.html\">Termini da evitare</"
 "a>."
 
-#. type: Attribute 'alt' of: <p><img>
+#. type: Attribute 'alt' of: <div><p><img>
 msgid "[Categories of software]"
 msgstr "[Categorie di software]"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This diagram, originally by Chao-Kuei and updated by several others since, "
 "explains the different categories of software. It's available as a <a href="
@@ -62,11 +66,11 @@
 "o successiva, o sotto \"Creative Commons Attribuzione-Condividi allo stesso "
 "modo\" versione 2.0 o successiva."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Free software"
 msgstr "Software libero"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is software that comes with permission for anyone to use, "
 "copy, and/or distribute, either verbatim or with modifications, either "
@@ -83,7 +87,7 @@
 "disponibile      anche una <a href=\"/philosophy/free-sw.html\">definizione "
 "completa</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If a program is free, then it can potentially be included in a free "
 "operating system such as GNU, or free versions of the <a href=\"/gnu/linux-"
@@ -93,7 +97,7 @@
 "sistema operativo libero quale GNU o in      versioni libere del <a "
 "href=      \"/gnu/linux-and-gnu.html\">sistema GNU/Linux</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There are many different ways to make a program free&mdash;many questions of "
 "detail, which could be decided in more than one way and still make the "
@@ -108,7 +112,7 @@
 "sulle singole licenze sono disponibili nella pagina <a href=\"/licenses/"
 "license-list.html\">Licenze varie e commenti relativi</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is a matter of freedom, not price. But proprietary software "
 "companies typically use the term &ldquo;free software&rdquo; to refer to "
@@ -126,7 +130,7 @@
 "non ha nulla a che fare con ciò che noi intendiamo per      software libero "
 "nel progetto GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Because of this potential confusion, when a software company says its "
 "product is free software, always check the actual distribution terms to see "
@@ -138,7 +142,7 @@
 "per verificare se gli utenti      hanno effettivamente tutte le libertà che "
 "il software libero      implica. Talvolta è software libero, altre volte no."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Many languages have two separate words for &ldquo;free&rdquo; as in freedom "
 "and &ldquo;free&rdquo; as in zero price. For example, French has &ldquo;"
@@ -159,7 +163,7 @@
 "di <a href= \"/philosophy/fs-translations.html\"> traduzioni del termine "
 "&ldquo;free software&rdquo;</a> in molte lingue."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is often <a href=\"/software/reliability.html\">more reliable</"
 "a> than nonfree software."
@@ -167,11 +171,11 @@
 "Spesso il software libero è <a href=      
\"/software/reliability.html\">più "
 "affidabile</a>  del software non      libero."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Open source software"
 msgstr "Software Open Source"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;open source&rdquo; software is used by some people to mean "
 "more or less the same category as free software. It is not exactly the same "
@@ -191,7 +195,7 @@
 "accadere che alcuni programmi liberi non siano accettati come open source, "
 "ma non sappiamo se questo sia mai successo."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We prefer the term &ldquo;<a href=\"/philosophy/open-source-misses-the-point."
 "html\">free software</a>&rdquo; because it refers to freedom&mdash;something "
@@ -201,11 +205,11 @@
 "point.html\">software libero</a>&rdquo; perché si riferisce alla libertà, "
 "contrariamente a &ldquo;open source&rdquo;."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Public domain software"
 msgstr "Software di pubblico    dominio"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Public domain software is software that is not copyrighted. If the source "
 "code is in the public domain, that is a special case of <a href=\"#Non-"
@@ -217,7 +221,7 @@
 "libero senza copyleft</a>, il che significa che alcune copie o versioni      "
 "modificate possono non essere affatto libere."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In some cases, an executable program can be in the public domain but the "
 "source code is not available. This is not free software, because free "
@@ -234,7 +238,7 @@
 "applicare una licenza libera che consenta a tutti di usare il software in "
 "libertà."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Sometimes people use the term &ldquo;public domain&rdquo; in a loose fashion "
 "to mean <a href=\"#FreeSoftware\">&ldquo;free&rdquo;</a> or &ldquo;available "
@@ -251,7 +255,7 @@
 "significato, e di usare altri termini per intendere gli altri      "
 "significati."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Under the Berne Convention, which most countries have signed, anything "
 "written down is automatically copyrighted. This includes programs. "
@@ -265,11 +269,11 @@
 "da lui scritto deve disconoscere il copyright con qualche procedura legale, "
 "altrimenti il programma ne sarà coperto."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Copylefted software"
 msgstr "Software con copyleft"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copylefted software is free software whose distribution terms ensure that "
 "all copies of all versions carry more or less the same distribution terms.  "
@@ -288,7 +292,7 @@
 "Questo protegge il programma e i suoi derivati da alcuni modi di renderlo "
 "proprietario."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Some copyleft licenses, such as GPL version&nbsp;3, block other means of "
 "turning software proprietary, such as <a href=\"/licenses/rms-why-gplv3.html"
@@ -298,7 +302,7 @@
 "rendere il software proprietario, come la <a href=\"/licenses/rms-why-gplv3."
 "html\">tivoization</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the GNU Project, we copyleft almost all the software we write, because "
 "our goal is to give <em>every</em> user the freedoms implied by the term "
@@ -312,7 +316,7 @@
 "licenses/copyleft.html\">Licenza Copyleft</a> per ulteriori      "
 "approfondimenti sul funzionamento del copyleft e del      perché lo usiamo."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copyleft is a general concept; to copyleft an actual program, you need to "
 "use a specific set of distribution terms. There are many possible ways to "
@@ -335,11 +339,11 @@
 "copyleft diverse; anche per questo è utile alla comunità che si usi una 
sola "
 "licenza copyleft."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Noncopylefted free software"
 msgstr "Software libero senza copyleft"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Noncopylefted free software comes from the author with permission to "
 "redistribute and modify, and also to add additional restrictions to it."
@@ -348,7 +352,7 @@
 "ridistribuire e modificare il programma, e anche      di aggiungervi "
 "ulteriori restrizioni."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If a program is free but not copylefted, then some copies or modified "
 "versions may not be free at all. A software company can compile the program, "
@@ -361,18 +365,43 @@
 "file eseguibile come      un prodotto software <a href=      "
 "\"#ProprietarySoftware\">proprietario</a>."
 
-#. type: Content of: <p>
-msgid ""
-"The <a href=\"http://www.x.org\";>X Window System</a> illustrates this.  The "
-"X Consortium released X11 with distribution terms that made it noncopylefted "
-"free software, and subsequent developers have mostly followed the same "
-"practice.  A copy which has those distribution terms is free software.  "
-"However, there are nonfree versions as well, and there are (or at least "
-"were) popular workstations and PC graphics boards for which nonfree versions "
-"are the only ones that work.  If you are using this hardware, X11 is not "
-"free software for you.  <a href=\"/philosophy/x.html\">The developers of X11 "
-"even made X11 nonfree</a> for a while; they were able to do this because "
-"others had contributed their code under the same noncopyleft license."
+#. type: Content of: <div><p>
+# | The <a [-href=\"http://www.x.org\";>X-]
+# | {+href=\"https://www.x.org/wiki/\";>X+} Window System</a> illustrates this.
+# |  The X Consortium released X11 with distribution terms that made it
+# | noncopylefted free software, and subsequent developers have mostly
+# | followed the same practice.  A copy which has those distribution terms is
+# | free software.  However, there are nonfree versions as well, and there are
+# | (or at least were) popular workstations and PC graphics boards for which
+# | nonfree versions are the only ones that work.  If you are using this
+# | hardware, X11 is not free software for you.  <a
+# | href=\"/philosophy/x.html\">The developers of X11 even made X11
+# | nonfree</a> for a while; they were able to do this because others had
+# | contributed their code under the same noncopyleft license.
+#, fuzzy
+#| msgid ""
+#| "The <a href=\"http://www.x.org\";>X Window System</a> illustrates this.  "
+#| "The X Consortium released X11 with distribution terms that made it "
+#| "noncopylefted free software, and subsequent developers have mostly "
+#| "followed the same practice.  A copy which has those distribution terms is "
+#| "free software.  However, there are nonfree versions as well, and there "
+#| "are (or at least were) popular workstations and PC graphics boards for "
+#| "which nonfree versions are the only ones that work.  If you are using "
+#| "this hardware, X11 is not free software for you.  <a href=\"/philosophy/x."
+#| "html\">The developers of X11 even made X11 nonfree</a> for a while; they "
+#| "were able to do this because others had contributed their code under the "
+#| "same noncopyleft license."
+msgid ""
+"The <a href=\"https://www.x.org/wiki/\";>X Window System</a> illustrates "
+"this.  The X Consortium released X11 with distribution terms that made it "
+"noncopylefted free software, and subsequent developers have mostly followed "
+"the same practice.  A copy which has those distribution terms is free "
+"software.  However, there are nonfree versions as well, and there are (or at "
+"least were) popular workstations and PC graphics boards for which nonfree "
+"versions are the only ones that work.  If you are using this hardware, X11 "
+"is not free software for you.  <a href=\"/philosophy/x.html\">The developers "
+"of X11 even made X11 nonfree</a> for a while; they were able to do this "
+"because others had contributed their code under the same noncopyleft license."
 msgstr ""
 "L'<a href=\"http://www.x.org\";>X Window System</a> illustra quanto detto: "
 "l'X Consortium realizzò X11 con termini di distribuzione che lo rendevano "
@@ -387,11 +416,11 @@
 "avevano  contribuito il proprio codice sotto la stessa licenza senza "
 "copyleft."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Lax permissive licensed software"
 msgstr "Software con licenza permissiva"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Lax permissive licenses include the X11 license and the <a href=\"/licenses/"
 "bsd.html\">two BSD licenses</a>.  These licenses permit almost any use of "
@@ -403,11 +432,11 @@
 "gli usi del codice, come la distribuzione di eseguibili proprietari con o "
 "senza modifiche al codice originario."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GPL-covered software"
 msgstr "Software    con licenza GPL"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/licenses/gpl.html\">GNU GPL (General Public License)</a> is "
 "one specific set of distribution terms for copylefting a program. The GNU "
@@ -417,18 +446,18 @@
 "termini di distribuzione per dare copyleft ad un    programma. Il Progetto "
 "GNU lo utilizza come licenza per la    maggior parte del software GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To equate free software with GPL-covered software is therefore an error."
 msgstr ""
 "&Egrave; quindi sbagliato pensare che il software libero e il software "
 "coperto da GPL siano la stessa cosa."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "The GNU operating system"
 msgstr "Il sistema operativo GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/gnu/gnu-history.html\">GNU operating system</a> is the Unix-"
 "like operating system, which is entirely free software, that we in the GNU "
@@ -437,7 +466,7 @@
 "Il <a href=\"/gnu/gnu-history.html\">sistema GNU</a> è un      completo "
 "sistema operativo di tipo Unix, completamente libero, in sviluppo dal 1984."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A Unix-like operating system consists of many programs. The GNU system "
 "includes all of the <a href=\"#GNUsoftware\">official GNU packages</a>.  It "
@@ -449,7 +478,7 @@
 "ufficiali</a> e       molti altri pacchetti come per esempio l'X Window "
 "System e      TeX, che non sono software GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The first test release of the complete GNU system was in 1996.  This "
 "includes the GNU Hurd, our kernel, developed since 1990.  In 2001 the GNU "
@@ -474,7 +503,7 @@
 "scegliere programmi diversi a seconda delle loro necessità e preferenze, e "
 "il risultato è sempre una variante del sistema GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Since the purpose of GNU is to be free, every single component in the GNU "
 "operating system is free software.  They don't all have to be copylefted, "
@@ -486,11 +515,11 @@
 "essere tutti coperti da copyleft; ogni tipo di software libero è legalmente "
 "adeguato      ad essere incluso se aiuta a raggiungere gli scopi tecnici."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GNU programs"
 msgstr "Programmi GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;GNU programs&rdquo; is equivalent to <a href=\"#GNUsoftware\">GNU "
 "software.</a> A program Foo is a GNU program if it is GNU software.  We also "
@@ -500,14 +529,29 @@
 "Un certo programma è un programma GNU se è software    GNU. A volte 
parliamo "
 "anche di \"pacchetto GNU\"."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GNU software"
 msgstr "Software GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | <a href=\"/software/software.html\">GNU software</a> is software that is
+# | released under the auspices of the <a href=[-
+# | -]\"/gnu/gnu-history.html\">GNU Project</a>. If a program is GNU software,
+# | we also say that it is a GNU program or a GNU package.  The README or
+# | manual of a GNU package should say it is one; also, the <a
+# | href=\"/directory\">Free Software Directory</a> identifies all GNU
+# | packages.
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/software/software.html\">GNU software</a> is software that is "
+#| "released under the auspices of the <a href= \"/gnu/gnu-history.html\">GNU "
+#| "Project</a>. If a program is GNU software, we also say that it is a GNU "
+#| "program or a GNU package.  The README or manual of a GNU package should "
+#| "say it is one; also, the <a href=\"/directory\">Free Software Directory</"
+#| "a> identifies all GNU packages."
 msgid ""
 "<a href=\"/software/software.html\">GNU software</a> is software that is "
-"released under the auspices of the <a href= \"/gnu/gnu-history.html\">GNU "
+"released under the auspices of the <a href=\"/gnu/gnu-history.html\">GNU "
 "Project</a>. If a program is GNU software, we also say that it is a GNU "
 "program or a GNU package.  The README or manual of a GNU package should say "
 "it is one; also, the <a href=\"/directory\">Free Software Directory</a> "
@@ -520,7 +564,7 @@
 "identificare come tale; tutti i pacchetti GNU sono elencati come tali nel "
 "nostro <a href=\"/directory\">Elenco di software libero</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Most GNU software is <a href= \"/licenses/copyleft.html\">copylefted</a>, "
 "but not all; however, all GNU software must be <a href=\"/philosophy/free-sw."
@@ -530,10 +574,28 @@
 "copyleft.html\">copyleft</a>, ma non      tutto; comunque tutto il software "
 "GNU deve essere <a href=\"/philosophy/free-sw.html\">software libero</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Some GNU software was written by <a [-href=
+# | \"http://www.fsf.org/about/staff/\";>staff</a>-]
+# | {+href=\"https://www.fsf.org/about/staff/\";>staff</a>+} of the <a
+# | href=\"http{+s+}://www.fsf.org/\">Free Software Foundation</a>, but most
+# | GNU software comes from many <a
+# | href=\"/people/people.html\">volunteers</a>.  (Some of these volunteers
+# | are paid by companies or universities, but they are volunteers for us.) 
+# | Some contributed software is copyrighted by the Free Software Foundation;
+# | some is copyrighted by the contributors who wrote it.
+#, fuzzy
+#| msgid ""
+#| "Some GNU software was written by <a href= \"http://www.fsf.org/about/";
+#| "staff/\">staff</a> of the <a href=\"http://www.fsf.org/\";>Free Software "
+#| "Foundation</a>, but most GNU software comes from many <a href=\"/people/"
+#| "people.html\">volunteers</a>.  (Some of these volunteers are paid by "
+#| "companies or universities, but they are volunteers for us.)  Some "
+#| "contributed software is copyrighted by the Free Software Foundation; some "
+#| "is copyrighted by the contributors who wrote it."
 msgid ""
-"Some GNU software was written by <a href= \"http://www.fsf.org/about/staff/";
-"\">staff</a> of the <a href=\"http://www.fsf.org/\";>Free Software "
+"Some GNU software was written by <a href=\"https://www.fsf.org/about/staff/";
+"\">staff</a> of the <a href=\"https://www.fsf.org/\";>Free Software "
 "Foundation</a>, but most GNU software comes from many <a href=\"/people/"
 "people.html\">volunteers</a>.  (Some of these volunteers are paid by "
 "companies or universities, but they are volunteers for us.)  Some "
@@ -548,11 +610,11 @@
 "software      offerto dai volontari è coperto da copyright della Free      "
 "Software Foundation; altro è coperto da copyright di chi lo      ha scritto."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "FSF-copyrighted GNU software"
 msgstr "Software GNU con copyright della FSF"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The developers of GNU packages can transfer the copyright to the FSF, or "
 "they can keep it.  The choice is theirs."
@@ -560,7 +622,7 @@
 "Gli sviluppatori di pacchetti GNU possono a loro scelta trasferire il "
 "copyright alla FSF o tenerlo per sé."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If they have transferred the copyright to the FSF, the program is FSF-"
 "copyrighted GNU software, and the FSF can enforce its license.  If they have "
@@ -571,7 +633,7 @@
 "scelto di tenere per sé il copyright, devono provvedere da soli a fare "
 "rispettare la licenza."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The FSF does not accept copyright assignments of software that is not an "
 "official GNU package, as a rule."
@@ -579,11 +641,11 @@
 "Di regola la FSF non accetta di ricevere assegnazioni di copyright per "
 "software che non sia un pacchetto GNU ufficiale."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Nonfree software"
 msgstr "Software non libero"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Nonfree software is any software that is not free.  Its use, redistribution "
 "or modification is prohibited, or requires you to ask for permission, or is "
@@ -594,11 +656,11 @@
 "richiedono un permesso o sono sottoposti a      tali vincoli che in pratica "
 "non si possono fare liberamente."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Proprietary software"
 msgstr "Software proprietario"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Proprietary software is another name for nonfree software.  In the past we "
 "subdivided nonfree software into &ldquo;semifree software&rdquo;, which "
@@ -614,7 +676,7 @@
 "non la consentiva. Ma ora non facciamo più questa distinzione e usiamo "
 "&ldquo;proprietario&rdquo; e &ldquo;non libero&rdquo; come sinonimi."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The Free Software Foundation follows the rule that we cannot install any "
 "proprietary program on our computers except temporarily for the specific "
@@ -628,7 +690,7 @@
 "non esistano      giustificazioni possibili per installare un programma      "
 "proprietario."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For example, we felt justified in installing Unix on our computer in the "
 "1980s, because we were using it to write a free replacement for Unix. "
@@ -643,7 +705,7 @@
 "sistemi      operativi non liberi, e su ogni nuovo computer che      "
 "installiamo deve girare un sistema operativo completamente      libero."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We don't insist that users of GNU, or contributors to GNU, have to live by "
 "this rule. It is a rule we made for ourselves. But we hope you will follow "
@@ -654,11 +716,11 @@
 "stessi. Ma speriamo che anche voi decidiate      di seguirla, in difesa "
 "della vostra libertà."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Freeware"
 msgstr "Freeware"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;freeware&rdquo; has no clear accepted definition, but it is "
 "commonly used for packages which permit redistribution but not modification "
@@ -672,11 +734,11 @@
 "disponibile). Questi pacchetti    <em>non</em> sono software libero, perciò "
 "non usate \"freeware\"    per indicare il software libero."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Shareware"
 msgstr "Shareware"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Shareware is software which comes with permission for people to redistribute "
 "copies, but says that anyone who continues to use a copy is <em>required</"
@@ -686,7 +748,7 @@
 "ma <em>impone</em> a chiunque continui      ad usarne una copia di pagarne "
 "la licenza d'uso."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Shareware is not free software, or even semifree. There are two reasons it "
 "is not:"
@@ -694,7 +756,7 @@
 "Lo shareware non è software libero, nè semilibero.      Questo per due "
 "motivi:"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "For most shareware, source code is not available; thus, you cannot modify "
 "the program at all."
@@ -703,7 +765,7 @@
 "disponibile; pertanto, non è assolutamente        possibile modificare il "
 "programma."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Shareware does not come with permission to make a copy and install it "
 "without paying a license fee, not even for individuals engaging in nonprofit "
@@ -716,11 +778,11 @@
 "ignorano i termini        di distribuzione e lo usano comunque, ma le "
 "licenze d'uso        non lo permettono)."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Private software"
 msgstr "Software privato"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Private or custom software is software developed for one user (typically an "
 "organization or company). That user keeps it and uses it, and does not "
@@ -731,7 +793,7 @@
 "usa, e non lo distribuisce al pubblico in forma di eseguibili o codice "
 "sorgente."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A private program is free software (in a somewhat trivial sense) if its sole "
 "user has the four freedoms.  In particular, if the user has full rights to "
@@ -745,7 +807,7 @@
 "distribuisce copie agli altri e non assegna a quelle copie le quattro "
 "libertà, allora le copie non sono software libero."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is a matter of freedom, not access.  In general we do not "
 "believe it is wrong to develop a program and not release it. There are "
@@ -765,7 +827,7 @@
 "tra lo sviluppo di software privato o personalizzato e i principi del "
 "movimento del software libero."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Nearly all employment for programmers is in development of custom software; "
 "therefore most programming jobs are, or could be, done in a way compatible "
@@ -775,11 +837,11 @@
 "software personalizzato, molti lavori nell'ambito della programmazione sono, "
 "o possono essere, compatibili con il movimento del software libero."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Commercial software"
 msgstr "Software commerciale"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;Commercial&rdquo; and &ldquo;proprietary&rdquo; are not the same! "
 "Commercial software is software developed by a business as part of its "
@@ -793,7 +855,7 @@
 "href=      \"#ProprietarySoftware\">proprietario</a>, ma c'è software      "
 "libero commerciale, e c'è software non commerciale non      libero."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For example, GNU Ada is developed by a company.  It is always distributed "
 "under the terms of the GNU GPL, and every copy is free software; but its "
@@ -811,7 +873,7 @@
 "compilatore commerciale; si dà il caso che sia      anche software "
 "libero&rdquo;."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For the GNU Project, the priorities are in the other order: the important "
 "thing is that GNU Ada is free software; that it is commercial is just a "
@@ -824,7 +886,7 @@
 "risulta dalla      commercializzazione dell'assistenza è indubbiamente "
 "un      beneficio."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please help spread the awareness that free commercial software is possible. "
 "You can do this by making an effort not to say &ldquo;commercial&rdquo; when "
@@ -860,14 +922,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 "
@@ -881,9 +943,16 @@
 "traduzioni</a>."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; [-1996, 1997, 1998, 2001, 2006,-] {+1996-1998,
+# | 2001-2005,+} 2007, [-2009, 2010, 2014,-] {+2009-2012,+} 2015, [-2016,
+# | 2017, 2018, 2019-] {+2019, 2021+} Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, "
+#| "2015, 2016, 2017, 2018, 2019 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
-"2016, 2017, 2018, 2019 Free Software Foundation, Inc."
+"Copyright &copy; 1996-1998, 2001-2005, 2007, 2009-2012, 2015, 2019, 2021 "
+"Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
 "2016, 2017, 2018, 2019 Free Software Foundation, Inc."
@@ -912,10 +981,9 @@
 msgid "Updated:"
 msgstr "Ultimo aggiornamento:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
-"2016, 2017, 2018, 2019, 2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
-"2016, 2017, 2018, 2019, 2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, "
+#~ "2015, 2016, 2017, 2018, 2019, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, "
+#~ "2015, 2016, 2017, 2018, 2019, 2021 Free Software Foundation, Inc."

Index: philosophy/po/categories.ja.po
===================================================================
RCS file: /web/www/www/philosophy/po/categories.ja.po,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- philosophy/po/categories.ja.po      21 Jul 2021 20:25:37 -0000      1.31
+++ philosophy/po/categories.ja.po      21 Jul 2021 20:34:05 -0000      1.32
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: categories.html\n"
-"POT-Creation-Date: 2019-02-21 01:56+0000\n"
+"POT-Creation-Date: 2021-07-21 20:25+0000\n"
 "PO-Revision-Date: 2019-07-01 14:55+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-07-21 20:25+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -24,11 +25,13 @@
 "自由および不自由なソフトウェアの分類 - 
GNUプロジェクト - フリーソフトウェア"
 "ファウンデーション"
 
-#. type: Content of: <h2>
-msgid "Categories of free and nonfree software"
+#. type: Content of: <div><h2>
+#, fuzzy
+#| msgid "Categories of free and nonfree software"
+msgid "Categories of Free and Nonfree Software"
 msgstr "自由および不自由なソフトウェアの分類"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Also see <a href=\"/philosophy/words-to-avoid.html\">Confusing Words which "
 "You Might Want to Avoid</a>."
@@ -36,11 +39,11 @@
 "<a 
href=\"/philosophy/words-to-avoid.html\">できれば避けたい混乱を招くことば"
 "</a>もご覧ください。"
 
-#. type: Attribute 'alt' of: <p><img>
+#. type: Attribute 'alt' of: <div><p><img>
 msgid "[Categories of software]"
 msgstr "[ソフトウェアの分類]"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This diagram, originally by Chao-Kuei and updated by several others since, "
 "explains the different categories of software. It's available as a <a href="
@@ -56,11 +59,11 @@
 "Creative Commons Attribution-Share Alike v2.0以降のいずれの条項のå…
ƒã§ã‚‚利用で"
 "きます。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Free software"
 msgstr "自由ソフトウェア"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is software that comes with permission for anyone to use, "
 "copy, and/or distribute, either verbatim or with modifications, either "
@@ -76,7 +79,7 @@
 "義です。詳しくは、<a 
href=\"/philosophy/free-sw.html\">自由ソフトウェアの定義"
 "</a>をご覧ください。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If a program is free, then it can potentially be included in a free "
 "operating system such as GNU, or free versions of the <a href=\"/gnu/linux-"
@@ -86,7 +89,7 @@
 "由なバージョンの<a href=\"/gnu/linux-and-gnu.html\">GNU/Linux 
システム</a>に"
 "含める現実的な可能性があります。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There are many different ways to make a program free&mdash;many questions of "
 "detail, which could be decided in more than one way and still make the "
@@ -100,7 +103,7 @@
 "述します。å…
·ä½“的な自由ソフトウェアのライセンスについての情å 
±ã¯ã€<a href=\"/"
 "licenses/license-list.html\">ライセンスの一覧</a>をご覧くだ
さい。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is a matter of freedom, not price. But proprietary software "
 "companies typically use the term &ldquo;free software&rdquo; to refer to "
@@ -117,7 +120,7 @@
 
"いったことは、わたしたちがGNUプロジェクトにおいて「自由ソフトウェア」で意味し"
 "ていることとは何の関係もありません。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Because of this potential confusion, when a software company says its "
 "product is free software, always check the actual distribution terms to see "
@@ -130,7 +133,7 @@
 
"べての自由があるかどうか確かめるようにして下さい。その製品は本当に自由ソフト"
 
"ウェアなのかも知れませんが、そうでないこともあるのです。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Many languages have two separate words for &ldquo;free&rdquo; as in freedom "
 "and &ldquo;free&rdquo; as in zero price. For example, French has &ldquo;"
@@ -151,7 +154,7 @@
 "href= \"/philosophy/fs-translations.html\">&ldquo;free 
software&rdquo;の用語"
 "の翻訳</a>のリストをご覧ください。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is often <a href=\"/software/reliability.html\">more reliable</"
 "a> than nonfree software."
@@ -159,11 +162,11 @@
 
"自由ソフトウェアは、不自由なソフトウェアよりも、しばしば、<a
 href=\"/"
 "software/reliability.html\">より信頼できる</a>ものです。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Open source software"
 msgstr "オープンソース・ソフトウェア"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;open source&rdquo; software is used by some people to mean "
 "more or less the same category as free software. It is not exactly the same "
@@ -183,7 +186,7 @@
 "的には、ある自由なプログラム
がオープンソースとして拒絶されることはありえます"
 
"が、これまでそういうことが起こったことは知りません。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We prefer the term &ldquo;<a href=\"/philosophy/open-source-misses-the-point."
 "html\">free software</a>&rdquo; because it refers to freedom&mdash;something "
@@ -193,11 +196,11 @@
 
"html\">自由ソフトウェア</a>」を選びます。なぜなら、それは自由を意味するからで"
 
"す。これは、「オープンソース」の用語がなさないものです。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Public domain software"
 msgstr "パブリックドメイン・ソフトウェア"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Public domain software is software that is not copyrighted. If the source "
 "code is in the public domain, that is a special case of <a href=\"#Non-"
@@ -210,7 +213,7 @@
 
"すが、このソフトウェアの複製物や改変されたバージョンはå
…¨ãè‡ªç”±ã§ãªããªã£ã¦ã—"
 "まうかもしれないことを意味します。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In some cases, an executable program can be in the public domain but the "
 "source code is not available. This is not free software, because free "
@@ -226,7 +229,7 @@
 "権が主張され、著作権者
が自由ソフトウェアのライセンスを用いて、すべての人に自"
 "由に利用する許可を法的に与えているのです。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Sometimes people use the term &ldquo;public domain&rdquo; in a loose fashion "
 "to mean <a href=\"#FreeSoftware\">&ldquo;free&rdquo;</a> or &ldquo;available "
@@ -243,7 +246,7 @@
 
"「パブリックドメイン」という語を使い、他の意味を伝えたいときは他の用語を使う"
 "ことをお勧めします。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Under the Berne Convention, which most countries have signed, anything "
 "written down is automatically copyrighted. This includes programs. "
@@ -257,11 +260,11 @@
 "著作権を放棄するいくつかの法的なステップを踏む必
要があります。そうでなけれ"
 "ば、プログラムには著作権があるのです。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Copylefted software"
 msgstr "コピーレフトとされるソフトウェア"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copylefted software is free software whose distribution terms ensure that "
 "all copies of all versions carry more or less the same distribution terms.  "
@@ -279,7 +282,7 @@
 "ムを保護し、改変されたバージョンがプログラム
をプロプライエタリにする通常の方"
 "法から守るのです。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Some copyleft licenses, such as GPL version&nbsp;3, block other means of "
 "turning software proprietary, such as <a href=\"/licenses/rms-why-gplv3.html"
@@ -289,7 +292,7 @@
 "エタリにする別の方法、たとえば<a 
href=\"/licenses/rms-why-gplv3.html"
 "\">tivoization</a>、をブロックしています。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the GNU Project, we copyleft almost all the software we write, because "
 "our goal is to give <em>every</em> user the freedoms implied by the term "
@@ -303,7 +306,7 @@
 
"のように機能するか、そしてなぜわたしたちがそれを適用するかについての詳細は<a
 "
 
"href=\"/licenses/copyleft.html\">コピーレフトの小論</a>をご覧くだ
さい。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copyleft is a general concept; to copyleft an actual program, you need to "
 "use a specific set of distribution terms. There are many possible ways to "
@@ -325,11 +328,11 @@
 
"のコードをマージすることは違法です。ですから、コミュニティにとって、人ã€
…が単"
 
"一のコピーレフト・ライセンスを使うことが良いことです。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Noncopylefted free software"
 msgstr "コピーレフトとされない自由ソフトウェア"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Noncopylefted free software comes from the author with permission to "
 "redistribute and modify, and also to add additional restrictions to it."
@@ -337,7 +340,7 @@
 "コピーレフトでない自由ソフトウェアには作者から再é…
å¸ƒã¨æ”¹å¤‰ã®è¨±å¯ãŒä¸Žãˆã‚‰ã‚Œã¦"
 "いますが、制限を追加
することもまた許可されています。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If a program is free but not copylefted, then some copies or modified "
 "versions may not be free at all. A software company can compile the program, "
@@ -350,18 +353,31 @@
 
"\"#ProprietarySoftware\">プロプライエタリ・ソフトウェア</a>製品としてé
…å¸ƒã™ã‚‹"
 "ことができます。"
 
-#. type: Content of: <p>
-msgid ""
-"The <a href=\"http://www.x.org\";>X Window System</a> illustrates this.  The "
-"X Consortium released X11 with distribution terms that made it noncopylefted "
-"free software, and subsequent developers have mostly followed the same "
-"practice.  A copy which has those distribution terms is free software.  "
-"However, there are nonfree versions as well, and there are (or at least "
-"were) popular workstations and PC graphics boards for which nonfree versions "
-"are the only ones that work.  If you are using this hardware, X11 is not "
-"free software for you.  <a href=\"/philosophy/x.html\">The developers of X11 "
-"even made X11 nonfree</a> for a while; they were able to do this because "
-"others had contributed their code under the same noncopyleft license."
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The <a href=\"http://www.x.org\";>X Window System</a> illustrates this.  "
+#| "The X Consortium released X11 with distribution terms that made it "
+#| "noncopylefted free software, and subsequent developers have mostly "
+#| "followed the same practice.  A copy which has those distribution terms is "
+#| "free software.  However, there are nonfree versions as well, and there "
+#| "are (or at least were) popular workstations and PC graphics boards for "
+#| "which nonfree versions are the only ones that work.  If you are using "
+#| "this hardware, X11 is not free software for you.  <a href=\"/philosophy/x."
+#| "html\">The developers of X11 even made X11 nonfree</a> for a while; they "
+#| "were able to do this because others had contributed their code under the "
+#| "same noncopyleft license."
+msgid ""
+"The <a href=\"https://www.x.org/wiki/\";>X Window System</a> illustrates "
+"this.  The X Consortium released X11 with distribution terms that made it "
+"noncopylefted free software, and subsequent developers have mostly followed "
+"the same practice.  A copy which has those distribution terms is free "
+"software.  However, there are nonfree versions as well, and there are (or at "
+"least were) popular workstations and PC graphics boards for which nonfree "
+"versions are the only ones that work.  If you are using this hardware, X11 "
+"is not free software for you.  <a href=\"/philosophy/x.html\">The developers "
+"of X11 even made X11 nonfree</a> for a while; they were able to do this "
+"because others had contributed their code under the same noncopyleft license."
 msgstr ""
 "<a href=\"http://www.x.org\";>Xウィンドウ・システム
</a>は、この例証となってい"
 "ます。Xコンソーシアム
はX11をコピーレフトでない自由ソフトウェアとするé…
å¸ƒæ¡ä»¶"
@@ -374,11 +390,11 @@
 
"由でないもの</a>にしたことさえありました。これは、ほかの人たちが、コピーレフ"
 
"トではない同じライセンスのもとでコードを貢献したからできたことです。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Lax permissive licensed software"
 msgstr "ゆるく寛容にライセンスされるソフトウェア"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Lax permissive licenses include the X11 license and the <a href=\"/licenses/"
 "bsd.html\">two BSD licenses</a>.  These licenses permit almost any use of "
@@ -390,11 +406,11 @@
 
"る利用を認めています。ソースコードの変更ありでまたはなしでプロプライエタリの"
 "バイナリを配布することを含めて認めています。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GPL-covered software"
 msgstr "GPLで保護されたソフトウェア"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/licenses/gpl.html\">GNU GPL (General Public License)</a> is "
 "one specific set of distribution terms for copylefting a program. The GNU "
@@ -404,18 +420,18 @@
 "ムをコピーレフトとするための配布条件の、å…
·ä½“的なセットの一つです。GNUプロジェ"
 "クトではほとんどのGNUソフトウェアのé…
å¸ƒæ¡ä»¶ã¨ã—てこれを使っています。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To equate free software with GPL-covered software is therefore an error."
 msgstr ""
 
"ですから、自由ソフトウェアをGPLで保護されたソフトウェアと同一視することは間違"
 "いです。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "The GNU operating system"
 msgstr "GNUオペレーティング・システム"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/gnu/gnu-history.html\">GNU operating system</a> is the Unix-"
 "like operating system, which is entirely free software, that we in the GNU "
@@ -425,7 +441,7 @@
 "クのオペレーティング・システム
で、すべてが自由ソフトウェアであり、1984年から"
 
"わたしたちがGNUプロジェクトとして開発してきているものです。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A Unix-like operating system consists of many programs. The GNU system "
 "includes all of the <a href=\"#GNUsoftware\">official GNU packages</a>.  It "
@@ -437,7 +453,7 @@
 "た、Xウィンドウ・システム
やTeXといったGNUソフトウェアではない多くのパッケージ"
 "も含んでいます。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The first test release of the complete GNU system was in 1996.  This "
 "includes the GNU Hurd, our kernel, developed since 1990.  In 2001 the GNU "
@@ -461,7 +477,7 @@
 
"求に応じて、異なるパッケージを選択できるのです。結果は、なおGNUシステãƒ
 ã®ä¸€ç¨®"
 "です。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Since the purpose of GNU is to be free, every single component in the GNU "
 "operating system is free software.  They don't all have to be copylefted, "
@@ -473,11 +489,11 @@
 "はないのです。そのプログラム
が技術的な目標を満たすのに有用ならば、どの種の自"
 "由ソフトウェアもGNUに含めるのに法律上、適します。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GNU programs"
 msgstr "GNUプログラム"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;GNU programs&rdquo; is equivalent to <a href=\"#GNUsoftware\">GNU "
 "software.</a> A program Foo is a GNU program if it is GNU software.  We also "
@@ -487,14 +503,22 @@
 "す。あるプログラム
FooがGNUソフトウェアならそれはGNUプログラム
です。また、わた"
 "したちは時々
、それは「GNUパッケージ」である、と言います。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GNU software"
 msgstr "GNUソフトウェア"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/software/software.html\">GNU software</a> is software that is "
+#| "released under the auspices of the <a href= \"/gnu/gnu-history.html\">GNU "
+#| "Project</a>. If a program is GNU software, we also say that it is a GNU "
+#| "program or a GNU package.  The README or manual of a GNU package should "
+#| "say it is one; also, the <a href=\"/directory\">Free Software Directory</"
+#| "a> identifies all GNU packages."
 msgid ""
 "<a href=\"/software/software.html\">GNU software</a> is software that is "
-"released under the auspices of the <a href= \"/gnu/gnu-history.html\">GNU "
+"released under the auspices of the <a href=\"/gnu/gnu-history.html\">GNU "
 "Project</a>. If a program is GNU software, we also say that it is a GNU "
 "program or a GNU package.  The README or manual of a GNU package should say "
 "it is one; also, the <a href=\"/directory\">Free Software Directory</a> "
@@ -507,7 +531,7 @@
 "ニュアルでは、GNUであることを示すべきです。また、<a 
href=\"/directory\">自由"
 
"ソフトウェア・ディレクトリ</a>でも、すべてのGNUパッケージを確認できます。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Most GNU software is <a href= \"/licenses/copyleft.html\">copylefted</a>, "
 "but not all; however, all GNU software must be <a href=\"/philosophy/free-sw."
@@ -518,10 +542,19 @@
 "ウェアは<a 
href=\"/philosophy/free-sw.html\">自由ソフトウェア</a>でなければな"
 "りません。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Some GNU software was written by <a href= \"http://www.fsf.org/about/";
+#| "staff/\">staff</a> of the <a href=\"http://www.fsf.org/\";>Free Software "
+#| "Foundation</a>, but most GNU software comes from many <a href=\"/people/"
+#| "people.html\">volunteers</a>.  (Some of these volunteers are paid by "
+#| "companies or universities, but they are volunteers for us.)  Some "
+#| "contributed software is copyrighted by the Free Software Foundation; some "
+#| "is copyrighted by the contributors who wrote it."
 msgid ""
-"Some GNU software was written by <a href= \"http://www.fsf.org/about/staff/";
-"\">staff</a> of the <a href=\"http://www.fsf.org/\";>Free Software "
+"Some GNU software was written by <a href=\"https://www.fsf.org/about/staff/";
+"\">staff</a> of the <a href=\"https://www.fsf.org/\";>Free Software "
 "Foundation</a>, but most GNU software comes from many <a href=\"/people/"
 "people.html\">volunteers</a>.  (Some of these volunteers are paid by "
 "companies or universities, but they are volunteers for us.)  Some "
@@ -536,11 +569,11 @@
 
"いくつかの寄贈されたソフトウェアはフリーソフトウェアファウンデーションの著作"
 "物とされています。いくつかはそれを書いた寄贈者
の著作物です。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "FSF-copyrighted GNU software"
 msgstr "FSFの著作物とされたGNUソフトウェア"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The developers of GNU packages can transfer the copyright to the FSF, or "
 "they can keep it.  The choice is theirs."
@@ -548,7 +581,7 @@
 "GNUパッケージの開発者
は著作権をFSFに移管できますし、そのまま自身で保持するこ"
 "ともできます。その選択はかれらのものです。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If they have transferred the copyright to the FSF, the program is FSF-"
 "copyrighted GNU software, and the FSF can enforce its license.  If they have "
@@ -558,7 +591,7 @@
 
"なります。そしてFSFはそのライセンスを守らせることができます。開発è€
…がそのまま"
 "著作権を保持するå 
´åˆã€ãƒ©ã‚¤ã‚»ãƒ³ã‚¹ã®å¼·åˆ¶ã¯ã‹ã‚Œã‚‰è‡ªèº«ã®è²¬ä»»ã§ã™ã€‚"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The FSF does not accept copyright assignments of software that is not an "
 "official GNU package, as a rule."
@@ -566,11 +599,11 @@
 "FSFは、ルールとして、å…
¬å¼GNUパッケージではないソフトウェアに対して著作権移譲"
 "を受け付けません。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Nonfree software"
 msgstr "不自由なソフトウェア"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Nonfree software is any software that is not free.  Its use, redistribution "
 "or modification is prohibited, or requires you to ask for permission, or is "
@@ -580,11 +613,11 @@
 "布、改変は禁止されているか、許可を得ることが必
要とされているか、あるいは厳し"
 
"い制限が課せられていて自由にそうすることが事実上できなくなっています。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Proprietary software"
 msgstr "プロプライエタリ・ソフトウェア"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Proprietary software is another name for nonfree software.  In the past we "
 "subdivided nonfree software into &ldquo;semifree software&rdquo;, which "
@@ -599,7 +632,7 @@
 
"た。しかし、わたしたちは、この区別を止め、今は、不自由なソフトウェアの同意語"
 
"として「プロプライエタリ・ソフトウェア」を使っています。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The Free Software Foundation follows the rule that we cannot install any "
 "proprietary program on our computers except temporarily for the specific "
@@ -613,7 +646,7 @@
 
"う規則を守っています。それ以外には、プロプライエタリ・プログラãƒ
 ã‚’インストー"
 "ルするいかなる可能な言い訳も存在しないと思います。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For example, we felt justified in installing Unix on our computer in the "
 "1980s, because we were using it to write a free replacement for Unix. "
@@ -629,7 +662,7 @@
 "ピュータではすべて完å…
¨ã«è‡ªç”±ãªã‚ªãƒšãƒ¬ãƒ¼ãƒ†ã‚£ãƒ³ã‚°ã‚·ã‚¹ãƒ†ãƒ 
を動かさなければならな"
 "いということにしました。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We don't insist that users of GNU, or contributors to GNU, have to live by "
 "this rule. It is a rule we made for ourselves. But we hope you will follow "
@@ -640,11 +673,11 @@
 
"しかし、わたしたちは、あなた自身の自由のために、これに従うことを望んでいま"
 "す。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Freeware"
 msgstr "フリーウェア"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;freeware&rdquo; has no clear accepted definition, but it is "
 "commonly used for packages which permit redistribution but not modification "
@@ -659,11 +692,11 @@
 
"</em>。ですから、自由ソフトウェアについて言及するのに「フリーウェア」という語"
 "は使わないようお願いします。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Shareware"
 msgstr "シェアウェア"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Shareware is software which comes with permission for people to redistribute "
 "copies, but says that anyone who continues to use a copy is <em>required</"
@@ -673,7 +706,7 @@
 
"使用し続ける人は皆ライセンス料を<em>払わなければならない</em>と主張するソフト"
 "ウェアのことです。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Shareware is not free software, or even semifree. There are two reasons it "
 "is not:"
@@ -681,7 +714,7 @@
 
"シェアウェアは自由ソフトウェアではありませんし、準自由ですらありません。それ"
 "には二つ理由があります。"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "For most shareware, source code is not available; thus, you cannot modify "
 "the program at all."
@@ -689,7 +722,7 @@
 "ほとんどのシェアウェアでは、ソースコードがå…
¥æ‰‹ã§ãã¾ã›ã‚“。よって、そのプログ"
 "ラムを改変することは全く不可能です。"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Shareware does not come with permission to make a copy and install it "
 "without paying a license fee, not even for individuals engaging in nonprofit "
@@ -701,11 +734,11 @@
 "うです。(実際のところ、人々は、しばしば、é…
å¸ƒæ¡ä»¶ã‚’無視して、どちらにしろそう"
 "するのですが、配布条件では認めていません。)"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Private software"
 msgstr "プライベート・ソフトウェア"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Private or custom software is software developed for one user (typically an "
 "organization or company). That user keeps it and uses it, and does not "
@@ -716,7 +749,7 @@
 
"を保持し使いますが、ソースコードでもバイナリのいずれでもリリースしå
…¬é–‹ã™ã‚‹ã“"
 "とはしません。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A private program is free software (in a somewhat trivial sense) if its sole "
 "user has the four freedoms.  In particular, if the user has full rights to "
@@ -730,7 +763,7 @@
 "しかしながら、そのユーザがコピーをé…
å¸ƒã—て、そのコピーに対して四つの自由をほ"
 
"かの人に与えなかったならば、そのコピーは自由ソフトウェアではありません。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is a matter of freedom, not access.  In general we do not "
 "believe it is wrong to develop a program and not release it. There are "
@@ -749,7 +782,7 @@
 "いでしょう。ですから、プライベートあるいはカスタム
・ソフトウェアを開発するこ"
 
"とと、自由ソフトウェア運動の原則とには衝突はありません。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Nearly all employment for programmers is in development of custom software; "
 "therefore most programming jobs are, or could be, done in a way compatible "
@@ -759,11 +792,11 @@
 
"ら、ほとんどのプログラミングの仕事は、自由ソフトウェア運動と両立するもの、あ"
 "るいは両立させることができるもの、です。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Commercial software"
 msgstr "商用ソフトウェア"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;Commercial&rdquo; and &ldquo;proprietary&rdquo; are not the same! "
 "Commercial software is software developed by a business as part of its "
@@ -777,7 +810,7 @@
 
"</a>ですが、商用の自由ソフトウェアはありますし、自由ではない非商用のソフト"
 "ウェアも存在します。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For example, GNU Ada is developed by a company.  It is always distributed "
 "under the terms of the GNU GPL, and every copy is free software; but its "
@@ -794,7 +827,7 @@
 "ルスマンは、「GNU 
Adaは<em>商用コンパイラ</em>ですよ。たまたま自由ソフトウェ"
 "アなだけで。」と答えるでしょう。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For the GNU Project, the priorities are in the other order: the important "
 "thing is that GNU Ada is free software; that it is commercial is just a "
@@ -806,7 +839,7 @@
 "いのです。しかしながら、商用であるがゆえにGNU 
Adaのさらなる開発が進むことは、"
 "もちろん有益なことです。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please help spread the awareness that free commercial software is possible. "
 "You can do this by making an effort not to say &ldquo;commercial&rdquo; when "
@@ -841,26 +874,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; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, "
+#| "2015, 2016, 2017, 2018, 2019 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
-"2016, 2017, 2018, 2019 Free Software Foundation, Inc."
+"Copyright &copy; 1996-1998, 2001-2005, 2007, 2009-2012, 2015, 2019, 2021 "
+"Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
 "2016, 2017, 2018, 2019 Free Software Foundation, Inc."
@@ -885,13 +922,12 @@
 msgid "Updated:"
 msgstr "最終更新:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
-"2016, 2017, 2018, 2019, 2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
-"2016, 2017, 2018, 2019, 2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, "
+#~ "2015, 2016, 2017, 2018, 2019, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, "
+#~ "2015, 2016, 2017, 2018, 2019, 2021 Free Software Foundation, Inc."
 
 #~ msgid ""
 #~ "Here is a glossary of various categories of software that are often "

Index: philosophy/po/categories.nl-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/categories.nl-diff.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- philosophy/po/categories.nl-diff.html       31 May 2021 09:06:20 -0000      
1.6
+++ philosophy/po/categories.nl-diff.html       21 Jul 2021 20:34:05 -0000      
1.7
@@ -11,7 +11,10 @@
 </style></head>
 <body><pre>
 &lt;!--#include virtual="/server/header.html" --&gt;
-&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.84</strong></del></span> <span 
class="inserted"><ins><em>1.86</em></ins></span> --&gt;
+&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.84</strong></del></span> <span 
class="inserted"><ins><em>1.96 --&gt;
+&lt;!-- This page is derived from /server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="term" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</em></ins></span> --&gt;
 &lt;title&gt;Categories of Free and Nonfree Software
 - GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;style type="text/css" media="screen"&gt;
@@ -22,7 +25,11 @@
 &lt;/style&gt;
 &lt;!--#include virtual="/philosophy/po/categories.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
-&lt;h2&gt;Categories of free and nonfree software&lt;/h2&gt;
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/philosophy/ph-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&lt;div class="reduced-width"&gt;</em></ins></span>
+&lt;h2&gt;Categories of <span 
class="removed"><del><strong>free</strong></del></span> <span 
class="inserted"><ins><em>Free</em></ins></span> and <span 
class="removed"><del><strong>nonfree software&lt;/h2&gt;</strong></del></span> 
<span class="inserted"><ins><em>Nonfree Software&lt;/h2&gt;</em></ins></span>
 
 &lt;p&gt;Also see &lt;a href="/philosophy/words-to-avoid.html"&gt;Confusing
        Words which You Might Want to Avoid&lt;/a&gt;.&lt;/p&gt;
@@ -193,7 +200,7 @@
        a &lt;a href="#ProprietarySoftware"&gt;proprietary&lt;/a&gt; software
        product.&lt;/p&gt;
 
-       &lt;p&gt;The &lt;a href="http://www.x.org"&gt;X Window System&lt;/a&gt;
+       &lt;p&gt;The &lt;a <span 
class="removed"><del><strong>href="http://www.x.org"&gt;X</strong></del></span> 
<span 
class="inserted"><ins><em>href="https://www.x.org/wiki/"&gt;X</em></ins></span> 
Window System&lt;/a&gt;
        illustrates this.  The X Consortium released X11 with
        distribution terms that made it noncopylefted free
        software, and subsequent developers have mostly followed the
@@ -265,8 +272,9 @@
 &lt;h3 id="GNUsoftware"&gt;GNU software&lt;/h3&gt;
 
        &lt;p&gt;&lt;a href="/software/software.html"&gt;GNU software&lt;/a&gt; 
is
-       software that is released under the auspices of the &lt;a href=
-       "/gnu/gnu-history.html"&gt;GNU Project&lt;/a&gt;. If a program is GNU
+       software that is released under the auspices of the &lt;a <span 
class="removed"><del><strong>href=
+       "/gnu/gnu-history.html"&gt;GNU</strong></del></span>
+       <span 
class="inserted"><ins><em>href="/gnu/gnu-history.html"&gt;GNU</em></ins></span> 
Project&lt;/a&gt;. If a program is GNU
        software, we also say that it is a GNU program or a GNU
        package.  The README or manual of a GNU package should say it
        is one; also, the &lt;a href="/directory"&gt;Free Software
@@ -277,9 +285,10 @@
        all GNU software must be &lt;a href="/philosophy/free-sw.html"&gt;free
        software&lt;/a&gt;.&lt;/p&gt;
 
-       &lt;p&gt;Some GNU software was written by &lt;a href=
-       "http://www.fsf.org/about/staff/"&gt;staff&lt;/a&gt; of
-       the &lt;a href="http://www.fsf.org/"&gt;Free Software
+       &lt;p&gt;Some GNU software was written by &lt;a <span 
class="removed"><del><strong>href=
+       
"http://www.fsf.org/about/staff/"&gt;staff&lt;/a&gt;</strong></del></span>
+       <span 
class="inserted"><ins><em>href="https://www.fsf.org/about/staff/"&gt;staff&lt;/a&gt;</em></ins></span>
 of
+       the &lt;a <span 
class="removed"><del><strong>href="http://www.fsf.org/"&gt;Free</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://www.fsf.org/"&gt;Free</em></ins></span> 
Software
        Foundation&lt;/a&gt;, but most GNU software comes from many
        &lt;a href="/people/people.html"&gt;volunteers&lt;/a&gt;.  (Some of 
these
        volunteers are paid by companies or universities, but they are
@@ -416,15 +425,17 @@
        to say &ldquo;commercial&rdquo; when you mean
        &ldquo;proprietary.&rdquo;&lt;/p&gt;
 
-&lt;!-- If needed, change the copyright block at the bottom. In general, --&gt;
+<span class="removed"><del><strong>&lt;!-- If needed, change the copyright 
block at the bottom. In general, --&gt;
 &lt;!-- all pages on the GNU web server should have the section about    --&gt;
 &lt;!-- verbatim copying.  Please do NOT remove this without talking     --&gt;
 &lt;!-- with the webmasters first. --&gt; 
 &lt;!-- Please make sure the copyright date is consistent with the document 
--&gt;
-&lt;!-- and that it is like this "2001, 2002" not this "2001-2002." --&gt;
+&lt;!-- and that it is like this "2001, 2002" not this "2001-2002." 
--&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/div&gt;</em></ins></span>
+
 &lt;/div&gt;&lt;!-- for id="content", starts in the include above --&gt;
 &lt;!--#include virtual="/server/footer.html" --&gt;
-&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 &lt;a
@@ -442,16 +453,16 @@
         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 of this 
article.&lt;/p&gt;
+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;
 
-&lt;p&gt;Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 
2014, 2015, 2016, <span class="removed"><del><strong>2017</strong></del></span> 
<span class="inserted"><ins><em>2017, 2018, 2019</em></ins></span> Free
+&lt;p&gt;Copyright &copy; <span class="removed"><del><strong>1996, 1997, 1998, 
2001, 2006,</strong></del></span> <span class="inserted"><ins><em>1996-1998, 
2001-2005,</em></ins></span> 2007, <span class="removed"><del><strong>2009, 
2010, 2014,</strong></del></span> <span 
class="inserted"><ins><em>2009-2012,</em></ins></span> 2015, <span 
class="removed"><del><strong>2016, 2017</strong></del></span> <span 
class="inserted"><ins><em>2019, 2021</em></ins></span> Free
 Software Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
@@ -462,7 +473,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/05/31 09:06:20 $
+$Date: 2021/07/21 20:34:05 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: philosophy/po/categories.nl.po
===================================================================
RCS file: /web/www/www/philosophy/po/categories.nl.po,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- philosophy/po/categories.nl.po      30 May 2021 20:26:36 -0000      1.27
+++ philosophy/po/categories.nl.po      21 Jul 2021 20:34:05 -0000      1.28
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: categories.html\n"
-"POT-Creation-Date: 2019-02-21 01:56+0000\n"
+"POT-Creation-Date: 2021-07-21 20:25+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Justin van Steijn <jvs@fsfe.org>\n"
 "Language-Team: Dutch\n"
@@ -26,11 +26,14 @@
 "Indeling van vrije en niet-vrije software - GNU-project - Free Software "
 "Foundation"
 
-#. type: Content of: <h2>
-msgid "Categories of free and nonfree software"
+#. type: Content of: <div><h2>
+# | Categories of [-f-]{+F+}ree and [-nonfree software-] {+Nonfree Software+}
+#, fuzzy
+#| msgid "Categories of free and nonfree software"
+msgid "Categories of Free and Nonfree Software"
 msgstr "Indeling van vrije en niet-vrije software"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Also see <a href=\"/philosophy/words-to-avoid.html\">Confusing Words which "
 "You Might Want to Avoid</a>."
@@ -38,11 +41,11 @@
 "Zie ook <a href=\"/philosophy/words-to-avoid.html\">onduidelijke woorden die "
 "je beter kunt vermijden</a>."
 
-#. type: Attribute 'alt' of: <p><img>
+#. type: Attribute 'alt' of: <div><p><img>
 msgid "[Categories of software]"
 msgstr "[Indeling van software]"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This diagram, originally by Chao-Kuei and updated by several others since, "
 "explains the different categories of software. It's available as a <a href="
@@ -58,11 +61,11 @@
 "v1.2 (of hoger), of de Creative Commons Attribution-Share Alike v2.0 (of "
 "hoger)."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Free software"
 msgstr "Vrije software"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is software that comes with permission for anyone to use, "
 "copy, and/or distribute, either verbatim or with modifications, either "
@@ -79,7 +82,7 @@
 "vereenvoudigde definitie. Zie ook de <a href=\"/philosophy/free-sw.html"
 "\">volledige definitie</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If a program is free, then it can potentially be included in a free "
 "operating system such as GNU, or free versions of the <a href=\"/gnu/linux-"
@@ -89,7 +92,7 @@
 "besturingssysteem zoals GNU, of in vrije versies van het <a href=\"/gnu/"
 "linux-and-gnu.html\">GNU/Linux-systeem</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There are many different ways to make a program free&mdash;many questions of "
 "detail, which could be decided in more than one way and still make the "
@@ -104,7 +107,7 @@
 "softwarelicenties, zie het <a href=\"/licenses/license-list.html\">licentie-"
 "overzicht</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is a matter of freedom, not price. But proprietary software "
 "companies typically use the term &ldquo;free software&rdquo; to refer to "
@@ -121,7 +124,7 @@
 "je koopt. Dit heeft niets te maken met wat wij binnen het GNU-project "
 "bedoelen met &ldquo;free software&rdquo;."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Because of this potential confusion, when a software company says its "
 "product is free software, always check the actual distribution terms to see "
@@ -133,7 +136,7 @@
 "te voorkomen. Soms voldoen die inderdaad aan de term vrije software maar "
 "soms ook niet."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Many languages have two separate words for &ldquo;free&rdquo; as in freedom "
 "and &ldquo;free&rdquo; as in zero price. For example, French has &ldquo;"
@@ -154,7 +157,7 @@
 "lijst van <a href=\"/philosophy/fs-translations.html\">vertalingen van de "
 "term &ldquo;free software&rdquo;</a> naar diverse andere talen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is often <a href=\"/software/reliability.html\">more reliable</"
 "a> than nonfree software."
@@ -162,11 +165,11 @@
 "Vrije software is vaak <a href=\"/software/reliability.html"
 "\">betrouwbaarder</a> dan niet-vrije software."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Open source software"
 msgstr "Open-bron-software"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | The term &ldquo;open source&rdquo; software is used by some people to mean
 # | more or less the same category as free software. It is not exactly the
 # | same class of software: they accept some licenses that we consider too
@@ -202,7 +205,7 @@
 "De verschillen zijn echter klein. Bijna alle open-bron-software is vrij en "
 "bijna alle vrije software is ook open bron."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We prefer the term &ldquo;<a href=\"/philosophy/open-source-misses-the-point."
 "html\">free software</a>&rdquo; because it refers to freedom&mdash;something "
@@ -212,11 +215,11 @@
 "misses-the-point.html\">vrije software</a>&rdquo; omdat dit verwijst naar "
 "vrijheid en de term &ldquo;open bron&rdquo; niet."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Public domain software"
 msgstr "Software in het publieke domein"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Public domain software is software that is not copyrighted. If the source "
 "code is in the public domain, that is a special case of <a href=\"#Non-"
@@ -229,7 +232,7 @@
 "software zonder auteursplicht</a>, wat inhoud dat sommige kopi&euml;n of "
 "gewijzigde versies misschien helemaal niet vrij zijn."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In some cases, an executable program can be in the public domain but the "
 "source code is not available. This is not free software, because free "
@@ -245,7 +248,7 @@
 "toestemming gegeven het in vrijheid te gebruiken met behulp van een vrije-"
 "software-licentie."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Sometimes people use the term &ldquo;public domain&rdquo; in a loose fashion "
 "to mean <a href=\"#FreeSoftware\">&ldquo;free&rdquo;</a> or &ldquo;available "
@@ -262,7 +265,7 @@
 "juridische betekenis te gebruiken en voor andere begrippen ook de andere "
 "termen te hanteren."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Under the Berne Convention, which most countries have signed, anything "
 "written down is automatically copyrighted. This includes programs. "
@@ -277,11 +280,11 @@
 "je juridische stappen moeten ondernemen om af te zien van het auteursrecht; "
 "anders valt het hier automatisch onder."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Copylefted software"
 msgstr "Auteursplichtige software"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copylefted software is free software whose distribution terms ensure that "
 "all copies of all versions carry more or less the same distribution terms.  "
@@ -299,7 +302,7 @@
 "bescherming tegen in gebruik zijnde technieken om een programma een private "
 "status te geven."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Some copyleft licenses, such as GPL version&nbsp;3, block other means of "
 "turning software proprietary, such as <a href=\"/licenses/rms-why-gplv3.html"
@@ -309,7 +312,7 @@
 "technieken om een programma om te zetten naar een niet-vrije versie, analoog "
 "aan de <a href=\"/licenses/rms-why-gplv3.html\">tivo-techniek</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the GNU Project, we copyleft almost all the software we write, because "
 "our goal is to give <em>every</em> user the freedoms implied by the term "
@@ -324,7 +327,7 @@
 "een uitleg over hoe deze &ldquo;auteursplicht&rdquo; werkt en waarom we het "
 "gebruiken."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copyleft is a general concept; to copyleft an actual program, you need to "
 "use a specific set of distribution terms. There are many possible ways to "
@@ -347,11 +350,11 @@
 "licentie. Het is dus in het belang van de gemeenschap wanneer men slechts "
 "&eacute;&eacute;n licentie-type gebruikt."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Noncopylefted free software"
 msgstr "Niet-auteursplichtige, vrije software"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Noncopylefted free software comes from the author with permission to "
 "redistribute and modify, and also to add additional restrictions to it."
@@ -360,7 +363,7 @@
 "te her-distribueren en veranderen maar ook de toestemming om meer "
 "beperkingen op te leggen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If a program is free but not copylefted, then some copies or modified "
 "versions may not be free at all. A software company can compile the program, "
@@ -372,18 +375,43 @@
 "programma, met of zonder wijzigingen, compileren en de executeerbare code "
 "verspreiden als een <a href=\"#ProprietarySoftware\">privaat</a> product."
 
-#. type: Content of: <p>
-msgid ""
-"The <a href=\"http://www.x.org\";>X Window System</a> illustrates this.  The "
-"X Consortium released X11 with distribution terms that made it noncopylefted "
-"free software, and subsequent developers have mostly followed the same "
-"practice.  A copy which has those distribution terms is free software.  "
-"However, there are nonfree versions as well, and there are (or at least "
-"were) popular workstations and PC graphics boards for which nonfree versions "
-"are the only ones that work.  If you are using this hardware, X11 is not "
-"free software for you.  <a href=\"/philosophy/x.html\">The developers of X11 "
-"even made X11 nonfree</a> for a while; they were able to do this because "
-"others had contributed their code under the same noncopyleft license."
+#. type: Content of: <div><p>
+# | The <a [-href=\"http://www.x.org\";>X-]
+# | {+href=\"https://www.x.org/wiki/\";>X+} Window System</a> illustrates this.
+# |  The X Consortium released X11 with distribution terms that made it
+# | noncopylefted free software, and subsequent developers have mostly
+# | followed the same practice.  A copy which has those distribution terms is
+# | free software.  However, there are nonfree versions as well, and there are
+# | (or at least were) popular workstations and PC graphics boards for which
+# | nonfree versions are the only ones that work.  If you are using this
+# | hardware, X11 is not free software for you.  <a
+# | href=\"/philosophy/x.html\">The developers of X11 even made X11
+# | nonfree</a> for a while; they were able to do this because others had
+# | contributed their code under the same noncopyleft license.
+#, fuzzy
+#| msgid ""
+#| "The <a href=\"http://www.x.org\";>X Window System</a> illustrates this.  "
+#| "The X Consortium released X11 with distribution terms that made it "
+#| "noncopylefted free software, and subsequent developers have mostly "
+#| "followed the same practice.  A copy which has those distribution terms is "
+#| "free software.  However, there are nonfree versions as well, and there "
+#| "are (or at least were) popular workstations and PC graphics boards for "
+#| "which nonfree versions are the only ones that work.  If you are using "
+#| "this hardware, X11 is not free software for you.  <a href=\"/philosophy/x."
+#| "html\">The developers of X11 even made X11 nonfree</a> for a while; they "
+#| "were able to do this because others had contributed their code under the "
+#| "same noncopyleft license."
+msgid ""
+"The <a href=\"https://www.x.org/wiki/\";>X Window System</a> illustrates "
+"this.  The X Consortium released X11 with distribution terms that made it "
+"noncopylefted free software, and subsequent developers have mostly followed "
+"the same practice.  A copy which has those distribution terms is free "
+"software.  However, there are nonfree versions as well, and there are (or at "
+"least were) popular workstations and PC graphics boards for which nonfree "
+"versions are the only ones that work.  If you are using this hardware, X11 "
+"is not free software for you.  <a href=\"/philosophy/x.html\">The developers "
+"of X11 even made X11 nonfree</a> for a while; they were able to do this "
+"because others had contributed their code under the same noncopyleft license."
 msgstr ""
 "Het <a href=\"http://www.x.org\";>X-Window systeem</a> is hier een voorbeeld "
 "van. Het X Consortium bracht X11 uit met distributievoorwaarden waarmee het "
@@ -394,11 +422,11 @@
 "is X11 voor jou geen vrije software.  <a href=\"/philosophy/x.html\">X11-"
 "ontwikkelaars brachten zelfs een tijdje niet-vrije X11-versies uit</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Lax permissive licensed software"
 msgstr "Software met een toegeeflijke licentie"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Lax permissive licenses include the X11 license and the <a href=\"/licenses/"
 "bsd.html\">two BSD licenses</a>.  These licenses permit almost any use of "
@@ -410,11 +438,11 @@
 "gebruik van de code toe, inclusief er private programma's van maken, met of "
 "zonder aanpassingen in de broncode."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GPL-covered software"
 msgstr "Software met een GPL-licentie"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/licenses/gpl.html\">GNU GPL (General Public License)</a> is "
 "one specific set of distribution terms for copylefting a program. The GNU "
@@ -425,18 +453,18 @@
 "distributievoorwaarden voor het auteursplichtig maken van een programma.  "
 "Het GNU-project gebruikt deze voorwaarden voor de meeste GNU-software."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To equate free software with GPL-covered software is therefore an error."
 msgstr ""
 "Om vrije software gelijk te stellen aan software met een GPL-licentie is dus "
 "fout."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "The GNU operating system"
 msgstr "Het GNU-besturingssysteem"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/gnu/gnu-history.html\">GNU operating system</a> is the Unix-"
 "like operating system, which is entirely free software, that we in the GNU "
@@ -446,7 +474,7 @@
 "besturingssysteem, lijkend op Unix, dat wij sinds 1984 in het GNU-project "
 "aan het ontwikkelen zijn."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A Unix-like operating system consists of many programs. The GNU system "
 "includes all of the <a href=\"#GNUsoftware\">official GNU packages</a>.  It "
@@ -458,7 +486,7 @@
 "veel andere software zoals het X-Window systeem en TeX, wat geen GNU-"
 "software is."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The first test release of the complete GNU system was in 1996.  This "
 "includes the GNU Hurd, our kernel, developed since 1990.  In 2001 the GNU "
@@ -482,7 +510,7 @@
 "verschillende pakketten samenstellen al naar gelang hun voorkeur en "
 "behoefte. Het resultaat is nog steeds een variant op het GNU-systeem."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Since the purpose of GNU is to be free, every single component in the GNU "
 "operating system is free software.  They don't all have to be copylefted, "
@@ -494,11 +522,11 @@
 "auteursplichtig te zijn, alle soorten vrije software kunnen worden gebruikt, "
 "als hiermee bepaalde technische doelen bereikt kunnen worden."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GNU programs"
 msgstr "GNU-programma's"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;GNU programs&rdquo; is equivalent to <a href=\"#GNUsoftware\">GNU "
 "software.</a> A program Foo is a GNU program if it is GNU software.  We also "
@@ -508,14 +536,29 @@
 "software</a>.  Een programma Foo is een GNU-programma als het GNU-software "
 "is. We zeggen ook wel eens: het is een &ldquo;GNU-pakket&rdquo;"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GNU software"
 msgstr "GNU-software"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | <a href=\"/software/software.html\">GNU software</a> is software that is
+# | released under the auspices of the <a href=[-
+# | -]\"/gnu/gnu-history.html\">GNU Project</a>. If a program is GNU software,
+# | we also say that it is a GNU program or a GNU package.  The README or
+# | manual of a GNU package should say it is one; also, the <a
+# | href=\"/directory\">Free Software Directory</a> identifies all GNU
+# | packages.
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/software/software.html\">GNU software</a> is software that is "
+#| "released under the auspices of the <a href= \"/gnu/gnu-history.html\">GNU "
+#| "Project</a>. If a program is GNU software, we also say that it is a GNU "
+#| "program or a GNU package.  The README or manual of a GNU package should "
+#| "say it is one; also, the <a href=\"/directory\">Free Software Directory</"
+#| "a> identifies all GNU packages."
 msgid ""
 "<a href=\"/software/software.html\">GNU software</a> is software that is "
-"released under the auspices of the <a href= \"/gnu/gnu-history.html\">GNU "
+"released under the auspices of the <a href=\"/gnu/gnu-history.html\">GNU "
 "Project</a>. If a program is GNU software, we also say that it is a GNU "
 "program or a GNU package.  The README or manual of a GNU package should say "
 "it is one; also, the <a href=\"/directory\">Free Software Directory</a> "
@@ -528,7 +571,7 @@
 "handleiding zou dit moeten vermelden. Verder vermeldt het <a href=\"/"
 "directory\">Overzicht vrije software</a> alle GNU-pakketten."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Most GNU software is <a href= \"/licenses/copyleft.html\">copylefted</a>, "
 "but not all; however, all GNU software must be <a href=\"/philosophy/free-sw."
@@ -538,10 +581,28 @@
 "\">auteursplichtige software</a>, maar niet allemaal; alle GNU-software moet "
 "echter wel <a href=\"/philosophy/free-sw.html\">vrije software</a> zijn."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Some GNU software was written by <a [-href=
+# | \"http://www.fsf.org/about/staff/\";>staff</a>-]
+# | {+href=\"https://www.fsf.org/about/staff/\";>staff</a>+} of the <a
+# | href=\"http{+s+}://www.fsf.org/\">Free Software Foundation</a>, but most
+# | GNU software comes from many <a
+# | href=\"/people/people.html\">volunteers</a>.  (Some of these volunteers
+# | are paid by companies or universities, but they are volunteers for us.) 
+# | Some contributed software is copyrighted by the Free Software Foundation;
+# | some is copyrighted by the contributors who wrote it.
+#, fuzzy
+#| msgid ""
+#| "Some GNU software was written by <a href= \"http://www.fsf.org/about/";
+#| "staff/\">staff</a> of the <a href=\"http://www.fsf.org/\";>Free Software "
+#| "Foundation</a>, but most GNU software comes from many <a href=\"/people/"
+#| "people.html\">volunteers</a>.  (Some of these volunteers are paid by "
+#| "companies or universities, but they are volunteers for us.)  Some "
+#| "contributed software is copyrighted by the Free Software Foundation; some "
+#| "is copyrighted by the contributors who wrote it."
 msgid ""
-"Some GNU software was written by <a href= \"http://www.fsf.org/about/staff/";
-"\">staff</a> of the <a href=\"http://www.fsf.org/\";>Free Software "
+"Some GNU software was written by <a href=\"https://www.fsf.org/about/staff/";
+"\">staff</a> of the <a href=\"https://www.fsf.org/\";>Free Software "
 "Foundation</a>, but most GNU software comes from many <a href=\"/people/"
 "people.html\">volunteers</a>.  (Some of these volunteers are paid by "
 "companies or universities, but they are volunteers for us.)  Some "
@@ -556,11 +617,11 @@
 "vrijwilligers.) Sommige bijdragen hebben het auteursrecht van de FSF, andere "
 "hebben het auteursrecht van degene die de bijdrage leverde."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "FSF-copyrighted GNU software"
 msgstr "GNU-software onder FSF-auteursrecht"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The developers of GNU packages can transfer the copyright to the FSF, or "
 "they can keep it.  The choice is theirs."
@@ -568,7 +629,7 @@
 "Ontwikkelaars van GNU-pakketten kunnen de auteursrechten overdragen aan de "
 "FSF of zelf behouden. Aan hen de keus."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If they have transferred the copyright to the FSF, the program is FSF-"
 "copyrighted GNU software, and the FSF can enforce its license.  If they have "
@@ -578,7 +639,7 @@
 "met FSF-auteursrechten en kan de FSF de licentierechten uitoefenen. Wanneer "
 "ze de auteursrechten zelf houden moeten ze deze ook zelf verdedigen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The FSF does not accept copyright assignments of software that is not an "
 "official GNU package, as a rule."
@@ -586,11 +647,11 @@
 "De regel is dat de FSF geen auteursrechten accepteert van software die geen "
 "officieel GNU-pakket is."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Nonfree software"
 msgstr "Niet-vrije software"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Nonfree software is any software that is not free.  Its use, redistribution "
 "or modification is prohibited, or requires you to ask for permission, or is "
@@ -601,11 +662,11 @@
 "toestemming vragen of er gelden dusdanige beperkingen dat je het niet "
 "vrijelijk kunt gebruiken."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Proprietary software"
 msgstr "Private software"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Proprietary software is another name for nonfree software.  In the past we "
 "subdivided nonfree software into &ldquo;semifree software&rdquo;, which "
@@ -621,7 +682,7 @@
 "onderscheid losgelaten en gebruiken  &ldquo;private software&rdquo; als "
 "synoniem voor niet-vrije software."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The Free Software Foundation follows the rule that we cannot install any "
 "proprietary program on our computers except temporarily for the specific "
@@ -634,7 +695,7 @@
 "een vrije variant van dat programma te maken. Afgezien van het bovenstaande, "
 "zien wij verder geen excuus voor het installeren van private programma's."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For example, we felt justified in installing Unix on our computer in the "
 "1980s, because we were using it to write a free replacement for Unix. "
@@ -649,7 +710,7 @@
 "besturingssystemen weggedaan en iedere nieuwe machine moet nu uitgerust "
 "worden met een volledig vrij besturingssysteem."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We don't insist that users of GNU, or contributors to GNU, have to live by "
 "this rule. It is a rule we made for ourselves. But we hope you will follow "
@@ -660,11 +721,11 @@
 "hopen echter dat jij zal besluiten dit voorbeeld te volgen, ook voor je "
 "eigen vrijheid."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Freeware"
 msgstr "Freeware"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;freeware&rdquo; has no clear accepted definition, but it is "
 "commonly used for packages which permit redistribution but not modification "
@@ -678,11 +739,11 @@
 "zijn <em>geen</em> vrije software, dus gebruik alsjeblieft niet de term "
 "&ldquo;freeware&rdquo; als je eigenlijk vrije software bedoelt."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Shareware"
 msgstr "Shareware"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Shareware is software which comes with permission for people to redistribute "
 "copies, but says that anyone who continues to use a copy is <em>required</"
@@ -692,7 +753,7 @@
 "betaald <em>moet</em> worden zodra je die kopie ook echt voor langere tijd "
 "gaat gebruiken."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Shareware is not free software, or even semifree. There are two reasons it "
 "is not:"
@@ -700,7 +761,7 @@
 "Shareware is geen vrije software, of zelfs maar semi-vrij. Hiervoor zijn "
 "twee redenen:"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "For most shareware, source code is not available; thus, you cannot modify "
 "the program at all."
@@ -708,7 +769,7 @@
 "De broncode van de meeste shareware is niet beschikbaar en dus kun je het "
 "programma helemaal niet veranderen."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Shareware does not come with permission to make a copy and install it "
 "without paying a license fee, not even for individuals engaging in nonprofit "
@@ -721,11 +782,11 @@
 "bepalingen en gebruiken de software toch, maar de bepalingen staan het niet "
 "toe)."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Private software"
 msgstr "Priv&eacute;-software"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Private or custom software is software developed for one user (typically an "
 "organization or company). That user keeps it and uses it, and does not "
@@ -736,7 +797,7 @@
 "houdt dat programma, gebruikt het en geeft het niet vrij aan derden, niet in "
 "broncode of binaire vorm."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A private program is free software (in a somewhat trivial sense) if its sole "
 "user has the four freedoms.  In particular, if the user has full rights to "
@@ -750,7 +811,7 @@
 "als de gebruiker kopie&euml;n verspreidt naar anderen en de vier vrijheden "
 "hier niet bijlevert, zijn deze kopie&euml;n geen vrije software. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is a matter of freedom, not access.  In general we do not "
 "believe it is wrong to develop a program and not release it. There are "
@@ -770,7 +831,7 @@
 "geen conflict tussen maatsoftware en de beginselen van de vrije-software-"
 "beweging."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Nearly all employment for programmers is in development of custom software; "
 "therefore most programming jobs are, or could be, done in a way compatible "
@@ -780,11 +841,11 @@
 "programma's op maat; het werk hierin zou dus gedaan kunnen worden op een "
 "manier die verenigbaar is met de vrije software beweging."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Commercial software"
 msgstr "Commerci&euml;le software"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;Commercial&rdquo; and &ldquo;proprietary&rdquo; are not the same! "
 "Commercial software is software developed by a business as part of its "
@@ -799,7 +860,7 @@
 "\">privaat</a> maar er bestaat ook commerci&euml;le vrije software en niet-"
 "commerci&euml;le, niet-vrije software."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For example, GNU Ada is developed by a company.  It is always distributed "
 "under the terms of the GNU GPL, and every copy is free software; but its "
@@ -816,7 +877,7 @@
 "<em>is</em> een commerci&euml;le compiler; het is toevallig ook nog vrije "
 "software.&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For the GNU Project, the priorities are in the other order: the important "
 "thing is that GNU Ada is free software; that it is commercial is just a "
@@ -828,7 +889,7 @@
 "slechts een detail. De extra ontwikkeling die plaatvindt doordat de compiler "
 "commerci&euml;el is, is echter mooi meegenomen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please help spread the awareness that free commercial software is possible. "
 "You can do this by making an effort not to say &ldquo;commercial&rdquo; when "
@@ -865,14 +926,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 "
@@ -882,15 +949,16 @@
 "voor informatie over het onderhoud van vertalingen op deze website."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014,
-# | 2015, 2016, [-2017-] {+2017, 2018, 2019+} Free Software Foundation, Inc.
+# | Copyright &copy; [-1996, 1997, 1998, 2001, 2006,-] {+1996-1998,
+# | 2001-2005,+} 2007, [-2009, 2010, 2014,-] {+2009-2012,+} 2015, [-2016,
+# | 2017-] {+2019, 2021+} Free Software Foundation, Inc.
 #, fuzzy
 #| msgid ""
 #| "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, "
 #| "2015, 2016, 2017 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
-"2016, 2017, 2018, 2019 Free Software Foundation, Inc."
+"Copyright &copy; 1996-1998, 2001-2005, 2007, 2009-2012, 2015, 2019, 2021 "
+"Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
 "2016, 2017 Free Software Foundation, Inc."
@@ -918,6 +986,18 @@
 msgstr "Bijgewerkt:"
 
 #~ 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 ""
 #~ "A private program is free software in a trivial sense if its sole user "
 #~ "has full rights to it."
 #~ msgstr ""

Index: philosophy/po/categories.pl.po
===================================================================
RCS file: /web/www/www/philosophy/po/categories.pl.po,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- philosophy/po/categories.pl.po      21 Jul 2021 20:25:37 -0000      1.54
+++ philosophy/po/categories.pl.po      21 Jul 2021 20:34:05 -0000      1.55
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: categories.html\n"
-"POT-Creation-Date: 2019-02-21 01:56+0000\n"
+"POT-Creation-Date: 2021-07-21 20:25+0000\n"
 "PO-Revision-Date: 2021-03-25 11:24-0600\n"
 "Last-Translator: Jan Owoc <jsowoc AT gmail DOT 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-07-21 20:25+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: Poedit 2.3\n"
@@ -29,11 +30,14 @@
 "Kategorie Wolnego i&nbsp;Niewolnego Oprogramowania - Projekt GNU - Free "
 "Software Foundation"
 
-#. type: Content of: <h2>
-msgid "Categories of free and nonfree software"
+#. type: Content of: <div><h2>
+# | Categories of [-f-]{+F+}ree and [-nonfree software-] {+Nonfree Software+}
+#, fuzzy
+#| msgid "Categories of free and nonfree software"
+msgid "Categories of Free and Nonfree Software"
 msgstr "Kategorie wolnego i&nbsp;niewolnego oprogramowania"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Also see <a href=\"/philosophy/words-to-avoid.html\">Confusing Words which "
 "You Might Want to Avoid</a>."
@@ -41,11 +45,11 @@
 "Zwróćcie też uwagę na&nbsp;<a href=\"/philosophy/words-to-avoid.html"
 "\">Mylące słowa, których prawdopodobnie wolelibyście unikać</a>."
 
-#. type: Attribute 'alt' of: <p><img>
+#. type: Attribute 'alt' of: <div><p><img>
 msgid "[Categories of software]"
 msgstr "[Kategorie oprogramowania]"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This diagram, originally by Chao-Kuei and updated by several others since, "
 "explains the different categories of software. It's available as a <a href="
@@ -62,11 +66,11 @@
 "oraz&nbsp;późniejszych, GNU FDL v1.2 oraz&nbsp;późniejszych oraz&nbsp;na "
 "zasadzie Creative Commons Attribute-Share Alike v2.0 i&nbsp;późniejszych."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Free software"
 msgstr "Wolne oprogramowanie [<em>Free software</em>]"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is software that comes with permission for anyone to use, "
 "copy, and/or distribute, either verbatim or with modifications, either "
@@ -84,7 +88,7 @@
 "prosimy zapoznać się również z&nbsp;jej <a 
href=\"/philosophy/free-sw.html"
 "\">pełną wersją</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If a program is free, then it can potentially be included in a free "
 "operating system such as GNU, or free versions of the <a href=\"/gnu/linux-"
@@ -94,7 +98,7 @@
 "wolnego systemu operacyjnego, takiego jak GNU lub&nbsp;jednej z&nbsp;wolnych "
 "wersji systemu <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There are many different ways to make a program free&mdash;many questions of "
 "detail, which could be decided in more than one way and still make the "
@@ -109,7 +113,7 @@
 "licencji wolnego oprogramowania zawartych jest na&nbsp;<a href=\"/licenses/"
 "license-list.html\">stronie z&nbsp;listą licencji</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is a matter of freedom, not price. But proprietary software "
 "companies typically use the term &ldquo;free software&rdquo; to refer to "
@@ -127,7 +131,7 @@
 "komputera, który kupujesz. Coś takiego nie ma nic wspólnego z&nbsp;tym, 
jak "
 "my rozumiemy wolne oprogramowanie w&nbsp;projekcie GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Because of this potential confusion, when a software company says its "
 "product is free software, always check the actual distribution terms to see "
@@ -141,7 +145,7 @@
 "z&nbsp;idei wolnego oprogramowania. Czasem program jest rzeczywiście wolny, "
 "a&nbsp;czasem nie."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Many languages have two separate words for &ldquo;free&rdquo; as in freedom "
 "and &ldquo;free&rdquo; as in zero price. For example, French has &ldquo;"
@@ -163,7 +167,7 @@
 "listą <a href= \"/philosophy/fs-translations.html\">tłumaczeń terminu 
&bdquo;"
 "wolne oprogramowanie&rdquo;</a> na&nbsp;inne języki."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is often <a href=\"/software/reliability.html\">more reliable</"
 "a> than nonfree software."
@@ -171,11 +175,11 @@
 "Wolne programy są często <a href=\"/software/reliability.html\">bardziej "
 "niezawodne</a> niż te, które wolne nie są."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Open source software"
 msgstr "Oprogramowanie &bdquo;Open Source&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;open source&rdquo; software is used by some people to mean "
 "more or less the same category as free software. It is not exactly the same "
@@ -197,7 +201,7 @@
 "być wolne oprogramowanie, które jest odrzucone jako open source, ale&nbsp;"
 "nie wiemy czy&nbsp;taki przekład istnieje."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We prefer the term &ldquo;<a href=\"/philosophy/open-source-misses-the-point."
 "html\">free software</a>&rdquo; because it refers to freedom&mdash;something "
@@ -207,12 +211,12 @@
 "\">wolne oprogramowanie</a>&rdquo;, ponieważ&nbsp;odwołuje się on do&nbsp;"
 "wolności, a&nbsp;określenie &bdquo;open source&rdquo; nie."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Public domain software"
 msgstr ""
 "Oprogramowanie będące dobrem publicznym [<em>Public domain software</em>]"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Public domain software is software that is not copyrighted. If the source "
 "code is in the public domain, that is a special case of <a href=\"#Non-"
@@ -226,7 +230,7 @@
 "a>, co znaczy, że&nbsp;niektóre z&nbsp;jego kopii lub&nbsp;zmodyfikowanych "
 "wersji mogą być niewolne."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In some cases, an executable program can be in the public domain but the "
 "source code is not available. This is not free software, because free "
@@ -244,7 +248,7 @@
 "stworzyli. Zrobili to, stosując odpowiednią licencję — licencję wolnego 
"
 "oprogramowania."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Sometimes people use the term &ldquo;public domain&rdquo; in a loose fashion "
 "to mean <a href=\"#FreeSoftware\">&ldquo;free&rdquo;</a> or &ldquo;available "
@@ -262,7 +266,7 @@
 "domain&rdquo; tylko w&nbsp;tym sensie, a&nbsp;innych terminów do&nbsp;"
 "oddania innych znaczeń."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Under the Berne Convention, which most countries have signed, anything "
 "written down is automatically copyrighted. This includes programs. "
@@ -277,11 +281,11 @@
 "podjąć pewne kroki prawne, żeby zrzec się swoich praw autorskich. W&nbsp;"
 "przeciwnym razie, program pozostanie takim prawem objęty."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Copylefted software"
 msgstr "Oprogramowanie objęte copyleft"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copylefted software is free software whose distribution terms ensure that "
 "all copies of all versions carry more or less the same distribution terms.  "
@@ -299,7 +303,7 @@
 "dozwolonych). To chroni program i&nbsp;jego zmodyfikowane wersje przed "
 "niektórymi sposobami zmieniania programu w&nbsp;program własnościowy."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Some copyleft licenses, such as GPL version&nbsp;3, block other means of "
 "turning software proprietary, such as <a href=\"/licenses/rms-why-gplv3.html"
@@ -309,7 +313,7 @@
 "inne metody przekształcania programów w&nbsp;oprogramowanie własnościowe, 
"
 "takie jak <a href=\"/licenses/rms-why-gplv3.html\">tivoization</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the GNU Project, we copyleft almost all the software we write, because "
 "our goal is to give <em>every</em> user the freedoms implied by the term "
@@ -324,7 +328,7 @@
 "się szczegółowe wyjaśnienie sposobu działania copyleft i&nbsp;powodów, 
dla "
 "których stosujemy to rozwiązanie."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copyleft is a general concept; to copyleft an actual program, you need to "
 "use a specific set of distribution terms. There are many possible ways to "
@@ -349,11 +353,11 @@
 "kodem objętym drugą jest nielegalne. Dlatego&nbsp;dobrze jest dla "
 "społeczności, jeśli wykorzystuje się tylko jedną licencję copyleft."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Noncopylefted free software"
 msgstr "Wolne oprogramowanie nie objęte przez copyleft"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Noncopylefted free software comes from the author with permission to "
 "redistribute and modify, and also to add additional restrictions to it."
@@ -362,7 +366,7 @@
 "dalsze rozpowszechnianie i&nbsp;modyfikowanie, jak również na&nbsp;"
 "nakładanie dodatkowych ograniczeń."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If a program is free but not copylefted, then some copies or modified "
 "versions may not be free at all. A software company can compile the program, "
@@ -375,18 +379,43 @@
 "i&nbsp;rozpowszechniać plik wykonywalny jako <a href=\"#ProprietarySoftware"
 "\">prawnie zastrzeżony</a> produkt."
 
-#. type: Content of: <p>
-msgid ""
-"The <a href=\"http://www.x.org\";>X Window System</a> illustrates this.  The "
-"X Consortium released X11 with distribution terms that made it noncopylefted "
-"free software, and subsequent developers have mostly followed the same "
-"practice.  A copy which has those distribution terms is free software.  "
-"However, there are nonfree versions as well, and there are (or at least "
-"were) popular workstations and PC graphics boards for which nonfree versions "
-"are the only ones that work.  If you are using this hardware, X11 is not "
-"free software for you.  <a href=\"/philosophy/x.html\">The developers of X11 "
-"even made X11 nonfree</a> for a while; they were able to do this because "
-"others had contributed their code under the same noncopyleft license."
+#. type: Content of: <div><p>
+# | The <a [-href=\"http://www.x.org\";>X-]
+# | {+href=\"https://www.x.org/wiki/\";>X+} Window System</a> illustrates this.
+# |  The X Consortium released X11 with distribution terms that made it
+# | noncopylefted free software, and subsequent developers have mostly
+# | followed the same practice.  A copy which has those distribution terms is
+# | free software.  However, there are nonfree versions as well, and there are
+# | (or at least were) popular workstations and PC graphics boards for which
+# | nonfree versions are the only ones that work.  If you are using this
+# | hardware, X11 is not free software for you.  <a
+# | href=\"/philosophy/x.html\">The developers of X11 even made X11
+# | nonfree</a> for a while; they were able to do this because others had
+# | contributed their code under the same noncopyleft license.
+#, fuzzy
+#| msgid ""
+#| "The <a href=\"http://www.x.org\";>X Window System</a> illustrates this.  "
+#| "The X Consortium released X11 with distribution terms that made it "
+#| "noncopylefted free software, and subsequent developers have mostly "
+#| "followed the same practice.  A copy which has those distribution terms is "
+#| "free software.  However, there are nonfree versions as well, and there "
+#| "are (or at least were) popular workstations and PC graphics boards for "
+#| "which nonfree versions are the only ones that work.  If you are using "
+#| "this hardware, X11 is not free software for you.  <a href=\"/philosophy/x."
+#| "html\">The developers of X11 even made X11 nonfree</a> for a while; they "
+#| "were able to do this because others had contributed their code under the "
+#| "same noncopyleft license."
+msgid ""
+"The <a href=\"https://www.x.org/wiki/\";>X Window System</a> illustrates "
+"this.  The X Consortium released X11 with distribution terms that made it "
+"noncopylefted free software, and subsequent developers have mostly followed "
+"the same practice.  A copy which has those distribution terms is free "
+"software.  However, there are nonfree versions as well, and there are (or at "
+"least were) popular workstations and PC graphics boards for which nonfree "
+"versions are the only ones that work.  If you are using this hardware, X11 "
+"is not free software for you.  <a href=\"/philosophy/x.html\">The developers "
+"of X11 even made X11 nonfree</a> for a while; they were able to do this "
+"because others had contributed their code under the same noncopyleft license."
 msgstr ""
 "Ilustruje to przypadek <a href=\"http://www.x.org\";>Systemu X Window</a>. "
 "Konsorcjum X wydawało X11 na&nbsp;warunkach dystrybucyjnych, które czyniło 
"
@@ -400,13 +429,13 @@
 "a> Byli to w&nbsp;stanie zrobić, ponieważ&nbsp;inni dołączali swój kod "
 "na&nbsp;tej samej licencji nie objętej copyleft."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Lax permissive licensed software"
 msgstr ""
 "Oprogramowanie na&nbsp;licencjach zbyt przyzwalających [<em>Lax permissive "
 "licensed software</em>]"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Lax permissive licenses include the X11 license and the <a href=\"/licenses/"
 "bsd.html\">two BSD licenses</a>.  These licenses permit almost any use of "
@@ -419,11 +448,11 @@
 "redystrybucję prawnie zastrzeżonych binarii z&nbsp;lub bez&nbsp;zmian kodu "
 "źródłowego."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GPL-covered software"
 msgstr "Oprogramowanie objęte GPL"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/licenses/gpl.html\">GNU GPL (General Public License)</a> is "
 "one specific set of distribution terms for copylefting a program. The GNU "
@@ -434,18 +463,18 @@
 "rozpowszechniania służący do&nbsp;objęcia programu licencją typu 
copyleft. "
 "Projekt GNU wydaje na&nbsp;jej warunkach większość swojego oprogramowania."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To equate free software with GPL-covered software is therefore an error."
 msgstr ""
 "Nieporozumieniem jest zrównanie wolnego oprogramowania wraz z&nbsp;"
 "oprogramowaniem objętym GPL."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "The GNU operating system"
 msgstr "System operacyjny GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/gnu/gnu-history.html\">GNU operating system</a> is the Unix-"
 "like operating system, which is entirely free software, that we in the GNU "
@@ -456,7 +485,7 @@
 "wolnego oprogramowania, który rozwijamy w&nbsp;ramach Projektu GNU "
 "od&nbsp;1984 roku."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A Unix-like operating system consists of many programs. The GNU system "
 "includes all of the <a href=\"#GNUsoftware\">official GNU packages</a>.  It "
@@ -468,7 +497,7 @@
 "wiele innych pakietów, jak System X Window i&nbsp;TeX, które nie są "
 "oprogramowaniem GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The first test release of the complete GNU system was in 1996.  This "
 "includes the GNU Hurd, our kernel, developed since 1990.  In 2001 the GNU "
@@ -493,7 +522,7 @@
 "dystrybutorzy mogą wybierać różne pakiety dostosowane do&nbsp;ich potrzeb 
"
 "i&nbsp;pragnień. Wynikiem tego jest wariant systemu GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Since the purpose of GNU is to be free, every single component in the GNU "
 "operating system is free software.  They don't all have to be copylefted, "
@@ -506,11 +535,11 @@
 "jest prawnie odpowiedni do&nbsp;dołączania, jeżeli&nbsp;tylko pomaga "
 "osiągnąć techniczne założenia."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GNU programs"
 msgstr "Programy GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;GNU programs&rdquo; is equivalent to <a href=\"#GNUsoftware\">GNU "
 "software.</a> A program Foo is a GNU program if it is GNU software.  We also "
@@ -521,14 +550,29 @@
 "oprogramowaniem GNU. Czasem mówimy też, że&nbsp;jest &bdquo;pakietem "
 "GNU&rdquo;."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GNU software"
 msgstr "Oprogramowanie GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | <a href=\"/software/software.html\">GNU software</a> is software that is
+# | released under the auspices of the <a href=[-
+# | -]\"/gnu/gnu-history.html\">GNU Project</a>. If a program is GNU software,
+# | we also say that it is a GNU program or a GNU package.  The README or
+# | manual of a GNU package should say it is one; also, the <a
+# | href=\"/directory\">Free Software Directory</a> identifies all GNU
+# | packages.
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/software/software.html\">GNU software</a> is software that is "
+#| "released under the auspices of the <a href= \"/gnu/gnu-history.html\">GNU "
+#| "Project</a>. If a program is GNU software, we also say that it is a GNU "
+#| "program or a GNU package.  The README or manual of a GNU package should "
+#| "say it is one; also, the <a href=\"/directory\">Free Software Directory</"
+#| "a> identifies all GNU packages."
 msgid ""
 "<a href=\"/software/software.html\">GNU software</a> is software that is "
-"released under the auspices of the <a href= \"/gnu/gnu-history.html\">GNU "
+"released under the auspices of the <a href=\"/gnu/gnu-history.html\">GNU "
 "Project</a>. If a program is GNU software, we also say that it is a GNU "
 "program or a GNU package.  The README or manual of a GNU package should say "
 "it is one; also, the <a href=\"/directory\">Free Software Directory</a> "
@@ -541,7 +585,7 @@
 "pakietu powinno być to wyraźnie napisane; wszystkie pakiety GNU wskazano "
 "także w&nbsp;<a href=\"/directory\">Katalogu wolnego oprogramowania</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Most GNU software is <a href= \"/licenses/copyleft.html\">copylefted</a>, "
 "but not all; however, all GNU software must be <a href=\"/philosophy/free-sw."
@@ -552,10 +596,28 @@
 "całość musi być <a href=\"/philosophy/free-sw.html\">wolnym 
oprogramowaniem</"
 "a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Some GNU software was written by <a [-href=
+# | \"http://www.fsf.org/about/staff/\";>staff</a>-]
+# | {+href=\"https://www.fsf.org/about/staff/\";>staff</a>+} of the <a
+# | href=\"http{+s+}://www.fsf.org/\">Free Software Foundation</a>, but most
+# | GNU software comes from many <a
+# | href=\"/people/people.html\">volunteers</a>.  (Some of these volunteers
+# | are paid by companies or universities, but they are volunteers for us.) 
+# | Some contributed software is copyrighted by the Free Software Foundation;
+# | some is copyrighted by the contributors who wrote it.
+#, fuzzy
+#| msgid ""
+#| "Some GNU software was written by <a href= \"http://www.fsf.org/about/";
+#| "staff/\">staff</a> of the <a href=\"http://www.fsf.org/\";>Free Software "
+#| "Foundation</a>, but most GNU software comes from many <a href=\"/people/"
+#| "people.html\">volunteers</a>.  (Some of these volunteers are paid by "
+#| "companies or universities, but they are volunteers for us.)  Some "
+#| "contributed software is copyrighted by the Free Software Foundation; some "
+#| "is copyrighted by the contributors who wrote it."
 msgid ""
-"Some GNU software was written by <a href= \"http://www.fsf.org/about/staff/";
-"\">staff</a> of the <a href=\"http://www.fsf.org/\";>Free Software "
+"Some GNU software was written by <a href=\"https://www.fsf.org/about/staff/";
+"\">staff</a> of the <a href=\"https://www.fsf.org/\";>Free Software "
 "Foundation</a>, but most GNU software comes from many <a href=\"/people/"
 "people.html\">volunteers</a>.  (Some of these volunteers are paid by "
 "companies or universities, but they are volunteers for us.)  Some "
@@ -571,11 +633,11 @@
 "wniesionych programów ma Fundacja Wolnego Oprogramowania, a&nbsp;prawa "
 "do&nbsp;reszty mają ich autorzy."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "FSF-copyrighted GNU software"
 msgstr "Oprogramowanie GNU, do&nbsp;którego FSF posiada prawa autorskie"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The developers of GNU packages can transfer the copyright to the FSF, or "
 "they can keep it.  The choice is theirs."
@@ -583,7 +645,7 @@
 "Deweloperzy paczek GNU mogą przekazać prawa autorskie FSF lub&nbsp;też "
 "zatrzymać dka siebie. To jest ich wybór."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If they have transferred the copyright to the FSF, the program is FSF-"
 "copyrighted GNU software, and the FSF can enforce its license.  If they have "
@@ -594,7 +656,7 @@
 "licencji. Jeżeli&nbsp;zachowali prawa autorskie dla siebie, egzekwowanie "
 "warunków licencji jest ich zadaniem."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The FSF does not accept copyright assignments of software that is not an "
 "official GNU package, as a rule."
@@ -602,11 +664,11 @@
 "FSF z&nbsp;zasady nie przyjmuje praw autorskich oprogramowania, które nie "
 "jest oficjalną paczką GNU."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Nonfree software"
 msgstr "Oprogramowanie niewolne [<em>non-free software</em>]"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Nonfree software is any software that is not free.  Its use, redistribution "
 "or modification is prohibited, or requires you to ask for permission, or is "
@@ -617,11 +679,11 @@
 "rozpowszechniania lub&nbsp;modyfikacji, albo&nbsp;wymaga proszenia o&nbsp;"
 "zgodę, albo&nbsp;jest tak ograniczone, że&nbsp;nie można efektywnie 
używać."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Proprietary software"
 msgstr "Oprogramowanie własnościowe"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Proprietary software is another name for nonfree software.  In the past we "
 "subdivided nonfree software into &ldquo;semifree software&rdquo;, which "
@@ -639,7 +701,7 @@
 "&bdquo;oprogramowanie własnościowe&rdquo; jako synonim oprogramowania "
 "niewolnego."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The Free Software Foundation follows the rule that we cannot install any "
 "proprietary program on our computers except temporarily for the specific "
@@ -654,7 +716,7 @@
 "wyjątkiem takich przypadków, nie widzimy żadnego usprawiedliwienia dla "
 "instalacji programu własnościowego."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For example, we felt justified in installing Unix on our computer in the "
 "1980s, because we were using it to write a free replacement for Unix. "
@@ -669,7 +731,7 @@
 "używamy żadnych niewolnych systemów operacyjnych a&nbsp;na każdym nowym "
 "komputerze instalujemy całkowicie wolny system operacyjny."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We don't insist that users of GNU, or contributors to GNU, have to live by "
 "this rule. It is a rule we made for ourselves. But we hope you will follow "
@@ -679,11 +741,11 @@
 "tej zasady. Ustanowiliśmy ją dla siebie. Jednak&nbsp;mamy nadzieję, 
że&nbsp;"
 "Wy także postanowicie się nią kierować, choćby dla wolności."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Freeware"
 msgstr "<em>Freeware</em>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;freeware&rdquo; has no clear accepted definition, but it is "
 "commonly used for packages which permit redistribution but not modification "
@@ -698,11 +760,11 @@
 "są</em> wolnym oprogramowaniem, więc&nbsp;prosimy o nieużywanie słowa 
&bdquo;"
 "freeware&rdquo; na&nbsp;określenie wolnego oprogramowania."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Shareware"
 msgstr "<em>Shareware</em>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Shareware is software which comes with permission for people to redistribute "
 "copies, but says that anyone who continues to use a copy is <em>required</"
@@ -712,7 +774,7 @@
 "rozpowszechnianie kopii, ale&nbsp;każdy, kto kontynuuje wykorzystywanie go "
 "jest <em>zobowiązany</em> uiścić opłatę licencyjną."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Shareware is not free software, or even semifree. There are two reasons it "
 "is not:"
@@ -720,7 +782,7 @@
 "Shareware nie jest wolnym oprogramowaniem, ani&nbsp;nawet półwolnym. Wynika 
"
 "to z&nbsp;dwóch powodów:"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "For most shareware, source code is not available; thus, you cannot modify "
 "the program at all."
@@ -728,7 +790,7 @@
 "W&nbsp;przypadku większości oprogramowania shareware kod źródłowy nie 
jest "
 "dostępny, zatem&nbsp;nie da się go w&nbsp;ogóle modyfikować."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Shareware does not come with permission to make a copy and install it "
 "without paying a license fee, not even for individuals engaging in nonprofit "
@@ -742,11 +804,11 @@
 "shareware bez&nbsp;płacenia, jednak&nbsp;warunki dystrybucji na&nbsp;to nie "
 "pozwalają.)"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Private software"
 msgstr "Oprogramowanie prywatne [<em>Private software</em>]"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Private or custom software is software developed for one user (typically an "
 "organization or company). That user keeps it and uses it, and does not "
@@ -758,7 +820,7 @@
 "z&nbsp;niego, nie udostępniając go ogółowi ani&nbsp;w&nbsp;postaci kodu "
 "źródłowego, ani&nbsp;binariów."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A private program is free software (in a somewhat trivial sense) if its sole "
 "user has the four freedoms.  In particular, if the user has full rights to "
@@ -773,7 +835,7 @@
 "użytkownik rozprowadza kopie innym i&nbsp;nie zapewnia czterych zasad "
 "wolności wraz z&nbsp;tymi kopiami, to kopie te nie są wolnym 
oprogramowaniem."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is a matter of freedom, not access.  In general we do not "
 "believe it is wrong to develop a program and not release it. There are "
@@ -793,7 +855,7 @@
 "oprogramowania prywatnego nie narusza zasad ruchu na&nbsp;rzecz wolnego "
 "oprogramowania."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Nearly all employment for programmers is in development of custom software; "
 "therefore most programming jobs are, or could be, done in a way compatible "
@@ -804,11 +866,11 @@
 "jest, lub&nbsp;mogłaby być, wykonywana w&nbsp;sposób zgodny 
z&nbsp;zasadami "
 "ruchu na&nbsp;rzecz wolnego oprogramowania."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Commercial software"
 msgstr "Oprogramowanie komercyjne [<em>commercial software</em>]"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;Commercial&rdquo; and &ldquo;proprietary&rdquo; are not the same! "
 "Commercial software is software developed by a business as part of its "
@@ -824,7 +886,7 @@
 "ale&nbsp;istnieje komercyjne wolne oprogramowanie i&nbsp;niewolne "
 "oprogramowanie niekomercyjne."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For example, GNU Ada is developed by a company.  It is always distributed "
 "under the terms of the GNU GPL, and every copy is free software; but its "
@@ -842,7 +904,7 @@
 "odpowiadają: &bdquo;GNU Ada <em>jest</em> kompilatorem komercyjnym, który "
 "równocześnie jest wolnym oprogramowaniem&rdquo;."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For the GNU Project, the priorities are in the other order: the important "
 "thing is that GNU Ada is free software; that it is commercial is just a "
@@ -854,7 +916,7 @@
 "komercyjne czy&nbsp;nie, to szczegół. Jednak&nbsp;dodatkowy rozwój GNU Ady 
"
 "wynikający z&nbsp;jej komercyjnego charakteru jest niewątpliwie korzystny."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please help spread the awareness that free commercial software is possible. "
 "You can do this by making an effort not to say &ldquo;commercial&rdquo; when "
@@ -892,14 +954,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, "
@@ -912,9 +980,16 @@
 "tłumaczeń</a>."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; [-1996, 1997, 1998, 2001, 2006,-] {+1996-1998,
+# | 2001-2005,+} 2007, [-2009, 2010, 2014,-] {+2009-2012,+} 2015, [-2016,
+# | 2017, 2018, 2019-] {+2019, 2021+} Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, "
+#| "2015, 2016, 2017, 2018, 2019 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
-"2016, 2017, 2018, 2019 Free Software Foundation, Inc."
+"Copyright &copy; 1996-1998, 2001-2005, 2007, 2009-2012, 2015, 2019, 2021 "
+"Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
 "2016, 2017, 2018, 2019 Free Software Foundation, Inc."
@@ -943,10 +1018,9 @@
 msgid "Updated:"
 msgstr "Aktualizowane:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
-"2016, 2017, 2018, 2019, 2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
-"2016, 2017, 2018, 2019, 2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, "
+#~ "2015, 2016, 2017, 2018, 2019, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, "
+#~ "2015, 2016, 2017, 2018, 2019, 2021 Free Software Foundation, Inc."

Index: philosophy/po/categories.pot
===================================================================
RCS file: /web/www/www/philosophy/po/categories.pot,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- philosophy/po/categories.pot        21 Feb 2019 02:01:30 -0000      1.38
+++ philosophy/po/categories.pot        21 Jul 2021 20:34:05 -0000      1.39
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: categories.html\n"
-"POT-Creation-Date: 2019-02-21 01:56+0000\n"
+"POT-Creation-Date: 2021-07-21 20:25+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,21 +22,21 @@
 "Foundation"
 msgstr ""
 
-#. type: Content of: <h2>
-msgid "Categories of free and nonfree software"
+#. type: Content of: <div><h2>
+msgid "Categories of Free and Nonfree Software"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Also see <a href=\"/philosophy/words-to-avoid.html\">Confusing Words which "
 "You Might Want to Avoid</a>."
 msgstr ""
 
-#. type: Attribute 'alt' of: <p><img>
+#. type: Attribute 'alt' of: <div><p><img>
 msgid "[Categories of software]"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This diagram, originally by Chao-Kuei and updated by several others since, "
 "explains the different categories of software. It's available as a <a "
@@ -46,11 +46,11 @@
 "Commons Attribution-Share Alike v2.0 or later."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Free software"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is software that comes with permission for anyone to use, "
 "copy, and/or distribute, either verbatim or with modifications, either "
@@ -60,14 +60,14 @@
 "href=\"/philosophy/free-sw.html\">full definition</a>."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If a program is free, then it can potentially be included in a free "
 "operating system such as GNU, or free versions of the <a "
 "href=\"/gnu/linux-and-gnu.html\">GNU/Linux system</a>."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There are many different ways to make a program free&mdash;many questions of "
 "detail, which could be decided in more than one way and still make the "
@@ -76,7 +76,7 @@
 "href=\"/licenses/license-list.html\">license list</a> page."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is a matter of freedom, not price. But proprietary software "
 "companies typically use the term &ldquo;free software&rdquo; to refer to "
@@ -86,7 +86,7 @@
 "what we mean by free software in the GNU project."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Because of this potential confusion, when a software company says its "
 "product is free software, always check the actual distribution terms to see "
@@ -94,7 +94,7 @@
 "implies. Sometimes it really is free software; sometimes it isn't."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Many languages have two separate words for &ldquo;free&rdquo; as in freedom "
 "and &ldquo;free&rdquo; as in zero price. For example, French has "
@@ -107,17 +107,17 @@
 "software&rdquo;</a> into various other languages."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is often <a href=\"/software/reliability.html\">more "
 "reliable</a> than nonfree software."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Open source software"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;open source&rdquo; software is used by some people to mean "
 "more or less the same category as free software. It is not exactly the same "
@@ -129,7 +129,7 @@
 "open source, but we don't know if that has ever happened."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We prefer the term &ldquo;<a "
 "href=\"/philosophy/open-source-misses-the-point.html\">free "
@@ -137,11 +137,11 @@
 "term &ldquo;open source&ldquo; does not do."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Public domain software"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Public domain software is software that is not copyrighted. If the source "
 "code is in the public domain, that is a special case of <a "
@@ -149,7 +149,7 @@
 "means that some copies or modified versions may not be free at all."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In some cases, an executable program can be in the public domain but the "
 "source code is not available. This is not free software, because free "
@@ -159,7 +159,7 @@
 "using a free software license."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Sometimes people use the term &ldquo;public domain&rdquo; in a loose fashion "
 "to mean <a href=\"#FreeSoftware\">&ldquo;free&rdquo;</a> or &ldquo;available "
@@ -169,7 +169,7 @@
 "terms to convey the other meanings."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Under the Berne Convention, which most countries have signed, anything "
 "written down is automatically copyrighted. This includes "
@@ -178,11 +178,11 @@
 "it; otherwise, the program is copyrighted."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Copylefted software"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copylefted software is free software whose distribution terms ensure that "
 "all copies of all versions carry more or less the same distribution terms.  "
@@ -193,14 +193,14 @@
 "of the common ways of making a program proprietary."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Some copyleft licenses, such as GPL version&nbsp;3, block other means of "
 "turning software proprietary, such as <a "
 "href=\"/licenses/rms-why-gplv3.html\">tivoization</a>."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the GNU Project, we copyleft almost all the software we write, because "
 "our goal is to give <em>every</em> user the freedoms implied by the term "
@@ -209,7 +209,7 @@
 "of how copyleft works and why we use it."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copyleft is a general concept; to copyleft an actual program, you need to "
 "use a specific set of distribution terms. There are many possible ways to "
@@ -222,17 +222,17 @@
 "good for the community if people use a single copyleft license."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Noncopylefted free software"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Noncopylefted free software comes from the author with permission to "
 "redistribute and modify, and also to add additional restrictions to it."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If a program is free but not copylefted, then some copies or modified "
 "versions may not be free at all. A software company can compile the program, "
@@ -240,25 +240,26 @@
 "href=\"#ProprietarySoftware\">proprietary</a> software product."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"The <a href=\"http://www.x.org\";>X Window System</a> illustrates this.  The "
-"X Consortium released X11 with distribution terms that made it noncopylefted "
-"free software, and subsequent developers have mostly followed the same "
-"practice.  A copy which has those distribution terms is free software.  "
-"However, there are nonfree versions as well, and there are (or at least "
-"were) popular workstations and PC graphics boards for which nonfree versions "
-"are the only ones that work.  If you are using this hardware, X11 is not "
-"free software for you.  <a href=\"/philosophy/x.html\">The developers of X11 "
-"even made X11 nonfree</a> for a while; they were able to do this because "
-"others had contributed their code under the same noncopyleft license."
+"The <a href=\"https://www.x.org/wiki/\";>X Window System</a> illustrates "
+"this.  The X Consortium released X11 with distribution terms that made it "
+"noncopylefted free software, and subsequent developers have mostly followed "
+"the same practice.  A copy which has those distribution terms is free "
+"software.  However, there are nonfree versions as well, and there are (or at "
+"least were) popular workstations and PC graphics boards for which nonfree "
+"versions are the only ones that work.  If you are using this hardware, X11 "
+"is not free software for you.  <a href=\"/philosophy/x.html\">The developers "
+"of X11 even made X11 nonfree</a> for a while; they were able to do this "
+"because others had contributed their code under the same noncopyleft "
+"license."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Lax permissive licensed software"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Lax permissive licenses include the X11 license and the <a "
 "href=\"/licenses/bsd.html\">two BSD licenses</a>.  These licenses permit "
@@ -266,33 +267,33 @@
 "or without changing the source code."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GPL-covered software"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/licenses/gpl.html\">GNU GPL (General Public License)</a> is "
 "one specific set of distribution terms for copylefting a program. The GNU "
 "Project uses it as the distribution terms for most GNU software."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "To equate free software with GPL-covered software is therefore an 
error."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "The GNU operating system"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/gnu/gnu-history.html\">GNU operating system</a> is the "
 "Unix-like operating system, which is entirely free software, that we in the "
 "GNU Project have developed since 1984."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A Unix-like operating system consists of many programs. The GNU system "
 "includes all of the <a href=\"#GNUsoftware\">official GNU packages</a>.  It "
@@ -300,7 +301,7 @@
 "which are not GNU software."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The first test release of the complete GNU system was in 1996.  This "
 "includes the GNU Hurd, our kernel, developed since 1990.  In 2001 the GNU "
@@ -314,7 +315,7 @@
 "still a variant of the GNU system."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Since the purpose of GNU is to be free, every single component in the GNU "
 "operating system is free software.  They don't all have to be copylefted, "
@@ -322,43 +323,43 @@
 "helps meet technical goals."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GNU programs"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;GNU programs&rdquo; is equivalent to <a href=\"#GNUsoftware\">GNU "
 "software.</a> A program Foo is a GNU program if it is GNU software.  We also "
 "sometimes say it is a &ldquo;GNU package&rdquo;."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GNU software"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "<a href=\"/software/software.html\">GNU software</a> is software that is "
-"released under the auspices of the <a href= \"/gnu/gnu-history.html\">GNU "
+"released under the auspices of the <a href=\"/gnu/gnu-history.html\">GNU "
 "Project</a>. If a program is GNU software, we also say that it is a GNU "
 "program or a GNU package.  The README or manual of a GNU package should say "
 "it is one; also, the <a href=\"/directory\">Free Software Directory</a> "
 "identifies all GNU packages."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Most GNU software is <a href= \"/licenses/copyleft.html\">copylefted</a>, "
 "but not all; however, all GNU software must be <a "
 "href=\"/philosophy/free-sw.html\">free software</a>."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"Some GNU software was written by <a href= "
-"\"http://www.fsf.org/about/staff/\";>staff</a> of the <a "
-"href=\"http://www.fsf.org/\";>Free Software Foundation</a>, but most GNU "
+"Some GNU software was written by <a "
+"href=\"https://www.fsf.org/about/staff/\";>staff</a> of the <a "
+"href=\"https://www.fsf.org/\";>Free Software Foundation</a>, but most GNU "
 "software comes from many <a href=\"/people/people.html\">volunteers</a>.  "
 "(Some of these volunteers are paid by companies or universities, but they "
 "are volunteers for us.)  Some contributed software is copyrighted by the "
@@ -366,45 +367,45 @@
 "it."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "FSF-copyrighted GNU software"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The developers of GNU packages can transfer the copyright to the FSF, or "
 "they can keep it.  The choice is theirs."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If they have transferred the copyright to the FSF, the program is "
 "FSF-copyrighted GNU software, and the FSF can enforce its license.  If they "
 "have kept the copyright, enforcing the license is their responsibility."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The FSF does not accept copyright assignments of software that is not an "
 "official GNU package, as a rule."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Nonfree software"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Nonfree software is any software that is not free.  Its use, redistribution "
 "or modification is prohibited, or requires you to ask for permission, or is "
 "restricted so much that you effectively can't do it freely."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Proprietary software"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Proprietary software is another name for nonfree software.  In the past we "
 "subdivided nonfree software into &ldquo;semifree software&rdquo;, which "
@@ -414,7 +415,7 @@
 "software."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The Free Software Foundation follows the rule that we cannot install any "
 "proprietary program on our computers except temporarily for the specific "
@@ -423,7 +424,7 @@
 "program."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For example, we felt justified in installing Unix on our computer in the "
 "1980s, because we were using it to write a free replacement for "
@@ -432,18 +433,18 @@
 "computer we install must run a completely free operating system."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We don't insist that users of GNU, or contributors to GNU, have to live by "
 "this rule. It is a rule we made for ourselves. But we hope you will follow "
 "it too, for your freedom's sake."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Freeware"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;freeware&rdquo; has no clear accepted definition, but it is "
 "commonly used for packages which permit redistribution but not modification "
@@ -452,30 +453,30 @@
 "software."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Shareware"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Shareware is software which comes with permission for people to redistribute "
 "copies, but says that anyone who continues to use a copy is "
 "<em>required</em> to pay a license fee."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Shareware is not free software, or even semifree. There are two reasons it "
 "is not:"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "For most shareware, source code is not available; thus, you cannot modify "
 "the program at all."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Shareware does not come with permission to make a copy and install it "
 "without paying a license fee, not even for individuals engaging in nonprofit "
@@ -483,18 +484,18 @@
 "this anyway, but the terms don't permit it.)"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Private software"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Private or custom software is software developed for one user (typically an "
 "organization or company). That user keeps it and uses it, and does not "
 "release it to the public either as source code or as binaries."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A private program is free software (in a somewhat trivial sense) if its sole "
 "user has the four freedoms.  In particular, if the user has full rights to "
@@ -503,7 +504,7 @@
 "those copies are not free software."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is a matter of freedom, not access.  In general we do not "
 "believe it is wrong to develop a program and not release it. There are "
@@ -515,18 +516,18 @@
 "software movement."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Nearly all employment for programmers is in development of custom software; "
 "therefore most programming jobs are, or could be, done in a way compatible "
 "with the free software movement."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Commercial software"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;Commercial&rdquo; and &ldquo;proprietary&rdquo; are not the same! "
 "Commercial software is software developed by a business as part of its "
@@ -535,7 +536,7 @@
 "software, and there is noncommercial nonfree software."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For example, GNU Ada is developed by a company.  It is always distributed "
 "under the terms of the GNU GPL, and every copy is free software; but its "
@@ -545,7 +546,7 @@
 "commercial compiler; it happens to be free software.&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For the GNU Project, the priorities are in the other order: the important "
 "thing is that GNU Ada is free software; that it is commercial is just a "
@@ -553,7 +554,7 @@
 "being commercial is definitely beneficial."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please help spread the awareness that free commercial software is "
 "possible. You can do this by making an effort not to say "
@@ -584,7 +585,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>. 
@@ -592,13 +593,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; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
-"2016, 2017, 2018, 2019 Free Software Foundation, Inc."
+"Copyright &copy; 1996-1998, 2001-2005, 2007, 2009-2012, 2015, 2019, 2021 "
+"Free Software Foundation, Inc."
 msgstr ""
 
 #. type: Content of: <div><p>

Index: philosophy/po/categories.pt-br.po
===================================================================
RCS file: /web/www/www/philosophy/po/categories.pt-br.po,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- philosophy/po/categories.pt-br.po   21 Jul 2021 20:25:38 -0000      1.23
+++ philosophy/po/categories.pt-br.po   21 Jul 2021 20:34:05 -0000      1.24
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: categories.html\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-21 01:56+0000\n"
+"POT-Creation-Date: 2021-07-21 20:25+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: 8bit\n"
+"X-Outdated-Since: 2021-07-21 20:25+0000\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "X-Generator: Gtranslator 40.0\n"
 
@@ -28,11 +29,13 @@
 "Categorias de softwares livres e não livres - Projeto GNU - Free Software "
 "Foundation"
 
-#. type: Content of: <h2>
-msgid "Categories of free and nonfree software"
+#. type: Content of: <div><h2>
+#, fuzzy
+#| msgid "Categories of free and nonfree software"
+msgid "Categories of Free and Nonfree Software"
 msgstr "Categorias de softwares livres e não livres"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Also see <a href=\"/philosophy/words-to-avoid.html\">Confusing Words which "
 "You Might Want to Avoid</a>."
@@ -40,11 +43,11 @@
 "Veja também <a href=\"/philosophy/words-to-avoid.html\">Palavras confusas "
 "que você poderia evitar</a>."
 
-#. type: Attribute 'alt' of: <p><img>
+#. type: Attribute 'alt' of: <div><p><img>
 msgid "[Categories of software]"
 msgstr "[Categorias de softwares]"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This diagram, originally by Chao-Kuei and updated by several others since, "
 "explains the different categories of software. It's available as a <a href="
@@ -60,11 +63,11 @@
 "licenças: GNU GPL (v2 ou posterior), GNU FDL (v1.2 ou posterior) ou Creative 
"
 "Commons Atribuição-CompartilhaIgual (v2.0 ou posterior)."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Free software"
 msgstr "Software livre"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is software that comes with permission for anyone to use, "
 "copy, and/or distribute, either verbatim or with modifications, either "
@@ -79,7 +82,7 @@
 "não é fonte, não é software”. Esta é uma descrição simplificada; 
veja também "
 "a <a href=\"/philosophy/free-sw.html\">definição completa</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If a program is free, then it can potentially be included in a free "
 "operating system such as GNU, or free versions of the <a href=\"/gnu/linux-"
@@ -89,7 +92,7 @@
 "operacional livre, como o GNU, ou versões livres como o sistema <a href=\"/"
 "gnu/linux-and-gnu.html\">GNU/Linux</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There are many different ways to make a program free&mdash;many questions of "
 "detail, which could be decided in more than one way and still make the "
@@ -106,7 +109,7 @@
 # Mantive free software (entre aspas) não traduzido buscando manter a 
atenção
 # na ambiguidade de "free" para "freedom" e "free-as-beer", que não acontece
 # no português -- Rafael
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is a matter of freedom, not price. But proprietary software "
 "companies typically use the term &ldquo;free software&rdquo; to refer to "
@@ -125,7 +128,7 @@
 # Mantive free software (entre aspas) não traduzido buscando manter a 
atenção
 # na ambiguidade de "free" para "freedom" e "free-as-beer", que não acontece
 # no português -- Rafael
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Because of this potential confusion, when a software company says its "
 "product is free software, always check the actual distribution terms to see "
@@ -137,7 +140,7 @@
 "para ver se os usuários realmente possuem todas as liberdades que o software 
"
 "livre implica. Às vezes o software é mesmo livre; às vezes, não é."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Many languages have two separate words for &ldquo;free&rdquo; as in freedom "
 "and &ldquo;free&rdquo; as in zero price. For example, French has &ldquo;"
@@ -159,7 +162,7 @@
 "philosophy/fs-translations.html\">traduções do termo “free 
software”</a> "
 "para várias outros idiomas."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is often <a href=\"/software/reliability.html\">more reliable</"
 "a> than nonfree software."
@@ -167,11 +170,11 @@
 "Software livre é frequentemente <a href=\"/software/reliability.html\">mais "
 "confiável</a> do que softwares não livres."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Open source software"
 msgstr "Código aberto (open source)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;open source&rdquo; software is used by some people to mean "
 "more or less the same category as free software. It is not exactly the same "
@@ -191,7 +194,7 @@
 "princípio, pode acontecer de alguns programas livres serem rejeitados como "
 "código aberto, mas não sabemos se isso já aconteceu."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We prefer the term &ldquo;<a href=\"/philosophy/open-source-misses-the-point."
 "html\">free software</a>&rdquo; because it refers to freedom&mdash;something "
@@ -201,11 +204,11 @@
 "html\">software livre</a>”, porque ele se refere à liberdade &mdash; algo "
 "que o termo “código aberto” não faz."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Public domain software"
 msgstr "Software de domínio público"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Public domain software is software that is not copyrighted. If the source "
 "code is in the public domain, that is a special case of <a href=\"#Non-"
@@ -217,7 +220,7 @@
 "CopyleftedFreeSoftware\">software livre sem copyleft</a>, o que significa "
 "que algumas cópias ou versões modificadas podem não ser livres."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In some cases, an executable program can be in the public domain but the "
 "source code is not available. This is not free software, because free "
@@ -233,7 +236,7 @@
 "e os detentores deste copyright autorizaram legalmente permissão para que "
 "todo mundo o use livremente, usando uma licença de software livre."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Sometimes people use the term &ldquo;public domain&rdquo; in a loose fashion "
 "to mean <a href=\"#FreeSoftware\">&ldquo;free&rdquo;</a> or &ldquo;available "
@@ -249,7 +252,7 @@
 "“domínio público” para este significado apenas, e usar outros termos 
para "
 "transmitir os outros significados."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Under the Berne Convention, which most countries have signed, anything "
 "written down is automatically copyrighted. This includes programs. "
@@ -263,11 +266,11 @@
 "no domínio público, você deve tomar algumas medidas legais para renunciar 
o "
 "copyright sobre ele; do contrário, o programa estará protegido sob 
copyright."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Copylefted software"
 msgstr "Software com copyleft"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copylefted software is free software whose distribution terms ensure that "
 "all copies of all versions carry more or less the same distribution terms.  "
@@ -286,7 +289,7 @@
 "programa, e suas versões modificadas, de algumas das formas comuns de tornar 
"
 "um programa privativo."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Some copyleft licenses, such as GPL version&nbsp;3, block other means of "
 "turning software proprietary, such as <a href=\"/licenses/rms-why-gplv3.html"
@@ -296,7 +299,7 @@
 "meios de tornar em software em privativo, tal como <a href=\"/licenses/rms-"
 "why-gplv3.html\">tivoização</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the GNU Project, we copyleft almost all the software we write, because "
 "our goal is to give <em>every</em> user the freedoms implied by the term "
@@ -310,7 +313,7 @@
 "copyleft.html\">artigo sobre copyleft</a> para maior explicação sobre como 
o "
 "copyleft funciona e por que o usamos."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copyleft is a general concept; to copyleft an actual program, you need to "
 "use a specific set of distribution terms. There are many possible ways to "
@@ -333,11 +336,11 @@
 "código usando a outra licença; portanto, é bom para a comunidade que as "
 "pessoas usem uma única licença copyleft."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Noncopylefted free software"
 msgstr "Software livre sem copyleft"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Noncopylefted free software comes from the author with permission to "
 "redistribute and modify, and also to add additional restrictions to it."
@@ -345,7 +348,7 @@
 "Software livre sem copyleft vem do autor com permissão para redistribuir e "
 "modificar, e também para incluir restrições adicionais a ele."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If a program is free but not copylefted, then some copies or modified "
 "versions may not be free at all. A software company can compile the program, "
@@ -358,18 +361,31 @@
 "executável na forma de um produto <a href=\"#ProprietarySoftware"
 "\">privativo</a>."
 
-#. type: Content of: <p>
-msgid ""
-"The <a href=\"http://www.x.org\";>X Window System</a> illustrates this.  The "
-"X Consortium released X11 with distribution terms that made it noncopylefted "
-"free software, and subsequent developers have mostly followed the same "
-"practice.  A copy which has those distribution terms is free software.  "
-"However, there are nonfree versions as well, and there are (or at least "
-"were) popular workstations and PC graphics boards for which nonfree versions "
-"are the only ones that work.  If you are using this hardware, X11 is not "
-"free software for you.  <a href=\"/philosophy/x.html\">The developers of X11 "
-"even made X11 nonfree</a> for a while; they were able to do this because "
-"others had contributed their code under the same noncopyleft license."
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The <a href=\"http://www.x.org\";>X Window System</a> illustrates this.  "
+#| "The X Consortium released X11 with distribution terms that made it "
+#| "noncopylefted free software, and subsequent developers have mostly "
+#| "followed the same practice.  A copy which has those distribution terms is "
+#| "free software.  However, there are nonfree versions as well, and there "
+#| "are (or at least were) popular workstations and PC graphics boards for "
+#| "which nonfree versions are the only ones that work.  If you are using "
+#| "this hardware, X11 is not free software for you.  <a href=\"/philosophy/x."
+#| "html\">The developers of X11 even made X11 nonfree</a> for a while; they "
+#| "were able to do this because others had contributed their code under the "
+#| "same noncopyleft license."
+msgid ""
+"The <a href=\"https://www.x.org/wiki/\";>X Window System</a> illustrates "
+"this.  The X Consortium released X11 with distribution terms that made it "
+"noncopylefted free software, and subsequent developers have mostly followed "
+"the same practice.  A copy which has those distribution terms is free "
+"software.  However, there are nonfree versions as well, and there are (or at "
+"least were) popular workstations and PC graphics boards for which nonfree "
+"versions are the only ones that work.  If you are using this hardware, X11 "
+"is not free software for you.  <a href=\"/philosophy/x.html\">The developers "
+"of X11 even made X11 nonfree</a> for a while; they were able to do this "
+"because others had contributed their code under the same noncopyleft license."
 msgstr ""
 "O <a href=\"http://www.x.org\";>X Window System</a> ilustra isso. O X "
 "Consortium lançou o X11 com termos de distribuição que o torna software "
@@ -383,11 +399,11 @@
 "capazes de fazer isso, porque outros contribuíram seus códigos sob a mesma "
 "licença sem copyleft."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Lax permissive licensed software"
 msgstr "Software com licença permissiva e leniente"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Lax permissive licenses include the X11 license and the <a href=\"/licenses/"
 "bsd.html\">two BSD licenses</a>.  These licenses permit almost any use of "
@@ -399,11 +415,11 @@
 "qualquer uso do código, incluindo distribuição de binários privativos com 
ou "
 "sem alteração do código-fonte."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GPL-covered software"
 msgstr "Software coberto pela GPL"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/licenses/gpl.html\">GNU GPL (General Public License)</a> is "
 "one specific set of distribution terms for copylefting a program. The GNU "
@@ -414,17 +430,17 @@
 "programa. O Projeto GNU a utiliza como termos de distribuição para a maior "
 "parte dos softwares GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To equate free software with GPL-covered software is therefore an error."
 msgstr ""
 "Igualar software livre a software coberto pela GPL é, portanto, um erro."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "The GNU operating system"
 msgstr "O sistema operacional GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/gnu/gnu-history.html\">GNU operating system</a> is the Unix-"
 "like operating system, which is entirely free software, that we in the GNU "
@@ -434,7 +450,7 @@
 "operacional no estilo Unix, porém composto inteiramente de software livre, "
 "que nós, no Projeto GNU, desenvolvemos desde 1984."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A Unix-like operating system consists of many programs. The GNU system "
 "includes all of the <a href=\"#GNUsoftware\">official GNU packages</a>.  It "
@@ -446,7 +462,7 @@
 "GNU</a>. Ele também inclui muitos outros pacotes, como o X Window System e "
 "TeX, que não são softwares GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The first test release of the complete GNU system was in 1996.  This "
 "includes the GNU Hurd, our kernel, developed since 1990.  In 2001 the GNU "
@@ -471,7 +487,7 @@
 "de acordo com suas necessidades e desejos. O resultado ainda é uma variante "
 "do sistema GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Since the purpose of GNU is to be free, every single component in the GNU "
 "operating system is free software.  They don't all have to be copylefted, "
@@ -483,11 +499,11 @@
 "copyleft; qualquer tipo de software livre é legalmente apropriado para "
 "inclusão se ajudar a atender requisitos técnicos."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GNU programs"
 msgstr "Programas GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;GNU programs&rdquo; is equivalent to <a href=\"#GNUsoftware\">GNU "
 "software.</a> A program Foo is a GNU program if it is GNU software.  We also "
@@ -497,14 +513,22 @@
 "Um programa Foo é um programa GNU se for software GNU. Nós também dizemos "
 "que é um “pacote GNU”."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GNU software"
 msgstr "Softwares GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/software/software.html\">GNU software</a> is software that is "
+#| "released under the auspices of the <a href= \"/gnu/gnu-history.html\">GNU "
+#| "Project</a>. If a program is GNU software, we also say that it is a GNU "
+#| "program or a GNU package.  The README or manual of a GNU package should "
+#| "say it is one; also, the <a href=\"/directory\">Free Software Directory</"
+#| "a> identifies all GNU packages."
 msgid ""
 "<a href=\"/software/software.html\">GNU software</a> is software that is "
-"released under the auspices of the <a href= \"/gnu/gnu-history.html\">GNU "
+"released under the auspices of the <a href=\"/gnu/gnu-history.html\">GNU "
 "Project</a>. If a program is GNU software, we also say that it is a GNU "
 "program or a GNU package.  The README or manual of a GNU package should say "
 "it is one; also, the <a href=\"/directory\">Free Software Directory</a> "
@@ -517,7 +541,7 @@
 "também, o <a href=\"/directory\">Diretório de Software Livre</a> identifica 
"
 "todos os pacotes GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Most GNU software is <a href= \"/licenses/copyleft.html\">copylefted</a>, "
 "but not all; however, all GNU software must be <a href=\"/philosophy/free-sw."
@@ -527,10 +551,19 @@
 "\">copyleft</a>, mas nem todos; contudo, todo software GNU deve ser <a href="
 "\"/philosophy/free-sw.html\">software livre</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Some GNU software was written by <a href= \"http://www.fsf.org/about/";
+#| "staff/\">staff</a> of the <a href=\"http://www.fsf.org/\";>Free Software "
+#| "Foundation</a>, but most GNU software comes from many <a href=\"/people/"
+#| "people.html\">volunteers</a>.  (Some of these volunteers are paid by "
+#| "companies or universities, but they are volunteers for us.)  Some "
+#| "contributed software is copyrighted by the Free Software Foundation; some "
+#| "is copyrighted by the contributors who wrote it."
 msgid ""
-"Some GNU software was written by <a href= \"http://www.fsf.org/about/staff/";
-"\">staff</a> of the <a href=\"http://www.fsf.org/\";>Free Software "
+"Some GNU software was written by <a href=\"https://www.fsf.org/about/staff/";
+"\">staff</a> of the <a href=\"https://www.fsf.org/\";>Free Software "
 "Foundation</a>, but most GNU software comes from many <a href=\"/people/"
 "people.html\">volunteers</a>.  (Some of these volunteers are paid by "
 "companies or universities, but they are volunteers for us.)  Some "
@@ -545,11 +578,11 @@
 "contribuições possuem copyright da Free Software Foundation; outras possuem 
"
 "copyright dos contribuidores que as escrevem."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "FSF-copyrighted GNU software"
 msgstr "Softwares GNU sujeito ao copyright da FSF"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The developers of GNU packages can transfer the copyright to the FSF, or "
 "they can keep it.  The choice is theirs."
@@ -557,7 +590,7 @@
 "Os desenvolvedores de pacotes GNU podem transferir o copyright para a FSF, "
 "ou eles podem mantê-los. A escolha é deles."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If they have transferred the copyright to the FSF, the program is FSF-"
 "copyrighted GNU software, and the FSF can enforce its license.  If they have "
@@ -567,7 +600,7 @@
 "sujeito ao copyright da FSF, e a FSF pode impor sua licença. Se eles "
 "mantiveram o copyright, a imposição da licença é responsabilidade deles."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The FSF does not accept copyright assignments of software that is not an "
 "official GNU package, as a rule."
@@ -575,11 +608,11 @@
 "A FSF não aceita atribuições de copyright de software que não é um 
pacote "
 "oficial do GNU, como uma regra."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Nonfree software"
 msgstr "Software não livre"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Nonfree software is any software that is not free.  Its use, redistribution "
 "or modification is prohibited, or requires you to ask for permission, or is "
@@ -590,11 +623,11 @@
 "ou é restrito de tal forma que você não possa efetivamente fazê-lo "
 "livremente."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Proprietary software"
 msgstr "Software privativo"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Proprietary software is another name for nonfree software.  In the past we "
 "subdivided nonfree software into &ldquo;semifree software&rdquo;, which "
@@ -609,7 +642,7 @@
 "não poderia. Mas nós descartamos tal distinção e agora usamos “software 
"
 "privativo” como sinônimo de software não livre."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The Free Software Foundation follows the rule that we cannot install any "
 "proprietary program on our computers except temporarily for the specific "
@@ -623,7 +656,7 @@
 "mesmo programa. Fora isso, achamos que não há justificativa possível para "
 "instalar um programa privativo."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For example, we felt justified in installing Unix on our computer in the "
 "1980s, because we were using it to write a free replacement for Unix. "
@@ -638,7 +671,7 @@
 "livre, e qualquer computador novo que instalamos precisa funcionar com um "
 "sistema operacional completamente livre."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We don't insist that users of GNU, or contributors to GNU, have to live by "
 "this rule. It is a rule we made for ourselves. But we hope you will follow "
@@ -648,11 +681,11 @@
 "que viver com essa regra. Essa é uma regra que fizemos para nós mesmos. Mas 
"
 "esperamos que você decida segui-la também, para seu próprio bem."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Freeware"
 msgstr "Freeware"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;freeware&rdquo; has no clear accepted definition, but it is "
 "commonly used for packages which permit redistribution but not modification "
@@ -665,11 +698,11 @@
 "código-fonte não está disponível). Estes pacotes <em>não</em> são 
software "
 "livre, portanto não use “freeware” para referir-se a software livre."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Shareware"
 msgstr "Shareware"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Shareware is software which comes with permission for people to redistribute "
 "copies, but says that anyone who continues to use a copy is <em>required</"
@@ -679,7 +712,7 @@
 "que qualquer um que continue usando uma cópia é <em>obrigado</em> a pagar "
 "por uma licença."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Shareware is not free software, or even semifree. There are two reasons it "
 "is not:"
@@ -687,7 +720,7 @@
 "Shareware não é software livre, ou mesmo semilivre. Existe duas razões 
para "
 "isso:"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "For most shareware, source code is not available; thus, you cannot modify "
 "the program at all."
@@ -695,7 +728,7 @@
 "Para maior parte dos sharewares, o código-fonte não está disponível; "
 "portanto, você não pode modificar o programa."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Shareware does not come with permission to make a copy and install it "
 "without paying a license fee, not even for individuals engaging in nonprofit "
@@ -708,11 +741,11 @@
 "distribuição e fazem isso de qualquer forma, mas os termos não permitem "
 "isso)."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Private software"
 msgstr "Softwares privados"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Private or custom software is software developed for one user (typically an "
 "organization or company). That user keeps it and uses it, and does not "
@@ -722,7 +755,7 @@
 "(geralmente uma organização ou empresa). Aquele usuário o mantém e o usa, 
e "
 "não o libera para o público como código-fonte ou como binários."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A private program is free software (in a somewhat trivial sense) if its sole "
 "user has the four freedoms.  In particular, if the user has full rights to "
@@ -736,7 +769,7 @@
 "usuário distribui cópias para outros e não fornece as quatro liberdades 
com "
 "aquelas cópias, estas não são software livre."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is a matter of freedom, not access.  In general we do not "
 "believe it is wrong to develop a program and not release it. There are "
@@ -756,7 +789,7 @@
 "desenvolvimento de software privado ou personalizado e os princípios do "
 "movimento software livre."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Nearly all employment for programmers is in development of custom software; "
 "therefore most programming jobs are, or could be, done in a way compatible "
@@ -767,11 +800,11 @@
 "é, ou poderia ser, feita em uma forma compatível com o movimento software "
 "livre."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Commercial software"
 msgstr "Software comercial"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;Commercial&rdquo; and &ldquo;proprietary&rdquo; are not the same! "
 "Commercial software is software developed by a business as part of its "
@@ -785,7 +818,7 @@
 "a>, mas existem softwares livres comerciais, e softwares não comerciais e "
 "não livres."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For example, GNU Ada is developed by a company.  It is always distributed "
 "under the terms of the GNU GPL, and every copy is free software; but its "
@@ -802,7 +835,7 @@
 "respondem, “GNU Ada <em>é</em> um compilador comercial, apenas acontece de 
"
 "ser um software livre”."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For the GNU Project, the priorities are in the other order: the important "
 "thing is that GNU Ada is free software; that it is commercial is just a "
@@ -814,7 +847,7 @@
 "entanto, o desenvolvimento adicional do GNU Ada que resulta do mesmo ser "
 "comercial é definitivamente benéfico."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please help spread the awareness that free commercial software is possible. "
 "You can do this by making an effort not to say &ldquo;commercial&rdquo; when "
@@ -850,14 +883,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 "
@@ -865,13 +898,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; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, "
+#| "2015, 2016, 2017, 2018, 2019 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
-"2016, 2017, 2018, 2019 Free Software Foundation, Inc."
+"Copyright &copy; 1996-1998, 2001-2005, 2007, 2009-2012, 2015, 2019, 2021 "
+"Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
 "2016, 2017, 2018, 2019 Free Software Foundation, Inc."
@@ -903,13 +940,12 @@
 msgid "Updated:"
 msgstr "Última atualização:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
-"2016, 2017, 2018, 2019, 2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
-"2016, 2017, 2018, 2019, 2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, "
+#~ "2015, 2016, 2017, 2018, 2019, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, "
+#~ "2015, 2016, 2017, 2018, 2019, 2021 Free Software Foundation, Inc."
 
 #~ msgid ""
 #~ "If they have transfered the copyright to the FSF, the program is FSF-"

Index: philosophy/po/categories.ro.po
===================================================================
RCS file: /web/www/www/philosophy/po/categories.ro.po,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- philosophy/po/categories.ro.po      31 May 2021 09:06:20 -0000      1.12
+++ philosophy/po/categories.ro.po      21 Jul 2021 20:34:05 -0000      1.13
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: categories.html\n"
-"POT-Creation-Date: 2019-02-21 01:56+0000\n"
+"POT-Creation-Date: 2021-07-21 20:25+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: web-translators <web-translators@gnu.org>\n"
@@ -26,11 +26,14 @@
 "Categorii de software liber și non-liber - Proiectul GNU - Fundatia pentru "
 "Software Liber"
 
-#. type: Content of: <h2>
-msgid "Categories of free and nonfree software"
+#. type: Content of: <div><h2>
+# | Categories of [-f-]{+F+}ree and [-nonfree software-] {+Nonfree Software+}
+#, fuzzy
+#| msgid "Categories of free and nonfree software"
+msgid "Categories of Free and Nonfree Software"
 msgstr "Categorii de software liber și non-liber"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Also [-note-] {+see+} <a
 # | href=\"/philosophy/words-to-avoid.html\">Confusing Words which You Might
 # | Want to Avoid</a>.
@@ -45,11 +48,11 @@
 "De asemenea citiți articolul&nbsp; „<a 
href=\"/philosophy/words-to-avoid.html"
 "\">Termeni vagi sau înșelători și expresii care ar trebui evitate</a>”"
 
-#. type: Attribute 'alt' of: <p><img>
+#. type: Attribute 'alt' of: <div><p><img>
 msgid "[Categories of software]"
 msgstr "[Categorii de software]"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | This [-diagram-] {+diagram, originally+} by Chao-Kuei {+and updated by
 # | several others since,+} explains the different categories of software.
 # | It's available as a <a href=\"/philosophy/category.svg\">Scalable Vector
@@ -75,11 +78,11 @@
 "\">Scalable Vector Graphic</a></cite>, și ca&nbsp; <a href=\"/philosophy/"
 "category.fig\">fisier XFig</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Free software"
 msgstr "Software liber"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Free software is software that comes with permission for anyone to use,
 # | copy, [-and-] {+and/or+} distribute, either verbatim or with
 # | modifications, either gratis or for a fee. In particular, this means that
@@ -109,7 +112,7 @@
 "definiție simplificată; studiați&nbsp; <a href=\"/philosophy/free-sw.html"
 "\">definiția integrală</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If a program is free, then it can potentially be included in a free "
 "operating system such as GNU, or free versions of the <a href=\"/gnu/linux-"
@@ -119,7 +122,7 @@
 "operare ca GNU, sau în versiuni libere ale&nbsp;<a 
href=\"/gnu/linux-and-gnu."
 "html\">sistemului GNU/Linux</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | There are many different ways to make a program free&mdash;many questions
 # | of detail, which could be decided in more than one way and still make the
 # | program free. Some of the possible variations are described below. {+For
@@ -142,7 +145,7 @@
 "care, toate, transformă programul într-unul liber. Unele din aceste 
variații "
 "sunt descrise mai jos."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Free software is a matter of freedom, not price. But proprietary software
 # | companies [-sometimes-] {+typically+} use the term &ldquo;free
 # | software&rdquo; to refer to price. Sometimes they mean that you can obtain
@@ -175,7 +178,7 @@
 "comun cu ceea ce noi înțelegem prin „software liber” în cadrul 
Proiectului "
 "GNU.&nbsp;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Because of this potential confusion, when a software company says its "
 "product is free software, always check the actual distribution terms to see "
@@ -188,7 +191,7 @@
 "presupune software-ul liber. Uneori chiar este vorba de software liber; "
 "alteori, nu."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Many languages have two separate words for &ldquo;free&rdquo; as in
 # | freedom and &ldquo;free&rdquo; as in zero price. For example, French has
 # | &ldquo;libre&rdquo; and &ldquo;gratuit&rdquo;.  [-English has-] {+Not so
@@ -230,7 +233,7 @@
 "philosophy/fs-translations.html\">traduceri ale noțiunii de &quot;software "
 "liber&quot;</a> în diverse alte limbi."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is often <a href=\"/software/reliability.html\">more reliable</"
 "a> than nonfree software."
@@ -238,11 +241,11 @@
 "Software-ul liber este <a href=\"/software/reliability.html\">mai fiabil</a> "
 "decât software-ul non-liber."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Open source software"
 msgstr "Software open source"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | The term &ldquo;open source&rdquo; software is used by some people to mean
 # | more or less the same [-thing-] {+category+} as free software. [-We
 # | prefer-] {+It is not exactly+} the [-term &ldquo;<a
@@ -275,18 +278,18 @@
 "preferăm termenul&nbsp; „<a 
href=\"/philosophy/open-source-misses-the-point."
 "html\">software liber</a>”; urmați linkul pentru a vedea de ce."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We prefer the term &ldquo;<a href=\"/philosophy/open-source-misses-the-point."
 "html\">free software</a>&rdquo; because it refers to freedom&mdash;something "
 "that the term &ldquo;open source&ldquo; does not do."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Public domain software"
 msgstr "Software în domeniul public"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Public domain software is software that is not copyrighted. If the source "
 "code is in the public domain, that is a special case of <a href=\"#Non-"
@@ -298,7 +301,7 @@
 "CopyleftedFreeSoftware\">software liber în afara copyleft-ului</a>, ceea ce "
 "înseamnă că unele copii sau versiuni modificate pot să nu fie libere de 
loc."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In some cases, an executable program can be in the public domain but the "
 "source code is not available. This is not free software, because free "
@@ -308,7 +311,7 @@
 "using a free software license."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Sometimes people use the term &ldquo;public domain&rdquo; in a loose fashion "
 "to mean <a href=\"#FreeSoftware\">&ldquo;free&rdquo;</a> or &ldquo;available "
@@ -324,7 +327,7 @@
 "notiunii de „domeniu public” doar cu acest sens, și sa utilizati alti "
 "termeni pentru a exprima alte sensuri."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Under the Berne Convention, which most countries have signed, anything "
 "written down is automatically copyrighted. This includes programs. "
@@ -333,11 +336,11 @@
 "otherwise, the program is copyrighted."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Copylefted software"
 msgstr "Software sub incidenta copyleft-ului"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Copylefted software is free software whose distribution terms [-do not let
 # | redistributors add any additional restrictions when they redistribute-]
 # | {+ensure that all copies of all versions carry more+} or [-modify-]
@@ -370,14 +373,14 @@
 "copiile software-ului, chiar dacă au fost modificate, trebuie să fie "
 "software liber."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Some copyleft licenses, such as GPL version&nbsp;3, block other means of "
 "turning software proprietary, such as <a href=\"/licenses/rms-why-gplv3.html"
 "\">tivoization</a>."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | In the GNU Project, we copyleft almost all the software we write, because
 # | our goal is to give <em>every</em> user the freedoms implied by the term
 # | &ldquo;free software.&rdquo; See our <a [-href=
@@ -405,7 +408,7 @@
 "pentru detalii suplimentare asupra efectelor copyleft-ului și asupra "
 "motivelor pentru care îl folosim."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Copyleft is a general concept; to [-actually-] copyleft [-a-] {+an
 # | actual+} program, you need to use a specific set of distribution terms.
 # | There are many possible ways to write copyleft distribution [-terms.-]
@@ -437,11 +440,11 @@
 "distribuție. Există mai multe modalități de a stipula termenii de "
 "distribuție sub copyleft."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Noncopylefted free software"
 msgstr "Software liber în afara copyleft-ului"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Noncopylefted free software comes from the author with permission to "
 "redistribute and modify, and also to add additional restrictions to it."
@@ -450,7 +453,7 @@
 "său, de permisiunea acordată utilizatorilor de a-l redistribui și 
modifica, "
 "și de asemenea de a adăuga restricții suplimentare în cazul 
redistribuiririi."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If a program is free but not copylefted, then some copies or modified "
 "versions may not be free at all. A software company can compile the program, "
@@ -463,8 +466,9 @@
 "fișierul executabil ca un produs software <a href=\"#ProprietarySoftware"
 "\">privat</a>."
 
-#. type: Content of: <p>
-# | The <a href=\"http://www.x.org\";>X Window System</a> illustrates this. 
+#. type: Content of: <div><p>
+# | The <a [-href=\"http://www.x.org\";>X-]
+# | {+href=\"https://www.x.org/wiki/\";>X+} Window System</a> illustrates this.
 # | The X Consortium release[-s-]{+d+} X11 with distribution terms that
 # | ma[-k-]{+d+}e it noncopylefted free [-software.  If you wish, you can get
 # | a-] {+software, and subsequent developers have mostly followed the same
@@ -486,16 +490,16 @@
 #| "boards for which nonfree versions are the only ones that work.  If you "
 #| "are using this hardware, X11 is not free software for you."
 msgid ""
-"The <a href=\"http://www.x.org\";>X Window System</a> illustrates this.  The "
-"X Consortium released X11 with distribution terms that made it noncopylefted "
-"free software, and subsequent developers have mostly followed the same "
-"practice.  A copy which has those distribution terms is free software.  "
-"However, there are nonfree versions as well, and there are (or at least "
-"were) popular workstations and PC graphics boards for which nonfree versions "
-"are the only ones that work.  If you are using this hardware, X11 is not "
-"free software for you.  <a href=\"/philosophy/x.html\">The developers of X11 "
-"even made X11 nonfree</a> for a while; they were able to do this because "
-"others had contributed their code under the same noncopyleft license."
+"The <a href=\"https://www.x.org/wiki/\";>X Window System</a> illustrates "
+"this.  The X Consortium released X11 with distribution terms that made it "
+"noncopylefted free software, and subsequent developers have mostly followed "
+"the same practice.  A copy which has those distribution terms is free "
+"software.  However, there are nonfree versions as well, and there are (or at "
+"least were) popular workstations and PC graphics boards for which nonfree "
+"versions are the only ones that work.  If you are using this hardware, X11 "
+"is not free software for you.  <a href=\"/philosophy/x.html\">The developers "
+"of X11 even made X11 nonfree</a> for a while; they were able to do this "
+"because others had contributed their code under the same noncopyleft license."
 msgstr ""
 "Aceasta situație se regăsește în exemplul&nbsp; <a 
href=\"http://www.x.org";
 "\">sistemului X Window</a>. Consortiul X distribuie X11 sub termeni de "
@@ -506,11 +510,11 @@
 "libere sunt compatibile. Dacă folosiți asemenea echipamente hardware, X11 
nu "
 "este, pentru dumneavoastră, utilizabil ca software liber."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Lax permissive licensed software"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Lax permissive licenses include the X11 license and the <a href=\"/licenses/"
 "bsd.html\">two BSD licenses</a>.  These licenses permit almost any use of "
@@ -518,11 +522,11 @@
 "changing the source code."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GPL-covered software"
 msgstr "Software sub incidența GPL"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | The <a [-href=\"/copyleft/gpl.html\">GNU-]
 # | {+href=\"/licenses/gpl.html\">GNU+} GPL (General Public License)</a> is
 # | one specific set of distribution terms for copylefting a program. The GNU
@@ -542,16 +546,16 @@
 "copyleft. Proiectul GNU o folosește ca acord de utilizare pentru cea mai "
 "mare parte a software-ului GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To equate free software with GPL-covered software is therefore an error."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "The GNU operating system"
 msgstr "Sistemul de operare GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | The <a href=\"/gnu/gnu-history.html\">GNU operating system</a> is [-a
 # | complete free-] {+the+} Unix-like operating [-system.-] {+system, which is
 # | entirely free software, that we in the GNU Project have developed since
@@ -568,7 +572,7 @@
 "<a href=\"/gnu/gnu-history.html\">Sistemul de operare GNU</a> este un sistem "
 "de operare liber, complet, similar Unix-ului."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | A Unix-like operating system consists of many programs. The GNU system
 # | includes all {+of+} the <a [-href=\"#GNUsoftware\">GNU software</a>, as
 # | well as-] {+href=\"#GNUsoftware\">official GNU packages</a>.  It also
@@ -591,7 +595,7 @@
 "numeroase alte pachete de distribuție ca sistemul X Window și TeX, care nu "
 "sunt software GNU."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | [-We have been developing and accumulating components for the GNU system
 # | since 1984; the-]{+The+} first test release of [-a &ldquo;complete-] {+the
 # | complete+} GNU [-system&rdquo;-] {+system+} was in 1996.  [-Today, in
@@ -634,7 +638,7 @@
 "Linux</a>, un derivat al sistemului GNU, care folosește kernel Linux, a "
 "devenit un uriaș succes."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Since the purpose of GNU is to be free, every single component in the GNU
 # | {+operating+} system [-has to be-] {+is+} free software.  They don't all
 # | have to be copylefted, however; any kind of free software is legally
@@ -660,11 +664,11 @@
 "folosi și chiar folosim software liber în afara copyleft-ului, ca de 
exemplu "
 "sistemul X Window."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GNU programs"
 msgstr "Programele GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | &ldquo;GNU programs&rdquo; is equivalent to <a href=\"#GNUsoftware\">GNU
 # | software.</a> A program Foo is a GNU program if it is GNU software.  {+We
 # | also sometimes say it is a &ldquo;GNU package&rdquo;.+}
@@ -681,20 +685,20 @@
 "\">software-ul GNU</a>.  Un program oarecare este un program GNU dacă este "
 "software GNU."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GNU software"
 msgstr "Software GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | <a href=\"/software/software.html\">GNU software</a> is software that is
-# | released under the auspices of the <a href={+
-# | +}\"/gnu/gnu-history.html\">GNU Project</a>.  [-Most-] {+If a program is
-# | GNU software, we also say that it is a+} GNU [-software-] {+program or a
-# | GNU package.  The README or manual of a GNU package should say it+} is
-# | {+one; also, the+} <a [-href=\"/copyleft/copyleft.html\">copylefted</a>,
-# | but not all; however,-] {+href=\"/directory\">Free Software Directory</a>
-# | identifies+} all GNU [-software must be <a
-# | href=\"/philosophy/free-sw.html\">free software</a>.-] {+packages.+}
+# | released under the auspices of the <a href=\"/gnu/gnu-history.html\">GNU
+# | Project</a>.  [-Most-] {+If a program is GNU software, we also say that it
+# | is a+} GNU [-software-] {+program or a GNU package.  The README or manual
+# | of a GNU package should say it+} is {+one; also, the+} <a
+# | [-href=\"/copyleft/copyleft.html\">copylefted</a>, but not all; however,-]
+# | {+href=\"/directory\">Free Software Directory</a> identifies+} all GNU
+# | [-software must be <a href=\"/philosophy/free-sw.html\">free
+# | software</a>.-] {+packages.+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"/software/software.html\">GNU software</a> is software that is "
@@ -704,7 +708,7 @@
 #| "\"/philosophy/free-sw.html\">free software</a>."
 msgid ""
 "<a href=\"/software/software.html\">GNU software</a> is software that is "
-"released under the auspices of the <a href= \"/gnu/gnu-history.html\">GNU "
+"released under the auspices of the <a href=\"/gnu/gnu-history.html\">GNU "
 "Project</a>. If a program is GNU software, we also say that it is a GNU "
 "program or a GNU package.  The README or manual of a GNU package should say "
 "it is one; also, the <a href=\"/directory\">Free Software Directory</a> "
@@ -716,7 +720,7 @@
 "copyleft.html\">copyleft</a>, însă nu integral; totuși, tot software-ul 
GNU "
 "trebuie să fie <a href=\"/philosophy/free-sw.html\">software liber</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | [-If a program is-]{+Most+} GNU [-software, we also say that it-]
 # | {+software+} is [-a-] {+<a href=
 # | \"/licenses/copyleft.html\">copylefted</a>, but not all; however, all+}
@@ -731,11 +735,12 @@
 msgstr ""
 "Dacă un program este software GNU, noi îl considerăm că este program GNU."
 
-#. type: Content of: <p>
-# | Some GNU software [-is-] {+was+} written by <a href=
-# | \"http://www.fsf.org/about/staff/\";>staff</a> of the <a
-# | href=\"http://www.fsf.org/\";>Free Software Foundation</a>, but most GNU
-# | software [-is contributed by-] {+comes from many+} <a
+#. type: Content of: <div><p>
+# | Some GNU software [-is-] {+was+} written by <a [-href=
+# | \"http://www.fsf.org/about/staff/\";>staff</a>-]
+# | {+href=\"https://www.fsf.org/about/staff/\";>staff</a>+} of the <a
+# | href=\"http{+s+}://www.fsf.org/\">Free Software Foundation</a>, but most
+# | GNU software [-is contributed by-] {+comes from many+} <a
 # | href=\"/people/people.html\">volunteers</a>.  {+(Some of these volunteers
 # | are paid by companies or universities, but they are volunteers for us.)+} 
 # | Some contributed software is copyrighted by the Free Software Foundation;
@@ -749,8 +754,8 @@
 #| "the Free Software Foundation; some is copyrighted by the contributors who "
 #| "wrote it."
 msgid ""
-"Some GNU software was written by <a href= \"http://www.fsf.org/about/staff/";
-"\">staff</a> of the <a href=\"http://www.fsf.org/\";>Free Software "
+"Some GNU software was written by <a href=\"https://www.fsf.org/about/staff/";
+"\">staff</a> of the <a href=\"https://www.fsf.org/\";>Free Software "
 "Foundation</a>, but most GNU software comes from many <a href=\"/people/"
 "people.html\">volunteers</a>.  (Some of these volunteers are paid by "
 "companies or universities, but they are volunteers for us.)  Some "
@@ -764,34 +769,34 @@
 "află sub copyright-ul Fundației pentru Software Liber; altă parte se află 
"
 "sub copyright-ul creatorilor săi."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "FSF-copyrighted GNU software"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The developers of GNU packages can transfer the copyright to the FSF, or "
 "they can keep it.  The choice is theirs."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If they have transferred the copyright to the FSF, the program is FSF-"
 "copyrighted GNU software, and the FSF can enforce its license.  If they have "
 "kept the copyright, enforcing the license is their responsibility."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The FSF does not accept copyright assignments of software that is not an "
 "official GNU package, as a rule."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Nonfree software"
 msgstr "Software neliber"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Nonfree software is {+any+} software that is not free.  Its use,
 # | redistribution or modification is prohibited, or requires you to ask for
 # | permission, or is restricted so much that you effectively can't do it
@@ -810,11 +815,11 @@
 "redistribuirea sau modificarea sa sunt interzise, sau atât de 
restricționate "
 "încât în mod concret nu se pot desfășura în libertate.&nbsp;"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Proprietary software"
 msgstr "Software privat"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Proprietary software is another name for nonfree software.  In the past we "
 "subdivided nonfree software into &ldquo;semifree software&rdquo;, which "
@@ -824,7 +829,7 @@
 "software."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The Free Software Foundation follows the rule that we cannot install any "
 "proprietary program on our computers except temporarily for the specific "
@@ -838,7 +843,7 @@
 "program pentru acel produs privat. Cu excepția acestei situații, credem că 
"
 "nu există justificare pentru instalarea unui program privat."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For example, we felt justified in installing Unix on our computer in the "
 "1980s, because we were using it to write a free replacement for Unix. "
@@ -853,7 +858,7 @@
 "operare, și orice computer pe care îl avem trebuie să ruleze sisteme de "
 "operare complet libere."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | We don't insist that users of GNU, or contributors to GNU, have to live by
 # | this rule. It is a rule we made for ourselves. But we hope you will
 # | [-decide to-] follow it [-too.-] {+too, for your freedom's sake.+}
@@ -871,11 +876,11 @@
 "această regulă. Am creat această regulă doar pentru noi. Dar sperăm că 
vă "
 "veți decide și dumneavoastră să o urmați."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Freeware"
 msgstr "Freeware"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;freeware&rdquo; has no clear accepted definition, but it is "
 "commonly used for packages which permit redistribution but not modification "
@@ -889,11 +894,11 @@
 "disponibil). Aceste pachete <em>nu</em> sunt software liber, așa încât vă 
"
 "rugăm să nu vă referiți la ele ca „software liber”."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Shareware"
 msgstr "Shareware"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Shareware is software which comes with permission for people to redistribute "
 "copies, but says that anyone who continues to use a copy is <em>required</"
@@ -903,7 +908,7 @@
 "redistribui copii, dar sub condiția <i>obligatorie</i> a achiziționării 
unei "
 "licențe contra cost în cazul în care se dorește continuarea utilizării 
sale."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Shareware is not free software, or even semifree. There are two reasons it "
 "is not:"
@@ -911,7 +916,7 @@
 "Shareware-ul nu este software liber, și nici măcar semi-liber. Aceasta, din 
"
 "două motive:"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "For most shareware, source code is not available; thus, you cannot modify "
 "the program at all."
@@ -919,7 +924,7 @@
 "Pentru majoritatea shareware-ului, codul-sursă nu este disponibil, astfel "
 "încât nu puteți modifica deloc programul."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Shareware does not come with permission to make a copy and install it "
 "without paying a license fee, not even for individuals engaging in nonprofit "
@@ -932,18 +937,18 @@
 "distributie nu sunt respectati și programele sunt instalate și de catre "
 "companii comerciale, chiar daca termenii de distributie nu admit aceasta.)"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Private software"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Private or custom software is software developed for one user (typically an "
 "organization or company). That user keeps it and uses it, and does not "
 "release it to the public either as source code or as binaries."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A private program is free software (in a somewhat trivial sense) if its sole "
 "user has the four freedoms.  In particular, if the user has full rights to "
@@ -952,7 +957,7 @@
 "those copies are not free software."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is a matter of freedom, not access.  In general we do not "
 "believe it is wrong to develop a program and not release it. There are "
@@ -964,18 +969,18 @@
 "software movement."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Nearly all employment for programmers is in development of custom software; "
 "therefore most programming jobs are, or could be, done in a way compatible "
 "with the free software movement."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Commercial software"
 msgstr "Software comercial"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | &ldquo;Commercial&rdquo; and &ldquo;proprietary&rdquo; are not the [-same
 # | thing!-] {+same!+} Commercial software is software [-being-] developed by
 # | a business [-which aims to make money from the use-] {+as part+} of [-the
@@ -1002,7 +1007,7 @@
 "este <a href=\"#ProprietarySoftware\">privat</a>, dar există și software "
 "comercial liber, și software non-comercial non-liber."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | For example, GNU Ada is {+developed by a company.  It is+} always
 # | distributed under the terms of the GNU GPL, and every copy is free
 # | software; but its developers sell support contracts. When their salesmen
@@ -1033,7 +1038,7 @@
 "Agenții de vânzări răspund „GNU Ada <em>este</em> un compiler 
comercial; "
 "atâta doar că este software liber.”"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | For the GNU Project, the [-emphasis is-] {+priorities are+} in the other
 # | order: the important thing is that GNU Ada is free software; [-whether-]
 # | {+that+} it is commercial is [-not-] {+just+} a [-crucial question.-]
@@ -1056,7 +1061,7 @@
 "prezintă prea mare importanță. Totuși, dezvoltările adiționale ale GNU 
Ada "
 "care rezultă din caracterul său comercial sunt categoric benefice."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please help spread the awareness that free commercial software is possible. "
 "You can do this by making an effort not to say &ldquo;commercial&rdquo; when "
@@ -1092,30 +1097,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>
+# | 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>
 #, fuzzy
 msgid ""
-"Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
-"2016, 2017, 2018, 2019 Free Software Foundation, Inc."
+"Copyright &copy; 1996-1998, 2001-2005, 2007, 2009-2012, 2015, 2019, 2021 "
+"Free Software Foundation, Inc."
 msgstr "Copyright &copy; 1996, 1997, 1998, 2001 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
@@ -1138,6 +1147,20 @@
 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>."
+
 #~ msgid "[diagram of a the different categories of software]"
 #~ msgstr " [diagramă cu diferitele categorii de software] "
 

Index: philosophy/po/categories.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/categories.ru.po,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- philosophy/po/categories.ru.po      21 Jul 2021 20:25:38 -0000      1.56
+++ philosophy/po/categories.ru.po      21 Jul 2021 20:34:05 -0000      1.57
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: categories.html\n"
-"POT-Creation-Date: 2019-02-21 01:56+0000\n"
+"POT-Creation-Date: 2021-07-21 20:25+0000\n"
 "PO-Revision-Date: 2018-01-01 17:17+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-07-21 20:25+0000\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
@@ -27,12 +28,15 @@
 "программного обеспечения"
 
 # type: Content of: <h2>
-#. type: Content of: <h2>
-msgid "Categories of free and nonfree software"
+#. type: Content of: <div><h2>
+# | Categories of [-f-]{+F+}ree and [-nonfree software-] {+Nonfree Software+}
+#, fuzzy
+#| msgid "Categories of free and nonfree software"
+msgid "Categories of Free and Nonfree Software"
 msgstr "Категории свободных и несвободных 
программ"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Also see <a href=\"/philosophy/words-to-avoid.html\">Confusing Words which "
 "You Might Want to Avoid</a>."
@@ -41,13 +45,13 @@
 "слова, которых вам стоило бы избегать</a>."
 
 # type: Content of: <h2>
-#. type: Attribute 'alt' of: <p><img>
+#. type: Attribute 'alt' of: <div><p><img>
 msgid "[Categories of software]"
 msgstr "[Категории программ]"
 
 # type: Content of: <p>
 #  XFig version is absent as it can't handle Cyrillics
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This diagram, originally by Chao-Kuei and updated by several others since, "
 "explains the different categories of software. It's available as a <a href="
@@ -64,12 +68,12 @@
 "Creative Commons Attribution-Share Alike v2.0 или более 
поздней."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Free software"
 msgstr "Свободные программы"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is software that comes with permission for anyone to use, "
 "copy, and/or distribute, either verbatim or with modifications, either "
@@ -86,7 +90,7 @@
 "free-sw.html\">полное определение</a>."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If a program is free, then it can potentially be included in a free "
 "operating system such as GNU, or free versions of the <a href=\"/gnu/linux-"
@@ -97,7 +101,7 @@
 "and-gnu.html\">системы GNU/Linux</a>."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There are many different ways to make a program free&mdash;many questions of "
 "detail, which could be decided in more than one way and still make the "
@@ -112,7 +116,7 @@
 "license-list.html\">нашему списку лицензий</a>."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is a matter of freedom, not price. But proprietary software "
 "companies typically use the term &ldquo;free software&rdquo; to refer to "
@@ -131,7 +135,7 @@
 "программой в проекте GNU."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Because of this potential confusion, when a software company says its "
 "product is free software, always check the actual distribution terms to see "
@@ -145,7 +149,7 @@
 "Иногда это действительно свободная 
программа; иногда&nbsp;&mdash; нет."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Many languages have two separate words for &ldquo;free&rdquo; as in freedom "
 "and &ldquo;free&rdquo; as in zero price. For example, French has &ldquo;"
@@ -169,7 +173,7 @@
 "языки."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is often <a href=\"/software/reliability.html\">more reliable</"
 "a> than nonfree software."
@@ -178,12 +182,12 @@
 "надежны</a>, чем несвободные."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Open source software"
 msgstr "Программы с открытым исходным текстом"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;open source&rdquo; software is used by some people to mean "
 "more or less the same category as free software. It is not exactly the same "
@@ -205,7 +209,7 @@
 "текстом, но мы не знаем, бывало ли такое на 
самом деле."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We prefer the term &ldquo;<a href=\"/philosophy/open-source-misses-the-point."
 "html\">free software</a>&rdquo; because it refers to freedom&mdash;something "
@@ -217,12 +221,12 @@
 "не подразумевает. "
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Public domain software"
 msgstr "Программы в общественном достоянии"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Public domain software is software that is not copyrighted. If the source "
 "code is in the public domain, that is a special case of <a href=\"#Non-"
@@ -237,7 +241,7 @@
 "модифицированные версии вполне могут не 
быть свободными."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In some cases, an executable program can be in the public domain but the "
 "source code is not available. This is not free software, because free "
@@ -256,7 +260,7 @@
 "ими."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Sometimes people use the term &ldquo;public domain&rdquo; in a loose fashion "
 "to mean <a href=\"#FreeSoftware\">&ldquo;free&rdquo;</a> or &ldquo;available "
@@ -275,7 +279,7 @@
 "значений."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Under the Berne Convention, which most countries have signed, anything "
 "written down is automatically copyrighted. This includes programs. "
@@ -291,12 +295,12 @@
 "авторское право на нее распространяется."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Copylefted software"
 msgstr "Программы с авторским левом"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copylefted software is free software whose distribution terms ensure that "
 "all copies of all versions carry more or less the same distribution terms.  "
@@ -316,7 +320,7 @@
 "сделать программу несвободной."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Some copyleft licenses, such as GPL version&nbsp;3, block other means of "
 "turning software proprietary, such as <a href=\"/licenses/rms-why-gplv3.html"
@@ -327,7 +331,7 @@
 "licenses/rms-why-gplv3.html\">тивоизация</a>."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the GNU Project, we copyleft almost all the software we write, because "
 "our goal is to give <em>every</em> user the freedoms implied by the term "
@@ -343,7 +347,7 @@
 "copyleft.html\">статье об авторском леве</a>."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copyleft is a general concept; to copyleft an actual program, you need to "
 "use a specific set of distribution terms. There are many possible ways to "
@@ -368,12 +372,12 @@
 "применяли только одну лицензию с 
авторским левом."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Noncopylefted free software"
 msgstr "Свободные программы без авторского 
лева"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Noncopylefted free software comes from the author with permission to "
 "redistribute and modify, and also to add additional restrictions to it."
@@ -383,7 +387,7 @@
 "дополнительные ограничения."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If a program is free but not copylefted, then some copies or modified "
 "versions may not be free at all. A software company can compile the program, "
@@ -397,18 +401,43 @@
 "программный продукт. "
 
 # type: Content of: <p>
-#. type: Content of: <p>
-msgid ""
-"The <a href=\"http://www.x.org\";>X Window System</a> illustrates this.  The "
-"X Consortium released X11 with distribution terms that made it noncopylefted "
-"free software, and subsequent developers have mostly followed the same "
-"practice.  A copy which has those distribution terms is free software.  "
-"However, there are nonfree versions as well, and there are (or at least "
-"were) popular workstations and PC graphics boards for which nonfree versions "
-"are the only ones that work.  If you are using this hardware, X11 is not "
-"free software for you.  <a href=\"/philosophy/x.html\">The developers of X11 "
-"even made X11 nonfree</a> for a while; they were able to do this because "
-"others had contributed their code under the same noncopyleft license."
+#. type: Content of: <div><p>
+# | The <a [-href=\"http://www.x.org\";>X-]
+# | {+href=\"https://www.x.org/wiki/\";>X+} Window System</a> illustrates this.
+# |  The X Consortium released X11 with distribution terms that made it
+# | noncopylefted free software, and subsequent developers have mostly
+# | followed the same practice.  A copy which has those distribution terms is
+# | free software.  However, there are nonfree versions as well, and there are
+# | (or at least were) popular workstations and PC graphics boards for which
+# | nonfree versions are the only ones that work.  If you are using this
+# | hardware, X11 is not free software for you.  <a
+# | href=\"/philosophy/x.html\">The developers of X11 even made X11
+# | nonfree</a> for a while; they were able to do this because others had
+# | contributed their code under the same noncopyleft license.
+#, fuzzy
+#| msgid ""
+#| "The <a href=\"http://www.x.org\";>X Window System</a> illustrates this.  "
+#| "The X Consortium released X11 with distribution terms that made it "
+#| "noncopylefted free software, and subsequent developers have mostly "
+#| "followed the same practice.  A copy which has those distribution terms is "
+#| "free software.  However, there are nonfree versions as well, and there "
+#| "are (or at least were) popular workstations and PC graphics boards for "
+#| "which nonfree versions are the only ones that work.  If you are using "
+#| "this hardware, X11 is not free software for you.  <a href=\"/philosophy/x."
+#| "html\">The developers of X11 even made X11 nonfree</a> for a while; they "
+#| "were able to do this because others had contributed their code under the "
+#| "same noncopyleft license."
+msgid ""
+"The <a href=\"https://www.x.org/wiki/\";>X Window System</a> illustrates "
+"this.  The X Consortium released X11 with distribution terms that made it "
+"noncopylefted free software, and subsequent developers have mostly followed "
+"the same practice.  A copy which has those distribution terms is free "
+"software.  However, there are nonfree versions as well, and there are (or at "
+"least were) popular workstations and PC graphics boards for which nonfree "
+"versions are the only ones that work.  If you are using this hardware, X11 "
+"is not free software for you.  <a href=\"/philosophy/x.html\">The developers "
+"of X11 even made X11 nonfree</a> for a while; they were able to do this "
+"because others had contributed their code under the same noncopyleft license."
 msgstr ""
 "Это иллюстрирует <a href=\"http://www.x.org\";>система X 
Window</a>. X "
 "Consortium выпускал X11 на условиях, которые 
делали ее свободной программой "
@@ -423,12 +452,12 @@
 "самой лицензией без авторского лева."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Lax permissive licensed software"
 msgstr "Программы с безрассудно либеральной 
лицензией"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Lax permissive licenses include the X11 license and the <a href=\"/licenses/"
 "bsd.html\">two BSD licenses</a>.  These licenses permit almost any use of "
@@ -441,12 +470,12 @@
 "оттранслированных файлов с изменениями 
исходного текста или без них."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GPL-covered software"
 msgstr "Программы под GPL"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/licenses/gpl.html\">GNU GPL (General Public License)</a> is "
 "one specific set of distribution terms for copylefting a program. The GNU "
@@ -458,7 +487,7 @@
 "большинства программ GNU."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To equate free software with GPL-covered software is therefore an error."
 msgstr ""
@@ -466,12 +495,12 @@
 "&mdash; ошибка."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "The GNU operating system"
 msgstr "Операционная система GNU"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/gnu/gnu-history.html\">GNU operating system</a> is the Unix-"
 "like operating system, which is entirely free software, that we in the GNU "
@@ -482,7 +511,7 @@
 "рамках проекта GNU с 1984&nbsp;года."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A Unix-like operating system consists of many programs. The GNU system "
 "includes all of the <a href=\"#GNUsoftware\">official GNU packages</a>.  It "
@@ -495,7 +524,7 @@
 "не являются программами GNU."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The first test release of the complete GNU system was in 1996.  This "
 "includes the GNU Hurd, our kernel, developed since 1990.  In 2001 the GNU "
@@ -521,7 +550,7 @@
 "результате все равно получается вариант 
системы GNU."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Since the purpose of GNU is to be free, every single component in the GNU "
 "operating system is free software.  They don't all have to be copylefted, "
@@ -536,12 +565,12 @@
 
 # type: Content of: <h3>
 #  skip the next passages: no need to support homomorphical synonyms in Russian
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GNU programs"
 msgstr " "
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;GNU programs&rdquo; is equivalent to <a href=\"#GNUsoftware\">GNU "
 "software.</a> A program Foo is a GNU program if it is GNU software.  We also "
@@ -549,15 +578,30 @@
 msgstr " "
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GNU software"
 msgstr "Программы GNU"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | <a href=\"/software/software.html\">GNU software</a> is software that is
+# | released under the auspices of the <a href=[-
+# | -]\"/gnu/gnu-history.html\">GNU Project</a>. If a program is GNU software,
+# | we also say that it is a GNU program or a GNU package.  The README or
+# | manual of a GNU package should say it is one; also, the <a
+# | href=\"/directory\">Free Software Directory</a> identifies all GNU
+# | packages.
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/software/software.html\">GNU software</a> is software that is "
+#| "released under the auspices of the <a href= \"/gnu/gnu-history.html\">GNU "
+#| "Project</a>. If a program is GNU software, we also say that it is a GNU "
+#| "program or a GNU package.  The README or manual of a GNU package should "
+#| "say it is one; also, the <a href=\"/directory\">Free Software Directory</"
+#| "a> identifies all GNU packages."
 msgid ""
 "<a href=\"/software/software.html\">GNU software</a> is software that is "
-"released under the auspices of the <a href= \"/gnu/gnu-history.html\">GNU "
+"released under the auspices of the <a href=\"/gnu/gnu-history.html\">GNU "
 "Project</a>. If a program is GNU software, we also say that it is a GNU "
 "program or a GNU package.  The README or manual of a GNU package should say "
 "it is one; also, the <a href=\"/directory\">Free Software Directory</a> "
@@ -571,7 +615,7 @@
 "<a href=\"/directory\">Каталоге свободных 
программ</a>."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Most GNU software is <a href= \"/licenses/copyleft.html\">copylefted</a>, "
 "but not all; however, all GNU software must be <a href=\"/philosophy/free-sw."
@@ -583,10 +627,28 @@
 "\">свободными</a>."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Some GNU software was written by <a [-href=
+# | \"http://www.fsf.org/about/staff/\";>staff</a>-]
+# | {+href=\"https://www.fsf.org/about/staff/\";>staff</a>+} of the <a
+# | href=\"http{+s+}://www.fsf.org/\">Free Software Foundation</a>, but most
+# | GNU software comes from many <a
+# | href=\"/people/people.html\">volunteers</a>.  (Some of these volunteers
+# | are paid by companies or universities, but they are volunteers for us.) 
+# | Some contributed software is copyrighted by the Free Software Foundation;
+# | some is copyrighted by the contributors who wrote it.
+#, fuzzy
+#| msgid ""
+#| "Some GNU software was written by <a href= \"http://www.fsf.org/about/";
+#| "staff/\">staff</a> of the <a href=\"http://www.fsf.org/\";>Free Software "
+#| "Foundation</a>, but most GNU software comes from many <a href=\"/people/"
+#| "people.html\">volunteers</a>.  (Some of these volunteers are paid by "
+#| "companies or universities, but they are volunteers for us.)  Some "
+#| "contributed software is copyrighted by the Free Software Foundation; some "
+#| "is copyrighted by the contributors who wrote it."
 msgid ""
-"Some GNU software was written by <a href= \"http://www.fsf.org/about/staff/";
-"\">staff</a> of the <a href=\"http://www.fsf.org/\";>Free Software "
+"Some GNU software was written by <a href=\"https://www.fsf.org/about/staff/";
+"\">staff</a> of the <a href=\"https://www.fsf.org/\";>Free Software "
 "Foundation</a>, but most GNU software comes from many <a href=\"/people/"
 "people.html\">volunteers</a>.  (Some of these volunteers are paid by "
 "companies or universities, but they are volunteers for us.)  Some "
@@ -603,12 +665,12 @@
 "авторские права на другие остаются за 
теми, кто предоставляет эти программы."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "FSF-copyrighted GNU software"
 msgstr "Программы GNU, авторские права на 
которые принадлежат ФСПО"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The developers of GNU packages can transfer the copyright to the FSF, or "
 "they can keep it.  The choice is theirs."
@@ -617,7 +679,7 @@
 "их за собой. Выбор&nbsp;&mdash; за ними."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If they have transferred the copyright to the FSF, the program is FSF-"
 "copyrighted GNU software, and the FSF can enforce its license.  If they have "
@@ -627,7 +689,7 @@
 "ФСПО может контролировать соблюдение ее 
лицензии. Если они оставили права за "
 "собой, то ответственность за контролем 
соблюдения лежит на них."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The FSF does not accept copyright assignments of software that is not an "
 "official GNU package, as a rule."
@@ -638,12 +700,12 @@
 # type: Content of: <h3>
 #  rearrange paragraphs: we don't know good synonyms for "nonfree" in Russian
 #  note also that this place is never referred to -- ineiev
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Nonfree software"
 msgstr "Полусвободные программы"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Nonfree software is any software that is not free.  Its use, redistribution "
 "or modification is prohibited, or requires you to ask for permission, or is "
@@ -654,12 +716,12 @@
 "некоммерческих целях. Но больше мы не 
употребляем этого термина."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Proprietary software"
 msgstr "Несвободные программы"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Proprietary software is another name for nonfree software.  In the past we "
 "subdivided nonfree software into &ldquo;semifree software&rdquo;, which "
@@ -674,7 +736,7 @@
 "можете делать это свободно."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The Free Software Foundation follows the rule that we cannot install any "
 "proprietary program on our computers except temporarily for the specific "
@@ -689,7 +751,7 @@
 "для установки несвободной программы нет."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For example, we felt justified in installing Unix on our computer in the "
 "1980s, because we were using it to write a free replacement for Unix. "
@@ -706,7 +768,7 @@
 "операционной системы."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We don't insist that users of GNU, or contributors to GNU, have to live by "
 "this rule. It is a rule we made for ourselves. But we hope you will follow "
@@ -717,12 +779,12 @@
 "Но мы надеемся, что вы тоже последуете 
ему&nbsp;&mdash; ради своей свободы."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Freeware"
 msgstr "Бесплатные программы"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;freeware&rdquo; has no clear accepted definition, but it is "
 "commonly used for packages which permit redistribution but not modification "
@@ -738,12 +800,12 @@
 "бесплатные программы&rdquo; для обозначения 
свободных программ."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Shareware"
 msgstr "Условно-бесплатные программы"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Shareware is software which comes with permission for people to redistribute "
 "copies, but says that anyone who continues to use a copy is <em>required</"
@@ -754,7 +816,7 @@
 "<em>обязан</em> внести лицензионную плату."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Shareware is not free software, or even semifree. There are two reasons it "
 "is not:"
@@ -763,7 +825,7 @@
 "полусвободными, по двум причинам:"
 
 # type: Content of: <ul><li>
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "For most shareware, source code is not available; thus, you cannot modify "
 "the program at all."
@@ -772,7 +834,7 @@
 "образом, вы никак не можете изменять 
программу."
 
 # type: Content of: <ul><li>
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Shareware does not come with permission to make a copy and install it "
 "without paying a license fee, not even for individuals engaging in nonprofit "
@@ -785,12 +847,12 @@
 "распространения и все равно делают это, но 
условия этого не допускают.)"
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Private software"
 msgstr "Заказные программы"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Private or custom software is software developed for one user (typically an "
 "organization or company). That user keeps it and uses it, and does not "
@@ -801,7 +863,7 @@
 "хранит их и пользуется ими, не публикуя их 
ни в виде исходного текста, ни в "
 "виде двоичных файлов."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A private program is free software (in a somewhat trivial sense) if its sole "
 "user has the four freedoms.  In particular, if the user has full rights to "
@@ -817,7 +879,7 @@
 "являются свободными программами."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is a matter of freedom, not access.  In general we do not "
 "believe it is wrong to develop a program and not release it. There are "
@@ -838,7 +900,7 @@
 "противоречия нет."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Nearly all employment for programmers is in development of custom software; "
 "therefore most programming jobs are, or could be, done in a way compatible "
@@ -850,12 +912,12 @@
 "образом."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Commercial software"
 msgstr "Коммерческие программы"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;Commercial&rdquo; and &ldquo;proprietary&rdquo; are not the same! "
 "Commercial software is software developed by a business as part of its "
@@ -871,7 +933,7 @@
 "несвободные некоммерческие программы."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For example, GNU Ada is developed by a company.  It is always distributed "
 "under the terms of the GNU GPL, and every copy is free software; but its "
@@ -889,7 +951,7 @@
 "является свободной программой&rdquo;."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For the GNU Project, the priorities are in the other order: the important "
 "thing is that GNU Ada is free software; that it is commercial is just a "
@@ -903,7 +965,7 @@
 "полезно."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please help spread the awareness that free commercial software is possible. "
 "You can do this by making an effort not to say &ldquo;commercial&rdquo; when "
@@ -940,14 +1002,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 ""
 "Мы старались сделать этот перевод точным 
и качественным, но исключить "
@@ -959,9 +1027,16 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
+# | Copyright &copy; [-1996, 1997, 1998, 2001, 2006,-] {+1996-1998,
+# | 2001-2005,+} 2007, [-2009, 2010, 2014,-] {+2009-2012,+} 2015, [-2016,
+# | 2017, 2018, 2019-] {+2019, 2021+} Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, "
+#| "2015, 2016, 2017, 2018, 2019 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
-"2016, 2017, 2018, 2019 Free Software Foundation, Inc."
+"Copyright &copy; 1996-1998, 2001-2005, 2007, 2009-2012, 2015, 2019, 2021 "
+"Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2011, 2014, "
 "2015, 2016, 2017, 2018, 2019 Free Software Foundation, Inc."
@@ -989,10 +1064,9 @@
 msgstr "Обновлено:"
 
 # type: Content of: <div><p>
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
-"2016, 2017, 2018, 2019, 2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2011, 2014, "
-"2015, 2016, 2017, 2018, 2019, 2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, "
+#~ "2015, 2016, 2017, 2018, 2019, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2011, "
+#~ "2014, 2015, 2016, 2017, 2018, 2019, 2021 Free Software Foundation, Inc."

Index: philosophy/po/categories.sr.po
===================================================================
RCS file: /web/www/www/philosophy/po/categories.sr.po,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- philosophy/po/categories.sr.po      31 May 2021 09:06:21 -0000      1.47
+++ philosophy/po/categories.sr.po      21 Jul 2021 20:34:05 -0000      1.48
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: categories.html\n"
-"POT-Creation-Date: 2019-02-21 01:56+0000\n"
+"POT-Creation-Date: 2021-07-21 20:25+0000\n"
 "PO-Revision-Date: 2009-07-05 21:49+0200\n"
 "Last-Translator: Strahinya Radich <vilinkamen@mail.ru>\n"
 "Language-Team: Serbian <www-sr-dev@lists.gnu.org>\n"
@@ -27,11 +27,13 @@
 "Врсте слободног и неслободног софтвера — 
Пројекат ГНУ — Задужбина за "
 "слободни софтвер"
 
-#. type: Content of: <h2>
-msgid "Categories of free and nonfree software"
+#. type: Content of: <div><h2>
+#, fuzzy
+#| msgid "Categories of free and nonfree software"
+msgid "Categories of Free and Nonfree Software"
 msgstr "Врсте слободног и неслободног 
софтвера"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Also see <a href=\"/philosophy/words-to-avoid.html\">Confusing Words which "
 "You Might Want to Avoid</a>."
@@ -39,7 +41,7 @@
 "Погледајте и <a 
href=\"/philosophy/words-to-avoid.html\">Збуњујуће речи које "
 "би требало избегавати</a>."
 
-#. type: Attribute 'alt' of: <p><img>
+#. type: Attribute 'alt' of: <div><p><img>
 msgid "[Categories of software]"
 msgstr "[Врсте софтвера]"
 
@@ -50,7 +52,7 @@
 # | an <a href=\"/philosophy/category.fig\">XFig document</a>, under the terms
 # | of any of the GNU GPL v2 or later, the GNU FDL v1.2 or later, or the
 # | Creative Commons Attribution-Share Alike v2.0 or later.
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "This diagram by Chao-Kuei explains the different categories of software. "
@@ -73,11 +75,11 @@
 "касније, ГНУ-ове СЛД в1.2 или касније, или 
Криејтив комонсове лиценце "
 "„Приписивање под истим условима“ в2.0 или 
касније."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Free software"
 msgstr "Слободни софтвер"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is software that comes with permission for anyone to use, "
 "copy, and/or distribute, either verbatim or with modifications, either "
@@ -92,7 +94,7 @@
 "изворни код, не ради се о софтверу.“ Ово је 
поједностављена опис; погледајте "
 "и <a href=\"/philosophy/free-sw.html\">пуну дефиницију</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If a program is free, then it can potentially be included in a free "
 "operating system such as GNU, or free versions of the <a href=\"/gnu/linux-"
@@ -102,7 +104,7 @@
 "је ГНУ, или слободне верзије <a 
href=\"/gnu/linux-and-gnu.html\">система ГНУ "
 "са Линуксом</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There are many different ways to make a program free&mdash;many questions of "
 "detail, which could be decided in more than one way and still make the "
@@ -116,7 +118,7 @@
 "слободној софтверској лиценци, 
погледајте страницу са <a href=\"/licenses/"
 "license-list.html\">списком лиценци</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is a matter of freedom, not price. But proprietary software "
 "companies typically use the term &ldquo;free software&rdquo; to refer to "
@@ -133,7 +135,7 @@
 "друго. Ово у оба ова случаја нема везе са 
оним што ми у Пројекту ГНУ "
 "подразумевамо под слободним софтвером."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Because of this potential confusion, when a software company says its "
 "product is free software, always check the actual distribution terms to see "
@@ -146,7 +148,7 @@
 "код слободног софтвера. Понекад се заиста 
ради о слободном софтверу, а "
 "понекад не."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Many languages have two separate words for &ldquo;free&rdquo; as in freedom "
 "and &ldquo;free&rdquo; as in zero price. For example, French has &ldquo;"
@@ -168,7 +170,7 @@
 "Погледајте наш <a 
href=\"/philosophy/fs-translations.html\">списак превода "
 "израза „слободни софтвер“</a> на разне 
друге језике."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is often <a href=\"/software/reliability.html\">more reliable</"
 "a> than nonfree software."
@@ -176,7 +178,7 @@
 "Слободни софтвер је често <a 
href=\"/software/reliability.html\">поузданији</"
 "a> од неслободног софтвера."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Open source software"
 msgstr "Софтвер отвореног изворног кода"
 
@@ -189,7 +191,7 @@
 # | open [-source, and nearly all open-] source [-software is-] {+but not+}
 # | free.  {+In principle it could happen that some free programs are rejected
 # | as open source, but we don't know if that has ever happened.+}
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "The term &ldquo;open source&rdquo; software is used by some people to "
@@ -217,7 +219,7 @@
 "слободни софтвер је софтвер отвореног 
изворног кода, а скоро сав софтвер "
 "отвореног изворног кода је слободан."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We prefer the term &ldquo;<a href=\"/philosophy/open-source-misses-the-point."
 "html\">free software</a>&rdquo; because it refers to freedom&mdash;something "
@@ -227,11 +229,11 @@
 "html\">слободни софтвер</a>“ бољи, јер се 
односи на слободу, за разлику од "
 "израза „отворени изворни код“."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Public domain software"
 msgstr "Софтвер у јавном власништву"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Public domain software is software that is not copyrighted. If the source "
 "code is in the public domain, that is a special case of <a href=\"#Non-"
@@ -244,7 +246,7 @@
 "CopyleftedFreeSoftware\">некопилефтованог слободног 
софтвера</a>, што значи "
 "да неки примерци или измењене верзије 
могу да буду сасвим неслободни."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In some cases, an executable program can be in the public domain but the "
 "source code is not available. This is not free software, because free "
@@ -260,7 +262,7 @@
 "носиоци ауторских права су правно дали 
дозволу свакоме да софтвер слободно "
 "користи преко слободне софтверске 
лиценце."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Sometimes people use the term &ldquo;public domain&rdquo; in a loose fashion "
 "to mean <a href=\"#FreeSoftware\">&ldquo;free&rdquo;</a> or &ldquo;available "
@@ -276,7 +278,7 @@
 "употребу израза „у јавном власништву“ 
искључиво да би се изразило то "
 "значење, а друге изразе за друга значења."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Under the Berne Convention, which most countries have signed, anything "
 "written down is automatically copyrighted. This includes programs. "
@@ -290,11 +292,11 @@
 "одређене правне кораке како бисте се 
одрекли ауторског права које постоји "
 "над њим, иначе је програм под ауторским 
правима."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Copylefted software"
 msgstr "Копилефтован софтвер"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copylefted software is free software whose distribution terms ensure that "
 "all copies of all versions carry more or less the same distribution terms.  "
@@ -317,7 +319,7 @@
 # | [-<a href=\"http://www.gnu.org/licenses/rms-why-gplv3.html\";>turning-]
 # | {+turning+} software [-proprietary</a>.-] {+proprietary, such as <a
 # | href=\"/licenses/rms-why-gplv3.html\">tivoization</a>.+}
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "Some copyleft licenses, such as GPL version&nbsp;3, block other means of "
@@ -332,7 +334,7 @@
 "начине <a 
href=\"http://www.gnu.org/licenses/rms-why-gplv3.html\";>претварања "
 "софтвера у власнички</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the GNU Project, we copyleft almost all the software we write, because "
 "our goal is to give <em>every</em> user the freedoms implied by the term "
@@ -356,7 +358,7 @@
 # | is illegal to merge the code using one license with the code using the
 # | other license; therefore, it is good for the community if people use a
 # | single copyleft license.
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "Copyleft is a general concept; to actually copyleft a program, you need "
@@ -389,11 +391,11 @@
 "спајати код под једном лиценцом са кодом 
под другом лиценцом; стога би било "
 "боље по заједницу ако би људи користили 
само једну лиценцу о копилефту."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Noncopylefted free software"
 msgstr "Некопилефтован слободни софтвер"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Noncopylefted free software comes from the author with permission to "
 "redistribute and modify, and also to add additional restrictions to it."
@@ -401,7 +403,7 @@
 "Некопилефтован слободни софтвер нуди 
аутор уз дозволе за расподељивање и "
 "измене, и додавање ограничења тим 
дозволама."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If a program is free but not copylefted, then some copies or modified "
 "versions may not be free at all. A software company can compile the program, "
@@ -425,7 +427,7 @@
 # | href=\"/philosophy/x.html\">The developers of X11 even made X11
 # | nonfree</a> for a while; they were able to do this because others had
 # | contributed their code under the same noncopyleft license.
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "The <a href=\"http://www.x.org\";>X Window System</a> illustrates this. "
@@ -439,16 +441,16 @@
 #| "for a while; they were able to do this because others had contributed "
 #| "their code under the same noncopyleft license."
 msgid ""
-"The <a href=\"http://www.x.org\";>X Window System</a> illustrates this.  The "
-"X Consortium released X11 with distribution terms that made it noncopylefted "
-"free software, and subsequent developers have mostly followed the same "
-"practice.  A copy which has those distribution terms is free software.  "
-"However, there are nonfree versions as well, and there are (or at least "
-"were) popular workstations and PC graphics boards for which nonfree versions "
-"are the only ones that work.  If you are using this hardware, X11 is not "
-"free software for you.  <a href=\"/philosophy/x.html\">The developers of X11 "
-"even made X11 nonfree</a> for a while; they were able to do this because "
-"others had contributed their code under the same noncopyleft license."
+"The <a href=\"https://www.x.org/wiki/\";>X Window System</a> illustrates "
+"this.  The X Consortium released X11 with distribution terms that made it "
+"noncopylefted free software, and subsequent developers have mostly followed "
+"the same practice.  A copy which has those distribution terms is free "
+"software.  However, there are nonfree versions as well, and there are (or at "
+"least were) popular workstations and PC graphics boards for which nonfree "
+"versions are the only ones that work.  If you are using this hardware, X11 "
+"is not free software for you.  <a href=\"/philosophy/x.html\">The developers "
+"of X11 even made X11 nonfree</a> for a while; they were able to do this "
+"because others had contributed their code under the same noncopyleft license."
 msgstr ""
 "Ово илуструје <a href=\"http://www.x.org\";>Прозорски 
систем Икс</a>. Икс "
 "конзорцијум (<em>X Consortium</em>) издаје Икс11 
(<em>X11</em>) под "
@@ -462,11 +464,11 @@
 "ураде зато што су остали доприносили њих
овом изворном коду под истом "
 "некопилефтованом лиценцом."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Lax permissive licensed software"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Lax permissive licenses include the X11 license and the <a href=\"/licenses/"
 "bsd.html\">two BSD licenses</a>.  These licenses permit almost any use of "
@@ -474,11 +476,11 @@
 "changing the source code."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GPL-covered software"
 msgstr "Софтвер под ОЈЛ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/licenses/gpl.html\">GNU GPL (General Public License)</a> is "
 "one specific set of distribution terms for copylefting a program. The GNU "
@@ -489,16 +491,16 @@
 "Пројекат ГНУ је користи као „одредбе о 
расподели“ за већи део ГНУ-овог "
 "софтвера."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To equate free software with GPL-covered software is therefore an error."
 msgstr "Зато је погрешно изједначавати 
слободни софтвер са софтвером под ОЈЛ."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "The GNU operating system"
 msgstr "Оперативни систем ГНУ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/gnu/gnu-history.html\">GNU operating system</a> is the Unix-"
 "like operating system, which is entirely free software, that we in the GNU "
@@ -513,7 +515,7 @@
 # | well as-] {+href=\"#GNUsoftware\">official GNU packages</a>.  It also
 # | includes+} many other packages, such as the X Window System and TeX, which
 # | are not GNU software.
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "A Unix-like operating system consists of many programs. The GNU system "
@@ -540,7 +542,7 @@
 # | this shows, the GNU system is not a single static set of programs; users
 # | and distributors may select different packages according to their needs
 # | and desires.  The result is still a variant of the GNU system.+}
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "The first test release of the complete GNU system was in 1996.  This "
@@ -570,7 +572,7 @@
 "and-gnu.html\">систем ГНУ са Линуксом</a>, изданак 
система ГНУ који користи "
 "Линукс као језгро уместо ГНУ-овог Крда."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Since the purpose of GNU is to be free, every single component in the GNU "
 "operating system is free software.  They don't all have to be copylefted, "
@@ -582,11 +584,11 @@
 "каква врста слободног софтвера је правно 
исправна за укључивање уколико "
 "помаже да се достигну тахнички циљеви."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GNU programs"
 msgstr "ГНУ-ови програми"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;GNU programs&rdquo; is equivalent to <a href=\"#GNUsoftware\">GNU "
 "software.</a> A program Foo is a GNU program if it is GNU software.  We also "
@@ -596,14 +598,22 @@
 "ов софтвер.</a> Програм „ТрлаБабаЛан“ је 
ГНУ-ов програм уколико је ГНУ-ов "
 "софтвер. Ми га понекад називамо и 
„ГНУ-овим пакетом“."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GNU software"
 msgstr "ГНУ-ов софтвер"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/software/software.html\">GNU software</a> is software that is "
+#| "released under the auspices of the <a href= \"/gnu/gnu-history.html\">GNU "
+#| "Project</a>. If a program is GNU software, we also say that it is a GNU "
+#| "program or a GNU package.  The README or manual of a GNU package should "
+#| "say it is one; also, the <a href=\"/directory\">Free Software Directory</"
+#| "a> identifies all GNU packages."
 msgid ""
 "<a href=\"/software/software.html\">GNU software</a> is software that is "
-"released under the auspices of the <a href= \"/gnu/gnu-history.html\">GNU "
+"released under the auspices of the <a href=\"/gnu/gnu-history.html\">GNU "
 "Project</a>. If a program is GNU software, we also say that it is a GNU "
 "program or a GNU package.  The README or manual of a GNU package should say "
 "it is one; also, the <a href=\"/directory\">Free Software Directory</a> "
@@ -616,7 +626,7 @@
 "требало да стоји да је тај програм ГНУ-ов. 
Такође, у <a href=\"/directory"
 "\">Каталогу слободног софтвера</a> су 
наведени сви ГНУ-ови пакети."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Most GNU software is <a href= \"/licenses/copyleft.html\">copylefted</a>, "
 "but not all; however, all GNU software must be <a href=\"/philosophy/free-sw."
@@ -635,7 +645,7 @@
 # | they are volunteers for us.)+}  Some contributed software is copyrighted
 # | by the Free Software Foundation; some is copyrighted by the contributors
 # | who wrote it.
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "Some GNU software was written by <a href= \"http://www.fsf.org/about/";
@@ -645,8 +655,8 @@
 #| "the Free Software Foundation; some is copyrighted by the contributors who "
 #| "wrote it."
 msgid ""
-"Some GNU software was written by <a href= \"http://www.fsf.org/about/staff/";
-"\">staff</a> of the <a href=\"http://www.fsf.org/\";>Free Software "
+"Some GNU software was written by <a href=\"https://www.fsf.org/about/staff/";
+"\">staff</a> of the <a href=\"https://www.fsf.org/\";>Free Software "
 "Foundation</a>, but most GNU software comes from many <a href=\"/people/"
 "people.html\">volunteers</a>.  (Some of these volunteers are paid by "
 "companies or universities, but they are volunteers for us.)  Some "
@@ -660,34 +670,34 @@
 "„ауторска права“ Задужбина за слободни 
софтвер, а неки други прилагачи који "
 "су га написали."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "FSF-copyrighted GNU software"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The developers of GNU packages can transfer the copyright to the FSF, or "
 "they can keep it.  The choice is theirs."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If they have transferred the copyright to the FSF, the program is FSF-"
 "copyrighted GNU software, and the FSF can enforce its license.  If they have "
 "kept the copyright, enforcing the license is their responsibility."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The FSF does not accept copyright assignments of software that is not an "
 "official GNU package, as a rule."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Nonfree software"
 msgstr "Неслободни софтвер"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Nonfree software is any software that is not free.  Its use, redistribution "
 "or modification is prohibited, or requires you to ask for permission, or is "
@@ -697,11 +707,11 @@
 "расподела или измена су забрањени, или од 
вас захтевају да тражите дозволу, "
 "или су ограничени у толикој мери да то 
ефективно не можете да урадите."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Proprietary software"
 msgstr "Власнички софтвер"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Proprietary software is another name for nonfree software.  In the past we "
 "subdivided nonfree software into &ldquo;semifree software&rdquo;, which "
@@ -711,7 +721,7 @@
 "software."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The Free Software Foundation follows the rule that we cannot install any "
 "proprietary program on our computers except temporarily for the specific "
@@ -730,7 +740,7 @@
 # | longer applicable; we [-have eliminated all our-] {+do not use any+}
 # | nonfree operating systems, and any new computer we install must run a
 # | completely free operating system.
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "For example, we felt justified in installing Unix on our computer in the "
@@ -756,7 +766,7 @@
 # | We don't insist that users of GNU, or contributors to GNU, have to live by
 # | this rule. It is a rule we made for ourselves. But we hope you will
 # | [-decide to-] follow it [-too.-] {+too, for your freedom's sake.+}
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "We don't insist that users of GNU, or contributors to GNU, have to live "
@@ -771,11 +781,11 @@
 "поступају. То је правило које смо 
установили за себе. Али се надамо да ћете "
 "и ви одлучити да га поштујете."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Freeware"
 msgstr "Фривер"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;freeware&rdquo; has no clear accepted definition, but it is "
 "commonly used for packages which permit redistribution but not modification "
@@ -789,11 +799,11 @@
 "софтвер, па вас молимо да не користите 
израз „фривер“ када мислите на "
 "слободни софтвер."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Shareware"
 msgstr "Шервер"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Shareware is software which comes with permission for people to redistribute "
 "copies, but says that anyone who continues to use a copy is <em>required</"
@@ -803,7 +813,7 @@
 "расподељују, али свако ко настави да 
користи примерак <em>мора</em> да плати "
 "цену лиценцирања."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Shareware is not free software, or even semifree. There are two reasons it "
 "is not:"
@@ -811,7 +821,7 @@
 "Шервер није слободни софтвер, па чак ни 
полуслободан. Ево два разлога зашто "
 "је то тако:"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "For most shareware, source code is not available; thus, you cannot modify "
 "the program at all."
@@ -819,7 +829,7 @@
 "За већину шервера није доступан изворни 
код, па уопште не можете да мењате "
 "програм."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Shareware does not come with permission to make a copy and install it "
 "without paying a license fee, not even for individuals engaging in nonprofit "
@@ -831,11 +841,11 @@
 "пракси, људи често не поштују одредбе о 
расподели и поред свега врше описане "
 "радње, али то одредбама није дозвољено.)"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Private software"
 msgstr "Приватни софтвер"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Private or custom software is software developed for one user (typically an "
 "organization or company). That user keeps it and uses it, and does not "
@@ -852,7 +862,7 @@
 # | program, the program is free.  However, if the user distributes copies to
 # | others and does not provide the four freedoms with those copies, those
 # | copies are not free software.+}
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "A private program is free software in a trivial sense if its unique user "
@@ -877,7 +887,7 @@
 # | [-harmful.-] {+wrong.+} Thus, there is no conflict between the development
 # | of private or custom software and the principles of the free software
 # | movement.
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "In general we do not believe it is wrong to develop a program and not "
@@ -904,7 +914,7 @@
 "штетно. Стога, изградња приватног или 
прилагођеног софтвера, није у сукобу "
 "са принципима Покрета за слободни 
софтвер."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Nearly all employment for programmers is in development of custom software; "
 "therefore most programming jobs are, or could be, done in a way compatible "
@@ -914,7 +924,7 @@
 "Зато сви програмерски послови јесу, или би 
могли да буду, реализовани на "
 "начин који је сагласан са покретом за 
слободни софтвер."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Commercial software"
 msgstr "Комерцијални софтвер"
 
@@ -924,7 +934,7 @@
 # | software.-] {+its business.+} Most commercial software is <a
 # | href=\"#ProprietarySoftware\">proprietary</a>, but there is commercial
 # | free software, and there is noncommercial nonfree software.
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "&ldquo;Commercial&rdquo; and &ldquo;proprietary&rdquo; are not the same "
@@ -945,7 +955,7 @@
 "a>, али постоји и комерцијални слободни 
софтвер, као и некомерцијални "
 "неслободни софтвер."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For example, GNU Ada is developed by a company.  It is always distributed "
 "under the terms of the GNU GPL, and every copy is free software; but its "
@@ -966,7 +976,7 @@
 # | {+that+} it is commercial is just a detail. However, the additional
 # | development of GNU Ada that results from its being commercial is
 # | definitely beneficial.
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "For the GNU Project, the emphasis is in the other order: the important "
@@ -984,7 +994,7 @@
 "комерцијалан. Међутим, додатни развој 
ГНУ-ове Аде који је производ њене "
 "комерцијалности је несумњиво позитиван."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please help spread the awareness that free commercial software is possible. "
 "You can do this by making an effort not to say &ldquo;commercial&rdquo; when "
@@ -1024,6 +1034,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
@@ -1031,22 +1042,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>.)"
+"превода овог чланка."
 
 # | Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, [-2009-] {+2009,
 # | 2010, 2014, 2015, 2016, 2017, 2018, 2019+} Free Software Foundation, Inc.
@@ -1056,8 +1069,8 @@
 #| "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009 Free Software "
 #| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
-"2016, 2017, 2018, 2019 Free Software Foundation, Inc."
+"Copyright &copy; 1996-1998, 2001-2005, 2007, 2009-2012, 2015, 2019, 2021 "
+"Free Software Foundation, Inc."
 msgstr ""
 "<b>Ауторска права:</b><br />Copyright &copy; 1996, 1997, 1998, 
2001, 2006, "
 "2007, 2009 Free Software Foundation, Inc."
@@ -1088,6 +1101,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>.)"
+
 #~ msgid ""
 #~ "A private program is free software in a trivial sense if its unique user "
 #~ "has full rights to it."

Index: philosophy/po/categories.ta.po
===================================================================
RCS file: /web/www/www/philosophy/po/categories.ta.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- philosophy/po/categories.ta.po      23 Jun 2019 15:23:39 -0000      1.6
+++ philosophy/po/categories.ta.po      21 Jul 2021 20:34:05 -0000      1.7
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: categories.html\n"
-"POT-Creation-Date: 2019-02-21 01:56+0000\n"
+"POT-Creation-Date: 2021-07-21 20:25+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: web-translators <web-translators@gnu.org>\n"
@@ -25,11 +25,14 @@
 msgstr ""
 "கட்டற்ற மற்றும் கட்டுடைய 
மென்பொருட்களின் வகைகள் - குனு 
திட்டம் - கட்டற்ற மென்பொருள் அ
றக்கட்டளை"
 
-#. type: Content of: <h2>
-msgid "Categories of free and nonfree software"
+#. type: Content of: <div><h2>
+# | Categories of [-f-]{+F+}ree and [-nonfree software-] {+Nonfree Software+}
+#, fuzzy
+#| msgid "Categories of free and nonfree software"
+msgid "Categories of Free and Nonfree Software"
 msgstr "கட்டற்ற மற்றும் கட்டுடைய 
மென்பொருட்களின் வகைகள்"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Also [-note-] {+see+} <a
 # | href=\"/philosophy/words-to-avoid.html\">Confusing Words which You Might
 # | Want to Avoid</a>.
@@ -44,11 +47,11 @@
 "<a href=\"/philosophy/words-to-avoid.html\">தாங்கள் 
தவிர்க்க விரும்பும் 
குழப்பமான "
 "பதங்கள் பக்கத்தையும்</a> 
கவனத்தில் கொள்க."
 
-#. type: Attribute 'alt' of: <p><img>
+#. type: Attribute 'alt' of: <div><p><img>
 msgid "[Categories of software]"
 msgstr "[மென்பொருட்களின் வகைகள்]"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This diagram, originally by Chao-Kuei and updated by several others since, "
 "explains the different categories of software. It's available as a <a href="
@@ -62,11 +65,11 @@
 "category.jpg\">ஜேபெக் வடிவிலும்</a> 1.5 
பெரிதாக்கப்பட்ட <a href=\"/philosophy/"
 "category.png\">பிஎன்ஜி படமாகவும் 
கிடைக்கிறது</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Free software"
 msgstr "கட்டற்ற மென்பொருள்"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Free software is software that comes with permission for anyone to use,
 # | copy, [-and-] {+and/or+} distribute, either verbatim or with
 # | modifications, either gratis or for a fee. In particular, this means that
@@ -95,7 +98,7 @@
 "விளக்கம் இது. இதற்கான <a 
href=\"/philosophy/free-sw.html\">முழு 
விளக்கத்தையும் "
 "வாசிக்கவும்</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If a program is free, then it can potentially be included in a free "
 "operating system such as GNU, or free versions of the <a href=\"/gnu/linux-"
@@ -104,7 +107,7 @@
 "மென்பொருளொன்று கட்டற்று 
இருக்குமாயின் அதனை தாராளமாக 
குனு அல்லது கட்டற்ற <a href=\"/"
 "gnu/linux-and-gnu.html\">குனு/லினக்ஸ்</a> 
போன்ற இயங்குதளங்களில் 
சேர்த்துக் கொள்ளலாம்."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There are many different ways to make a program free&mdash;many questions of "
 "detail, which could be decided in more than one way and still make the "
@@ -118,7 +121,7 @@
 "அறிய, <a 
href=\"/licenses/license-list.html\">உரிமங்களின் 
பட்டியல்</a> பக்கத்தின் "
 "துணையினை நாடவும்."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Free software is a matter of freedom, not price. But proprietary software
 # | companies [-sometimes-] {+typically+} use the term &ldquo;free
 # | software&rdquo; to refer to price. Sometimes they mean that you can obtain
@@ -149,7 +152,7 @@
 "கொடுக்கப்பட்டிருக்கும் 
எனப் பொருள் கொள்வதுண்டு. 
இதற்கும் குனு திட்டத்தில் 
நாம் ப்ஃரீ சாப்ஃட்வேர் "
 "என்று சொல்வதற்கும் எந்தவொரு 
தொடர்பும் இல்லை."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Because of this potential confusion, when a software company says its "
 "product is free software, always check the actual distribution terms to see "
@@ -161,7 +164,7 @@
 "பயனர்களுக்கு மெய்யாகவே 
வழங்கப் பட்டுள்ளதா என 
எப்பொழுதும் உறுதி செய்துக் 
கொள்ளவும். சில "
 "சமயம் அது உண்மையாகவே 
கட்டற்ற மென்பொருளாக 
இருக்கலாம். அல்லது 
இல்லாமலும் போகலாம்."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Many languages have two separate words for &ldquo;free&rdquo; as in freedom "
 "and &ldquo;free&rdquo; as in zero price. For example, French has &ldquo;"
@@ -182,7 +185,7 @@
 "translations.html\">கட்டற்ற 
மென்பொருளின் 
மொழிபெயர்ப்புகள்</a> 
பக்கத்தில் இதன் பன்மொழிப் "
 "பெயர்ப்புகளைக் காணலாம்."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is often <a href=\"/software/reliability.html\">more reliable</"
 "a> than nonfree software."
@@ -190,11 +193,11 @@
 "தனியுரிம மென்பொருளைக் 
காட்டிலும் கட்டற்ற 
மென்பொருள் <a href=\"/software/reliability."
 "html\">அதிக நம்பகத் 
தன்மையுடையது</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Open source software"
 msgstr "திறந்த மூல மென்பொருள்"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | The term &ldquo;open source&rdquo; software is used by some people to mean
 # | more or less the same category as free software. It is not exactly the
 # | same class of software: they accept some licenses that we consider too
@@ -230,7 +233,7 @@
 "குறைவானதே. கிட்டத்தட்ட அ
னைத்து கட்டற்ற 
மென்பொருட்களும் திறந்த மூல 
மென்பொருளே. அதேபோல் "
 "கிட்டத்தட்ட அனைத்து திறந்த 
மூல மென்பொருளும் 
கட்டற்றவையே."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | We prefer the term &ldquo;<a href=[-
 # | -]\"/philosophy/open-source-misses-the-point.html\">free
 # | software</a>&rdquo; because it refers to freedom&mdash;something that the
@@ -249,11 +252,11 @@
 "மென்பொருள்</a>” எனும் 
பதத்தையே விரும்புகிறோம். 
ஏனெனில் அது சுதந்தரத்தை 
குறிக்கிறது. "
 "திறந்த மூலம் அங்ஙனம் இல்லை."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Public domain software"
 msgstr "பொதுவுடைமை மென்பொருள்"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Public domain software is software that is not copyrighted. If the source "
 "code is in the public domain, that is a special case of <a href=\"#Non-"
@@ -265,7 +268,7 @@
 "கட்டற்ற மென்பொருட்களுள்</a> 
சிறப்பு வகையைச் சார்ந்தது. 
இதன் பொருள் இவற்றின் சில 
நகல்கள் "
 "அல்லது மாற்றப் பட்ட வகைகள் 
கட்டற்று இல்லாது போகலாம்."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In some cases, an executable program can be in the public domain but the "
 "source code is not available. This is not free software, because free "
@@ -280,7 +283,7 @@
 "பதிப்புரிமைப் பெற்றவை. 
பதிப்புரிமைப் பெற்றவர்கள், 
கட்டற்ற மென்பொருட்கள் 
உரிமமொன்றினைக் "
 "கொண்டு, அதனை அனைவரும் 
சுதந்தரமாகப் பயன்படுத்த அ
னுமதி வழங்கியுள்ளனர்."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Sometimes people use the term &ldquo;public domain&rdquo; in a loose fashion "
 "to mean <a href=\"#FreeSoftware\">&ldquo;free&rdquo;</a> or &ldquo;available "
@@ -296,7 +299,7 @@
 "அப்பொருளிலேயே பயன் 
படுத்துமாறு கேட்டுக் 
கொள்கிறோம். வேறு பொருள்களைச் 
சுட்ட வேறு பதங்களை "
 "பயன்படுத்துங்கள்."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Under the Berne Convention, which most countries have signed, anything "
 "written down is automatically copyrighted. This includes programs. "
@@ -309,11 +312,11 @@
 "நிரலொன்றைப் 
பொதுவுடைமையாக்க 
விரும்பினால், அதன் மீதான 
பதிப்புரிமையினை நீக்க சட்ட 
ரீதியான "
 "நடவடிக்கைகள் எடுக்க 
வேண்டியிருக்கும். 
இல்லையெனில் அந்நிரல் 
பதிப்புரிமைப் பெற்றதே."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Copylefted software"
 msgstr "காபிலெப்ட் மென்பொருள்"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Copylefted software is free software whose distribution terms [-do not let
 # | redistributors add any additional restrictions when they redistribute-]
 # | {+ensure that all copies of all versions carry more+} or [-modify-]
@@ -345,14 +348,14 @@
 "மென்பொருள். இதன் பொருள் 
மென்பொருளின் பிரதியொரு 
நகலும், அவை மாற்றப் 
பட்டாலும், கட்டற்ற "
 "மென்பொருளாகவே இருக்க 
வேண்டும்."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Some copyleft licenses, such as GPL version&nbsp;3, block other means of "
 "turning software proprietary, such as <a href=\"/licenses/rms-why-gplv3.html"
 "\">tivoization</a>."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the GNU Project, we copyleft almost all the software we write, because "
 "our goal is to give <em>every</em> user the freedoms implied by the term "
@@ -366,7 +369,7 @@
 "பயன்படுத்துகிறோம் என அ
றியவும் <a href= 
\"/licenses/copyleft.html\">காபிலெப்ட் "
 "பக்கத்தின்</a> துணையினை 
நாடவும்."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Copyleft is a general concept; to [-actually-] copyleft [-a-] {+an
 # | actual+} program, you need to use a specific set of distribution terms.
 # | There are many possible ways to write copyleft distribution terms, so in
@@ -408,11 +411,11 @@
 "நிரலொன்றை மற்றொரு 
உரிமத்தைப் பயன்படுத்தும் 
நிரலுடன் பொருத்துவது சட்ட 
விரோதமாக "
 "இருக்கலாம். ஆக மக்கள் ஒரு 
காபிலெப்ட் உரிமத்தினைப் 
பயன்படுத்துவது சமூகத்திற்கு 
நல்லது."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Noncopylefted free software"
 msgstr "காபிலெப்ட் செய்யப் படாத 
கட்டற்ற மென்பொருள்"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Noncopylefted free software comes from the author with permission to "
 "redistribute and modify, and also to add additional restrictions to it."
@@ -420,7 +423,7 @@
 "மென்பொருளை இயற்றியவர் அதனை 
மறுவிநியோகம் செய்ய, மாற்ற 
மட்டுமல்லாது கூடுதல் 
கட்டுக்களை "
 "விதிக்க அனுமதியளித்தால் அது 
காபிலெப்ட் செய்யப் படாத 
கட்டற்ற மென்பொருள்."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If a program is free but not copylefted, then some copies or modified "
 "versions may not be free at all. A software company can compile the program, "
@@ -432,8 +435,9 @@
 "மாற்றதவாரோ அந்நிரலை 
ஒடுக்கி, அதன் இயக்கவல்லக் 
கோப்பினை <a href=\"#ProprietarySoftware"
 "\">தனியுரிம மென்பொருளாக</a> 
விநியோகிக்கலாம்."
 
-#. type: Content of: <p>
-# | The <a href=\"http://www.x.org\";>X Window System</a> illustrates this. 
+#. type: Content of: <div><p>
+# | The <a [-href=\"http://www.x.org\";>X-]
+# | {+href=\"https://www.x.org/wiki/\";>X+} Window System</a> illustrates this.
 # | The X Consortium release[-s-]{+d+} X11 with distribution terms that
 # | ma[-k-]{+d+}e it noncopylefted free [-software. If you wish, you can get
 # | a-] {+software, and subsequent developers have mostly followed the same
@@ -457,16 +461,16 @@
 #| "hardware, X11 is not free software for you. <a href=\"/philosophy/x.html"
 #| "\">The developers of X11 even made X11 nonfree for a while.</a>"
 msgid ""
-"The <a href=\"http://www.x.org\";>X Window System</a> illustrates this.  The "
-"X Consortium released X11 with distribution terms that made it noncopylefted "
-"free software, and subsequent developers have mostly followed the same "
-"practice.  A copy which has those distribution terms is free software.  "
-"However, there are nonfree versions as well, and there are (or at least "
-"were) popular workstations and PC graphics boards for which nonfree versions "
-"are the only ones that work.  If you are using this hardware, X11 is not "
-"free software for you.  <a href=\"/philosophy/x.html\">The developers of X11 "
-"even made X11 nonfree</a> for a while; they were able to do this because "
-"others had contributed their code under the same noncopyleft license."
+"The <a href=\"https://www.x.org/wiki/\";>X Window System</a> illustrates "
+"this.  The X Consortium released X11 with distribution terms that made it "
+"noncopylefted free software, and subsequent developers have mostly followed "
+"the same practice.  A copy which has those distribution terms is free "
+"software.  However, there are nonfree versions as well, and there are (or at "
+"least were) popular workstations and PC graphics boards for which nonfree "
+"versions are the only ones that work.  If you are using this hardware, X11 "
+"is not free software for you.  <a href=\"/philosophy/x.html\">The developers "
+"of X11 even made X11 nonfree</a> for a while; they were able to do this "
+"because others had contributed their code under the same noncopyleft license."
 msgstr ""
 "<a href=\"http://www.x.org\";>எக்ஸ் விண்டோஸ் 
முறை</a> இதற்கான சான்றாகும். 
எக்ஸ் "
 "கன்சார்டியம் எக்ஸ்11 னை 
வெளியிடும் விதிகளின் படி அது 
காபிலெப்ட் செய்யப்படாத 
கட்டற்ற "
@@ -477,11 +481,11 @@
 "மென்பொருளாகாது. <a 
href=\"/philosophy/x.html\">எக்ஸ்11 னை 
உருவாக்குவோர் சில "
 "காலங்களுக்கு எக்ஸ்11 யையே 
கட்டுடையதாக்கி 
வைத்திருந்தனர்</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Lax permissive licensed software"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Lax permissive licenses include the X11 license and the <a href=\"/licenses/"
 "bsd.html\">two BSD licenses</a>.  These licenses permit almost any use of "
@@ -489,11 +493,11 @@
 "changing the source code."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GPL-covered software"
 msgstr "ஜிபிஎல் வகை மென்பொருள்"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | The <a [-href=\"/copyleft/gpl.html\">GNU-]
 # | {+href=\"/licenses/gpl.html\">GNU+} GPL (General Public License)</a> is
 # | one specific set of distribution terms for copylefting a program. The GNU
@@ -512,16 +516,16 @@
 "\">குனு பொது மக்கள் உரிமமும்</a> 
ஒன்று. பெரும்பாலான குனு 
மென்பொருட்களுக்கு குனு "
 "திட்டம் அதனையே 
விநியோகிப்பதற்கான விதியாகப் 
பயன்படுத்துகின்றது."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To equate free software with GPL-covered software is therefore an error."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "The GNU operating system"
 msgstr "குனு இயங்குதளம்"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | The <a href=\"/gnu/gnu-history.html\">GNU {+operating+} system</a> is the
 # | Unix-like operating system, which is entirely free software, that we in
 # | the GNU Project have developed since 1984.
@@ -538,7 +542,7 @@
 "முற்றிலும் கட்டற்ற 
மென்பொருளால், நாங்கள் 1984 
லிருந்து உருவாக்கிய 
யுனிக்ஸ் போன்றதொரு "
 "இயங்கு தளம் <a 
href=\"/gnu/gnu-history.html\">குனு அ
மைப்பாகும்</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | A Unix-like operating system consists of many programs. The GNU system
 # | includes all {+of+} the <a [-href=\"#GNUsoftware\">GNU software</a>, as
 # | well as-] {+href=\"#GNUsoftware\">official GNU packages</a>.  It also
@@ -560,7 +564,7 @@
 "\"#GNUsoftware\">குனு 
மென்பொருட்களையும்</a> டெக்ஸ், 
எக்ஸ் விண்டோ அமைப்பு போன்ற 
குனு "
 "அல்லாத மென்பொருளையும் 
உள்ளடக்கியது."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | The first test release of the complete GNU system was in 1996.  This
 # | includes the GNU Hurd, our kernel, developed since 1990.  In 2001 the GNU
 # | system (including the GNU Hurd) began working fairly reliably, but the
@@ -600,7 +604,7 @@
 "href=\"/gnu/linux-and-gnu.html\">குனு/ லினக்ஸ்</a> அ
மைப்பு 1990 லிருந்து மிகப் "
 "பெரிய வெற்றியினைத் 
தந்துள்ளது."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Since the purpose of GNU is to be free, every single component in the GNU
 # | {+operating+} system [-has to be-] {+is+} free software.  They don't all
 # | have to be copylefted, however; any kind of free software is legally
@@ -622,11 +626,11 @@
 "ஆயினும், தொழில்நுட்ப 
இலக்குகளை அடைய உதவும் 
எந்தவொரு கட்டற்ற 
மென்பொருளும் சட்டப் படி "
 "பொருந்துதற் குகந்ததே."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GNU programs"
 msgstr "குனுநிரல்கள்"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;GNU programs&rdquo; is equivalent to <a href=\"#GNUsoftware\">GNU "
 "software.</a> A program Foo is a GNU program if it is GNU software.  We also "
@@ -636,14 +640,29 @@
 "பூ எனும் பெயர் கொண்ட நிரல் 
குனு மென்பொருளானால் அது குனு 
நிரலாகும். சில சமயங்களில் "
 "அதனை நாங்கள் “குனு பொதி” 
எனவும் வழங்குவதுண்டு."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GNU software"
 msgstr "குனு மென்பொருள்"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | <a href=\"/software/software.html\">GNU software</a> is software that is
+# | released under the auspices of the <a href=[-
+# | -]\"/gnu/gnu-history.html\">GNU Project</a>. If a program is GNU software,
+# | we also say that it is a GNU program or a GNU package.  The README or
+# | manual of a GNU package should say it is one; also, the <a
+# | href=\"/directory\">Free Software Directory</a> identifies all GNU
+# | packages.
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/software/software.html\">GNU software</a> is software that is "
+#| "released under the auspices of the <a href= \"/gnu/gnu-history.html\">GNU "
+#| "Project</a>. If a program is GNU software, we also say that it is a GNU "
+#| "program or a GNU package.  The README or manual of a GNU package should "
+#| "say it is one; also, the <a href=\"/directory\">Free Software Directory</"
+#| "a> identifies all GNU packages."
 msgid ""
 "<a href=\"/software/software.html\">GNU software</a> is software that is "
-"released under the auspices of the <a href= \"/gnu/gnu-history.html\">GNU "
+"released under the auspices of the <a href=\"/gnu/gnu-history.html\">GNU "
 "Project</a>. If a program is GNU software, we also say that it is a GNU "
 "program or a GNU package.  The README or manual of a GNU package should say "
 "it is one; also, the <a href=\"/directory\">Free Software Directory</a> "
@@ -655,7 +674,7 @@
 "கையேடு அவை ஒன்றெனவே 
சொல்லும். மேலும் கட்டற்ற 
மென்பொருள் பட்டியல் அனைத்து 
குனு "
 "பொதிகளையும் இனங்காணும்."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Most GNU software is <a href=
 # | [-\"/copyleft/copyleft.html\">copylefted</a>,-]
 # | {+\"/licenses/copyleft.html\">copylefted</a>,+} but not all; however, all
@@ -675,11 +694,12 @@
 "செய்யப் பட்டது. ஆனால் அ
னைத்தும் அல்ல. ஆனால் அனைத்து 
குனு மென்பொருளும் <a href=\"/"
 "philosophy/free-sw.html\">கட்டாயம் கட்டற்ற 
மென்பொருளாக</a> இருத்தல் 
வேண்டும்."
 
-#. type: Content of: <p>
-# | Some GNU software [-is-] {+was+} written by <a href=
-# | \"http://www.fsf.org/about/staff/\";>staff</a> of the <a
-# | href=\"http://www.fsf.org/\";>Free Software Foundation</a>, but most GNU
-# | software [-is contributed by-] {+comes from many+} <a
+#. type: Content of: <div><p>
+# | Some GNU software [-is-] {+was+} written by <a [-href=
+# | \"http://www.fsf.org/about/staff/\";>staff</a>-]
+# | {+href=\"https://www.fsf.org/about/staff/\";>staff</a>+} of the <a
+# | href=\"http{+s+}://www.fsf.org/\">Free Software Foundation</a>, but most
+# | GNU software [-is contributed by-] {+comes from many+} <a
 # | href=\"/people/people.html\">volunteers</a>.  {+(Some of these volunteers
 # | are paid by companies or universities, but they are volunteers for us.)+} 
 # | Some contributed software is copyrighted by the Free Software Foundation;
@@ -693,8 +713,8 @@
 #| "the Free Software Foundation; some is copyrighted by the contributors who "
 #| "wrote it."
 msgid ""
-"Some GNU software was written by <a href= \"http://www.fsf.org/about/staff/";
-"\">staff</a> of the <a href=\"http://www.fsf.org/\";>Free Software "
+"Some GNU software was written by <a href=\"https://www.fsf.org/about/staff/";
+"\">staff</a> of the <a href=\"https://www.fsf.org/\";>Free Software "
 "Foundation</a>, but most GNU software comes from many <a href=\"/people/"
 "people.html\">volunteers</a>.  (Some of these volunteers are paid by "
 "companies or universities, but they are volunteers for us.)  Some "
@@ -708,34 +728,34 @@
 "கட்டற்ற மென்பொருள் அ
றக்கட்டளை பதிப்புரிமைப் 
பெற்றுள்ளது. சில அதனை 
இயற்றியவரின் "
 "பதிப்புரிமைப் பெற்றவை."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "FSF-copyrighted GNU software"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The developers of GNU packages can transfer the copyright to the FSF, or "
 "they can keep it.  The choice is theirs."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If they have transferred the copyright to the FSF, the program is FSF-"
 "copyrighted GNU software, and the FSF can enforce its license.  If they have "
 "kept the copyright, enforcing the license is their responsibility."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The FSF does not accept copyright assignments of software that is not an "
 "official GNU package, as a rule."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Nonfree software"
 msgstr "கட்டுடைய மென்பொருள்"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Nonfree software is any software that is not free.  Its use, redistribution "
 "or modification is prohibited, or requires you to ask for permission, or is "
@@ -745,11 +765,11 @@
 "அல்லது மாற்றம் தடை செய்யப் 
பட்டிருக்கும் அல்லது அ
தற்கென தாங்கள் அனுமதி பெற 
வேண்டியிருக்கும் "
 "அல்லது கட்டற்று செய்ய இயலாத 
படிக்கு அதிகத் தடைகளை 
கொண்டிருக்கும்."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Proprietary software"
 msgstr "தனியுரிம மென்பொருள்"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Proprietary software is [-equivalent to <a
 # | href=\"#non-freeSoftware\">nonfree software</a>.-] {+another name for
 # | nonfree software.  In the past we subdivided nonfree software into
@@ -772,7 +792,7 @@
 "<a href=\"#non-freeSoftware\">கட்டுடைய 
மென்பொருள்</a> நிகரானவை 
தனியுரிம "
 "மென்பொருளாகும்."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The Free Software Foundation follows the rule that we cannot install any "
 "proprietary program on our computers except temporarily for the specific "
@@ -785,7 +805,7 @@
 "நெறியினை கட்டற்ற மென்பொருள் 
அறக்கட்டளை 
கடைபிடிக்கின்றது. இதைத் 
தவிர்த்து தனியுரிம "
 "மென்பொருளை நிறுவதற்கான 
காரணம் எதுவும் இருப்பதாக 
எங்களுக்குத் தோன்றவில்லை."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | For example, we felt justified in installing Unix on our computer in the
 # | 1980s, because we were using it to write a free replacement for Unix.
 # | Nowadays, since free operating systems are available, the excuse is no
@@ -813,7 +833,7 @@
 "அனைத்து கட்டுடைய 
இயங்குதளங்களையும் நாங்கள் 
ஒழித்து விட்டோம். நாங்கள் 
நிறுவும் எந்த வொரு "
 "கணினியும் இனி கட்டற்ற 
இயங்கு தளங்களைக் கொண்டே 
இயங்க வேண்டும்."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | We don't insist that users of GNU, or contributors to GNU, have to live by
 # | this rule. It is a rule we made for ourselves. But we hope you will
 # | [-decide to-] follow it [-too.-] {+too, for your freedom's sake.+}
@@ -831,11 +851,11 @@
 "வேண்டும் என நாங்கள் 
கட்டாயப்படுத்தவில்லை. இது 
எங்களுக்கு நாங்களே 
விதித்துக் கொண்ட ஒன்று. "
 "ஆனால் தாங்களும் அங்ஙனம் 
கடைபிடிக்கத் 
தீர்மானிப்பீர்கள் என 
நம்புகின்றோம்."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Freeware"
 msgstr "இலவச மென்பொருள்"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;freeware&rdquo; has no clear accepted definition, but it is "
 "commonly used for packages which permit redistribution but not modification "
@@ -849,11 +869,11 @@
 "மென்பொருள் அல்ல. ஆகையால் 
“இலவச மென்பொருள்” என்பதைக் 
கட்டற்ற மென்பொருளைக் 
குறிக்க பயன்படுத்த "
 "வேண்டாம்."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Shareware"
 msgstr "பகிர் மென்பொருள்"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Shareware is software which comes with permission for people to redistribute "
 "copies, but says that anyone who continues to use a copy is <em>required</"
@@ -862,7 +882,7 @@
 "மறுவிநியோகம் செய்வதற்கான அ
னுமதியுடன், அதே சமயம் 
நகலொன்றைத் தொடர்ச்சியாகப் 
பயன்படுத்தும் "
 "ஒருவர் உரிமக் கட்டணத்தை 
செலுத்த வேண்டும் எனச் 
சொல்வது பகிர் 
மென்பொருளாகும்."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Shareware is not free software, or even semifree. There are two reasons it "
 "is not:"
@@ -870,7 +890,7 @@
 "பகிர் மென்பொருள் கட்டற்ற 
மென்பொருளும் அல்ல குறை 
கட்டற்ற மென்பொருளும் அல்ல. அ
தற்கு இரண்டு "
 "காரணங்கள் உள்ளன:"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "For most shareware, source code is not available; thus, you cannot modify "
 "the program at all."
@@ -878,7 +898,7 @@
 "பெரும்பாலான பகிர் 
மென்பொருட்களுக்கு மூல 
நிரல்கள் கிடைப்பதில்லை.எனவே 
தங்களால் நிரலை "
 "மாற்றுவது என்பது முடியவே 
முடியாது."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Shareware does not come with permission to make a copy and install it "
 "without paying a license fee, not even for individuals engaging in nonprofit "
@@ -890,11 +910,11 @@
 "(நடைமுறையில் மக்கள் விநியோக 
விதிகளை புறக்கணித்து விட்டு 
நிறுவி விடுவார்கள், ஆனால் "
 "விதிகள் அதனை அனுமதியாது.)"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Private software"
 msgstr "தனியார் மென்பொருள்"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Private or custom software is software developed for one user (typically an "
 "organization or company). That user keeps it and uses it, and does not "
@@ -904,7 +924,7 @@
 "அமைப்பிற்கோ அல்லது 
நிறுவனத்திற்கோ). அப்பயனர் அ
தனை தன்னகத்தெ வைத்துக் 
கொண்டு "
 "பயன்படுத்துவார். அதன் மூல 
நிரல்களையோ அல்லது 
இருமங்களையோ வெளியிட 
மாட்டார்."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | A private program is free software {+(+}in a {+somewhat+} trivial
 # | sense{+)+} if its [-unique-] {+sole user has the four freedoms.  In
 # | particular, if the+} user has full rights to [-it.-] {+the private
@@ -930,7 +950,7 @@
 "முக்கியத்துவமல்லாத கட்டற்ற 
மென்பொருளாகிறது. ஆனால், 
ஆழ்ந்து நோக்குகின்ற பொழுது அ
த்தகைய "
 "மென்பொருள் கட்டற்ற 
மென்பொருளா இல்லையா எனக் 
கேட்பதில் அர்த்தம் எதுவும் 
இல்லை."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | {+Free software is a matter of freedom, not access.+}  In general we do
 # | not believe it is wrong to develop a program and not release it. There are
 # | occasions when a program is so [-useful-] {+important that one might
@@ -966,7 +986,7 @@
 "கட்டற்ற மென்பொருள் 
இயக்கத்தின் கொள்கைகளுக்கும் 
தனியார் மென்பொருள் 
உருவாக்கத்திற்கும் எந்த "
 "முரண்பாடும் கிடையாது."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Nearly all employment for programmers is in development of custom software; "
 "therefore most programming jobs are, or could be, done in a way compatible "
@@ -976,11 +996,11 @@
 "உருவாக்கத்தில் தான் உள்ளன. 
ஆகையால் பெரும்பாலான 
நிரலாக்கப் பணிகள் கட்டற்ற 
மென்பொருள் "
 "இயக்கத்தோடு பொருந்துகின்ற 
வகையில் இருக்கலாம் அல்லது 
இருக்கின்றன."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Commercial software"
 msgstr "வர்த்தக மென்பொருள்"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | {+&ldquo;Commercial&rdquo; and &ldquo;proprietary&rdquo; are not the
 # | same!+} Commercial software is software [-being-] developed by a business
 # | [-which aims to make money from the use-] {+as part+} of [-the software.
@@ -1008,7 +1028,7 @@
 "ஆனால் வர்த்தக ரீதியான 
கட்டற்ற மென்பொருளும் உண்டு, 
வர்த்தக நோக்கமற்ற கட்டுடைய 
மென்பொருளும் "
 "உண்டு."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | For example, GNU Ada is {+developed by a company.  It is+} always
 # | distributed under the terms of the GNU GPL, and every copy is free
 # | software; but its developers sell support contracts. When their salesmen
@@ -1039,7 +1059,7 @@
 "இருக்கும் எனச் 
சொல்வதுண்டு.” “குனு அடா ஒரு 
வர்த்தக ஒடுக்கி. அது கட்டற்ற 
மென்பொருளும் கூட "
 "என விற்பனையாளர் 
பதிலளிப்பார்.”"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | For the GNU Project, the [-emphasis is-] {+priorities are+} in the other
 # | order: the important thing is that GNU Ada is free software; [-whether-]
 # | {+that+} it is commercial is [-not-] {+just+} a [-crucial question.-]
@@ -1062,7 +1082,7 @@
 "முக்கியமானக் கேள்வியன்று. 
குனு அடா வர்த்தக ரீதியாக 
இருப்பதால் ஏற்படும் கூடுதல் 
உருவாக்கம் "
 "நிச்சயம் பயனுள்ளதே."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Please help spread the awareness that [-commercial-] free {+commercial+}
 # | software is possible. You can do this by making an effort not to say
 # | &ldquo;commercial&rdquo; when you mean &ldquo;proprietary.&rdquo;
@@ -1106,15 +1126,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 "
@@ -1122,16 +1147,16 @@
 "கோப்பைக்</a> காணவும்."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 1996, 1997, 1998, [-1999, 2000,-] 2001, 2006, [-2007-]
-# | {+2007, 2009, 2010, 2014, 2015, 2016, 2017, 2018, 2019+} Free Software
+# | Copyright &copy; [-1996, 1997, 1998, 1999, 2000, 2001, 2006, 2007-]
+# | {+1996-1998, 2001-2005, 2007, 2009-2012, 2015, 2019, 2021+} Free Software
 # | Foundation, Inc.
 #, fuzzy
 #| msgid ""
 #| "Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2006, 2007 Free "
 #| "Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
-"2016, 2017, 2018, 2019 Free Software Foundation, Inc."
+"Copyright &copy; 1996-1998, 2001-2005, 2007, 2009-2012, 2015, 2019, 2021 "
+"Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2006, 2007 Free "
 "Software Foundation, Inc. (கட்டற்ற 
மென்பொருள் அறக்கட்டளை, 
நிறுவப்பட்டது.)"
@@ -1156,6 +1181,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 ""
 #~ "This <a id=\"diagram\" name=\"diagram\">diagram</a> by Chao-Kuei explains "
 #~ "the different categories of software. It's available as an <a href= \"/"

Index: philosophy/po/categories.tr.po
===================================================================
RCS file: /web/www/www/philosophy/po/categories.tr.po,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- philosophy/po/categories.tr.po      21 Jul 2021 20:25:37 -0000      1.62
+++ philosophy/po/categories.tr.po      21 Jul 2021 20:34:05 -0000      1.63
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: categories.html\n"
-"POT-Creation-Date: 2019-02-21 01:56+0000\n"
+"POT-Creation-Date: 2021-07-21 20:25+0000\n"
 "PO-Revision-Date: 2021-02-13 17:15+0100\n"
 "Last-Translator: T. E. Kalayci <tekrei@member.fsf.org>\n"
 "Language-Team: Turkish <www-tr-comm@gnu.org>\n"
@@ -17,6 +17,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-07-21 20:25+0000\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 2.4.1\n"
 
@@ -28,11 +29,13 @@
 "Özgür ve Özgür Olmayan Yazılım Kategorileri - GNU Projesi - Özgür 
Yazılım "
 "Vakfı"
 
-#. type: Content of: <h2>
-msgid "Categories of free and nonfree software"
+#. type: Content of: <div><h2>
+#, fuzzy
+#| msgid "Categories of free and nonfree software"
+msgid "Categories of Free and Nonfree Software"
 msgstr "Özgür ve Özgür Olmayan Yazılım Kategorileri"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Also see <a href=\"/philosophy/words-to-avoid.html\">Confusing Words which "
 "You Might Want to Avoid</a>."
@@ -40,11 +43,11 @@
 "Ayrıca <a href=\"/philosophy/words-to-avoid.html\">Uzak Durmak "
 "İsteyebileceğiniz Kafa Karıştıran Kelimeler</a>'e dikkat edin."
 
-#. type: Attribute 'alt' of: <p><img>
+#. type: Attribute 'alt' of: <div><p><img>
 msgid "[Categories of software]"
 msgstr "[Yazılım Kategorileri]"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This diagram, originally by Chao-Kuei and updated by several others since, "
 "explains the different categories of software. It's available as a <a href="
@@ -60,11 +63,11 @@
 "(SVG)</a> ve <a href=\"/philosophy/category.fig\">XFig dosyası</a>olarak "
 "mevcuttur."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Free software"
 msgstr "Özgür yazılım"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is software that comes with permission for anyone to use, "
 "copy, and/or distribute, either verbatim or with modifications, either "
@@ -80,7 +83,7 @@
 "&rdquo; Bu basitleştirilmiş bir tanımdır; ayrıca <a 
href=\"/philosophy/free-"
 "sw.html\">tam tanıma</a> bakın."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If a program is free, then it can potentially be included in a free "
 "operating system such as GNU, or free versions of the <a href=\"/gnu/linux-"
@@ -90,7 +93,7 @@
 "\"/gnu/linux-and-gnu.html\">GNU/Linux</a> sistemlerin özgür sürümlerine "
 "dahil edilebilir."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There are many different ways to make a program free&mdash;many questions of "
 "detail, which could be decided in more than one way and still make the "
@@ -104,7 +107,7 @@
 "lisansları hakkında bilgi için <a href=\"/licenses/license-list.html"
 "\">lisans listesi</a> sayfasına bakın."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is a matter of freedom, not price. But proprietary software "
 "companies typically use the term &ldquo;free software&rdquo; to refer to "
@@ -121,7 +124,7 @@
 "olduğu anlamında kullanırlar. Her durumda, özgür yazılımın GNU 
projesinde  "
 "bizim bahsettiğimiz anlamıyla hiçbir ilgisi yoktur."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Because of this potential confusion, when a software company says its "
 "product is free software, always check the actual distribution terms to see "
@@ -134,7 +137,7 @@
 "olmadıklarını, asıl dağıtım koşullarına bakarak kontrol edin. Bazen, 
"
 "gerçekten özgür yazılımdır; bazen değildir."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Many languages have two separate words for &ldquo;free&rdquo; as in freedom "
 "and &ldquo;free&rdquo; as in zero price. For example, French has &ldquo;"
@@ -156,7 +159,7 @@
 "&ldquo;özgür yazılım&rdquo; tanımının değişik dillere 
çevirileri</a> "
 "listesine bakın."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is often <a href=\"/software/reliability.html\">more reliable</"
 "a> than nonfree software."
@@ -164,11 +167,11 @@
 "Özgür yazılım, çoğunlukla, özgür olmayan yazılımdan <a 
href=\"/software/"
 "reliability.html\">daha güvenilirdir</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Open source software"
 msgstr "Açık kaynak yazılım"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;open source&rdquo; software is used by some people to mean "
 "more or less the same category as free software. It is not exactly the same "
@@ -189,7 +192,7 @@
 "özgür programların açık kaynak olarak kabul edilmeyebilir, ancak bunun "
 "şimdiye kadar olup olmadığını bilmiyoruz."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We prefer the term &ldquo;<a href=\"/philosophy/open-source-misses-the-point."
 "html\">free software</a>&rdquo; because it refers to freedom&mdash;something "
@@ -199,11 +202,11 @@
 "yazılım</a>&rdquo; terimini tercih ediyoruz; çünkü, o özgürlüğe 
işaret "
 "eder&mdash;&ldquo;açık kaynak&rdquo; teriminin yapmadığı bir şey."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Public domain software"
 msgstr "Kamuya açık yazılım"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Public domain software is software that is not copyrighted. If the source "
 "code is in the public domain, that is a special case of <a href=\"#Non-"
@@ -215,7 +218,7 @@
 "olmayabileceği anlamına gelen <a href=\"#Non-CopyleftedFreeSoftware"
 "\">copyleft olmayan özgür yazılım</a> özel halidir."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In some cases, an executable program can be in the public domain but the "
 "source code is not available. This is not free software, because free "
@@ -231,7 +234,7 @@
 "kullanma izinlerini, bir özgür yazılım lisansı kullanarak yasal olarak "
 "vermiştir."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Sometimes people use the term &ldquo;public domain&rdquo; in a loose fashion "
 "to mean <a href=\"#FreeSoftware\">&ldquo;free&rdquo;</a> or &ldquo;available "
@@ -248,7 +251,7 @@
 "terimini, başka anlamları ifade etmek için diğer terimleri kullanmanızı 
"
 "öneriyoruz."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Under the Berne Convention, which most countries have signed, anything "
 "written down is automatically copyrighted. This includes programs. "
@@ -262,11 +265,11 @@
 "hakkını çıkarmak için bazı yasal adımlardan geçmek zorundasınız; 
yoksa, "
 "program telif hakkına sahiptir."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Copylefted software"
 msgstr "Copyleft yazılım"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copylefted software is free software whose distribution terms ensure that "
 "all copies of all versions carry more or less the same distribution terms.  "
@@ -285,7 +288,7 @@
 "sürümlerini özel mülk yazılım haline getirmenin bazı bilindik 
yollarından "
 "bir kalkan gibi korur."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Some copyleft licenses, such as GPL version&nbsp;3, block other means of "
 "turning software proprietary, such as <a href=\"/licenses/rms-why-gplv3.html"
@@ -295,7 +298,7 @@
 "sağlayan, <a href=\"/licenses/rms-why-gplv3.html\">tivoization</a> gibi "
 "yöntemleri durdurur."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the GNU Project, we copyleft almost all the software we write, because "
 "our goal is to give <em>every</em> user the freedoms implied by the term "
@@ -309,7 +312,7 @@
 "kullandığımız hakkında daha çok açıklama için <a 
href=\"/licenses/copyleft."
 "html\">Copyleft</a> sayfasına bakınç"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copyleft is a general concept; to copyleft an actual program, you need to "
 "use a specific set of distribution terms. There are many possible ways to "
@@ -331,11 +334,11 @@
 "birleştirmek yasal değildir; böylece, eğer insanlar tek bir copyleft 
lisans "
 "kullanması toplum için iyidir."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Noncopylefted free software"
 msgstr "Copyleft olmayan özgür yazılım"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Noncopylefted free software comes from the author with permission to "
 "redistribute and modify, and also to add additional restrictions to it."
@@ -343,7 +346,7 @@
 "Copyleft-olmayan özgür yazılımlar, yazarından yeniden dağıtma ve 
değiştirme "
 "ve ayrıca sonradan kısıtlamalar ekleme izinleri ile gelir."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If a program is free but not copylefted, then some copies or modified "
 "versions may not be free at all. A software company can compile the program, "
@@ -356,18 +359,31 @@
 "dosyayı, <a href=\"#ProprietarySoftware\">mülk</a> yazılım ürünü 
olarak "
 "dağıtabilir."
 
-#. type: Content of: <p>
-msgid ""
-"The <a href=\"http://www.x.org\";>X Window System</a> illustrates this.  The "
-"X Consortium released X11 with distribution terms that made it noncopylefted "
-"free software, and subsequent developers have mostly followed the same "
-"practice.  A copy which has those distribution terms is free software.  "
-"However, there are nonfree versions as well, and there are (or at least "
-"were) popular workstations and PC graphics boards for which nonfree versions "
-"are the only ones that work.  If you are using this hardware, X11 is not "
-"free software for you.  <a href=\"/philosophy/x.html\">The developers of X11 "
-"even made X11 nonfree</a> for a while; they were able to do this because "
-"others had contributed their code under the same noncopyleft license."
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The <a href=\"http://www.x.org\";>X Window System</a> illustrates this.  "
+#| "The X Consortium released X11 with distribution terms that made it "
+#| "noncopylefted free software, and subsequent developers have mostly "
+#| "followed the same practice.  A copy which has those distribution terms is "
+#| "free software.  However, there are nonfree versions as well, and there "
+#| "are (or at least were) popular workstations and PC graphics boards for "
+#| "which nonfree versions are the only ones that work.  If you are using "
+#| "this hardware, X11 is not free software for you.  <a href=\"/philosophy/x."
+#| "html\">The developers of X11 even made X11 nonfree</a> for a while; they "
+#| "were able to do this because others had contributed their code under the "
+#| "same noncopyleft license."
+msgid ""
+"The <a href=\"https://www.x.org/wiki/\";>X Window System</a> illustrates "
+"this.  The X Consortium released X11 with distribution terms that made it "
+"noncopylefted free software, and subsequent developers have mostly followed "
+"the same practice.  A copy which has those distribution terms is free "
+"software.  However, there are nonfree versions as well, and there are (or at "
+"least were) popular workstations and PC graphics boards for which nonfree "
+"versions are the only ones that work.  If you are using this hardware, X11 "
+"is not free software for you.  <a href=\"/philosophy/x.html\">The developers "
+"of X11 even made X11 nonfree</a> for a while; they were able to do this "
+"because others had contributed their code under the same noncopyleft license."
 msgstr ""
 "<a href=\"http://www.x.org\";>X Pencere Sistemi</a> bunu örnekle açıklar. X 
"
 "Birliği, X11'i, copyleft olmayan özgür yazılım yapan dağıtım 
koşulları ile "
@@ -380,11 +396,11 @@
 "yaptılar</a>; bunu yapabiliyorlardı, çünkü diğer kişiler aynı 
copyleft "
 "olmayan lisans altında koda katkıda bulundular."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Lax permissive licensed software"
 msgstr "Lax serbest lisanslı yazılım"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Lax permissive licenses include the X11 license and the <a href=\"/licenses/"
 "bsd.html\">two BSD licenses</a>.  These licenses permit almost any use of "
@@ -396,11 +412,11 @@
 "değiştirip veya değiştirmeden özel mülk çalıştırılabilir 
dosyaları da "
 "dağıtmayı içerecek şekilde neredeyse her şekilde kullanımına izin 
veriyorlar."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GPL-covered software"
 msgstr "GPL kapsamlı yazılım"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/licenses/gpl.html\">GNU GPL (General Public License)</a> is "
 "one specific set of distribution terms for copylefting a program. The GNU "
@@ -410,17 +426,17 @@
 "programı copyleft yazılım yapmak için özel bir dağıtım 
koşullarıdır. GNU "
 "projesi, çoğu GNU yazılım için dağıtım koşulu olarak kullanır."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To equate free software with GPL-covered software is therefore an error."
 msgstr ""
 "Dolaisiyle özgür yazılımı GPL ile korunan yazılım ile eş saymak bir 
hatadır."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "The GNU operating system"
 msgstr "GNU İşletim Sistemi"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/gnu/gnu-history.html\">GNU operating system</a> is the Unix-"
 "like operating system, which is entirely free software, that we in the GNU "
@@ -430,7 +446,7 @@
 "1984'den beri GNU projesinde geliştirdiğimiz, tamamen özgür yazılım 
işletim "
 "sistemidir."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A Unix-like operating system consists of many programs. The GNU system "
 "includes all of the <a href=\"#GNUsoftware\">official GNU packages</a>.  It "
@@ -441,7 +457,7 @@
 "bütün <a href=\"#GNUsoftware\">resmi GNU paketleri</a> gibi diğer, X 
Pencere "
 "Sistemi ve TeX gibi bir çok GNU yazılımı olmayan diğer paketleri de 
içerir."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The first test release of the complete GNU system was in 1996.  This "
 "includes the GNU Hurd, our kernel, developed since 1990.  In 2001 the GNU "
@@ -463,7 +479,7 @@
 "başarı olan Linux çekirdeğini kullanan GNU sistemi doğmuştur. Oluşan 
sonuç "
 "yine de bir GNU sistemi türüdür."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Since the purpose of GNU is to be free, every single component in the GNU "
 "operating system is free software.  They don't all have to be copylefted, "
@@ -475,11 +491,11 @@
 "gerekmiyor; eğer teknik bir hedefe ulaşmaya yardımcı oluyor ise her hangi 
"
 "bir çeşit özgür yazılımı yasal olarak dahil etmeye uygundur."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GNU programs"
 msgstr "GNU Programları"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;GNU programs&rdquo; is equivalent to <a href=\"#GNUsoftware\">GNU "
 "software.</a> A program Foo is a GNU program if it is GNU software.  We also "
@@ -489,14 +505,22 @@
 "aynı anlama gelir. Eğer Foo programı bir GNU yazılımı ise, o bir GNU "
 "programıdır. Bazen, onun bir &ldquo;GNU paketi&rdquo; olduğunu da 
söyleriz."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GNU software"
 msgstr "GNU yazılımı"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/software/software.html\">GNU software</a> is software that is "
+#| "released under the auspices of the <a href= \"/gnu/gnu-history.html\">GNU "
+#| "Project</a>. If a program is GNU software, we also say that it is a GNU "
+#| "program or a GNU package.  The README or manual of a GNU package should "
+#| "say it is one; also, the <a href=\"/directory\">Free Software Directory</"
+#| "a> identifies all GNU packages."
 msgid ""
 "<a href=\"/software/software.html\">GNU software</a> is software that is "
-"released under the auspices of the <a href= \"/gnu/gnu-history.html\">GNU "
+"released under the auspices of the <a href=\"/gnu/gnu-history.html\">GNU "
 "Project</a>. If a program is GNU software, we also say that it is a GNU "
 "program or a GNU package.  The README or manual of a GNU package should say "
 "it is one; also, the <a href=\"/directory\">Free Software Directory</a> "
@@ -509,7 +533,7 @@
 "öyle olduğunu söylemelidir; ayrıca, <a href=\"/directory\">Özgür 
Yazılım "
 "Rehberi</a> bütün GNU paketlerini tanımlar."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Most GNU software is <a href= \"/licenses/copyleft.html\">copylefted</a>, "
 "but not all; however, all GNU software must be <a href=\"/philosophy/free-sw."
@@ -519,10 +543,19 @@
 "\">copyleft</a> yazılımdır; ancak, bütün <a 
href=\"/philosophy/free-sw.html"
 "\">GNU yazılımları</a> özgür yazılım olmak zorundadır."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Some GNU software was written by <a href= \"http://www.fsf.org/about/";
+#| "staff/\">staff</a> of the <a href=\"http://www.fsf.org/\";>Free Software "
+#| "Foundation</a>, but most GNU software comes from many <a href=\"/people/"
+#| "people.html\">volunteers</a>.  (Some of these volunteers are paid by "
+#| "companies or universities, but they are volunteers for us.)  Some "
+#| "contributed software is copyrighted by the Free Software Foundation; some "
+#| "is copyrighted by the contributors who wrote it."
 msgid ""
-"Some GNU software was written by <a href= \"http://www.fsf.org/about/staff/";
-"\">staff</a> of the <a href=\"http://www.fsf.org/\";>Free Software "
+"Some GNU software was written by <a href=\"https://www.fsf.org/about/staff/";
+"\">staff</a> of the <a href=\"https://www.fsf.org/\";>Free Software "
 "Foundation</a>, but most GNU software comes from many <a href=\"/people/"
 "people.html\">volunteers</a>.  (Some of these volunteers are paid by "
 "companies or universities, but they are volunteers for us.)  Some "
@@ -537,11 +570,11 @@
 "korunurken, bazıları da ona katkıda bulunan yazarlar tarafından telif 
hakkı "
 "ile korunmaktadır."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "FSF-copyrighted GNU software"
 msgstr "FSF telif hakkına sahip GNU yazılımı"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The developers of GNU packages can transfer the copyright to the FSF, or "
 "they can keep it.  The choice is theirs."
@@ -549,7 +582,7 @@
 "GNU paketi geliştiricileri telif haklarını FSF'ye devredebilir veya "
 "ellerinde tutabilirler. Tercih onların."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If they have transferred the copyright to the FSF, the program is FSF-"
 "copyrighted GNU software, and the FSF can enforce its license.  If they have "
@@ -559,7 +592,7 @@
 "yazılımı haline gelir ve FSF lisanslarını yürütür. Telif haklarını 
ellerinde "
 "tutarlarsa, lisansların yürütülmesi kendi sorumluluklarıdır."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The FSF does not accept copyright assignments of software that is not an "
 "official GNU package, as a rule."
@@ -567,11 +600,11 @@
 "Kural olarak FSF resmi GNU paketi olmayan yazılımların telif hakkı "
 "tahsislerini kabul etmez."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Nonfree software"
 msgstr "Özgür olmayan yazılım"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Nonfree software is any software that is not free.  Its use, redistribution "
 "or modification is prohibited, or requires you to ask for permission, or is "
@@ -582,11 +615,11 @@
 "gerektirir veya o kadar kısıtlandırılmıştır ki özgür bir şekilde 
etkin "
 "olarak değişiklik yapamazsınız."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Proprietary software"
 msgstr "Özel mülk yazılım"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Proprietary software is another name for nonfree software.  In the past we "
 "subdivided nonfree software into &ldquo;semifree software&rdquo;, which "
@@ -602,7 +635,7 @@
 "yapmıyoruz ve &ldquo;özel mülk yazılımı&rdquo; özgür olmayan 
yazılımla eş "
 "anlamlı olarak kullanıyoruz."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The Free Software Foundation follows the rule that we cannot install any "
 "proprietary program on our computers except temporarily for the specific "
@@ -615,7 +648,7 @@
 "kuralını uygular. Bunun dışında özel mülk bir program yüklemenin 
herhangi "
 "bir bahanesi olduğunu düşünmüyoruz."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For example, we felt justified in installing Unix on our computer in the "
 "1980s, because we were using it to write a free replacement for Unix. "
@@ -630,7 +663,7 @@
 "kullanmıyoruz ve herhangi bir yeni kurduğumuz bilgisayarda mutlaka tamamen "
 "özgür bir işletim sistemi kullanmalıyız."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We don't insist that users of GNU, or contributors to GNU, have to live by "
 "this rule. It is a rule we made for ourselves. But we hope you will follow "
@@ -640,11 +673,11 @@
 "ısrar etmiyoruz. Bu kendimiz için yaptığımız bir kuraldır. Ama, sizin 
de, "
 "özgürlüğünüz için buna uymaya karar vereceğinizi umut ediyoruz."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Freeware"
 msgstr "Freeware"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;freeware&rdquo; has no clear accepted definition, but it is "
 "commonly used for packages which permit redistribution but not modification "
@@ -658,11 +691,11 @@
 "özgür yazılım <em>değildirler</em>, yani, lütfen özgür yazılımı 
ifade etmek "
 "için &ldquo;ücretsiz yazılım&rdquo; terimini kullanmayın."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Shareware"
 msgstr "Shareware"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Shareware is software which comes with permission for people to redistribute "
 "copies, but says that anyone who continues to use a copy is <em>required</"
@@ -672,7 +705,7 @@
 "fakat kullanmaya devam eden kişilerin lisans ücreti ödemesi 
<em>gerektiğini</"
 "em> söyler."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Shareware is not free software, or even semifree. There are two reasons it "
 "is not:"
@@ -680,7 +713,7 @@
 "Paylaşılan yazılım, özgür yazılım, hatta yarı-özgür yazılım bile 
değildir. "
 "Olmamasının iki sebebi vardır:"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "For most shareware, source code is not available; thus, you cannot modify "
 "the program at all."
@@ -688,7 +721,7 @@
 "Çoğu paylaşılan yazılımın kaynak kodu mevcut değildir; yani, 
programı "
 "tamamen değiştiremezsiniz."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Shareware does not come with permission to make a copy and install it "
 "without paying a license fee, not even for individuals engaging in nonprofit "
@@ -701,11 +734,11 @@
 "bir şekilde, bir kopyasını yaparlar ve yüklerler, ama dağıtım 
koşulları "
 "bunlara izin vermez.)"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Private software"
 msgstr "Özel yazılım"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Private or custom software is software developed for one user (typically an "
 "organization or company). That user keeps it and uses it, and does not "
@@ -715,7 +748,7 @@
 "kurum veya şirket için). Bu kullanıcı, yazılımı saklar ve kullanır, 
ve "
 "kamuya, kaynak koduveya çalışabilir halini yayınlamaz."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A private program is free software (in a somewhat trivial sense) if its sole "
 "user has the four freedoms.  In particular, if the user has full rights to "
@@ -729,7 +762,7 @@
 "başkalarına dağıtır ama dört özgürlüğü bu kopyalarla onlara 
sağlamazsa, bu "
 "kopyalar özgür yazılım değildir."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is a matter of freedom, not access.  In general we do not "
 "believe it is wrong to develop a program and not release it. There are "
@@ -748,7 +781,7 @@
 "yazılım hareketinin ilkeleri ile özel veya isteğe göre yazılım 
geliştirmek "
 "arasında bir uyuşmazlık yoktur."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Nearly all employment for programmers is in development of custom software; "
 "therefore most programming jobs are, or could be, done in a way compatible "
@@ -758,11 +791,11 @@
 "çoğu programlama işleri, özgür yazılım hareketi ile uyumlu bir 
şekilde "
 "yapılabilinir veya yapılabilinirdi."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Commercial software"
 msgstr "Ticari yazılım"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;Commercial&rdquo; and &ldquo;proprietary&rdquo; are not the same! "
 "Commercial software is software developed by a business as part of its "
@@ -776,7 +809,7 @@
 "\"#ProprietarySoftware\">özel mülk yazılımdır</a>, ama ticari özgür "
 "yazılımlar da vardır, ve ticari ve özgür olmayan yazılımlar da 
vardır."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For example, GNU Ada is developed by a company.  It is always distributed "
 "under the terms of the GNU GPL, and every copy is free software; but its "
@@ -793,7 +826,7 @@
 "Pazarlamacı, &ldquo;GNU Ada <em>ticari</em> bir derleyicidir ile yanıtlar; "
 "özgür yazılım olsa bile öyledir.&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For the GNU Project, the priorities are in the other order: the important "
 "thing is that GNU Ada is free software; that it is commercial is just a "
@@ -805,7 +838,7 @@
 "bir ayrıntıdır. Ancak, GNU Ada derleyicisinin ticari olmasından 
kaynaklanan "
 "ek gelişmeler kesinlikle yararlıdır."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please help spread the awareness that free commercial software is possible. "
 "You can do this by making an effort not to say &ldquo;commercial&rdquo; when "
@@ -848,14 +881,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 "
@@ -869,9 +907,13 @@
 "\">çalışma&nbsp;sayfamızı</a> ziyaret edebilirsiniz."
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, "
+#| "2015, 2016, 2017, 2018, 2019 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
-"2016, 2017, 2018, 2019 Free Software Foundation, Inc."
+"Copyright &copy; 1996-1998, 2001-2005, 2007, 2009-2012, 2015, 2019, 2021 "
+"Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
 "2016, 2017, 2018, 2019 Free Software Foundation, Inc."
@@ -912,13 +954,12 @@
 msgid "Updated:"
 msgstr "Son Güncelleme:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
-"2016, 2017, 2018, 2019, 2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
-"2016, 2017, 2018, 2019, 2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, "
+#~ "2015, 2016, 2017, 2018, 2019, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, "
+#~ "2015, 2016, 2017, 2018, 2019, 2021 Free Software Foundation, Inc."
 
 #~ msgid ""
 #~ "A private program is free software in a trivial sense if its unique user "

Index: philosophy/po/categories.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/categories.zh-cn.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- philosophy/po/categories.zh-cn.po   21 Jul 2021 20:25:37 -0000      1.13
+++ philosophy/po/categories.zh-cn.po   21 Jul 2021 20:34:05 -0000      1.14
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: categories.html\n"
-"POT-Creation-Date: 2019-02-21 01:56+0000\n"
+"POT-Creation-Date: 2021-07-21 20:25+0000\n"
 "PO-Revision-Date: 2019-06-25 23:44+0800\n"
 "Last-Translator: Hagb (郭馂余) <hagb_green@qq.com>\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-07-21 20:25+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -22,11 +23,13 @@
 "Foundation"
 msgstr "自由与非自由软件的分类 - GNU 工程 - 自由软件基金会"
 
-#. type: Content of: <h2>
-msgid "Categories of free and nonfree software"
+#. type: Content of: <div><h2>
+#, fuzzy
+#| msgid "Categories of free and nonfree software"
+msgid "Categories of Free and Nonfree Software"
 msgstr "自由与非自由软件的分类"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Also see <a href=\"/philosophy/words-to-avoid.html\">Confusing Words which "
 "You Might Want to Avoid</a>."
@@ -34,11 +37,11 @@
 "另见<a href=\"/philosophy/words-to-avoid.html\">《应避免使用(或æ…
Žç”¨ï¼‰çš„词"
 "语,由于它们是不公正的或者引起混淆的》</a>一文。"
 
-#. type: Attribute 'alt' of: <p><img>
+#. type: Attribute 'alt' of: <div><p><img>
 msgid "[Categories of software]"
 msgstr "[自由与非自由软件的分类]"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This diagram, originally by Chao-Kuei and updated by several others since, "
 "explains the different categories of software. It's available as a <a href="
@@ -54,11 +57,11 @@
 "或更高版本、GNU 自由文档许可证(GNU FDL)1.2 
或更高版本、或者创作共用-署名-相"
 "同方式共享(CC BY-SA)许可证 2.0 或更高版本。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Free software"
 msgstr "自由软件(Free Software)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is software that comes with permission for anyone to use, "
 "copy, and/or distribute, either verbatim or with modifications, either "
@@ -73,7 +76,7 @@
 "您可以在<a 
href=\"/philosophy/free-sw.html\">《什么是自由软件?》</a>找到自由"
 "软件的完整定义。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If a program is free, then it can potentially be included in a free "
 "operating system such as GNU, or free versions of the <a href=\"/gnu/linux-"
@@ -82,7 +85,7 @@
 "如果一个程序是自由的,它就有可能被包
含在一种自由的操作系统中,例如 GNU,或者 "
 "<a href=\"/gnu/linux-and-gnu.html\">GNU/Linux 
操作系统</a>的自由版本。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There are many different ways to make a program free&mdash;many questions of "
 "detail, which could be decided in more than one way and still make the "
@@ -95,7 +98,7 @@
 "行描述。如果需要获得关于å…
·ä½“的自由软件许可证的信息,参见<a href=\"/licenses/"
 "license-list.html\">《许可证列表》</a>页面。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is a matter of freedom, not price. But proprietary software "
 "companies typically use the term &ldquo;free software&rdquo; to refer to "
@@ -110,7 +113,7 @@
 "份副本,而整台计算机的价格包含了二者各自的价æ 
¼ã€‚不管是哪种方式,这都与我们在 "
 "GNU 计划中所指的自由软件无关。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Because of this potential confusion, when a software company says its "
 "product is free software, always check the actual distribution terms to see "
@@ -121,7 +124,7 @@
 "时候,务必查看实际
的发布条款以确认用户是否真正拥有自由软件所蕴含的所有基本自"
 "由。有时它真的属于自由软件,有时它不是。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Many languages have two separate words for &ldquo;free&rdquo; as in freedom "
 "and &ldquo;free&rdquo; as in zero price. For example, French has &ldquo;"
@@ -140,18 +143,18 @@
 "整理的<a 
href=\"/philosophy/fs-translations.html\">《&ldquo;自由软件&rdquo;一"
 "词的翻译》</a>。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is often <a href=\"/software/reliability.html\">more reliable</"
 "a> than nonfree software."
 msgstr ""
 "自由软件常常比专有软件更<a 
href=\"/software/reliability.html\">可靠</a>。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Open source software"
 msgstr "开源软件(Open Source Software)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;open source&rdquo; software is used by some people to mean "
 "more or less the same category as free software. It is not exactly the same "
@@ -168,7 +171,7 @@
 "两者
外延的差别并不大:就我们所知,只有很少的开源软件不是自由软件。理论上,可"
 
"能也会有自由软件不被接受为是开源软件,但是我们还没有看到实é™
…的例子。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We prefer the term &ldquo;<a href=\"/philosophy/open-source-misses-the-point."
 "html\">free software</a>&rdquo; because it refers to freedom&mdash;something "
@@ -178,11 +181,11 @@
 
"href=\"/philosophy/open-source-misses-the-point.html\">开源</a>&rdquo;这一短"
 "语所不能体现的。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Public domain software"
 msgstr "公有领域软件(Public Domain Software)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Public domain software is software that is not copyrighted. If the source "
 "code is in the public domain, that is a special case of <a href=\"#Non-"
@@ -193,7 +196,7 @@
 "href=\"#Non-CopyleftedFreeSoftware\">非 copyleft 
自由软件</a>的特例。这意味着"
 "某些副本或者修改版本可能完全不是自由的。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In some cases, an executable program can be in the public domain but the "
 "source code is not available. This is not free software, because free "
@@ -207,7 +210,7 @@
 
"中,它们是受版权保护的,并且版权持有人通过使用自由软件许可证合法地赋予任何人"
 "使用它们的自由许可。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Sometimes people use the term &ldquo;public domain&rdquo; in a loose fashion "
 "to mean <a href=\"#FreeSoftware\">&ldquo;free&rdquo;</a> or &ldquo;available "
@@ -222,7 +225,7 @@
 "意。为了澄清,我们建议将&ldquo;公有领域&rdquo;仅仅
用于它所严格指代的涵义,而"
 "使用其他短语来指代其他涵义。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Under the Berne Convention, which most countries have signed, anything "
 "written down is automatically copyrighted. This includes programs. "
@@ -234,11 +237,11 @@
 "得版权,这也包括计算机程序。因
此,如果您想要使您的程序进入公有领域,您必须采"
 "取某些法律步骤以放弃å…
¶ç‰ˆæƒï¼›å¦åˆ™è¯¥ç¨‹åºæ˜¯å—版权保护的。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Copylefted software"
 msgstr "Copyleft 软件(Copylefted Software)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copylefted software is free software whose distribution terms ensure that "
 "all copies of all versions carry more or less the same distribution terms.  "
@@ -253,7 +256,7 @@
 "外的限制条款(尽管有限的一些安全的附加条款可能被å…
è®¸ï¼‰ï¼Œå¹¶ä¸”要求源代码可获"
 "得。这可以保护该程序及å…
¶ä¿®æ”¹ç‰ˆæœ¬ï¼Œä½¿å¾—常见的某些方式无法将其变为专有软件。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Some copyleft licenses, such as GPL version&nbsp;3, block other means of "
 "turning software proprietary, such as <a href=\"/licenses/rms-why-gplv3.html"
@@ -263,7 +266,7 @@
 "有化的方式,例如 <a href=\"/licenses/rms-why-gplv3.html\">Tivo 化"
 "(tivoization)</a>。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the GNU Project, we copyleft almost all the software we write, because "
 "our goal is to give <em>every</em> user the freedoms implied by the term "
@@ -276,7 +279,7 @@
 "copyleft 的文章<a href=\"/licenses/copyleft.html\">《什么是 
Copyleft?》</a>"
 "以获知关于 copyleft 
许可证如何发挥作用以及我们为何使用它们的更多解释。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copyleft is a general concept; to copyleft an actual program, you need to "
 "use a specific set of distribution terms. There are many possible ways to "
@@ -295,11 +298,11 @@
 "不兼容,这意味着直接将使用一种许可证的代ç 
ä¸Žä½¿ç”¨å¦ä¸€ç§è®¸å¯è¯çš„代码合并将会是"
 "非法的;因此,人们使用同一种 copyleft 
许可证将会有利于社区。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Noncopylefted free software"
 msgstr "非 copyleft 的自由软件(Noncopylefted Free Software)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Noncopylefted free software comes from the author with permission to "
 "redistribute and modify, and also to add additional restrictions to it."
@@ -307,7 +310,7 @@
 "非 copyleft 的自由软件带有来自作者
的再分发和修改的许可,也带有添加额外限制条"
 "款的许可。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If a program is free but not copylefted, then some copies or modified "
 "versions may not be free at all. A software company can compile the program, "
@@ -318,18 +321,31 @@
 "完全不是自由的。软件公司可以编译该程序,不论是否对å…
¶è¿›è¡Œä¿®æ”¹ï¼Œéƒ½å¯ä»¥å°†å¯æ‰§è¡Œ"
 "文件作为<a href=\"#ProprietarySoftware\">专有软件</a>产品发布。"
 
-#. type: Content of: <p>
-msgid ""
-"The <a href=\"http://www.x.org\";>X Window System</a> illustrates this.  The "
-"X Consortium released X11 with distribution terms that made it noncopylefted "
-"free software, and subsequent developers have mostly followed the same "
-"practice.  A copy which has those distribution terms is free software.  "
-"However, there are nonfree versions as well, and there are (or at least "
-"were) popular workstations and PC graphics boards for which nonfree versions "
-"are the only ones that work.  If you are using this hardware, X11 is not "
-"free software for you.  <a href=\"/philosophy/x.html\">The developers of X11 "
-"even made X11 nonfree</a> for a while; they were able to do this because "
-"others had contributed their code under the same noncopyleft license."
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The <a href=\"http://www.x.org\";>X Window System</a> illustrates this.  "
+#| "The X Consortium released X11 with distribution terms that made it "
+#| "noncopylefted free software, and subsequent developers have mostly "
+#| "followed the same practice.  A copy which has those distribution terms is "
+#| "free software.  However, there are nonfree versions as well, and there "
+#| "are (or at least were) popular workstations and PC graphics boards for "
+#| "which nonfree versions are the only ones that work.  If you are using "
+#| "this hardware, X11 is not free software for you.  <a href=\"/philosophy/x."
+#| "html\">The developers of X11 even made X11 nonfree</a> for a while; they "
+#| "were able to do this because others had contributed their code under the "
+#| "same noncopyleft license."
+msgid ""
+"The <a href=\"https://www.x.org/wiki/\";>X Window System</a> illustrates "
+"this.  The X Consortium released X11 with distribution terms that made it "
+"noncopylefted free software, and subsequent developers have mostly followed "
+"the same practice.  A copy which has those distribution terms is free "
+"software.  However, there are nonfree versions as well, and there are (or at "
+"least were) popular workstations and PC graphics boards for which nonfree "
+"versions are the only ones that work.  If you are using this hardware, X11 "
+"is not free software for you.  <a href=\"/philosophy/x.html\">The developers "
+"of X11 even made X11 nonfree</a> for a while; they were able to do this "
+"because others had contributed their code under the same noncopyleft license."
 msgstr ""
 "<a href=\"http://www.x.org\";>X Window 系统</a>阐释了这一点。X 
联盟将 X11 以某"
 "种非 copyleft 发布条款发布,使其成为非 copyleft 
的自由软件,并且后续开发者几"
@@ -340,11 +356,11 @@
 "专有软件发布</a>;他们之所以能够如此,是由于å…
¶ä»–人使用相同的非 copyleft 许可"
 "证贡献了他们的代码。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Lax permissive licensed software"
 msgstr "使用包容型许可证的软件(Lax Permissive Licensed 
Software)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Lax permissive licenses include the X11 license and the <a href=\"/licenses/"
 "bsd.html\">two BSD licenses</a>.  These licenses permit almost any use of "
@@ -355,11 +371,11 @@
 "a>。这些许可证几乎允许对其代码进行任何方式的使用,包
括发布专有的二进制版本,"
 "不论是否更改了源代码。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GPL-covered software"
 msgstr "使用 GPL 许可的软件(GPL-Covered Software)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/licenses/gpl.html\">GNU GPL (General Public License)</a> is "
 "one specific set of distribution terms for copylefting a program. The GNU "
@@ -368,16 +384,16 @@
 "<a href=\"/licenses/gpl.html\">GNU GPL</a> 
是一类特定的发布条款集合,用于使该"
 "程序成为 copyleft 软件。GNU 计划将其用作大部分 GNU 
软件的发布条款。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To equate free software with GPL-covered software is therefore an error."
 msgstr "因此,将自由软件等同于使用 GPL 
许可的软件是一种错误。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "The GNU operating system"
 msgstr "GNU 操作系统(The GNU Operating System)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/gnu/gnu-history.html\">GNU operating system</a> is the Unix-"
 "like operating system, which is entirely free software, that we in the GNU "
@@ -387,7 +403,7 @@
 "统&rdquo;,它完全由自由软件构成,我们在 GNU 计划中于 1984 
年开始 GNU 操作系统"
 "开发。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A Unix-like operating system consists of many programs. The GNU system "
 "includes all of the <a href=\"#GNUsoftware\">official GNU packages</a>.  It "
@@ -398,7 +414,7 @@
 "\"#GNUsoftware\">GNU 程序包</a>。它还包括很多其他程序包
,诸如 X Window 系统以"
 "及 TeX,它们不是 GNU 软件。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The first test release of the complete GNU system was in 1996.  This "
 "includes the GNU Hurd, our kernel, developed since 1990.  In 2001 the GNU "
@@ -420,7 +436,7 @@
 "分发者可以根据他们的需求和偏好来选择不同的软件包。å…
¶ç»“果仍是一种 GNU 操作系统"
 "的变体。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Since the purpose of GNU is to be free, every single component in the GNU "
 "operating system is free software.  They don't all have to be copylefted, "
@@ -431,11 +447,11 @@
 "是,它们不必须都是 copyleft 
的,任何类别的自由软件都可以被合法并且合适地包含"
 "进来,如果它有助于实现技术上的目标。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GNU programs"
 msgstr "GNU 程序(GNU Programs)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;GNU programs&rdquo; is equivalent to <a href=\"#GNUsoftware\">GNU "
 "software.</a> A program Foo is a GNU program if it is GNU software.  We also "
@@ -445,14 +461,22 @@
 "序 foo 是一个 GNU 程序,那么它也是一个 GNU 
软件。我们有时也称之为 GNU 软件"
 "包。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GNU software"
 msgstr "GNU 软件(GNU Software)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/software/software.html\">GNU software</a> is software that is "
+#| "released under the auspices of the <a href= \"/gnu/gnu-history.html\">GNU "
+#| "Project</a>. If a program is GNU software, we also say that it is a GNU "
+#| "program or a GNU package.  The README or manual of a GNU package should "
+#| "say it is one; also, the <a href=\"/directory\">Free Software Directory</"
+#| "a> identifies all GNU packages."
 msgid ""
 "<a href=\"/software/software.html\">GNU software</a> is software that is "
-"released under the auspices of the <a href= \"/gnu/gnu-history.html\">GNU "
+"released under the auspices of the <a href=\"/gnu/gnu-history.html\">GNU "
 "Project</a>. If a program is GNU software, we also say that it is a GNU "
 "program or a GNU package.  The README or manual of a GNU package should say "
 "it is one; also, the <a href=\"/directory\">Free Software Directory</a> "
@@ -464,7 +488,7 @@
 "册应当声明它是一个 GNU 软件包;同时,<a 
href=\"/directory\">自由软件目录</a>"
 "标识了所有 GNU 软件包。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Most GNU software is <a href= \"/licenses/copyleft.html\">copylefted</a>, "
 "but not all; however, all GNU software must be <a href=\"/philosophy/free-sw."
@@ -474,10 +498,19 @@
 "全部;然而,所有 GNU 软件都必须是<a 
href=\"/philosophy/free-sw.html\">自由软"
 "件</a>。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Some GNU software was written by <a href= \"http://www.fsf.org/about/";
+#| "staff/\">staff</a> of the <a href=\"http://www.fsf.org/\";>Free Software "
+#| "Foundation</a>, but most GNU software comes from many <a href=\"/people/"
+#| "people.html\">volunteers</a>.  (Some of these volunteers are paid by "
+#| "companies or universities, but they are volunteers for us.)  Some "
+#| "contributed software is copyrighted by the Free Software Foundation; some "
+#| "is copyrighted by the contributors who wrote it."
 msgid ""
-"Some GNU software was written by <a href= \"http://www.fsf.org/about/staff/";
-"\">staff</a> of the <a href=\"http://www.fsf.org/\";>Free Software "
+"Some GNU software was written by <a href=\"https://www.fsf.org/about/staff/";
+"\">staff</a> of the <a href=\"https://www.fsf.org/\";>Free Software "
 "Foundation</a>, but most GNU software comes from many <a href=\"/people/"
 "people.html\">volunteers</a>.  (Some of these volunteers are paid by "
 "companies or universities, but they are volunteers for us.)  Some "
@@ -490,18 +523,18 @@
 "者大学支付薪酬,但他们确实是我们的志愿者
)。某些贡献的软件由 FSF 拥有版权,有"
 "些由编写它们的贡献者拥有版权。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "FSF-copyrighted GNU software"
 msgstr "FSF 拥有版权的 GNU 软件(FSF-Copyrighted GNU Software)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The developers of GNU packages can transfer the copyright to the FSF, or "
 "they can keep it.  The choice is theirs."
 msgstr ""
 "GNU 软件包的开发者可以选择将版权转让给 FSF 或者
自己保留。这是他们的选择权利。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If they have transferred the copyright to the FSF, the program is FSF-"
 "copyrighted GNU software, and the FSF can enforce its license.  If they have "
@@ -511,17 +544,17 @@
 
"制实行它的许可证。如果他们选择自己保留版权,强制实行å
…¶è®¸å¯è¯æ˜¯ä»–们自己的责"
 "任。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The FSF does not accept copyright assignments of software that is not an "
 "official GNU package, as a rule."
 msgstr "FSF 不会接受非官方 GNU 软件包
的软件的版权转让,这是一条规定。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Nonfree software"
 msgstr "非自由软件(Nonfree Software)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Nonfree software is any software that is not free.  Its use, redistribution "
 "or modification is prohibited, or requires you to ask for permission, or is "
@@ -530,13 +563,13 @@
 
"非自由软件是指任何不是自由软件的软件。它的使用、再分发或修改被禁止,或è€
…要求"
 "您请求授权许可,或者被严æ 
¼é™åˆ¶ä»¥è‡´äºŽæ‚¨äº‹å®žä¸Šä¸å¯èƒ½è‡ªç”±åœ°è¿›è¡Œä»¥ä¸Šè¡Œä¸ºã€‚"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Proprietary software"
 msgstr ""
 "专有软件(或译为“私有软件”<sup><a 
href=\"#TransNote1\">1</a></sup>,"
 "Proprietary software)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Proprietary software is another name for nonfree software.  In the past we "
 "subdivided nonfree software into &ldquo;semifree software&rdquo;, which "
@@ -550,7 +583,7 @@
 
"发;以及专有软件,它们禁止任何修改或再分发。但我们现在已经放弃了这种区分,并"
 "且现在将&ldquo;专有软件&rdquo;用作非自由软件的同义词。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The Free Software Foundation follows the rule that we cannot install any "
 "proprietary program on our computers except temporarily for the specific "
@@ -562,7 +595,7 @@
 
"于一种特定用途,即编写一个自由软件来取代它。除此之外,我们感觉没有任何可能的"
 "借口来安装一款专有软件。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For example, we felt justified in installing Unix on our computer in the "
 "1980s, because we were using it to write a free replacement for Unix. "
@@ -575,7 +608,7 @@
 "经有了,因
此这一借口不再适用;我们不会使用任何专有操作系统,并且我们所组è£
…çš„"
 "任何一台新计算机都必须运行一款完全自由的操作系统。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We don't insist that users of GNU, or contributors to GNU, have to live by "
 "this rule. It is a rule we made for ourselves. But we hope you will follow "
@@ -584,11 +617,11 @@
 "我们并不坚持要求 GNU 的用户或者贡献者也必须严æ 
¼éµå®ˆè¿™æ¡è§„则。它只是我们对自己"
 
"制定的规则。但我们希望您也愿意遵循它,为了您自己的自由。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Freeware"
 msgstr "免费软件(Freeware)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;freeware&rdquo; has no clear accepted definition, but it is "
 "commonly used for packages which permit redistribution but not modification "
@@ -600,11 +633,11 @@
 "允许再分发但禁止修改(并且其源代码不可获得)的软件包
。这些软件包不是自由软"
 "件,因
此请您<em>不要</em>使用&ldquo;freeware&rdquo;来指代自由软件。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Shareware"
 msgstr "共享软件(Shareware)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Shareware is software which comes with permission for people to redistribute "
 "copies, but says that anyone who continues to use a copy is <em>required</"
@@ -613,19 +646,19 @@
 "共享软件是指那些附带有å…
è®¸äººä»¬å†åˆ†å‘副本的许可协议的软件,但它宣称任何人如果"
 "想要继续使用其一份副本就<em>必
须</em>支付一笔授权许可费用。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Shareware is not free software, or even semifree. There are two reasons it "
 "is not:"
 msgstr "å…
±äº«è½¯ä»¶ä¸æ˜¯è‡ªç”±è½¯ä»¶ï¼Œç”šè‡³ä¸æ˜¯åŠè‡ªç”±è½¯ä»¶ã€‚有两大原因:"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "For most shareware, source code is not available; thus, you cannot modify "
 "the program at all."
 msgstr "对于大多数共享软件,源代码不可获得;因此,您完å…
¨ä¸èƒ½ä¿®æ”¹å®ƒä»¬ï¼›"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Shareware does not come with permission to make a copy and install it "
 "without paying a license fee, not even for individuals engaging in nonprofit "
@@ -636,11 +669,11 @@
 
"可条款,甚至对于那些从事非盈利性活动的个人用户也不提供这æ
 ·çš„许可(实际上,人"
 "们经常不遵守这种发布条款并且仍然这æ 
·åšï¼Œä½†è®¸å¯æ¡æ¬¾å¹¶ä¸å…è®¸ï¼‰ã€‚"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Private software"
 msgstr "私人软件(Private Software)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Private or custom software is software developed for one user (typically an "
 "organization or company). That user keeps it and uses it, and does not "
@@ -649,7 +682,7 @@
 "私人软件或者
定制软件是指专为某一特定用户(通常是一家组织机构或者
商业公司)开"
 "发的软件。该用户保存和使用它,并且不会以源代码或者
二进制格式将其对公众发布。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A private program is free software (in a somewhat trivial sense) if its sole "
 "user has the four freedoms.  In particular, if the user has full rights to "
@@ -662,7 +695,7 @@
 "而,如果用户向å…
¶ä»–人分发副本但不随之提供四项基本自由,那些副本就不是自由软"
 "件。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software is a matter of freedom, not access.  In general we do not "
 "believe it is wrong to develop a program and not release it. There are "
@@ -679,7 +712,7 @@
 "并非如此生死攸关,拒绝将它对å…
¬ä¼—发布并不是特别地坏。因此,开发私人软件或者定"
 "制软件的实践与自由软件运动的原则之间并无冲突。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Nearly all employment for programmers is in development of custom software; "
 "therefore most programming jobs are, or could be, done in a way compatible "
@@ -688,11 +721,11 @@
 "几乎所有受雇佣的程序员都在开发某种定制软件;因
此大部分编程工作就是或者可以是"
 "一种与自由软件运动相容的方式完成的。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Commercial software"
 msgstr "商业软件(Commercial Software)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;Commercial&rdquo; and &ldquo;proprietary&rdquo; are not the same! "
 "Commercial software is software developed by a business as part of its "
@@ -704,7 +737,7 @@
 "一部分所开发的软件。大部分商业软件是<a 
href=\"#ProprietarySoftware\">专有软件"
 
"</a>,但确实也有商业化的自由软件,并且也有非商业化的专有软件。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For example, GNU Ada is developed by a company.  It is always distributed "
 "under the terms of the GNU GPL, and every copy is free software; but its "
@@ -719,7 +752,7 @@
 "&ldquo;GNU Ada 
<em>确实是</em>一款商业化的编译器;它恰好也是一款自由软件"
 "&rdquo;。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For the GNU Project, the priorities are in the other order: the important "
 "thing is that GNU Ada is free software; that it is commercial is just a "
@@ -730,7 +763,7 @@
 "它同时也是一款商业软件只是细节。然而,由于å…
¶ä½œä¸ºä¸€æ¬¾å•†ä¸šè½¯ä»¶è€Œå¸¦æ¥çš„额外发展"
 "是大有裨益的。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please help spread the awareness that free commercial software is possible. "
 "You can do this by making an effort not to say &ldquo;commercial&rdquo; when "
@@ -764,9 +797,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
@@ -774,26 +805,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=\"mailto:web-translators@gnu.org";
-"\">&lt;web-translators@gnu.org&gt;</a>。</p>\n"
-"<p>关于进行协调与提交翻译的更多信息参见<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; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, "
+#| "2015, 2016, 2017, 2018, 2019 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
-"2016, 2017, 2018, 2019 Free Software Foundation, Inc."
+"Copyright &copy; 1996-1998, 2001-2005, 2007, 2009-2012, 2015, 2019, 2021 "
+"Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
 "2016, 2017, 2018, 2019 Free Software Foundation, Inc."
@@ -822,10 +859,23 @@
 msgid "Updated:"
 msgstr "最后更新:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
-"2016, 2017, 2018, 2019, 2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
-"2016, 2017, 2018, 2019, 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=\"mailto:web-translators@gnu.";
+#~ "org\">&lt;web-translators@gnu.org&gt;</a>。</p>\n"
+#~ "<p>关于进行协调与提交翻译的更多信息参见<a 
href=\"/server/standards/README."
+#~ "translations.html\">《译者指南》</a>。"
+
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, "
+#~ "2015, 2016, 2017, 2018, 2019, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, "
+#~ "2015, 2016, 2017, 2018, 2019, 2021 Free Software Foundation, Inc."

Index: philosophy/po/categories.zh-tw.po
===================================================================
RCS file: /web/www/www/philosophy/po/categories.zh-tw.po,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- philosophy/po/categories.zh-tw.po   21 Jul 2021 20:25:38 -0000      1.22
+++ philosophy/po/categories.zh-tw.po   21 Jul 2021 20:34:05 -0000      1.23
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: categories.html\n"
-"POT-Creation-Date: 2019-02-21 01:56+0000\n"
+"POT-Creation-Date: 2021-07-21 20:25+0000\n"
 "PO-Revision-Date: 2020-02-08 17:11+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-07-21 20:25+0000\n"
 "X-Generator: Poedit 2.2.4\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
@@ -23,11 +24,14 @@
 "Foundation"
 msgstr "自由與非自由軟體的類別 - GNU 專案 - 自由軟體基金會"
 
-#. type: Content of: <h2>
-msgid "Categories of free and nonfree software"
+#. type: Content of: <div><h2>
+# | Categories of [-f-]{+F+}ree and [-nonfree software-] {+Nonfree Software+}
+#, fuzzy
+#| msgid "Categories of free and nonfree software"
+msgid "Categories of Free and Nonfree Software"
 msgstr "自由與非自由軟體的類別"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Also see <a href=\"/philosophy/words-to-avoid.html\">Confusi